labofsahil/github-event-dataset-2012 huggingface dataset:
Fix Windows pathname issue in 'odd encoding' test.

Fixes #2017
Merge pull request #2021 from jdmarch/fix_odd_encoding_test_windows

Fix Windows pathname issue in 'odd encoding' test.

Fixes #2017
Add welcome_message option to enable_pylab

This way, custom apps that enable pylab won't see it by default.  See for
example sympy/sympy#1489.
Merge pull request #2308 from asmeurer/pylab-message

Add welcome_message option to enable_pylab
Add dvipng backend to latex_to_png
Use dvipng to format sympy.Matrix to PNG display
latex_to_png returns None when the backend cannot be used

When matplotlib/dvipng is not present, other formatter will be used.
Document print_png and print_display_png
Copyright fix on sympyprinting.py and latextools.py

See: #1644
Suppress output from latex and dvipng command
Check if latex/dvipng exist before calling them
Merge pull request #1861 from tkf/dvipng

Use dvipng to format sympy.Matrix, enabling display of matrices in the Qt console with the sympy printing extension.

Two changes are introduced:

    new dvipng backend is added to latex_to_png
    PNG formatter for sympy.Matrix uses the dvipng backend
Fix: longest_substr([]) -> ''

Previously the algorithm used to find the longest common starting substring
unintentionally raised an error when it was called on an empty list.
Merge pull request #2261 from bfroehle/empty_paste_fix

Fix: longest_substr([]) -> ''
Changed language system
IE9 compat
add raynos to authors
arachne uses both entity and item in its permalinks!
Merge branch 'master' into gh-pages
the egg link needs a virtualenv to install into
Fixed pause bug. Changed input behavoir of highscore screen. Added fade out tweens on enemies
[jruby] update gemfile and deploy script
HowtoGuides zips and Release of July
starting to clean up a bit
Revert: ^.^
(c15c6cb091eee8406fc6ac80aa3df805e9964816)
upload photo
textobj from kana

ie, ae - entire
ii, ai - indent
il, al - line
modules bump merge
flake8 annoying D:
there are functions on your lawn
Change patterns link to use current version
Fix to securesync model verification.
fix window size and comment
fix conflits
Integrated with buster asserts
Merge branch 'master' of github.com:jamietre/iqtest
Update _config.yml

up
updated system-architecture.txt
iteracje
New features + fixes
Added support for bootstrap-typeahead.js
Moved subnav from docs.css to bootstrap (not documented)
Another big arse commit. Case almost done. Parser getting cleaner. Ast getting dirtier.
Added option for placing Javascript calls at the bottom
Fixed Bootstrap carousel conflict with Mootools
refresh pour les 2 vues
Updated a few tests (and commited missing .html files)
Update readme and test if this thing is working
Sync for clipboard ring bug fix
Remove unused/undocumented #zoomSlider
Move _zoomToStep to WorldMap.setZoomStep
Rename zoomStep to zoomScaleFactor to distinguish it from zoom(Cur|Max)Step
Rename zoomCurStep to zoomStep
Allow setting the current zoomStep via API and the initializer.
Add onZoomChange event
Update slider so transition is only executed when new image is loaded. Interval is cleared/restarted for every transition.
More readable Rect repr.
Merge branch 'master' of github.com:jceipek/pyShiva
classes.py has our sample python classes
Merge branch 'master' of github.com:jceipek/pyShiva
PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest
Issue 445: retry EC2ComputeService.cleanUpIncidentalResources due to failure if done too soon after last VM terminates!
added windows password parsing to ec2
Issue 1049:support aws-ec2 cluster compute instances in eu-west-1
test expectations
Returning one logger per class in Spring JavaConfig's logger @Resource injection support
added @Transform
changed tmux prefix to ctrl-space
Added option to gather blogs stats - not sending e-mails.
Changed "tagline"
Added index interface to CSV method
bits since forever.
Replaced uses of deprecated equals

Replaced uses of deprecated equals() with equal()
Added AMD Support
Added AMD Support and method aliases

Added AMD Support and aliased bind/unbind with on/off to match jQuery
1.7+ naming conventions.
receive commands from ADK

Signed-off-by: Jens Moser <jenmo917@student.liu.se>
Merge branch 'development' of https://github.com/jenmo917/TNE085 into development
Added Gtest and test folder.
Add pacman
Merge branch 'master' into gh-pages
Ultima incorporacion
Added footer navigation. Added images.
Refactor EMF family transform.
updated at Mo 16. Jul 14:46:21 CEST 2012
Small tweaks, mostly Album
Abridged statistics
Started background
New resource db format
TickerTimer now restarts ok
added encoding cookie
refactored config files
Remove debug (indexing just a few packages)
get rid of gitx and macvim, add some tweaks
adding melissa's files
ggg
going back before the failed first merge
added color debug and better list generation for ranges of colors
added bare bones of video class and updated particle behavior
updated vid class and new particles per source
added rings to sources and changed subParticles
merged beatD with master
mergggeeee
MERGED
sources with rings
sources with rings
everybodys working ridiculously slow.
hurrying
working vidMode, additional sound framework
before add vid mode
added beat detection debug screen and fixed mousePress error
its gonna be a late one folks
merged?
pause for drinks
removing old .zsh directory if it exists
Shifted the spike over to using a local copy of OpenLayers instead of
pulling it from their site.
Added symbolic link from spike directory to OpenLayers.
fixed dependency on existience of agenda_bottom
Api change (bis)
updated 2012-04-29 04:19:00
cmd/8g: fix erroneous LEAL nil.

Fixes issue 4399.

R=golang-dev, nigeltao
CC=golang-dev
http://codereview.appspot.com/6845053
misc/benchcmp: show byte allocation statistics

R=golang-dev, rsc
CC=golang-dev
https://codereview.appspot.com/6971048

Committer: Russ Cox <rsc@golang.org>
runtime: aggregate defer allocations

benchmark             old ns/op    new ns/op    delta
BenchmarkDefer              165          113  -31.52%
BenchmarkDefer10            155          103  -33.55%
BenchmarkDeferMany          216          158  -26.85%

benchmark            old allocs   new allocs    delta
BenchmarkDefer                1            0  -100.00%
BenchmarkDefer10              1            0  -100.00%
BenchmarkDeferMany            1            0  -100.00%

benchmark             old bytes    new bytes    delta
BenchmarkDefer               64            0  -100.00%
BenchmarkDefer10             64            0  -100.00%
BenchmarkDeferMany           64           66    3.12%

Fixes issue 2364.

R=ken2
CC=golang-dev
https://codereview.appspot.com/7001051
Visual studio fix
Added the entry action change events
Now the actions associated to entries are also successfuly saved
Now works for final years and first years
Professor create work offer
Removed secret token.
Add AWS FOG info after setting up S3 buckets and CloudFront for assets and content CDN
The original name is abit digusting..
Added Jersey Libs

Added Libs
Bugfix for Windows users with ETags and CTags

Windows has case insensitive files (where linux doesn't). "TAGS" is
standard for ETags, and "tags" is standard for CTags, and hasktag
supports both.  This results in an error when trying to open both files
on Windows. Easy Solution: generate an error message when Windows users
attempt this.
Chapter 7 testing
Merge branches 'master' and 'validation-unit-testing'
topnavcategories.html - demo with time script
Fix linking error on home page
Added pipsqueak
blah
blahhhh
wrote works, etc
wrote works, etc
remastered simtools based on django models with model edit and session tracking
Add org.sonatype.oss:oss-parent:7 as the root POM's parent.
Updated readme to match recent change to find methods.
Circle packing with size and color animation
Merge remote-tracking branch 'origin/master'
adding rack/task numbers to Tree Visualization
[Add] UDID-for-iOS-5 (1.0)
Add hash option to fv_converter for learning in fixed-size memory: fix #67

The dimension of feature space can grow gradually with current version.
To prevent this situation, I implement hash option that calculate hash values of
feature dimensions and force to learn in fixed size memory.
Note that it causes collision of hash values and inefficiency of learning.
Merge pull request #106 from jubatus/feature/hash-feature

Hash feature keys: fixes #67
add tyt
add Rconcern
Type in generate script.
Tagging v1.0.6
Updating build, Mootools, Zepto working
Merge branch 'master' of github.com:jupiterjs/canjs
can.view('name') now returns renderer function
Fixed can.Control.plugin and added tests
Changed MenuBar and ToolBar to be more specific and gray out simultaneously.
change scene/terrain
Correct typos
Fix crash when accessing the transaction code via post.xact.code using python

ledger would abort with the following error message:
  TypeError: No Python class registered for C++ class boost::optional<std::string>

The changes pass a CallPolicy to make_getter when adding the transaction
code property for python, so that the correct to_python conversion is
made. For details see:
http://www.boost.org/doc/libs/1_52_0/libs/python/doc/v2/faq.html#topythonconversionfailed
Merge pull request #108 from afh/pull/python_xact_code

Fix crash when accessing the transaction code via post.xact.code using python
Merge pull request #106 from afh/pull/typos

Correct typos
Merge branch 'next' of github.com:ledger/ledger into next
Problem with Protocol...
get that sukka ver2
also check for doPause, fixed playInterface update, don't autoplay
Preparation for memory domain.
Added missing tic
update vim-pathogen and snippets
Updated codebase to use centralised Log
add fdk-aac support to ffmpeg (currently HEAD only)
saving original code
New version of opening hours.

A bunch of bugfixes.
add test_karel.php to gitignore

Signed-off-by: Karel Kellner <karel@kellner.be>
HoverButton can add BitmapSource
Merge branch 'master' of github.com:bhaviksingh/Choreoh
resized radialmenu for the timelineradialmenu
Merge branch 'master' of github.com:bhaviksingh/Choreoh into timelineselection
working home screen in container
fixed merge conflict
working on radial menu for timeline
merged
added offset to waveform class
enabled selecting segments
selection works
Fixed multiple click events being triggered on radial menu
bugfix for crash
Merge branch 'master' of github.com:bhaviksingh/Choreoh
changes to waveform class to facilitate playback scrolling
added playback slider
added audio playing
merging
testing
added audio playback in recording screen
added disable disable button when submitting
Small improvements

Getters and setters now return values rather than properties.  Methods
added to return model properties.
added testcase for external potential
Merge branch 'tabextpot' of github.com:kessel/espresso into tabextpot
working
Lot's of progress
removed hack for DARTBUG 5350
The big exception/error rename/alignment
Deleting js files.
A little helper to indicate who's who
Adds travis images to ReadMe for each branch
Fixes wrong username
Remove unwantted logic from the set
attributes_dict now conatins 'id' is defined

* fixes #2
Setting a reference field deletes the reference (and cached object)

* fixes #3
Fixes unittests
Added install_requires to setup.py.

This will automatically install deps. from requirements.txt.
Simplified .travis.yml

Dependencies get installed automatically now, no need to do it
manually.
Merge pull request #4 from jkbr/master

Added `install_requires` to setup.py
Added Set.__ne__().
Merge pull request #6 from jkbr/master

Added Set.__ne__()
Added support for multiple input values in common operations.
Updating documentation.
Fixing documentation.
Merge pull request #7 from jeloou/master

A better way to add data to containers.
Apply type validation to falsy values as well.
Merge pull request #9 from jkbr/master

Apply type validation to falsy values as well
HOTFIX - Set temporary keys to expire after one minute

fixes #10
Merge branch 'master' of github.com:kiddouk/redisco
Canvas size was wrong in this branch.
Added product/code
Named test class for Check In Test
Use the hash-table version.
Test solubility of n-puzzle.
Outsource to R.
First pass at plotting Voronoi over ggplot2 and deldir.
comment
Commnet
SWITCHYARD-1049: Introduction of Drools class breaks Forge rules tooling
[SWITCHYARD-1039] - HTTP component enhancements
[SWITCHYARD-1050] - Fixed default namespace for OperationSelector
[SWITCHYARD-1005] - Added forge plugin for HTTP gateway
SWITCHYARD-1054: BPM process/signal event data can only be from context, not content
Merge remote-tracking branch 'upstream/master'
set ttyfast for smoother scrolling
Merge branch 'master' of github.com:knubie/dotfiles
nbxml: GenericKeyValueParserImpl: test and fix for whitespace in end
nbxml: XMLTokenizer: don't emit empty pi target.

We need to skip the beginning whitespace in <? whitespace ?>, data can
contain it.
nbxml: XMLParser: don't warn if there's no encoding specified.
nbxml: ParseXmlDeclarationTestCase: new lead/trailing whitespace test
rank_label is html_safe
Improved admin tools (tigmaker + tiggit debug mode)
"Sincro symfony"
Merge branch 'master' of github.com:koxder/Noticias
"Parte 3 symblog"
Hiding the mini register button if @is_past is true
przed debugiem
Fixed updating global config settings
Worked on adding list command
(almost) unbreaking stuff
format - reversed order
RMI registry scripts
Right way to fix tabs
Make tabs work lolz
sed ftw
fix byline html

wrong markup for bylines. changed to proper syntax.
emacs 増量
Improved the indentation
Merge branch 'master' of github.com:ksinkar/ksinkar
Added the rails minor mode as a submodule
added rails-templates as subproject,made ruby install optional
FEATURE: Adding normalization for valid outputs
Initial push

HTML pages based on Bootstrap
Pushed the assets

CSS
Images
JS
Renamed home to index for gh-pages
Updated menu
Hide navbar bottom in tablets and mobile
Hidden username text on tablets and mobiles
CSS tweaks
Merge pull request #1 from shibulijack/gh-pages

Version 2.0
30: Upload images
Merge branch '30' of github.com:kv109/mytravels into 30
Applets:

Browser -> scrolling -> repaint all applets
---> timer-Object repaints the applet after 2 seconds after scrolling

execute.jsp
-> javascript function -> call draw() of all applets on scrolling
new xml reader problem
A fix in MeshReaderH2DXML.
misc changes to debian packaging script
Enabled choose field: added some comments
fix potential hang when program uses call on an event that has no associated command
fixed missing line breaks in help output
Refactoring the sort function to fit into the framework.
Fix #5: Fix broken tests.

Fix TeX test cases for MathJax.
Remove asciidoc tests.
removing json from milestones
removing json from albums
removing json from experiences
removing json from journal entries
removing json from photo albums
removing json from photos
removing json from profiles
removing json from projects
removing json from songs
removing json from videos
Added test to see how GUI looks (Passed).
Minor cosmetic changes and bug fixes in gui
Improved the label formatting function
Handled image not found
Added a launcher.
Everything works.
Minor fixes in dbbuilder and gui.
Fixed rvmrc to allow ruby 1.9.3 stable versions.
Exercicio 30
Exercicio 31
Exercicio 32
Exercicio 33
Adding visualstart plugin
single pass design_primers, initial
single pass design_primers, working
Get rid of IPS/UPS/BPS patching
structure finilized, init the styles
gateone.js:  Changed the capabilities checks behavior when the client browser is missing window.URL (or window.webkitURL)...  Instead of throwing an alert() and preventing Gate One from loading it will merely display a warning dialog where the user can choose to opt out of the warning in the future.  This is to allow browsers that support everything *but* window.URL (Safari 5.1 and maybe 6.0) to work with Gate One.  The only thing they won't be able to do is load the Web Worker via the WebSocket (the fallback to using a URL should still work) and use GateOne.Utils.saveAs().  This means they will be unable to save session logs/recordings or download SSH identities.
gateone.js:  Made the same change as above related to Blob() and BlobBuilder():  They're now only warnings.
gateone.js:  GateOne.Visual.alert() can now be given a pre-constructed DOM node as opposed to just a text string (as the message argument).
gateone.js:  Fixed Chrome/Chromium 18 support by adding a sophisticated check for a *working* Blob interface.  Older versions of Chrome had Blob() but it didn't work...  Fortunately they also have BlobBuilder() so the compatibility checks will now gracefully handle this (weird) situation.
Playback Plugin:  Updated to fix the sidetitle position to match that of the Logging Plugin.
Playback Plugin:  The recording is now explicitly passed through json_encode() before being sent to the client (like the Logging Plugin).  This should fix issues related to older versions of Tornado and Python.
Logging Plugin:  Renamed "View Log (Flat)" and "View Log (Playback)" to "Printable Log" and "View Playback" respectively.
Logging Plugin:  Modified the output format of the "Printable" log format so that it can be copied and pasted properly.  Prior to this change the newlines would get lost when copying and pasting (really annoying).
terminal.py:  Updated _spanify_scrollback() to use the new optimizations that were added to _spanify_screen().
termio.py:  Added a bit of extra exception handling to work around corrupt logs.
gateone.js:  When resizing terminals the screen will be adjusted upwards to hide the scollback buffer just like it does when a new terminal is created (or when the page is reloaded).
Playback Plugin:  Removed the logic that moves the terminal screen upwards to account for the playback controls since the aforementioned change to gateone.js now takes GateOne.prefs.rowAdjust into account.
gateone.js:  Fixed the bug where the terminal screen would become empty if you increased the size of your browser window.
terminal.py:  Added the beginnings of printing support.  I have more code to add from a separate branch but am still working out some implementation details.
gateone.js:  Added GateOne.terminals.count() which simply returns the number of open terminals.
gateone.js:  Instead of loading the accept_certificate.html page in the current window (so the user can accept Gate One's SSL certificate when embedding) a new window will be opened to accept_certificate.html instead.  This window will be checked at an interval and the <Gate One URL>/combined_js will be reloaded when it is closed.  This should allow the user to accept Gate One's SSL certificate without having to leave the current web page.
accept_certificate.html:  Instead of redirecting the user to the previous page in the browser's history the JavaScript will simply call window.close().  This works well in conjunction with the new SSL error logic inside of gateone.js (see previous note).
gateone.py:  Changed how the api_keys option is determined so that you can override it on the command line if you want.
gateone.py:  Added 'command' to the Application settings dict so that plugins can more easily access that option.
gateone.py:  Fixed a bug in API authentication where self._current_user wasn't getting set after successful authentication.
setup.py:  Gate One will now require Tornado 2.4+.
Fixed bug in Item
test
Test2
stuff
Merge branch 'master' of github.com:lihaoyi/21W.789

Conflicts:
	AndroidManifest.xml
	bin/Shopaholix.apk
	bin/classes.dex
	bin/classes/Shopaholix/database/Backend$Tuple.class
	bin/classes/Shopaholix/database/Backend.class
	bin/classes/Shopaholix/database/DBAdapter$DatabaseHelper.class
	bin/classes/Shopaholix/database/DBAdapter.class
	bin/classes/Shopaholix/database/Item.class
	bin/classes/Shopaholix/database/UPCDatabase.class
	bin/classes/Shopaholix/main/BaseView.class
	bin/classes/Shopaholix/main/ItemActivity.class
	bin/classes/Shopaholix/main/ItemView.class
	bin/classes/Shopaholix/main/R$id.class
	bin/classes/Shopaholix/main/R$layout.class
	bin/classes/Shopaholix/main/R$string.class
	bin/classes/Shopaholix/main/R$style.class
	bin/classes/Shopaholix/main/R$xml.class
	bin/classes/Shopaholix/main/ScanActivity.class
	bin/classes/Shopaholix/main/ScanView.class
	bin/classes/Shopaholix/main/SearchActivity$1.class
	bin/classes/Shopaholix/main/SearchActivity.class
	bin/classes/Shopaholix/main/SearchableActivity.class
	bin/classes/Shopaholix/main/ShopaholixActivity.class
	bin/resources.ap_
	src/Shopaholix/main/SearchActivity.java
added rst
boxes (unstable)
Remove QtMain from CMakeList.txt
Resolved diffusion maps redundant memory requirements issue
RAD-342: Added "Go To" and "Face" context menu options on the nearby avatar list
Refactored calculating avatar position and moving to target to StateManager.cs

git-svn-id: https://radegast.googlecode.com/svn/trunk@1260 f7a694da-4d33-11de-9ad6-1127a62b9fcd
Initial module version
Readme update
space-el oldal lapozas (normal modban)
pathogen fix,  netrwhist ignoralasa
bizonytalanul mukodo funkciok eltavolitasa

 * vimrc szerkesztes utani ujratoltese neha meghulyitette a PowerLine-t
 * Rename parancs nem tudta helyesen kezelni az ekezetes fajlokat (nem
   kizart, hogy OS X specifikus hibarol volt szo)
uses haml
adds paperclip, factory_girl, guard
Implemented matching pursuit.
Merge branch 'master' into develop

Conflicts:
	code/isa/include/isa.h
	code/isa/src/isa.cpp
	code/isa/src/isainterface.cpp
	code/isa/tests/isa_test.py
Implemented orthogonalization of basis.
Fixed a bug in initialization.
Added possibility to retrieve all importance weights.
Implemented merge algorithm and fixed a couple of bugs.
Implemented test for subspace merging.
Fixed a bug in computation of annealed importance weights.
Updated Eigen version.
Fixed several bugs in subspace merging.
Hidden states now persist across training periods.
Added mixture capabilities to ISA.
Fixed a bug in evaluation of Gaussian-ISA mixture.
Added interface for prior loglikelihood.
Fixed issue with nans by replacing implementation of sampleNormal.
discover media asynchronously (wip)
novo scriptsql
Bugfix: ft232r: Always flush writes before purging buffers, and empty local read buffer when flushing ftdi read buffer
Bugfix: x6500: When purging ft232r buffers (during bitstream upload), also clear JTAG delayed read counter to avoid any potential desync
x6500: Whenever we get a hardware error, purge buffers just in case of read/write desync
Bugfix: dynclock: Use standard C struct initializer to handle initialization, instead of memsetting memory to nulls

This fixes a possible case where float 0 is not represented by null bytes
Merge branch 'bugfix_dclk_prep' into dev_x6500
x6500: Try a more flexible approach to applying dynclock logic
ft232r: If we are searching for a specific serial, pay no attention to the product id
FPGA-README: Discuss X6500 --scan-serial usage of cases where it may be needed
Bugfix: ztex: Include --scan-serial option even for ztex-only builds, so it can be used to disable autodetect if needed
Merge branch 'ztex_S_noauto' into dev_x6500

Conflicts:
	miner.c
Bugfix: x6500: Include --scan-serial option even for x6500-only builds
Implement new --force-dev-init option to force bitstream upload to modminer and x6500 devices
latest fixes to category model
fix resume bug
avoid dispose final object
GrScreen avoid dispose static member
var rename
add smoothzoom in new 1 touch
var rename
fix one finger move momentum
bugfix: game crashes, when resume after pause
添加菜单，添加内容
add dns resolv
emacs config. zshrc
added python script to fetch data from linkedin
Filter long messages
Adicionando Spell
Configurando Spell e exibindo a statusbar
Finalização Parcial enquete e Finalização das DAOS: DadosPessoaisUsuarioDAO, DadosProfissionaisUsuarioDAO e ImagemUsuarioDAO.
moving intArrayToString() from DefinitionPoller to Util
ignoring compressed static styles and scripts - don't compress locally
static files
README update
Merge branch 'master' of github.com:macat/greenroom
app修正
Add very, very basic support for 2D textures, shaders, vertex arrays, 2D scenes, scene nodes and keyboard input.
Add a second demo that shows a textured quad that can be moved left and right with the arrow keys.
Add gl-matrix-min.js. From https://github.com/toji/gl-matrix
maybe foreground music works on phone?
random port support
Add mageekguy\atoum\runner::addDefaultReport().
Test autoloader now generate mock on demand.
Finished and added footer
timing for tests
implement config option for alternative resilence calculation. close #75.
Move loot condition SQL file to SD2.
[mr2104] Add a new Vehicle Function for better Passenger controll.
Usefull for Snobolds in Gortok encounter, which enter Player-Vehicle
[mr2105] Little Cleanup
[mr2106] Use 2099 and rewrite some erase functions
Merge branch 'master' into testing
remove onte threat lock, forget in mr2082.
rewrite Evade system on event-based structure. related to #1086 and some other. testing.
Forgot to instantiate the EmailRaw object.
Fixed some NPEs.
Added multi-threaded support to the MailSender so that each email is sent in its own thread.
capmt: add support for on-demand sockets per service id

This commit fixes simultaneous channel decryption in capmt oscam mode.
Initial channel PMT data and PMT updates are sent to oscam via different
capmt socket connections (a socket is created per channel SID).
OScam is stopping decrypting when the socket is closed.

More details in this thread:
http://www.streamboard.tv/wbb2/thread.php?threadid=33323

Thanks to @posixx for days of testing :)
Making clearer the interpretation of the relation symbols.
Definition of the interface
Tag carto, for #1760
added github section.
add a simple, dumb, and slow method of detecting windows drives - refs #1679
Merge branch 'master' of https://github.com/mapbox/tilemill
pull in latest millstone
Fix exception due to undeclared variable.
Merge branch 'PasteToolAbsFlowFix'
fixes #2365, restored changes that were back leveled by commit
5162b5e5c89a401d575f78d6ff534be02e07747e
导出excel
Signed-off-by: git_jun <122419795@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git into git_jun

Conflicts:解决冲突
	code/Authority/THOK.Wms.Bll/Service/CellService.cs
	code/Authority/Wms/Wms.csproj
修补cellservice中的getproductcell方法
Signed-off-by: git_jun <122419795@qq.com>
补充导出功能，判断盘符，新添样式。
Signed-off-by: git_jun <122419795@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git into git_jun
库存分布查询（+产品=>商品）
Signed-off-by: Endis <369029432@qq.com>
库存分布改动
Signed-off-by: Endis <369029432@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge remote-tracking branch 'thok-wyl/master'
综合查询界面调整
Signed-off-by: Endis <369029432@qq.com>
入库单查询优化
Signed-off-by: Endis <369029432@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
增加车载读取作业数据的接口（未完成）；
Merge remote-tracking branch 'thok-wyl/master'
Merge remote-tracking branch 'thok-zzb/master'
综合查询BuG调整
Signed-off-by: Endis <369029432@qq.com>
修改数据结构作业员，及实时作业标识，增加车载读取作业数据的接口（未完成）；处理日结结果不正确的错误，及显示错误和排序；
Merge remote-tracking branch 'thok-zzb/master'

Conflicts:
	code/Authority/THOK.Wms.Bll/Service/DailyBalanceService.cs
Merge remote-tracking branch 'thok-wyl/master'
增加车载读取作业数据的接口（测试中）；
Fix settings chevron icons to use new icons
Modificação na validação dos campos do contrato
Fixando tamanho de campos
Teste co processamento parcial da tela
Merge remote-tracking branch 'origin/master'
Fixed typo and added the `die` alias.
bug no creating folder .jGrep fixed
weitere Nodes implementiert
git merge alias
powder aliases
default editor to sublime
eka dokumentti
Update URL to use API instead of iPhone page
Move parameter processing to its own class.
updated gitignore to ignore manuals and trade reviews
Getting some structure in place.
Working version of the code. Refactoring required.
Add a comment to the assertion
able to append to an already exsisting file
Merge branch 'master' of github.com:mattles/Comp317
c

Signed-off-by: mattma2009 <mazhengxiu@gmail.com>
added client side rendering engine
add stuff
resolve conflict
Merge branch 'master' of https://github.com/mavlee/gamehack
Create `configuration.properties' before everything else.
fixes to data structures
added sample data fro responsible person
added children maintenance
vaadin updated to 6.8.6
returning string instead of string* for newick trs
now listening for .ghpy addutions in main GHA folder.
Removed the old stats.html using flot to use the new page that uses graphics from nagios.
Merge branch 'statistics' into production
Changes: Fix memory leak from JQuery's click callback
003_add_disk_format.py: Avoid deadlock in upgrade

The connection used to query existing images needs to be closed
earlier to avoid deadlocking later calls thru sqlalchemy.

Fixes bug 932466

Update: Update my email in Authors

Update: Revert Authors email to original, add git commit email
        to .mailamp.

Change-Id: Ic248fdfe3933437928f0b393d8cde993b96bf2cb
making setup obey pip-requires.
bzr is not a dep.
Backport sendfile code from OS trunk.
import the rest of the sendfile stuff from essex
fix a shadowed test
warning fixes for builtin overrides
log status code of error
Prevent killed images from leaking.

If an image is killed before a location is set (which happens due to a
checksum failure) the orphaned data will remain on disk forever with no
way (via glance api) to remove it.
Add RBD store backend.

To use this you'll need the latest version of Ceph from git,
which will become version 0.37.

Change-Id: Ia2126395525759eb8c11df055bdc6f286dea97b9
remove custom field stuff
adding preview overlay viewer
data form problem 6
done problem 6
Smarter and more functionable Object.isCopy

It can check deep copies (with customizable depth), compares also
objects by string represenation.
MENTA-167 - Update thinking lifecycle with interface and activity diagram
Corrected Interface diagram.
Transform Response XML
por favor... trabajad en windows.

Da conflictos por que la mierda de git no es capaz de comparar
correctamente los ficheros.... me ha hecho perder dos horas preciosas
add file get_instance_name.cpp
Reach for the Top videos appear to be back now, removing 'update' about removed videos.
Adjust styles; add RSS subscribe and Twitter follow links
New blog post: Thoughts about sleep
Edit cooking blog post: lower case title
fix simple example
reformat exat.erl
reindente eresye.erl
reformat eresye
reformat media_type
add support for binaries in sl and reformat sl.erl
wordpress replacer update
updates to code, sorry for poor code - time-constraint
Getting crud to work
Added query benchmarks. Added test data.
Not functional. Need to go to dinner.
added license files and new constructor
improved logging on common implementation problem
added logging to help diagnose problems when multiple property sources are in use
added logging to help diagnose problems when multiple property sources are in use
added license
added license files
JVMのメモリ設定追加
Update readable links to the red altcolor
fixed bug in broadcast message serialization
needless context
a bit
refactoring: rename module
refactoring: move instance declaration
Remove sbt

Now just running typesafe's stuff, with sbt 0.12 copied in.
Fix link to nave standalone script
vim: mt to --remote-silent-tab, m to --remote-silent
works with old versions of rubygems
Add progress meter implementation
refactored affine transform
added unit test
Add simple config
Make delimiter be configurable
Wrap base64 decoding in an error handler
Added support for different encoding types
added haar wavelet steganography support
changed default encoding to "none" from "base64"
Documentation updates, and rename last_context => context
push to recover deleted files
代码加亮用rainbow.js，增加RakeFile
tests for summary caching, dataset update function fix, closes #15
move calculations into tasks, process dataset upload as task
Free gc and pixmap
Popup-like InteractionManage control panel
Add UIs for controlling each interaction source
Fix type error when getting rows from TreeIndex over a primitive-typed column
Avoid allocating new Path2D.Double instances
If a column already exists, do not create a new Column instance
Ensure mongoization of localized fields on _translations=. Fixes #2026.
Added empty test script file such that travis build can succeed.
UTF functions refactoring
Adding an option to emit comments pointing to the source file and line number.
Merge git://github.com/hcatlin/libsass
Changed player and ball tracking to HashMap.
BalajiN | #0 | Setting the hudson build number in a non invasive manner
[Bug 633136] Show diffs and summaries in emails.

In emails that go out when people edit, review, and reqeust review on
documents, show diffs and summaries, to better match how tikiwiki did it
back in the day.

Also make the emails consistent, and make all of the tests related to
these emails more consistent.
Bug 794659 - remove erroneous delete reference in mozfile.extract docstring;r=wlach
new test for this bug, and a stab at a proposed fix.
added default change to fix all tests with this fix
added a check for a case that has ALL envs, not just the specific expected one
Formatting tweak.
Merge branch 'bug749465' into 1.0.X
Added ID3 stub.
Verifier updates.  Implemented more bytecodes required to run the tests under /tests/regress/correctness.
Phi function simplification.
log if file isn't present
update image references for inlined CSS (****REVERT ASAP****)
Pass mkt settings to build_appcache
allow filter to just be passed an object as well (bug 771015)
Don't overwrite the real `csrf`.
allow admins to upload featured promo graphics (bug 744648)
no refund for in-app (bug 719215)
mock ES tests harder
Try to guarantee ES mock teardowns
change account settings header title to "Settings" (bug 804714)
desktop frolicking (bug 823984)
disable country stores
do not do _ratings transforms if we're accessing Webapp from AMO
if pre-approval fails in any other currency, try in USD
Add logger setter, fixes #270
added global  variable
Keyword analysis working
Fixed a bug to prevent generators from spawning minoins if no path has been drawn.

also cleaned up the project a little.
Add NOSIGNAL opt to prevent crashy when using threads with timeouts
Docs: Fixed color paremeter desc in LineBasicMaterial. Fixes #1990. 
Merge branch 'master' into dev
Replaced THREE.UV with THREE.Vector2.
Updated builds.
Fix issue with returning the wrong DRAM cartridge lead address
Change stubs for VDP1 cons driver
Handle result from teardown phase of class_setup_teardown.
class_setup_teardown tests covering setup and teardown phase. The setup phase behavior is wrong; its test is partially invalid but passes.
Remove debug print
TestRunnerServer failure_limit, including with class_teardown.
[base] Add reference objects and descriptor representation.
add the can_ship? method to the order model that speficies if an order is willing to allow shipments
Forgot to 'to_s' the resulting query_terms. Even though it worked with the the array.
added required linux dll for libtcod
Added the structure for message request
changed magic number 0.5 to a constant
minor code cleanup
changed protected goal class fields to private
Fix GET favorites/list url.

Url has changed between API version 1 and 1.1. Old one: http://api.twitter.com/version/favorites.json New one: https://api.twitter.com/1.1/favorites/list.json
More Benson updates
Moved exploit.shell.reverse to shell.send and moved other shell modules into shell folder
2012-03-19-14.52.22: src/lib/src/list-fns.api: Dropped  find_first  because it was identical to list::find.
2012-12-26-19.11.34: src/c/lib/posix-io/write.c:  Uncommented retry-on-EINTR logic.
评论 @ API
Primera pantalla andando...
alias contains (search for file containing)
WSH JS Template Files
Started working on action collection
Merge branch 'master' of github.com:nahimov/Redwood
Restructure folders

Restructuring
adding future to the chunked handling
Update vimrc pythonrc;
Some updates;
'ahah'
ahah
Re-adjust navbar
Removing annotated source.
Updating annotated source.
Fixed failure reason collecting.
added nested routes for thoughts model
Added build Travis CI build status icon
ruler: Remove code cruft

getShadedDuration was always == gst.CLOCK_TIME_NONE
Limit the dumper max depth in exception stack trace.
Merge pull request #82 from nekokak/fix/limit-dumper-depth-in-exception

Limit the dumper max depth in exception stack trace.
Added an @Ignored test for dijkstra with negative costs
Removed log dir property from config
Altered default auto index config key to match what the kernel actually expects. Bug reported by friendly.
removed superflous newlines
Merge branch 'master' of github.com:neo4j/packaging
Revert "Removed all the cats"

This reverts commit e29c9d51dd04dd4df943300717987a7491f5a827.
Added a tunnel recolor shader
Readme + travis file
introduce interceptor for hidden field in POST forms to provide e.g. PUT and DELETE requests.
Fixed test script. Moved util functions into this project.
mark specs needing 64bit patch for ruby and don't run them on travis
Merge branch 'release/0.1.0' into development
bridge the gap in definition of modal width when resizing window 480px..575px
Signed in User can destroy torrent
show content size before deleting torrent
detect duplicate torrents by url-generated filename
Merge branch 'feature/delete-torrents' into development
animated removal of torrent
remove old json response for torrents/create
upgrade gems, use new FactoryGirl syntax all over
Feed without valid is invalid
validate uniqueness of Torrent#url only if present
reorder arguments in Guardfile for diff conveniance
set all default Encodings to UTF8
fix version of versatilejs, use term-ansicolor for scenario todos
correctly use decorator
puts :confirm link option into data
Merge branch 'feature/upgrade' into development
update todo
search accepts a :per param to set page size
filenames in Torrent's content must be UTF8 to not break the page rendering
show directory path only on its own page, but not its list
show copies of directory on other disk as button group
tyPO
fixing login white boxes on labels
Merge branch 'master' of https://github.com/ninjury/Ninjury
made methods @classmethod so that plugin descriptions are available from
a class even before it is instantiated.
updates include basic plugin mechanism for workflows and some
experimental test code
who clearly does not give a fuck
Merge branch 'p-lizard' of github.com:nireis/texpferd into nireis
Merge branch 'master' of github.com:nireis/texpferd into p-lizard

Conflicts:
	simple.pdf
Added title (file-as) and author (file-as) field.
Generate reflow text ePub (experimental)
tried to add prepareDownload function but failed har :(
Add unbounded inversProperty feature.
Add documentation to some core vector functions.
Freehand creates SVG-compatible paths.
A nested list of lists going into ports with list range are now treated as a list of values, making it easier to process them with a longest list strategy.
Introduce GRID_NODE_MARGIN constant.
Network view grabs focus when mouse enters.

This ensures that spacebar-panning always works.
Added test to check correct nested list behavior if expected argument to a function is a list.
Draw node icon.
Clean up SVG icons.
Reverting port to default value works again.
PortRow accesses the row through a lookup, not by keeping (a potentially old and maybe invalid) reference to the Port.
Merge branch 'master' of github.com:nodebox/nodebox
New black icons.
Merge branch 'master' into vertical-network-view
Clean up SVG icons to fit 128x128 grid.

All icons are now sorted in categories and use Helvetica Neue Bold.
Small fix to unexpected error on server start
[dist] Use `nodejitsu-api@0.3.0`
Prompt.bash : Verify if acpi command exists to avoid error message.
Fix : no power_supply support message

Close #1
Merge pull request #2 from Zeuh/master

Fix: test if acpi exists to avoid error message
implemented first real live_setup.sh script
Remove NoDupFlatMapR; can;t be proven
Merge pull request #313 from sys9kdr/master

Update Japanese Translation
modificado para probar
add Google Webmaster Tools attempt2
config: Add TI Calypso CPU configuration

This patch add the TI Calypso CPU to the configuration files.

Change-Id: Ieb462960391c4a2c630d7a83699c3b6e8162ace9
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/630
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
fixed bug where your account was still deactivated after your trial ended
aug 2012 updates
merge in old code as example
write base class for mailer, form footer/auth builder.
place mail script, test, problem fixes, testing.
Added test for @Join and parameters
BUGFIX:  Fix the broken perform readonly transformation which was always showing NO (#6453)
Merge pull request #262 from halkyon/security_import

ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, and styling fixes.
API CHANGE: Added DataObject::relField(), which pushes the "relation dot syntax" code of TableListField/GridField back to the model.
BUGFIX: Made DataObject::relObject() more flexible; allowable thanks to new ORM.
Merge pull request #260 from simonwelsh/assettablefield

MINOR Remove unused AssetTableField js file
Merge pull request #256 from halkyon/cleanup

GridFieldDeleteAction minor tidy up
BUGFIX: #7036 refresh CMS panel when adding a new file
MINOR: remove console.log
BUGFIX #7018 This stops an infinite loop when Depreciation::notice is called from set_dev_servers(). This doesn't stop people from setting $dev_servers directly (not that it is used in the core code anywhere).
Merge pull request #265 from garethbfoster/fix-7018

BUGFIX #7018 This stops an infinite loop when Depreciation::notice is ca...
Add functioning contact form
Deploy.rb minifix
added dump_module to main.ml
Cambiando extension de README
added placeholder text to datepicker
finally removed log from grid.js
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:omersaeed/gloss
法線つけた。影ついた
法線デバッグ表示
デバッグ表示軽量化
Modified post model. Added post view.
Add .rbx/ to .gitignore
Fix typo
Hack tablestyle for edition columns
Use edition style on table columns

- Fixes issue#11
enable remote text imput as default
[gigablue] move setrtcoffset to dreamboxhardware.py
comerr: Convert to using libtool

Convert the libafs_comerr library so that it uses libtool.

comerr uses a pthread lock to protect the error tables, so it needs
to be built as both an LWP, and a pthread library (previously, we've
just built it as LWP, which is probably broken on some platforms, as
it won't define -D_REENTRANT)

libafscom_err.a remains as the LWP variant, and all pthreaded code is
modified to use the libtool liboafs_comerr.la library.

Change-Id: Id421cc97ad8681b42af7a5eb3cb512e1e1ce9a90
Reviewed-on: http://gerrit.openafs.org/8054
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: Derrick Brashear <shadow@your-file-system.com>
Added initial, UI-less, hard-coded date version of a simple Chrome MementoWeb plugin.
Update notes for submitted changes

* add OPTIONS to proxy_logging configs and docs
Add user_state record
Initial chef_wm_users file; some methods lack defined bodies, has
questions to be answered
Remove no longer needed check_calls target
Fix typo and add in missing malformed_request_method
Clean up add_to_solr and delete_from_solr to handle
non-indexable types more cleanly; clean up indexable_types
type to only include indexable_types
Add uri route logic for users
Use new DRY'd up chef_db instead of old way
Fix typo and silence warnings on unused vars.
Fix alignment
Add comment clarifying permissions
Add data_bag_item back to indexable type, so not needed to be
explicitly listed (it should never have been removed, twas a mistake)
Add users endpoint to dipatch.conf
Change chef_db create call to make refactored chef_db
Add placeholder auth logic for chef_users that authorizes everything
Slight clean up of chef_users to handle empty body
Indentation & tracking code update
plugins tests
Merge branch 'testing-ninja' into testing
Unify plugins and themes in the same template
Bump version to 2.4.0

* (framework) Use OSXFUSE logo as default volume icon

* (kext) Fix length of FUSE_WRITE message in strategy operation

  Closes issue #28: Bad length passed to client process in write operation

* (kext) Finish ticket reference counting

* (kext) Do not wait for an answer, if we are not interested in the result

* (kext) Fix race condition in fticket_aw_pull_uio (FT_A_BUF)

* (framework) Fix header search path

* (prefpane) Fix path of kernel extension

* (prefpane) Fix path of preferences file
Make envelope header extraction less memory hungry
documentation fix #2
added simple method for finding center of bounding sphere

still have to compute radius...
probably in another loop
refactored functionality into leaf
addd lights
Print File for printing pdf
Update date on gemspec.

[ci skip]
added cut/copy/paste & edit functions to core
added basic checkbox plugin
fixes to vakata.js collection (+ selection functions)
forgot to remove some code duplication and a console.log statement
Merge remote-tracking branch 'remotes/vakata/v.1.0' into v.1.1.fr
small wip on FileWatch
gardening; deprecate CA_DEFINE_FUNCTION and List
introduce Term.uniqueOrdinal
replace NameLookupType and ListType with standard names
refactor find_name and find_local_name to take a single param object
Refactor name search to have a central run_name_search function
Implement a protected distribution checker
Add DeskClock app
Update version for 5.17.18 release

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17485 b6a209e6-650d-0410-972b-dadffa731f64
Fix for Issue #866 - stats.tsv file header column has missing separator
Merge pull request #867 from caps/stats_tsv_bug

Fix for Issue #866 - stats.tsv file header column has missing separator
Maven plugin doesn't rely on Ant to run Gatling anymore
cshrc, vimrc, aliases
Add window bringer to xmonad, but it's not working yet.
Fixed some things
Merge branch 'master' of https://github.com/peq/WurstScript
adding shortcut (F3) and menu entry for jump to declaration
some check.py
[FIX] Default levels in logging
created Http.* namespace, moved HttpRouter to Http.Router
Updating with the files
label fix + removed unused string
cosmetics for custom videoosd dialog
Merge remote-tracking branch 'Big_Noids_Aeon_Nox/eden'
script fix for 1132
label fix for widgetchooser
Merge remote-tracking branch 'Big_Noids_Aeon_Nox/eden'

Conflicts:
	1080i/Custom_1133_WidgetChooser.xml
alarmclocks for featured widget 2
Debugging ding-dbmanager.cc - getShouldTrackBeVisible() - SQL Queries line 698
started work on implementing whois. weird commas have started showing up in places...
fixed the clear command and implemented it more appropriately.
added clearall command. will have to add clear user capabilities later.
cleanup. delegating display to chatterbox. I think I have done as much as I can do without screwing up the merging process later. That said, fixing conflicts is pretty easy, usually. the trouble is the templates file is massively different, and working out how to merge the styles properly may be very tricky.
half way there, kinda. most other changes will be aesthetic and stuff relying on code not implemented in dev yet. oops. going to be fun merging everything.
merging in whois branch. fixed conflicts.
bump.
fixed conflicts.
version field replaced in ApplicationInfo.java
dependency.properties version changed
made retained var overloaded option more clear code wise, removed global vars from sampleand replaced with a proper struct to pass the required info to the trackbar handler
added new sample - starter_image_sequence_reader.cpp
ajuste no how-to
https support for google api sparklines in analytics reports + updated to the latest service url and relocated the helper for generating the url

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1577 1f8fe7d8-47f0-464c-8d0a-336f4953ab05


git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1578 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
adds site_media to .gitignore
changes body class sponsors --> sponsorship to handle addblocker firefox bug
adds demo installation instructions and note on fixture data
Merge pull request #16 from mattsenate/master

FF AdBlocker Bug Fix and README Update
Prevent to do two hasher refresh at the same time
Merge branch 'master' into issue_41__Fix_add_sharedpoints
Delete removed files on the refresh walk-about
Remove vim command mistake