labofsahil/github-event-dataset-2012 huggingface dataset:
create portable archive on buildslave &
- add optional output path to make_portable_archive.sh
- remove temp files
- adjust docs
fix symbolic link
Add MSVC 2010 project files + minor fixes
(unitsync) "Error: error:" -> "Error:"
Attempt to fix mantis #3140 (Spring MT hangs)
Reduce chances for compile error
Print a stacktrace on sigabrt
[HL] use less cpu-time
don't sleep _that_ much
try to fix compilation
typo
Fix bug with MT call chain warnings
Try to fix mantis #3146 (Warning: Network error 11: Resource temporarily unavailable)
minor formatting
QTPFS: fix assertion failure
fix 3151
s/LuaLoadscreen/LuaIntro/g
so it is is possible w/o name conflict to implement the pregrame menu in it, too
update sounds.lua (wanted by FLOZi)
fix error in FileSystemAbstraction::DirExists()
it did not what the comment said !
fix nanos try to assist stuff out of their range
Simplified design. Added shuffle
Don't use jarjar to strip unused classes.

It was stripping required classes that were only needed
moved classes. We don't have any unused classes so this is
a wasted step anyway.
Merge pull request #8 from square/jwilson/pool

Don't use jarjar to strip unused classes.
update conf for Gunn_Pt radar
Added tf_logger
Require Parser and Compiler in the server-side conditions

Simply make them members of the `L20n` object for now.  We might want
to hide them from the public code in the future.
added AST comparison functionnality to facilitate unit testing.
serialize context as well as code
Removed contact views
Various Updates and reverts
Correct example apache config
Merge branch 'apache_doc_fix' into devel
production builds need to pull from github not AFS
Merge branch 'local' into develop
BeautifulSoup performance improvement.
I don't think 'aw' was a valid flag.
this change should not show up in the twin branch
Should be final Makefile for docs.
Add link to MOAB on README
Few more changese
use cors in jquery
support for localFiles, remoteFiles, localData, remoteData functions
Added third screenshot to landing page. Renamed screenshot files.
부모 POM 프로젝트에 .project 파일 추가
敵の表示を実装
敵の出現を実装
ショットの実装
ゲームメインの制御を実装
メインの制御を実装中
Temporary change syntastic to fork
tommee module removed
added tons of migrations, made a working sections tab, updated the sample database maker accordingly
add gitK and modified zshrc
don't crash when the directory was deleted or changed permissions
c99 and parameterized CC
add the crash fix to ChangeLog
Fixing last 2 images.
Set default response type to text/html;charset=utf-8
Removed an unnecessary set of println statements
utc test
added --retry to rerun iwlist forever until a scan is successful
small message printing cleanup and code cleanup, explicitly handled case of scan-recent when no scan had ever been performed
when guessing the ssid, dont rescan if a scan happened within the last 3s
when guessing an ssid, scan forever until successful
cleaned up subroutines
explicitly handled the case for scanLast where no previous scan exists
added a wstatus for being in the middle of tethering
added schematic and more testing
deleted old directory
Forgot to add crack
Debut info !
Merge
fixlet for disappearing directories
fix flag handling
conflict fixes
Add a performance test comparing the various index versions

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
IME切り替え等々
Merge branch 'master' of github.com:the9ball/.vim
Add `current_state` to Engine and implement in pg.

Not very keen on having to require DateTime, but the alternative is to do all
sorts of hacking to convert things to the local time zone -- including how to
figure out what the local time zone is! Better just to let DateTime do all
that, since it's the sort of thing it was designed for and does it very well.

Will be using this in the forthcoming `status` command.
LoA: Life 12.
oops;)
added preview style and example blog
Updating composer for Packagist...
[feature] add ability to convert images to tiled exrs
context manager for tunable quorums
updated .gitignore
its making me commit
[Validator] Updated Romanian translations
merged branch dlsniper/translation-update (PR #5220)

Commits
-------

0677ed7 [Validator] Updated Romanian translations

Discussion
----------

[Validator] Updated Romanian translations

Just a small update for the validator translation.

---------------------------------------------------------------------------

by travisbot at 2012-08-08T21:47:01Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2070722) (merged 0677ed77 into 7dbadbf2).
preserve MemberMetadata::$collectionCascaded property between __sleep:s
remove usage of ?<url> in regex (does not work in older PCRE versions)
[Routing] simplified regex with named variables (reverse-merged from commit f66683690046d40454d19470f5d1dadcc434d5e5)
work in progress on Google+ url support for syncing
[Build] The Xapian version is now retrieved by CMake.
Merge branch 'trunk' into releases
[Doc] Re-created the removed basic documentation.
[Build] Reduced the requirement for Xapian (from 1.2 to 1.0).
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
[Doc] Updated basic documentation for the 0.4.0 version.
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
Merge branch 'trunk' into releases
[Dev] 1. Moved the StringSet and StringPartition structures,
         out from the test/partition directory, into the BOM layer.
      2. Moved the partition.cpp test, out from the test/partition directory,
         into the test/opentrep directory.
Merge branch 'trunk' into releases
fuckton of work done for CMM
test for merge
Merge branch 'master' of https://github.com/triton7/mixer
java maven compile on save added
Bug 802095 - [Media Storage] TypeError: dsfile.lastModifiedDate is null
first improvements
README 削除。というか、消したはずなのに。
WaveIO, MidiIO, ACMMP3Decoder Available.
Fix addSlash behaviour and handle rendering of static.File directory listings...
Fix CS.
Typos.
Cleaning up vision remnants
EXEC_INPUT_STREAM: deferred class shall not have creation procedures
llvm: little changes
wrappers, small changes
avoid :call bug when chained by dot after function call
Comments are enabled on the page level.
updated site
updated site
updated site
updated site
updated site
updated site
updated site
updated site
updated site
updated site
updated site
updated site
updated site
recommitted the released jars
updated site
updated site
updated site
updated site
updated site
updated site
Make only_validates well behaved
Merge pull request #238 from danielrichman/well_behaved_decorator

Make only_validates well behaved
OS-X compatibility fixes (patch by Uliano Guerrini)
fixed Linux warning
vigranumpy: change include ordering (Python.h must be first)
Кэширую результат чтения кофига
hopefully re-fixed problem with date conversions for some pg instances
added spec for rank and parent names
added specs for Boa constrictor listing (removed example from seeds)
rspec output formatting
Show tickets in last 7 days
adding support for returning values without transformation - application.passthru decorator skips translation so file contents can be passed back to the browser, for example from mongodb/gridfs
Rules and monitoring panel styling.
Merge branch 'master' of https://github.com/unweb/mist.io
Courses graphic added
Added plus
Decreased the level of WTF in Makefile: now 'make tests' actually builds and runs tests instead of just building the tests
Update Makefile

Update find options to use -delete instead of -exec.
test: duffing: make it more flexible
test: duffing: optimize it
test: duffing: make it more flexible
We drop incomplete packets.
refactoring of Procedures model on App
Assert on stderr
Mise a jour phonegap 1.8.1
Test for sharpenImage()
README: More formatting fixes
User pubs
Pages for user registration, session, password and more
Added week 8 material
Merge branch 'master' of https://github.com/rioleo/CS147
end week8
Classifiers work

Features Added:
1. prints incoming/outgoing/cross traffic
2. prints if traffic is within the local subnet or external
3. can show TCP and UDP (src and dest)

Prints details on stdout.
Hack! Force HPD

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>

Conflicts:

	drivers/video/omap2/dss/hdmi.c

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
Initial commit of finagle web server
latest conf
XVim settings
Support for Haxe 2.09
Compilation server support
added chris
chris
chris
chris
chris
add files
files
derrkick
docs youtube fix

Signed-off-by: Thibaud Arnault <thyb@webshell-dev.(none)>
Merge branch 'master' of github.com:webshell/APIs
publish v1.5
disable exception not
Add Jussi's comment to homepage
Bring back restarting/reloading

I went for a hybrid approach. I brought over Bob's os.execv
implementation from magic bus, to cover responding to HUP as well as
changes to Python files (both modules and configuration scripts). It's
valuabable to be able to tap into os.exec to keep process state around
when doing systems programming with Aspen. I kept thrash around to cover
SyntaxErrors and other truly fatal exits from the main aspen executable.
It now uses a smart algorithm rather than thrashing every second. We'll
see how it wears. I figured out a simple way to not cache templates
bases. The --changes_reload knob replaces --changes_kill, and triggers
non-caching template bases as well as HUP on Python file changes.

So there. Bulk of a fix for #49.
Add Video-Option for Fullscreen-Stretch (no black bars / not proportional)
If Video-Option "Stretch to fullscreen" is on, don't shrink movie proportional, this fills the screen with the complete movie. So there should be no black bars left, until they are in the movie itself.
Merge pull request #57 from cocoon/master

Add Video-Option "Stretch to fullscreen"
glw: Make image loaders load expired images from cache if they are available.

It then retries (at lowest priority) to refetch those images and will
replace the displayed image if the contents have changed

Fixes #784
Update Italian translation
Correctly deal with SQLITE_LOCKED in blobcache
Add some code for loading raw javascript from commandline
Better support for truncating text

Fixes #779
js: Load raw js code from a detached thread to avoid blocking the main thread
Fix support for 5.0 audio

Fixes #803
Change some pthread_ into hts_
Update trad. Chinese translation
Update Russian translation
Add setting_detach()
settings: Avoid duplicate init for integer settings
Make prop_get_name() thread safe
Add prop_courier_create_lockmgr()

This can be used for special cases where we want to force locking
mode from the courier.
Clear callback when setting is destroyed
Make settings_create_multiopt() accept prop_courier argument like the rest of the settings does
js: Add createMultiOpt() to the settings object and fix various race conditions.

In addition make the settings object properly resource tracked instead
of relying on the spidermonkey GC to reap the objects.

Fixes #802
new ruby 19 flags. some of the other ones dont work but i havent figured out which is which
Allow bots to request RSS content even when they may not access the site
First stab at connecting neighbors
open bg music
updated readme
Merge pull request #3 from christianwach/master

readme update
fixed shit
changed gemfile
removed redcar files
removed public landing page
removed files staged for deletion
styling
styling
currency storing and expense form formatting
Denormalize database.
prelimenary nginx config
Fix logout page.
Improve UI for granting access to location.
Fixed CARBON-10743

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128979 a5903396-d722-0410-b921-86c7d4935375
Fix for the REGISTRY-1150

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132718 a5903396-d722-0410-b921-86c7d4935375
fixing ESBJAVA-1123

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132719 a5903396-d722-0410-b921-86c7d4935375
reading sample xmls from product distro

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132720 a5903396-d722-0410-b921-86c7d4935375
Apply updates to new api provider app

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126247 a5903396-d722-0410-b921-86c7d4935375
jdbc driver .dbs configuration get from framework properties.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126248 a5903396-d722-0410-b921-86c7d4935375
Remove unnecessary sout messages

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134947 a5903396-d722-0410-b921-86c7d4935375
Fixed CARBON-12713 and updated the release notes.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130348 a5903396-d722-0410-b921-86c7d4935375
event bridge core - almost complete

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@129857 a5903396-d722-0410-b921-86c7d4935375
Modifying Logviewer client due to changes in LogViewerStub

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132358 a5903396-d722-0410-b921-86c7d4935375
Fixed REGISTRY-967

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131844 a5903396-d722-0410-b921-86c7d4935375
added xquery test cases

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131845 a5903396-d722-0410-b921-86c7d4935375
adding versions

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@140657 a5903396-d722-0410-b921-86c7d4935375
Fixed https://wso2.org/jira/browse/BAM-549

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132806 a5903396-d722-0410-b921-86c7d4935375
added LifeCycle Test to Greg Integration test

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130673 a5903396-d722-0410-b921-86c7d4935375
punt 1 dels preliminars -> OK (assumeix que X = X^{-1} i no defineix ni paraules cíclicament conjugades ni res per l'estil perquè només ho utilitz una vegada
Added configurable in/out buffer sizes
Works on MRI 1.9.2. Cleanup. Fixes. Version bump.
may 14
may 16
Adapted FSM test to new generator.
Modified generation from 'create FSM from these states' to 'add these states to existing (possibly empty) FSM'.
Added fsm* macro and test skeleton.
get enyo-x up to date
Merge pull request #256 from jrogelstad/master

git enyo-x up to date.
Issue #18659: fixed ordering of floated items in the toolbar so that they display normally in Firefox
Issue #18659: fixed ordering of floated items in the toolbar so that they display normally in Firefox. Made fix to prevent overlapping of header.
Merge branch 'master' into 18659
Issue #18659: Fixed dropped elements in Firefox for Search and Workspace toolbars.
Merge pull request #55 from lynnaloo/18659

18659 - Firefox issue with dropped divs and buttons overlapping text on toolbar
64-bit compilation fixes for BFS, add to x86_64 boot image.
Support building images for x86_64.

Added a temporary Haiku64Image file that gets included instead of
HaikuImage when building for x86_64, which I will add to as I port
stuff. Images currently only include the boot loader, kernel and
a bunch of add-ons.
New #update_columns method.
Use update_columns to implemente the update_column
Deprecate update_column in favor of update_columns.

Closes #1190
Merge branch 'update_columns'
remove duplicate build runs in travis.  These extra runs were used to
test identity map and not fully removed when the feature was removed.
Merge pull request #7151 from graceliu/travis-rm-dup-run

remove duplicate build runs in travis
Use string datatype for the setting attribute
to make store works all database adapters.
Merge pull request #7158 from yahonda/use_string_for_settings

Use string datatype for the setting attribute
Trema::PacketIn の拡張を別ファイルに分離
mongozoo
fix some bugs and add a feature to show a user's policy.
Fixed voting and made the refresh indicator show for automatic refreshes
Replaces `or` with `|` in typespecs
python mixin
Removed unneeded TODO - TRUNK-3256

git-svn-id: http://svn.openmrs.org/openmrs/trunk@28642 5bac5841-c719-aa4e-b3fe-cce5062f897a
clickable skill filters
Add Joyce Chang to contributors
Plural support - implement validation triggers when text changed
Plural support - change how validation panel got inserted into editor
opening up all editors for one transunit
workaround for history exception plus new editor change
refactor and fix TargetContentsPresenterTest
ignore some history related tests after workaround fix
minor unit test
remove unused image and resource reference
Plural support - fire validation event for selected trans unit
Plural support - Fix validation firing event
Plural support - fire validation upon requestValidation event
Plural support - fix test
add javamelody
Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572
Redesign right column hover action
Changed css style for iteration page
javamelody restricted to admin access
Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572
Resize TM source and target column
Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572
Implemented breadcrumbs in all pages
trying to fix navigation on save
fix some bugs
await: added order testcase

* Makefile: removed (auto-generated)
Adding max-list-eval-depth definition for older systems
:triangular_ruler: toughening up specs for the reorder_tags function, removing get_array from the end of functions because some consumers will be using the hash and some will use the array
Allow non-integer y-axis bounds via -Y flag.
too much
too much
Multiple changes.
ucb1: when generating an invalid path, return []
ucb1: receive penalty of -1, rather than 0
graph: the cost of an empty path [] is 1
graph: use lazy version of MonadRandom
main: use random starting points
main: add the simple test graph
exploit the laziness again
remove unused function
disable random w/mem for now, it is too slow
Add type synonym for Path.
Cleanup a bit, use the State monad
print the iteration number as well
Add some results.
* man/xml-source/amfetchdump.8.xml: Add --decrypt, --no-decrypt,
  --server-decrypt, --client-decrypt, --compress, --no-compress,
  --server-compress, --client-compress.
* server-src/amfetchdump.pl: Document new options.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4690 a8d146d6-cc15-0410-8900-af154a0219e0
@T851:R comment out 'has_many :campaigns' until campaign model exists
Merge branch 'master' of https://github.com/zmushtaq/test

Conflicts:
	New Text Document.txt
remove unused PATH
Move man page into man directory.
history: add stats helper
agent: make style more consistent
agent: add README
Merge commit '18111dd15dea6e6fdbe5d1423d44506aa5121106'
Beautify and tidy up copyright message
helium-domain: adding createEntity() method to EntityModel.
helium-domain: creating an interface for relationships, and necessary refactoring.
The old session would not work on PHP 5.2
Added link to Sam&Max's blog msg
Basic working test
Don't cd into the folder since it acts weird on travis
Ignore test git repo and vagrant files
MUST… TRACK... DOWN… BUG
sp_term()/ETERM handshaking implemented

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Added mods from local; func
add git.json
reste le pb de l'angle tourelle
Adding Project Euler P4
#strict standards: Non-static method
KunenaProfileComprofiler::trigger()
should not be called statically
removed boa.getNaturalLanguageRepresentation(...) conflict in NLConstructor
Что-же тут творится, м вашу? (autoupdate by script)
Cleaned up redundancies, fixed tests.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed JPopsuck TV link, added Fuji News Network.
[814876] Fix wifi string on properties
[815084] Fix strings in steps (fi was one letter)
Fix typo
Bug 804571: Support for canceling (pausing) system update downloads. r=etienne
Move app / system update cancel tests into separate suites
Bug 816823 - Add UA override for maps.google.com - r=ochameau
Bug 815836 - fix attentionhide event timing.
Bug 815857 - fixing homescreen visibility on getting a call
Bug 816933 - [Contacts] contacts app calls querySelectorAll() on every key press
Merge pull request #6684 from fcampo/fix_wifi_string

[814876] Fix wifi string on properties
Merge pull request #6686 from fcampo/ftu_notification_string

[815084] fi is one letter instead of two in locales
Merge pull request #6719 from fcampo/ftu_typo

[816467] Fix typo in properties
Bug 817181 - [Settings] Panes are scrollable horizontally but they shouldn't be
Bug 816243 - Overlay long text does not fit correctly for the tabs in the awesome screen
Merge pull request #6779 from alivedise/bugzilla/815857/homescreen-get-a-call

Bug 815857 - fixing homescreen visibility on getting a call
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into mcjimenez_wpa_version
Merge pull request #6786 from vingtetun/816243-landing

Bug 816243 - Overlay long text does not fit correctly for the tabs in th...
Bug 816987 - [email/IMAP] bug in mimelib dep on consecutive base64-encoded mime encoded-words breaks IMAP synchronization due to our Buffer shim's angry base64 decoding. r=squib, a=blocking-basecamp
Merge pull request #6789 from asutherland/fix-base64-explosions

Bug 816987 - [email/IMAP] bug in mimelib dep on consecutive base64-encoded mime encoded-words breaks IMAP synchronization due to our Buffer shim's angry base64 decoding. r=squib, a=blocking-basecamp
Bug 811677 - Turn "Licensing" item into "Legal Information" and make it a sub-menu r=fabi1cazenave

a

a

a
Correcting the config loading to prevent errors being thrown for no reason
remove doc folder
populate page
remove yardoc folder
Downgrade libmemcached version.

As the comment says, somewhere between here and version 1.0.8,
v8cgi starts segfaulting.
Update stemcell builder README

Mention the use of a backported kernel talking about btrfs on 10.04.

Change-Id: I05e52983c6cfb686f7a81fa3b737053ba0f0f841
Merge "Update stemcell builder README"
Port existing code to utils.ensure_tree

Now that we have ensure_tree in utils, port most users of
os.makedirs() to use it.

Change-Id: I3256cbb76bd889f99f1e6f3367bd620645f828a1
Fix KeyError when test_servers_get fails.

Updates the integrated.test_api_samples.ServersSampleAllExtensionXmlTest
test_servers_get function so that it doesn't try to list the line number
when the test fails.

Fixes a KeyError: '\'i\' exceptions.

Partial fix for LP Bug #1042709.

Change-Id: I666d18c1d4585cebce4534b1f16cd327850e8cdc
Merge "Port existing code to utils.ensure_tree"
Merge "Fix KeyError when test_servers_get fails."
Move installation of couchdb dependencies
from essentials recipe to couchdb recipe

Change-Id: Iec790273279fb3d2ceaecb9cd0aab0dc7b671409
Print water.
Implement flooding.
suppression des console.log
change feed exp
fixup RTS carry
Fix return/don't allow make t really be verbose unless debugging.
The hack continues. I've increased the event channel buffer. I know I'm
goofing here.

What I'd personally like to do is just use an "infinite" channel. That
is, push the limit of how many events can be processed to the machine
and not set an artificial limit in XGB. Some day...
update 19/11/2012
implemented loading and saving of video metadata
changed type of lat / long fields to double
fixed an issue with missing commas in json response of video list handler; added data dirs to gitignore
uploaded files will now be stored in videoFiles dir; metadata is persisted after each upload
allow empty hours offset
added double click event to table cell
Fix script searching not working properly.
add promise.both tests
#27 creation de la table Creneau_Salle dans le script AllCreates.sql
add a task to a group
entry

inline edit some css fix
working 1 thread
Removed the true/false/nullptr constants from SourceContext::SourceContext so they stop existing in C. (They're now part of the parser, instead.)
Hopefully fixes the HTML-download issue
RI: Retirados todos los ForcedDespawn
rpc parse
rpc parsec
Now HDU is supported.
Correção do bug ao executar a linha dentro da pasta puppet.
Catch exception when parent is deleted.
Fix apply permissions recursively.
Merge remote-tracking branch 'dev/1360_git_deleted_parent' into stable

* dev/1360_git_deleted_parent:
  Catch exception when parent is deleted.
Do not hardcode tuleap version
Automatically increment tuleap version number
This is Tuleap 5.4.99.9
Merge remote-tracking branch 'dev/1361_docman_apply_permissions_recursively' into stable

* dev/1361_docman_apply_permissions_recursively:
  Fix apply permissions recursively.
This is Tuleap 5.4.99.10
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改出库单保存时的字段，修改损益主单查询方法
Signed-off-by: wu <981145751@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改盘点单主单、出库单出单查询，移库单和损益单查询页面
Signed-off-by: wu <981145751@qq.com>
盘点单查询页面改动
Signed-off-by: wu <981145751@qq.com>
修改入库单、盘点单、移库单、损益单类方法
Signed-off-by: wu <981145751@qq.com>
修改分拣调度，生成出库单；
Merge remote-tracking branch 'thok-wyl/master'
Merge remote-tracking branch 'thok-zzb/master'
更改盘点单和出库单生成单据号
Signed-off-by: wu <981145751@qq.com>
修改批量删除；
Merge remote-tracking branch 'thok-zzb/master'
修改入库单、移库单、出库单、损益单、盘点单细单查询方法
Signed-off-by: wu <981145751@qq.com>
修改批量更新及批量删除以直接更多的表达式；并以此具修改卷烟预设界面，以提高速度；
Merge remote-tracking branch 'thok-wyl/master'
修改盘点单的异动盘点查询语句
Signed-off-by: wu <981145751@qq.com>
Merge remote-tracking branch 'thok-wyl/master'
Merge remote-tracking branch 'thok-zzb/master'
added a helper for manipulating colors
used the new helper to lighten up the background of the containers
Oprava zakladnich scriptu
README set to UTF-8 format
Added a translation
added reset function fixed js bugs
upated user for gsm sms registration
Fix infinite loop when minecraft stdout/stderr close and the process doesn't terminate.
Merge branch 'master' of git://github.com/peterix/MultiMC4 into dev
Changed the test class to use ActivityInstrumentationTestCase2 instead for convenience
Merge branch 'testingbranch' of https://github.com/Frolle/Schmaps into testingbranch
create VoterDao interface
get rid of FormFu
get rid of FormFu
Bugfix — deployString
tiles and highscore
Remove SkyHack.
Merge branch 'master' of https://github.com/H1ccup/SkyHack
added references, messy for now, but works
Merge branch 'users'
Tehty oma kansio ja viikko1 tiedosto
Added /filter and /clear
Added packet counts
cleaned up handler->systemMsg
fixed key where conflict on HS BUS and MS BUS
remove pages files
Renamed protein-chemical to ichem.
Revised.
barsテーブル追加
vetor.xml
Modified method name from write.isatab to write.ISAtab
Added setters
Increasing version number
Merge pull request #9 from ISA-tools/devel

Devel
fix bug 478950948
globnav animations tweaks
case-672 Setup old theme, initial commit + search block.
Modifications to menu styles, initial page styles.
Merge remote-tracking branch 'origin/dev-line' into case-672
Merge remote-tracking branch 'origin/dev-line' into case-672
Front page left menu (taxonomy) styles.
Merge remote-tracking branch 'origin/dev-line' into case-672
Merge remote-tracking branch 'origin/dev-line' into case-672
Merge remote-tracking branch 'origin/dev-line' into case-672
Adding permissions for all users to use search form.
Modify Front page view, change order of news.
Merge remote-tracking branch 'origin/dev-line' into case-672
Frontpage corrections.
Added css styles for video content
Fixed landing_video_block_page
Frontpage styles, latest news template.
Frontpage fixes for latest news template.
Frontpage fixes, features, template.
Fix front page video block
Frontpage, footer.
Merge branch 'case-672' of github.com:IliaDragan/vg3 into case-672
add Cdoc document and directory
removed deletion of hardware, all hardware must be defined/modified at start
processing summary report.
Add script to open windows formated samba url to linux one in thunderbird
add timerReadableStream
fix readableStream.js
fix timerReadableStream
add bufferWritableStream
fixjsstyle
Save the Varanus client peering information into the database.
Make single precision default again, switching to double was a mistake. Sorry. :(
GatherMate2 Setup
Be a little bit more tolerent for pixel-by-pixel tests
Moved port to config, fixed RPL_NAMREPLY on JOIN and RPL_WHOREPLY on WHO, and the KICK command now works.
More Or less done .
Drew Sir Pinski.png
Sortal2 5.0 BETA1 release
Fixes bug 796048 - Removed microseconds from the middleware.
Bug 799280 - Fixed some of the old services.
stuff
pec27 test commit
Improve LuaJIT compatibility, part #1: "*" library list is loaded through luaL_openlibs()
maqueteo aplicacion
Converted from restify to flatiron TO BE TESTED
Further Panorization
further Panorification
Add a button in PM read to allow The User to accept/decline a request
Use quaternion methods to rotate scanner head
Scanner takes the short way around
Radial detector
Added status message for insufficient power
Rename KE-HG206 -> KE-SP206
Cleanup
Formatting
Use KSP.IO to load map images
Extract function for saving map of a given CelestialBody
Save body maps individually inside loop. Fixes locking problem.
Unused method
fixi iiffififi
fixyyyyyyyyyyyy
Implemented asynchronous image download!
Handle Lamps in GTS3 class
Added Licence
Fixes the j snomask not working properly
Fixes for bug #12
Fix some of the include guard names (requested by SaberUK)
Explicitly shut down stdio's stdin/stdout/stderr.

The previous logic here was to only do this if stdio was connected to a controlling
terminal.  However, we must do this always to avoid information leaks and other
problems related to stdio.

The only exception is if we are in debug mode.
Merge pull request #62 from nenolod/insp20

Explicitly shut down stdio's stdin/stdout/stderr.
Merge pull request #55 from Justasic/insp20

[2.0] Fixes for bug #12
Fix compilation with GCC 4.7.

GCC 4.7 headers no longer implicitly include unistd.h in many places, see
http://gcc.gnu.org/gcc-4.7/porting_to.html

Fixes #65
fix build on kfreebsd

fixes #64
FileWriter hasn't been non-blocking for a very, very long time.
remove trailing whitespace
Update Doxyfile.
Merge pull request #68 from SaberUK/update-doxygen

Update Doxyfile.
Merge pull request #70 from Shawn-Smith/insp20+chancreatefix

[2.0] Fixes the j/J snomask not working properly.
/STATS: updates
Be more helpful when processing commands from a linked server.

When diagnosing errors with s2s traffic, it costs us next to nothing to try a
little harder to generate useful errors so errors are immediately apparent.
Match the logging in the rest of this module.
Fix typo.
Log mode errors when processing FJOIN.
Merge pull request #74 from Robby-/insp20-statsupdates

[2.0] /STATS updates
Forward port 1d703dcf7858a322c823bbd80f9507b627c5738c.
Add to_s to Day
After some bug fixes the graph mechanism now works when executed
Pick recovery from CyanogenMod

Change-Id: I80a046e91104c9c02ee9521d72b5138b0c34662d
Added implementation for object permissions

See discussion on django-developers mailing list for further information:
https://groups.google.com/forum/?fromgroups#!topic/django-developers/6UNjPu1mcgc
fixed composed for one dimension
Merge branch 'master' of https://github.com/Moviri/recline
added param to composedView
removed style from template
child side changes to delete groups
pay almost works
Fixing memory leaks in MPI backend
Use static_cast
p4#: 19154
concurrent processing on finding nearest line
Centered schema list under map
White bkg to match site
Add missing requires to OZones library
(cherry picked from commit b4de0b1c145676a9bab25a5b267a26267d270681)
grid, tree
minimax, negamax, tictactoe
Merge branch 'master' of 207.97.227.239:Origraena/moca
Correction atoll --> inet_addr
Configuration for the VPS
update 3-comment.tex
Merge branch 'master' of github.com:Patre/epistemo
update 3-comment
Merge branch 'master' of github.com:Patre/epistemo
Merge branch 'master' of github.com:Patre/epistemo
merge
Merge branch 'master' of github.com:Patre/epistemo
Merge branch 'master' of github.com:Patre/epistemo
add solution neuroscientifique
Merge branch 'master' of github.com:Patre/epistemo
Updated substitles script.
First 8 port shared memory implementation (still missing port B input logic functions)
clean up EIT start_time,duration
fix forgot close tag
fix segfault from http://engawa.2ch.net/test/read.cgi/linux/1326804531/860
fix message, from http://engawa.2ch.net/test/read.cgi/linux/1326804531/859
Added command for toggling ingame update messages.
Update Magnemite.txt

So, added some messages!
Merge pull request #7 from Magnemite/patch-1

Update Magnemite.txt
committing again
merged changes from testbr branch
Remove not required cairo_set_line_width
Relax library requirements
v1.0-rc2
Increase version number so that some dependent checks work correctly.
fixed CollisionMode.STATIC
Update htdocs/events/sfd2012/index.shtml
Audio with Sfxr
Creating site for gaedo-graphviz in
						site/0.3.1-SNAPSHOT/gaedo-graphviz
bugfix for https://github.com/Riduidel/gaedo/issues/2
Unntige Code Zeilen aus kalender.js entfernt
meetvmodel: add interface for models
eventmodel: implement meetvmodel
channelmodel: implement meetvmodel
dvrentrymodel: implement meetvmodel
tagmodel: implement meetvmodel
modelhelper: add a helper to sort and filter models
helpermodel: make sort invokable from QML
channelmodel: add helper() method to get MeeTvModelHelper for the model
meetv: register MeeTvModelHelper as ModelHelper
browserchannels: sort channels on number
eventmodel: add helper to return MeeTvModelHelper
modelhelper: add count propery and countChanged and itemsChanged signals
modelhelper: fix crash in get(int)
meetv: don't register eventModel as it isn't getting used
modelhelper: resort when items get inserted or removed or sortColumn changes
EventList: place ScrollDecorator and SectionScroller outside ListView as it should be
core.js: use objects instead of indexes as parameters
SearchEventResult: sort events on starttime
BrowseTags: sort on name of the tag
ViewDvrEntry: sort dvr entries based on their state
event: add nextEvent property
event: add previousEvent property
event: set 'this' as previousEvent on 'next event'
event: don't change previousEvent when the event(Ids) are the same
eventlist: add method to search 'previous event' based on current event id

This method searches an event in the list which nextEventId is the specified
('current') event id.
htsp: set previousEvent on event when handling getEvents
eventlist: performance optimalisation in findPreviousEvent
event: 'lazy search' previousEvent

Only search the previousEvent when it's actually needed, instead of always
setting (& searching) it.
event: check if previous exists, fixes QObject::connect warning
Merge support for getting previous and next event of an event
some huge commit that adds a bunch of functionality. sue me
added waypoints to gps
Added PB element to morph callback
Bing Maps update
Reverted to old episode view.
Add some tests for Dispatcher changing the currentURL and currentRoute properties on the App.
First happy run on linux box
Initial commit that adds /authenticate path and adjusts finishAuth logic for new behaviour
Add support for using access_key to bind a new account to an old one
Fix underscored variables, per review.
Attempt to clarify situations in which logic executes, based on review
Finally, deal with literal "false" -- everywhere...
BIG step, custom keys used during auth are now all stored in their own buckets, and used the same during requests like proxy, super good
Merge branch 'master' of github.com:Singly/hallway
More efficient calculation using buffers.
Added alt tags (oops, should have had them already)
Put some member info in a sidebar
Gave images rounded corners, tweaked some sizes
More roadmap tweaks.
Pass world parameter
Added non-sortable CPU columns
some last little fixes, like binding and the double assignment in class decls
Working more with a sidebar.
circe-use-cycle-completion: New variable.

Using this variable, Circe can be asked to configure cycle
completion in IRC buffers by default, overriding the user's
global settings. This is ENABLED by default.
circe-nickserv-handler: correction to regain handler

The circe-server-my-nick-p test should be against the nick that sent the
NICK message, not circe-nickserv-nick.
circe-completion-at-point: Handle bug when completing at the prompt.
circe-read-network: ignore case
circe-networks: Add default ports for networks where we know it.

(Also does some whitespace fixes.)
lui-fool-toggle-display: Initialize `buffer-invisibility-spec` if necessary.

The value is `t` by default, meaning fools are hidden, but the value
is not fixed by `remove-from-invisibility-spec`. We now turn it into
a list if it's just `t`.
circe-networks: Support a cons cell as service value for non-tls/tls ports.

This allows us to specify default ports for Freenode both with
and without TLS support in a least-surprising way.
lui-insert: Also inhibit intangible text from confusing us.

This caused problems when timestamps got added to fool lines.
circe-server-sentinel: Trim the server event before you send it.

The events Emacs sends end in a newline. No, I don't know why.
checkdoc: Fix docstrings to conform to Emacs' guidelines.

M-x checkdoc was new to me. I like it, mostly.
tls connections: Handle idiosyncracies of `open-tls-stream`

First of all, remove the debug messages it emits when connecting.
Then make sure the process does not query if it should die before
Circe does just the same again, and finally handle the case in
`circe-server-sentinel' that the process buffer is gone already.
cloned Twitter's bootstrap-project
almost complete redesign using Twitter's bootstrap as a base
cleaning out old scripts, stylesheets etc
i have no idea what i am doing..
Adding iterator friendly options

Fleet.Wings
Wing.Squads
Squad.Members
Idle a bit after changing fleet structure so multiple CreateWing/CreateSquad commands are not sent
QueueState Idle, not InsertState!
More cargo methods, and added to Salvage.  Will now unload to station hangar.
Big fix for receiving data

Fix for whenever bigger amounts of data get sent, splitted up. As the
data is being read async, it's handed quite complicated.
implemented start(), pauseNext(), resume(), and related interpreter events
Removed debug code.
Added spinner completion handling back in.
Merge pull request #537 from futuraprime/b-audio-player-wrapup

Allows the audio player to recognize when a track has ended.
locales fixes.
Hopefully added 64bit support to the damn bot
Contest: more code style fixes
AbstractContest: add inline method ApplyShiftedHandicap()

Move code from ApplyHandicap().  This eliminats run-time special case
checks and replaces them with dedicated inline formulas.
MapWindow: Added weather stations

Implements ticket #1487
*: more uses of Clamp()
Math/fixed: don't import min/max from std:: namespace
gdb.py: pretty printers for gdb
fixed: Removed fixed_int_constant() macro

fixed() is constexpr now and does the same thing
fixed: Removed fixed_constant() macro

fixed() is constexpr now, does the same thing and is simpler. it is also
more error-proof since it can't happen that both constants actually differ.
fixed: Removed fixed_deg_to_rad/rad_to_deg #defines

These are trivial macros and there is no reason to keep them.
fixed: Removed unused fixed_quarter_pi #define

What is needed is actually 1/8th of PI but that is so trivial that we don't
need a macro for that.
FlightPath: Extended usage output
Limiting memory on jenkins
Renamed old main file to new one
fix jsdoc error
added gallery extension with lightbox (added jquery) test looks ok, but no admin panel not finished
Adding Wolf control and JavaDocs to sheep and wolf.
Reimplemented the changes to CAAT.Director::easeInOut() which was accidentally reverted in the previous commit.
Revert to "v3.55 - added experimental raw data handling"
660271-38160519 Pasek funkcyjny obiektu - Zawiadomienie o zmianie
'Change Notification' shows Print Modal
660271-38160347 Pasek funkcyjny obiektu - Skan
Added scan
660271-37332489 Pasek funkcyjny obiektu
Removed unneeded DIV
[#37332489] Pasek funkcyjny obiektu
Unified rightPanelAction arguments
[#37332489] Pasek funkcyjny obiektu
TerrainCategoryReport adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
shareSummary adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
Change List adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
Reservation adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
Custom report adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
Difference report adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
Scan adapted to new rightPanelAction
[#37332489] Pasek funkcyjny obiektu
Moved some definitions from individual Search controllers to List and Search controller where it fits better
[#38160237] Pasek funkcyjny obiektu - Powiązane obiekty
Added java model classes/methods and mock data
[#38160237] Pasek funkcyjny obiektu - Powiązane obiekty
Related objects are opened in new tab (if one) or shown on list
fixing bracketing error in compile_function_call in Lython compiler
Fixed vault dependency in pom.xml.
added license field and required field
Borré todo lo referente a Adminium
addition questions by type works
Add support of remove for CUDF job administration.
Add delete web service method for CUDF job administration.
Add support of remove CUDF job in web interface.
arreglar desaguisado
Meet作成
Merge branch 'master' of git://github.com/mryoshio/TAITEN
Merge pull request #2 from a1107de/master

Meet作成しました。pullお願いします。
大会登録、選手一覧モック画面
js stub
libreria JDBC para sqlite
Now working on iteration 3 (version 0.3)
[aws|elasticache] Fix bug in cache cluster test
[aws|elasticache] Remove erroneous whitespace trimming
[cloudstack|security_group] fix rule revoke mock
Fixing typo bug in rackspace load balancer set_ssl_termination request
Recognize ninefold_api_url option for pre-production testing
Merge pull request #1055 from adamtanner/master

Local storage support for #public_url.
Merge pull request #1054 from ninefold/master

Allow Ninefold option of specifying api url
Default to being less pessimistic about excon

- It limits using more recent gems through a project
- If there are explicit breaking changes in future versions, then add an additional <=
Merge pull request #1056 from mummifyus/master

Typo in Rackspace Load Balancer set_ssl_termination
Merge pull request #1051 from kevmoo/master

Default to being less pessimistic about excon
Merge pull request #1052 from engineyard/fix_cloudstack_rules

[cloudstack|security_group] fix rule revoke mock
Only dup @attributes if it's not nil
each based pagination for Fog::AWS::IAM#users
Merge pull request #1058 from benton/fix/whitespaceremoval

Fix / partial rollback of commit 4d81b869
Merge pull request #1057 from freeformz/iam_users_page_support

Fog::AWS::IAM#each paging support
Add Sao Paulo server to Amazon RDS known regions
Add Sao Paulo server to Amazon SQS known regions
Merge pull request #1060 from Irio/master

Add Sao Paulo server to Amazon known regions
Add symbol deps for autotools
Change setup.sh
Arreglando el estilo del slideshow
Get rid of empty parens when we don't have a SHA in the about dialog
Merge pull request #2340 from adobe/nj/fix-about-dialog

Get rid of empty parens when we don't have a SHA in the about dialog
Add item highlighting and keyboard navigation/selection.
Forgot to move package.json name to brackets.config namespace
Load full package.json as brackets.packageJSON. Parse buildNumber from package.json version field.
version 0.14.0-0
change packageJSON to metadata
remove test name
Merge pull request #1547 from adobe/jason-sanjose/sprint14

Forgot to move package.json name to brackets.config namespace
BUGFIX: Styles for drop-down rise-up
working on highlight reel

got the layout to display as a table view. getting link errors trying
to make outlets to buttons
gui bigger
Merge branch 'master' of https://github.com/agale123/Catan
ljlkjl
sdad
Updated products listing
Updated to use style sheet in product index
fixed image links
Introduced store index page
added italian translation
Merge pull request #7 from LostCrew/master

added italian translation
Add unit test for TaskBase.
Inner/Outer Breeding classes merged. Added fake breeder that "breeds"
indiciduals from ensemble.
Added max-bound-change parameter, 
Reading class names for inner operations
Inner mutation implemented
Inner xover implemented
Offline revisions should be saved in local storage

- Added support for `localStorage`
- Fixes https://github.com/ajaxorg/cloud9infra/issues/1358
Implement suggestions in review https://github.com/ajaxorg/cloud9/pull/1602
Save offline queue in local storage on browser/tab exit
Corrected stupid this/self error
Merge branch 'master' into revisions_localstorage

* master:
  * update plus/minus buttons for deploy in sidebar
  Remove debug code
  Javascript scope keeps hard
  Refactor out static getPort calls
  Fixes based on comments in the Pull Request review: - https://github.com/ajaxorg/cloud9/pull/1599
  Put 'if' statement in its own line for clarity
  Revisions doesn't set style and caption in the auto-save button unless it needs to
  Revisions no longer re-populates the model every time a revision is saved/ - Fixes https://github.com/ajaxorg/cloud9infra/issues/1354
  Fix wrong calls to add and removeEventListeners
  Revisions: Simplifiy external change dialog options
  Restructure some stuff
  Rework the runners so they work with a callback based structure instead of just returning. This allows to dynamically calculate the port an application runs on.

Conflicts:
	plugins-client/ext.revisions/revisions.js
Merge pull request #1602 from ajaxorg/revisions_localstorage

Offline revisions should be saved in local storage
Updated the way args are passed and upgraded npmnode
add linkerView
pre AbeloMainView creation
more Markdown formatting in README
MSImageCache仮完成
Merge branch 'master' of github.com:akiii/meshi365
Impliment Zoetrope Visual Engine

Weeeeeee
added validation helper to jsCQRS and validation logic to seller authentication
[Item #99] Let no + or space appear first in a phone number.
Install Roo
Let the browser handle screenshots as blobs (bug 802647).
Let the card view handle screenshots as blobs (bug 802647).
Let the window manager understand screenshots as blobs (bug 802647).
Calculator Font Size Improvements

Calculator Font Size Improvements
Made the button text 9pt instead of 8pt

Made the button text 9pt instead of 8pt, also added ", sans-serif;" to
the font name, for redundancy.
Font and Layout Changes

Changed all the font sizes to REM from MOZMM. Updated the date and
network name string to be vertically centered.
Remove double font-semibold class
Bug 805340 - [email] remove launch of Contacts app when touching email address in To/cc/bcc fields
Bug 806277 - [bluetooth] implement blue tooth file transfer
Bug 803178: [Calendar] Remove inline scripts r=lightsofapollo
Made the app labels large due to usability / legibility issues.
Bug 807006 - [BB][Clock] Apply building blocks [headers]
Updated the alarm tones with final versions.

Updated the alarm tones with final versions.
Merge pull request #6115 from patrykdesign/clock_sounds

Clock sounds
Merge pull request #6098 from stripTM/fix_double_class_dialer

Bug 807275 - Remove double font-semibold class
Merge pull request #5987 from ochameau/csp-calendar

Bug 803178: [Calendar] Remove inline scripts
Merge pull request #6091 from basiclines/clock-apply-building_blocks

Bug 807006 - [BB][Clock] Apply building blocks [headers]
Bug 796739: Fix CSP in keyboard by removing inline script.
Bug 805825 - [MMI] Follow up: handle USSD session expiration; r=arcturus

Tests and fixes

Lint errors

Removed useless commented code
Merge pull request #6118 from ochameau/csp-keyboard

Bug 796739: Fix CSP in keyboard by removing inline script.
Adding title and cleaning multiple trustedUI (without transitions)
add syntax highlighting to a few example slides
Updated for bsubbing.
[tools] disable debug
removed well around map
moved libs into lib and changed to use foodev.event package
OOps didn't checkout arc branch.

Revert "converted to ARC"

This reverts commit 5cb7f6503768fd3957d9655efca9e53aedabe145.
First step towards DDRs. Still needs to be put in place on all relevant
places.