labofsahil/github-event-dataset-2012 huggingface dataset:
冷静に考えてPython使わない
refresh path
clean up
clean up
download miss fix
dont sync files only for mac
fix for executable file
goodbye
Use one buffer per loop.
add sponsor_footer box
ACCUMULO-647 allowed zookeeper code to use other ACL schemes and removed hardcoded accumulo user from fate

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1370427 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-718 changed static methods to instance methods for ColumnFQ

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1370432 13f79535-47bb-0310-9956-ffa450edef68
README追加
変更
変更
変更
[zsh] vi-mode
refactored location service to only use location listeners and removed gps status listeners which where a battery drain, commit fixes #35 and #41
Changed NLS menu.
Dashboard subscribers count output. Added reset actions for form subscribers add one by one.
Added default page for campaigns.
integrating postfix and wordpress based on config constant
add check_deps script
Fix python scripts install location.
HYLIBRA-298: ETD submission status verbiage
adding comment about output. Specific port is overriden
converted tab/4 sp to 2sp
Make NERDTree harder to use
replace iedit-occurrence-face with real face
Merge pull request #18 from lewang/lewang-use-real-face

replace iedit-occurrence-face with real face
delay for twit
added some more details to the logical interpreter piece
modified by sid
added subtasks to the web stack task
minor mod to overview text
added above and right to test out the ide wp; exposed issues with the layouting logic thereby. the output of this picture is hilariously wrong
initial effort at creating the to-be syntax of wp. the top half comprises the simple syntax, while the botom half has an early attempt at a containment synatx and some design notes thereby
initial version of web stack demo page
minor style changes + change to module style of calling the wordpic lib. actual code for lib tbd
initial commit which is more of a stash than a commit. most of the code written is in the javascript object/function style which i'm starting to change over to the module style. lot of work tbd
awesome new feature
more dev
Merge branch 'master' into guacamole

Conflicts:
	ShabuyaProject/src/edu/ca/ualberta/cs301/gui/MyShabuyaClass.java
Merge pull request #1 from virckof/guacamole

Guacamole
failover to config.py.example for testing. priority use of environment vars, with secure encrypted env var in travis yml
fixed some bugs - costs seem to be off, otherwise it should be ok
Fix bzip, gdbm, blueprints, rexster
cleanup
finished basic builtins
Moved Recovery payload to initramfs + missing binary for modem.
also we now using JB LEAK kernel adbd binary for JB ROMS.

TNX to alucard_24@xda for help with modem fix for JB LEAK ROM.
Fixed ICS ROMS detection. + some changes in tweaks for JB.
Still some problems in ICS roms, need to check more.
Disabled Some kernel hacks for now. need more stable release.
Merge remote-tracking branch 'dorimanx/master'

+ ...
Merge remote-tracking branch 'dorimanx/master'

+ ...
Small room clean.
Merge remote-tracking branch 'dorimanx/master'

+ ...
Updated emacs

  * emacs/PKGBUILD: small clean up, increased version.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
error message
remove Coro temporalily because it have not worked before
Merge branch 'master' of git://github.com/kentaro/cinnamon

Conflicts:
	Build.PL
	lib/Cinnamon/Config.pm
daemontools task template
Minor edit
Re-add label
Merge branch 'master' of github.com:water/resources
Add centering to coverage
Amend description of Lab model
Correct abstract
Fix error in example code in tutorial
Checkpoint commit for App Engine compatibility.
amd require is now async in webpack too
Added features to improve compilation time

Now using switch for the proto grammar.
Also using primitive transforms in the codegen transform.
updated some things, again
Updated profile for post summer 2012
toggling button, and changing active Card
new shite
fix some things code analysis complained about
Added question41.c and stuindex.c files
Add RBD support for primary storage
update from server at Fri, Oct 12, 2012 10:59:31 PM
@N BUGZILLA 1276 beim Klick auf "Einstellungen zuruecksetzen" eine
SettingsRestoredMessage (analog zu SettingsChangedMessage) schicken.
Dann koennen andere Plugins ihre Einstellungen ebenfalls auf die
"Werkseinstellungen" zuruecksetzen.
updated about Dialog (fixes #22)
Merge pull request #35 from master-lincoln/aboutDialog

updated about Dialog (fixes #22)
キャッシュを無効に切り替えても反映されないことがあるバグを修正
Fix help in yapp load testing
added global flag controling circuit profiling information
Implementation of the presenter api changes.
gps保存位置
bashrc: new function, convert flac/ape to mp3
Minor tweaks to the Debian packaging information.
Fixed link to the wiki on the NSIS installer.
Улучшения прогрессбара + багфиксы два
fixed damage upgrade bug
when skill is upgrade moren than once
Added textanalyzer
fixed conflict in preprocessor
PR-1255: logging for SXM performance analysis

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Merge commit 'ce1d526d5bccd85ddda216e00b567f6fce74db12'
Merge commit '0a7289493e9b2ce01d69e2ecefa5b4df5c80573f'
Added linear interpolation and middle vector functions
SNS
Merge pull request #243 from cminkyung/master

SNS비교 과제제출합니다~!
fix backbg bug
add staff infomation
#1022 Changing poll options should be forbidden (when running the poll)
Merge remote-tracking branch 'upstream/master' into bugs2
#1022 Changing poll options should be forbidden
Fix #1032: URL containing "http://" not always clickable link
Fix #970: If Joomla was installed to subfolder, subscription links break
Fix topic numbering on last post first (#960)
Fix URL to last post in "Last post first" ordering (#960)
Fix #1051: If message has no IP address, wrong IP gets displayed
Merge pull request #1055 from mahagr/master

Fix #1032, #970, #960 and #1051
Fix #795: Hidden user online status not always hidden
Fix #971: New indication shows new messages only from 2 levels
Remove hard limit from #971 nesting levels
Merge remote branch 'xillibit/bugs2'
Missing string in french language file
Fix #1022: Changing poll should be forbidden when running the poll
Fix minor layout issue in RT Kirigami (votes in a poll have 100% height)
Merge pull request #1057 from xillibit/bugs6

Missing string in french language file
Merge pull request #1058 from mahagr/master

Fix #795, #971, #1022 and minor layout issue in K.org
Fatal Error with poll under Joomla 1.5 with mod_kunenalastest
Merge pull request #1059 from xillibit/bugs6

#1003 Fatal Error with poll under Joomla 1.5 with mod_kunenalastest
Revert "GRADLE-2238: Change jarjar pattern to rename plexus packages too as maven ant builder jar already contains plexus packages."

This reverts commit 02057fe91aab7ecb5fff457f5681b5dba4f03a60.
Fix release notes.
Release notes
Try to get the commit build green; works locally.
GRADLE-2238: Add transitive maven settings builder dependencies explicitly.
Added @Nullable and @Experimental to various places in the tooling API.
Added @Experimental to various types.
Removed unused field and types.
GRADLE-2238: some changes to the JarJar task.
- Use one input file and one output file in the JarJar task.
- Remove merged jar support from JarJar task
- Create one jarjar task for each lib we want to jarjar.
- Remove keep rules in our build file as they don't work over jar boundaries.
- Fix TestFile.Snapshot to be explicitly initialised with values from TestFile
- Tweaked test so that it is resilient to filesystems with 1s modtime granularity
Remove IgnoreIf closure for ignoring test when daemon executer is used.
remove unused imports
Simplify definition of integ test compile classpath.
Fix definition of integ test classpaths.

And some cleanup/simplifications.
GRADLE-2318: Let MavenRepository test fixture always publish root maven-metadata.xml file.
GRADLE-2318: Handle multiple versions of one module in MavenRepository Test fixture.
GRADLE-2318: Publish multiple versions of projectC to verify dynamic resolving behaviour works correctly.
deleted obsolete class
removed TODO because the simplification I had in mind doesn't appear to work
test logging: log header for a standard out/err event only once per test method, not for each TestOutputListener event
Adding albumart rendering, fixxing issue with scroll not working on the now playing list
Various webkit scrollbar hacks!
Merge remote branch 'origin/master'
Renaming bloody "init" and "template" so its obvious which one you have to do first!
Fix date format of domain .TH on domain controller

add whois button on edit page
change format input of name server
Added problem 9. No tests are really needed here.
Enable responsive design features
Added necessary jars
add a concise & precise paragraph on  gauge fixing
Create core models.
Add views
Add views
Add admin site.
Add Twitter Bootstrap.
Add a LICENSE file of Twitter Bootstrap.
Make groups reminder button same color as the other instances
vim: Move contents of vim/vimfiles up to vim/
vim: Add syntastic
add example; add help
a few words in license
pass unit test
adding comment model
adding comment controller
add comment relationship with post
added game.js decision
init.el: Add setting of frames
init.el: Modify comment
init.el: Change the hook using recenter-frame to window-setup-hook
init.el: Add setting of screen display
init.el: Add miscellaneous setings
init.el: Add setting of command line option
Disabling read access check on loacations for now
updated table header to support multiple columns
added spacer element
my sample script.
changing version number to 0.4-14
test with mongoid 3 on travis
Supported expanduser.
Supported cd commands with Python.
Fixed cd command.
fix #78
Add form validation for transcript in Synote player
Start adding chaining tests
Always use lastest version in custom third_party
Updated readme with a longer description.
Fuck why the hell can't I figure out submodules
Merge branch 'master' of https://github.com/zeorin/dotfiles
Merge branch 'master' of https://github.com/zeorin/dotfiles
Merge branch 'master' of https://github.com/zeorin/dotfiles
Updated all submodules
lisasin/tegin korda "contacts" lehe'
- juurde tuleb maili saatmise kast (maybe)
early update for parser seems right now
add map implement for zdict
1206170906-home
BLACKTIE-399 wait for socket server to startup
JBTM-1156 Don't download JDBC drivers for IPv6 builds
Merge branch 'JBTM-1156'
JBTM-1225 fix closes counter
JBTM-1156 Perform a more robust test for unset env var
Merge branch 'JBTM-1225' of git://github.com/zhfeng/narayana into zhfeng-JBTM-1225
JBTM-1235 Add some debug
JBTM-1235 Add some debug
JBTM-1235 Add some debug
JBTM-1236 update to ignore the exception when deploy the xtstest.war at the first booting the container since it might be killed already.
JBTM-747 Track draft 8 of the REST-AT spec
JBTM-1223 corrected the TestResource scanner to make sure it does not allow simulatenous scanners
JBTM-1217 WSTX11-interop & WSTFSC07 IPv6 tests fail: Error launching test
JBTM-1156 Don't download JDBC drivers for IPv6 builds
Merge branch 'JBTM-1217_WSTX11-interop_&_WSTFSC07_IPv6_tests_fail_Error_launching_test' of git://github.com/paulrobinson/narayana into paulrobinson-JBTM-1217_WSTX11-interop_and_WSTFSC07_IPv6_tests_fail_Error_launching_test
Merge branch 'JBTM-1236' of git://github.com/zhfeng/narayana into zhfeng-JBTM-1236
JBTM-747 Remove provided scope in restat-util pom since it breaks the quickstarts.
Clean up unused classes and add license headers.
Replace TxLinkRel with constants (JAX-RS @Path annotation has to be a constant)
JBTM-1156 fix too many args issue
JBTM-1237 Add a multiplier for increasing timeouts on slow machines
JBTM-1241 Simplify XTS JBossAS7ServerKillProcessor by making linux only
Added unit test for Opera 11.66 on Mac OS X 10.8.1.
refined the shift-testing-texture
Config
Adding core zooniverse library
Retooled the marketing site for mobile
removed .nice from tabs

the nice class is depreciated in 3.0
removed lists

lists are in common/_typography.scss and .nice is depreciated in 3.0
symlink images, stylesheets, and javascripts into docs/ directory
Controller Client: Recent connections window should react on double click
Controller Client: Fix port passing string to spinbox and clean up code
Controller Client: Return to Connection Settings after selecting a recent connection
Bug gh-226: ControllerClient recent connections window does not load at startup

Load the recent connections from db during initialization.

Freeseer/freeseer#226
From web
Updated to 1.3
Updated the README file
Add LoginFilter.java
adds git pull to cook meals
A slightly better keylayout
Correct subtle mistake.
trash removed :)
Add a TODO in README
Revert migration change in 362fee3ae8c70137f2378737c7918840b667a39b. Create a new migration instead and use this
Improve post views, add disqus and implement a scope
Improve Post model specs
Implement active menu recognition
Add Links to Products and move the shared partial in layouts/
Implement category filtering in products#index
Remove seed data from ProductCategory.
Improve products admin view
Implement controller method to set the active categories in the view (for filter output)
got it to work
almost done
made web solution the start up project
current state
Merge branch 'master' into configure-with-url
draft initialization test
Merge branch 'master' into tests
Merge branch 'tests' into configure-with-url

Conflicts were at:
	anm.player.js
[Fix #36496815] Fix loading size of player from canvas vs opts
Merge pull request #49 from Animatron/configure-with-url

Loading player size from options or canvas + Tests
Change of BG
Initiate Options page
Changed OSX face size from 9 to 11.
Added checks for Emacs 24.
Copied Emacs 23 `custom' file for Emacs 22.
Added the gallery and image resizing for thumbnails, working on image pages next
Svn Server Installation on CentOS-Redhat-Fedora
More fixes to dumb bugs.
Ready for cloudbees (except database)
RM
Merge branch 'main-dev'
fix NativeBranding
fix visitor, improve selectors, add find
view_processo pronto para processos com apenas um autor e um reu
Add tripanel to musicfiles view
area color button fix
Fixed RCB filtering
Merge remote-tracking branch 'origin/master'
commented out script stuff for now
Enable loot frame by default
EMI: hack to implement global alpha
Added PHP minify

http://code.google.com/p/minify/wiki/UserGuide
Added assets folders
Pfade im Makefile an die neue Installation von Pike angepasst -
Änderungen in der Beleuchtungssteuerung
arreglando un poco mas el foro
added string functions and fixed get methods
added a bunch of events and added additional functions to create_time_t
Merge branch 'eventString' into testing
Merging Jay and Gerron's branch
Conflicts:
	Roto-Cal.pro
Changing EC2 instance -> LaunchConfig
forget to add the Gemfile.lock for syslog
move i3 and newsbeuter configs
removed ACRA
Task 7.44c: Google Issues # 35, #198
Merge remote-tracking branch 'origin/master' into StephanFellhofer
Task 7.44c: Google Issues # 35, # 36 implemented, Testcases adapted
Tests updated for Double
PlaceAtBrick formula added
update tab for version < 7.3
Fix jit options
[#160] No response to write if server is using SslHandler and client is not

- Make SslHandler close the connection on SSLException or NotSslRecordException
[#160] Make sure the exception is fired before the channel gets closed
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added menu gestures
Set default focus to editor
Fixed crash issue when clicking on the "No suggestions" CC window
Merge remote-tracking branch 'remotes/maxfork/master'
Improvements to menu gestures
Added a style for the GestureMenuItem to mimic that of the MenuItem.
Updated readme to 0.4.237
Added a stopping global that scripts can listen to for tear down tasks
Added generic button support for Mouse plugin
Merge pull request #1 from AndersMalmgren/master

Synchronisation
Completed problems 4, 5, 7, 8, 9
Leechcraft 0.5.60-428-gacb5df1.
c++11 Renaming and polish
Moving tests/utils/* into tests/base/*
Adding trivial cpp11 test file
missing files
Merge pull request #334 from dcoeurjo/clangC++11

Clang c++11
KSpace as a pointer in GridCurve
CCellularGridSpaceND becomes default-constructible and KSpace template of GridCurve is tested wrt this concept
Merge pull request #359 from troussil/issue233

Issue233
added undo transaction generator, added notes about Transaction class
destinationPossible echiquier
aide presque fonctinnelle
minor: rename to imply correct usage fw & bw
Updated Default Config
Anti-Windows
give more time for the agent to start on travis
Update tests/test_haproxy.py
First version of the nginx and memcached multiple instances check
Fix the travis file to run the tests
Add the nginx conf file
Fix the travis file
Fix the nginx tests
Fix nginx test and requirements
Fix nginx test and requirements
Change memcache metric names
Update datadog.conf.example, the memcache tag is now optional
Dummy commit to relaunch travis build
Fix a bug that prevent from counter memecache metrics to be reported
nginx check must return false in case of no configuration
Improve testings for memcache and nginx
Merge master into multiple_instances
Merge pull request #184 from DataDog/multiple_instances

Multiple instances of memcache and nginx
The game worker will take clicks only if it is not busy
tex.vim pointed to the wrong viewers. Added some commentary.
Merge branch 'master' of https://github.com/DeadDork/Niminal
Renamed navigator plugin to ui plugin
Integrated editor plugin into ui plugin
Merge branch 'master' of git@github.com:Delors/Vespucci2.git

Conflicts:
	de.opalproject.vespucci.navigator/src/de/opalproject/vespucci/navigator/handlers/NewEnsembleHandler.java
	de.opalproject.vespucci.navigator/src/de/opalproject/vespucci/navigator/wizards/NewEnsembleWizard.java
Сделал парсинг пользователей, записей.
Okay, we're on GitHub now, add some docs
Creating dates calculation.
changing some RVM path options within the deloy file
Ported to Ruby.
Emacs config file
Update Makefile
Merge branch 'dev'
Use our system/media repo.

Change-Id: I94d07ff47ae9168d464c498f7aff0282a882f1b4
removed the ingrained slug support in favor of the callextend method
list scripts in order of script name
Don't show the "There's only one player left..." prompt if the one player still in the "alive" list isn't actually online. That just looks silly.
Erreichbarkeit und Mitgliederlisten für Minderheitsbegehren
добавил фильтр по подкатегориям
Hid left-active area (temporary)
Major code cleanup along with minor restructuring and refactoring
Fix multiple repeated entries in context menu
Incorporated recent changes
Resolve conflicts in recent contributions
Integrate all recent changes upstream
Merge pull request #56 from lorefnon/code_cleanup

Code cleanup and minor refactoring
more shader work - very temporary
Don't run Ai until all sprites are ready
Separated action data that needs to be transmitted over the wire
Ai not working - needs to be made threadsafe
Fixed a bug with loading games
Fixed a race-condition with actions
FOUDHGE
Now have separate minion and denizens ais, still lots of work to go
Lots of ai stuff - now separate master ais and entity ais
Have actions draw stuff on the floor again
Made floor drawers indicate when actions are out of range
Can't click through the main bar to entities behind it
Split up ai code into a few different files
Readme for ais
Update some ai things
some more useful ai stuff
Now select what side to play at the start
temporary work on ais
Ais seem to be working - might still be some bugs
Doors are openable, need to look better though
needed to rename cause of uppercases
hopefully the name is now correct
removed params log
changed the name from dashboard to newsboard
now empty elements should be hidden and a well should be shown if their is no entry
Got rid of old stuff.
poprawki w Readme :)
Added Peer class, used to store peer address
added a stupidly simple ToJson udf and simple unit test for it
changed alias e for emacsclient
удален старый комментарий
Install im_control.vim and use Japanese input fixed mode
Use safe mappings with <SID> (ref: vim-users.jp Hack #144)
Make Collections\Collection more resilient.
Make public.
Add EagerLoader.

Add IncompatibleMapperException.

Add test.
Relations arg is optional, if missing eager load all relations.
Use $in query.
Merge IDs that will be collected from the same mapper.
Expose suffixes.
Eager load with the correct model suffix.
EagerLoader::loadRelations() now returns a map of collections.
Convert specified relations into Relationship objects.
Only use MongoID if using MongoMapper. This will be made much prettier later.
Add additional testcase.
Change variable names... whoops.
Refactor.
[Performance] Use alias as key name in AttributeList.
[Performance] Cache AttributeList locally.
Use ::alias().
Now has alias as key so no need for array_values().
updated urls and stars
Removes obsolete code and optimizes template a bit
undelet
Merge branch 'master' of git://github.com/HEP-KBFI/susy-dm
Revert "changed gridjob"

This reverts commit 2a3a8a71febc492077a332ff7d4de3168a10111c.
use google collections to create a concurrent soft map. Also wrap reports in a catch-everything (yikes) and pretend nothing happened if it does catch anything
remove old config load code
Menu
Merge conflicts
semicolons up my colon
have config file reading parameters.ini
Working on more styling.
authors views changed
Issue 86: Ant targets from the root
code refactoring
Added build.xml at the root
Fixing Issue #88
Merge pull request #89 from moizjv/issue-88

Fixing Issue #88
Merge pull request #91 from moizjv/issue-86

Issue #86 Added ant tasks at root directory.
Changes made for autosuggest at the server end.
Issue #94
Minor fix in robo-build.xml
Merge pull request #93 from Imaginea/server-auto

Changes made for autosuggest at the server end. issue #90
Fix for prev entry no not working when adding an entry before the 1st row
Merge pull request #96 from Imaginea/preventryno-fix

Fix for prev entry no not working when adding an entry before the 1st row
Merge pull request #95 from moizjv/Issue-94

Issue #94 
Fixing issue related to menu click and menu item click.Also refactoring some aspects code
Merge pull request #97 from moizjv/Issue-82

Fix for the issue #82
Merge remote-tracking branch 'origin/master' into webview-recording

Conflicts:
	recorder/src/org/imaginea/botbot/Recorder.java
Reload for great success [ci skip]
Create Project
add index.jsp
Some minor OmniMap changes and resource changes.
Boat changed
Use utf8 charset, auto_increment ID
First plugin
Merge branch 'master' of https://github.com/Jacobstrati/Test.git
Better exception handling. Better metadata serialization.
update register page url in header.php

change register page url.
Atualizacao
Atualizar
KT-1719 Navigate -> Symbol... completions are not super helpful for extension functions
 #KT-1719 fixed
Fix build - fix id for attaching kotlin sorter
Coerce any type to Number before unboxing
Cast arguments to proper types when generating delegates

Also minor refactoring in a couple places to adopt this style
Remove unused method
Minor refactoring in delegate codegen
DelegateKind is not needed when generating delegates

"this.context" is correct and more useful
Remove OwnerKind.DelegateKind

It's not used anywhere anymore.

Add another assertion to checkMustGenerateCode()
Minor, kill useless param
Generate bridges for delegates
Supported loading named objects within named objects from compiled library.
Supported loading named objects within class objects from compiled library.
Regenerated lazy resolve test.
Renamed ClassObject$ to object in JVM backend.
Moved and renamed DescriptorUtils.getInnerClasses
Simplified and clarified JavaClassResolver.javaClassToKotlinFqName
KT-2859 Inconsistency before reparse upon completing by Tab key

 #KT-2859 fixed
Removed doTest(char), since it was erroneous.

If lookupString and tailText are both null, completionChar is ignored.
Overwrite slice bug - invalidate caches of headers resolve
Script/Quest: Solve some related problems with "An Audience With The Arcanist" and "A Meeting With The Magister"

https://github.com/TrinityCore/TrinityCore/commit/4bdc5353735a7ec73c23e11f824adb378eea3adf
Core/Conditions: Change CONDITION_REPUTATION_RANK. It now no longer explicitly checks if ConditionValue2 is equal to the reputation rank. It now checks if the player's reputation rank is in the bitmask of ConditionValue2, where each bits are (1 << ReputationRank).

Idea by Aokromes and Malcrom
Data conversion query by Malcrom (*WATCH OUT WITH CUSTOM CONTENT AS THIS DELETES ALL CONDITION TYPE 5's AND RE-ADDS STOCK DATA ONLY*)

https://github.com/TrinityCore/TrinityCore/commit/5dd6b8b2dcc99644f103a31e48fd5194795db123
Core/Items: Fix a trading spoof exploit.

https://github.com/TrinityCore/TrinityCore/commit/6a44399852f746883d39a17e34670e1f5c8c10a6
Core/Auras: Add some documentation to new proc system code to avoid confusion.

https://github.com/TrinityCore/TrinityCore/commit/b754f7c91dc284073786ac60e6205bb5f38443b2
Core/Items: Attempt to fix crash in Player::SplitItem.
And some random cleanup

https://github.com/TrinityCore/TrinityCore/commit/819da8af4df187f39061d1abbfe80414e5e1607c
Core/Items: Really fix a trading spoof exploit.
Thanks Alexsot for fix.

https://github.com/TrinityCore/TrinityCore/commit/cc88681dc5da60218e36ca00873cdf3033bcc5b5
Fixed bug where all files in the theme less dir where pulled and not just less files
修复提示的登录的bug
nothing
fix 系统只有一个活动时首页排版错误
在发现页面也添加上发起活动按钮
Merge branch 'master' of https://github.com/gardenia2007/slimevent
fix 登录页面回车提交
stupid =
修复上传图片为空时不显示默认图片的bug
Merge branch 'master' of https://github.com/gardenia2007/slimevent
艰难的决定：不兼容ie8及以下
添加用户初次登录 提示输入昵称功能
Merge branch 'master' of https://github.com/KJlmfe/slimevent
replace swfs
added prevent default to plus and minus icons
prevent default with plus and minus icons in search result quickview
Fixes #559 Moved quick-authenticate-password event binding from AuthenticationEditView.js to AppView.js. This widened the scope to make the enter key click event accessible in the locale_Password modal.
edited the help text for datum field settings judgment - blank can mean gramatical
edited json message for drag and drop audio/video tooltip
Merge pull request #690 from Kedersha/master

moved registration progress bar for new users so it's just above intro video, closes #687
changed Advanced Search message to Gretchen's tidied up version
Fixes #661 Added for loop to remove multiple checked items from datalist. Also added confirm box.
edited quick start instruction
fixes #674 added a condition in search to see if there is no : and then it goes into keyword mode and searches for any datum which contains a string that matches what is typed in (it ignors case and ignors white space)
Merge pull request #691 from cesine/master

Search works like a user expects! (just type something and it will look anywhere in the datum)
Merge pull request #689 from senhorzinho/master

Resolved enter key click event password issue.
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream
putting search buttons on the top and hte bottom
we added All Data item to dropdown Data menu in Corpus views, started on code to call searchByQueryStringon an empty string, but couldn't succeed in calling the method with an empty string. Help needed
changed the title and description for the first default datalist. closes #669
fixes #662 the datum fields were not clearing to empty if you delete the string. making it so that previous search queries were not removed and so searches became progressively more limiting.
fixes #683 cleaning up adding classes and drag and drop listeners to the datum fields by moving the code into teh datum fields themselves. also updated the autosize libarary but it still isn't actually causing the size to grow to fit the data
fixes #694 corpus was listening to change son title to detect if the corpus settings need to be renderd, now listening ot pouchname whcih should only change if it truely is a seperate corpus
simplified datum save fixes #679 now save button saves regardless of whether the model thinks it needs a save, the morpheme was not triggering need save. turned off the save every 10seconds. now the app just saves if the user clicks on the save button, or if the datum is pushed off the screen.
Fix doc links
Display and link lint errors on line 0

Summary:
Some lint errors (e.g. Javelin) don't have a line number.
Put them on the first line.

Putting them above the first line would be even nicer but much more complicated.

Test Plan: Display diff with lint error on line 0 (D2583).

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2599
Use loadRelatives() in loadPrimaryEmail()

Summary: This is an example of code simplification with D2557.

Test Plan: Display user list, verify the SQL queries.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2558
Add button to reveal all files in Differential

Summary: D2216 tried to ask the user, this one is explicit.

Test Plan: Click the button

Reviewers: epriestley, lucian

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2600
Use heavy-check and heavy-x next to "Accept" and "Raise Concern" Audit actions

Summary: Mark these actions with the same markers we use in Differential.

Test Plan: {F12094}

Reviewers: csilvers, jungejason, btrahan

Reviewed By: csilvers

CC: aran

Maniphest Tasks: T1289

Differential Revision: https://secure.phabricator.com/D2601
Upgrade phabricator to libphutil v2

Summary: Mechanical changes from D2588. No "Class.php" moves yet.

Test Plan: See D2588.

Reviewers: vrana, btrahan, jungejason

Reviewed By: vrana

CC: aran

Maniphest Tasks: T1103

Differential Revision: https://secure.phabricator.com/D2591
Merge branch 'master' of http://github.com/facebook/phabricator
Depend on class autoloading

Test Plan:
Run setup.
/differential/

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Maniphest Tasks: T1103

Differential Revision: https://secure.phabricator.com/D2612
Merge branch 'master' of http://github.com/facebook/phabricator
Slightly better handling of version checking.
Another rounds of warning clean up

Change-Id: I956c730dc7c9ee4b45e61cd16959210fb0d26d0d
Merge topic 'fix_more_pv_warning_part2' into next

0dab52a Another rounds of warning clean up
BUG #13256. Add support to remmeber "Save Selected View" setting.
Merge topic '13256_remember_save_all_views' into next

4a08b23 BUG #13256. Add support to remmeber "Save Selected View" setting.
Fixed Slice representation in client-server modes.

vtkPVDataDeliveryManager was ending up not requesting new data when slice
parameters were changed. This happened because the mtime we used in
vtkPVDataDeliveryManager used the data-time, which clearly didn't change on the
client after every update. Since vtkPVDataDeliveryManager::SetPiece() uses the
executive's data-time to check if data was really updated, we shouldn't use the
data mtime in vtkPVDataDeliveryManager's SetDataObject() call.
Merge topic '13194_refactor_render_view' into next

297d002 Fixed Slice representation in client-server modes.
Merge topic 'scatter-plot-matrix-pc'

6b5b647 Moved VTK forward for scatter plot matrix fixes
46e0b1c Use the new function (get rid of deprecated warning)
a65ff5b Updates to communicate the active plot
Merge branch 'master' into next

* master:
Fixes for windows build problems and Linux/Mac compile warnings.

Change-Id: I2f7ec5109c6fefc07a7f01389306a631f118eeec
Merge topic '13083_build_coprocessing_by_default' into next

0595de3 Fixes for windows build problems and Linux/Mac compile warnings.
Streamline new wrapping cmake script.

The cache variable was overkill.
So was the inclusion of the header files, since they come from
the wrappercore lib itself.

Change-Id: I2cbf608d40d34e53eee1aba5594df25afb764784
Merge topic 'upgrade_cs_wrapping' into next

357aa26 Streamline new wrapping cmake script.
Initial support of internal links
Tag v0.8
Next is 0.9
Remove useless space
Merge branch 'master' into absolute
html link activation
exception util
Gave enemies a turn on drinking potion
Added gold to the looking mode information
Ctags setup automatically with changes to git
Add utility.table_tree for debugging. It's pretty
Change loading mechanism
tclt_dispatch_command take a new parameter to give to the function called
adapt the test to the new interface
fix trash test
We're going to try this again.
adding the codebase
Work on script engine creation.
Add support to Asset API to register an asset factory several times to handle different extensions. This is used e.g. with script assets so that each script plugin (Javascript, Python, Angelscript) can register the same factory to handle its own asset types, without needing for them each to be aware of each other.
Complement previous commit to clean up JavascriptModule and PythonScriptModule asset factory registrations.
Clean up temp code.
Add support for creating Angelscript modules in AngelscriptInstance.
Added Angelscript demo scene with a Hello world example.
Move function documentation from .cpp to .h, remove duplicate function documentation, set initial values of attribute in the class initializer list instead within the ctor body.
Remove unneeded ENABLE_OGRE_ASSET_EDITOR logic.
Move Scene::Emit* from being slots to regular functions. Left EmitEntityCreated still as a slot as I can remember it being used by scripts at some point (though this is nowadays unnecessary).
Build fix.
Fix unsigned/signed mismatch & unreferenced local variable warnings. Fix (disable) signed/unsigned mismatch warning coming from boost.
Ogre profiler overlay can be enabled and disabled with "ogreProf" console command.
Added first AJAX interfacing to commit scribls to server.
Eliminate SurvivalPlayer and CreativePlayer to retain data structure of initial VanillaPlayer parent
Signed-off-by: Windwaker <wjcrouse913@aim.com>
Merge pull request #123 from MWisBest/master

Saturation is float, not short
Added a link attribute to entry. Added the link to the tweet to be sent when parsed from the feed, contains a link to the original RSS entry.
Update src/java/chat/data/ChatRoomManager.java
cluda/ocl: fixed some errors in argument parsing in Kernel methods
test/test_cluda_vsizes: added some comments
test/test_cluda: added tests for automatic local_size calculation
cluda/helpers: added limit to factors() function
cluda/prelude: added get_global_size() for CUDA
cluda/ocl, cuda: added max_work_group_size parameter for Kernel classes
cluda/ocl: fixed call to kernel parameters (needs device to be passed)
test/test_cluda_vsizes: forcibly releasing temporary context
cluda/cuda: added simple automatic local_size finder
test/test_cluda: added test for local_size finder
got rid of fade in effect, scrolling now works

in addition the site loads faster with the fade ins gone
added detect ie script
misc
On branch Bash

	new file:   Bash/README
Added CT number seperator.
Cleanup.
More cleanup.
Add "Anticipation" to Filger.
Merge branch 'master' of https://github.com/Shestak/ShestakUI
new simpler design, still need to fix fadein and button
Fixed /shout command (Why was this commented out?)
Merge pull request #48 from don4of4/patch-1

Fixed /shout command.
Rename to PeerJS location and namespace
Merge remote-tracking branch 'origin/master'
Merging
Ajout de 2 nouveaux symboles : Const et Program
make temperature and humidity shout
Borrado archivo vacio
Files added: Proposal2
Slides Postbox
added approximation to resolve Infinity issue with gamma(150)
Fixes #2972 : You can now delete reports in postgres database in the UI
Fixes #2974 : add vacuum on archive/delete reports
fixes #2976 : Display archived reports size
Ref #2972 : Dynamic button for archive/delete reports
Ref #2972 : Box archive/delete functions and add try/catch on I/O with reports database
Ref #2972 : add CleanReportAction type to clarify, correct logger, and better indentation
Ref #2972 refactor code for get DatabaseSize
Ref #2972 fixes last typo in dbmanagement
Ref #2972 change explanantion on dbManagement page
Merge pull request #8 from VinceMacBuche/2996_Implem_2972_Manual_delete_reports

Ref #2996 : Implementation part : Add manual delete reports
details
Merge branch 'master' of github.com:Numero7/Marmotte
Added Directories for different languages
add A13 script.bin
resizable elements
Add new tags & medium.
payments comments
private_list
removes x in performers link for test
#23 fix dashlet view
Remove feature added to test reloading
ChannelLogger: Use open() instead of file().
added task editing + safe editing and deleting tasks
found a bug in ajax callback + added .tr1 .tr2
started editing forms
modified BindTaskAjax
changed some design issues
added table form edit
fixed design
Update src/minecraft/net/minecraft/src/EntityLiving.java
Merge pull request #67 from Kasoo/patch-2

Update src/minecraft/net/minecraft/src/EntityLiving.java
NPE fix
formatting and cleanup
Remove debugging
fixed startup error in MCP
This fixes SPOUTCRAFT-2
Added new Chat options screen
Added screen to edit words that should be highlighted
Added screen to edit users that should be ignored
Added persistence for both
(no implementation in ChatManager - yet)
This closes SPOUTCRAFT-1
Moved the chat rendering to SpoutcraftAPI
Forgot that file
Fixed #1721 - Item tooltips displaying on top left of screen instead of over item
Allow regex matching with the new chat options
fix chat bar 
remove
Allow alpha blending for Chat Colored text - thanks ThVortex
some aesthetics
aesthetics
Fix my merging fail
small fix for a potential bug
unused preferences get disabled
Removed unneeded files from the repo and added a .gitignore
codejam round 1 c
module - subscriptions, updated
Added a fabulous seagull
Added requirement to color module
zene lejátszó
Merge branch 'master' of github.com:RyanWest/mplayer

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
tune hl-syn , set statusline-test only in debug mode.
Solved issue in ticket #17 regarding the not saved changes warning message in redefine cadastre and cadastre change.
Added 3 methods into CadastreTransactionMapPanel:
private void saveTransactionState() {
        MainForm.saveBeanState(this.mapControl.getTransactionBean());
    }

    private boolean saveTransaction() {
       SaveTransaction actionSave = new SaveTransaction(this.mapControl);
       actionSave.onClick();
       saveTransactionState();
        close();
        return true;
    }
    @Override
    protected boolean panelClosing() {
        if (MainForm.checkSaveBeforeClose(this.mapControl.getTransactionBean())) {
            return saveTransaction();
        }
        return true;
    }
sort users by createdAt
empty comment form when posting a new comment
updated voting and scoring to give more "power" to admins
mpi_#3

[!temp state]
adding host as part of auth request
kill strange folders
fixed bug with null pointer exception on crud test of master and slaves
add workspace..xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Теперь можно сохранять базу на диск (локально на каждой ноде) командой flush и
восстанавливать состояние командой load, как было изначально в первом дз.
Initial version of the toolbox rework

Warning, this is WIP and will be rebased as core OpenCPN changes until (eventually) merged.
Modified to take input from a file. Also implemented a routine to find the no. of points not in the rotational order.
merge in upstream changes to header_value and trim string header values
Changed default in Project.__init__ validate=False
.bash_aliases added la
Add cache management in ContainerBuilder class
Fix guard requirement
Added listners to resident leave/join
Reduce view distances
Added drag and drop abilities.
Bug fix for MSTest versioning.
AlbumView refactoring
Made serach bar it's own object. Better encapsulation
页面改动
Signed-off-by: zxl <loou@vip.qq.com>
Merge branch 'master' of http://59.61.87.212:8080/Git.aspx/sw-Authority
小变动
Signed-off-by: Endis <369029432@qq.com>
增加入库订单添加产品功能
Signed-off-by: wu <981145751@qq.com>
添加入库订单分配按钮
Signed-off-by: wu <981145751@qq.com>
增加入库订单分配页面
Signed-off-by: wu <981145751@qq.com>
出口修改
Signed-off-by: zxl <loou@vip.qq.com>
增加分配算法；

Signed-off-by: zengys <ynnuyonw@126.com>
Merge branch 'master' of D:\server\git\zzb-sw-Authority-new
Merge branch 'master' of D:\server\git\zxl-sw-Authority
Merge branch 'master' of D:\server\git\wyl-sw-Authority

Conflicts:
	code/Authority/Wms/Controllers/Wms/StockIn/StockInBillController.cs
	code/Authority/Wms/Views/StockInBill/_AllotPartial.cshtml
	code/Authority/Wms/Wms.csproj

Signed-off-by: zengys <ynnuyonw@126.com>
added redirect after contractor signup
fix bad if statement in prism_create_html()
switch asides to html5 markup
Fix some combat behaviour of NPC-Pets

https://github.com/mangos/mangos/commit/de5521c24b000f4546aae6939f0babd0a6c50035#diff-5
by faramir118
install: install the "wafadmin/Tools" files into the correct dir

Previously they were going into just "wafadmin" and node-waf wasn't working.
install: add a "portable" npm shebang mode

This will be needed for the precompiled binary packages,
since the hard-coded shebang locations just don't work properly.

These precompiled tarballs may be untar'd anywhere, and the user
would expect ./node-vXXX-linux-i386/bin/npm to "just work".
So the proper behavior is to use "the node in this same directory" relatively.
Makefile: add target for precompiled binary tarballs

This target compiles node with "/" as the prefix and installs into a directory
like: "node-v0.8.6-darwin-x86_64". Then it creates a gzipped-tarball of that
directory, called something like: "node-v0.8.6-darwin-x86_64.tar.gz".
Makefile: add `make tarball` helper target
Makefile: add `make binary` helper target
Framework\Http\Request\Requests
Display Requests
Response
store rendered notes of todos in database to avoid costly rendering when you load a page
Get all non-cucumber tests passing
make cucumber scenarios pass
create a copy of site.yml on Travis
make cucumber scenarios pass
store rendered notes of todos in database to avoid costly rendering when you load a page
Get all non-cucumber tests passing
Generacion de CRUD y cambio de nombre de ImagenBundle por ImagenesBundle
Actualizado Twitter Bootstrap
Agregar a collection
Fixed News Media and Added attribute 'NewsAuthor' to the database
Make Command-T open files starting from + (plus)
Starting point. Uploaded UWTE original code to master branch. Note: All changes should only be made under sub branches.
Add Active Model Serializer Gem
Create serializer models
Create relationships among models
Show all Games using backbone
Games style.
Add root: false to teams json response
Defined Jboss with version 7.1.1.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
cookie in da house as last possible fallback
horizontal markovization(to be tested)
fixing C-x C-f not working with viewing /
Implemented a canvas clear tool.
* changed the movie path to be found under the static path
* closes #562 (once pushed to production)
Merge branch 'master' of github.com:WormBase/website
Updated cairocompmgr-git following long awaited updated of upstream git
v2
v2
v3
v3.1
ad learn
ad fb like
ad fb like
Merge branch 'master' of github.com:Youpinadi/jlearn
change delivery address
Merge branch 'master' of github.com:Zeega/Zeega-Core
Merge branch 'master' of github.com:Zeega/Zeega-Core into blaster
Merge branch 'master' of github.com:Zeega/Zeega-Core
Merge branch 'master' of github.com:Zeega/Zeega-Core into blaster
Fixed bookmarklet thumbnail url - closes #990
Merge branch 'master' of github.com:Zeega/Zeega-Core
Merge branch 'master' of github.com:Zeega/Zeega-Core
Fixed thumbnail issues - closes #988
Fixed bug on the bookmarklet - screenshot variable was missing
removed unused styles
less updates
layer controls reactivate after preview closes. fixes # 977
Added thumbnail controller to generate item's thumbnails to the core bundle
Merge conflict fix
new item icons added and zeega icons updated
new zeega logo added to player and moved to correct position. fixed #933
added exit button to add media modal. fixes #981
cover field now indicates that its droppable when an item is dragged. fixes #958
removed old players
Removed file extension and leading slash from items imported from Dropbox
collection-wise stats file and dc size
Change from anorm to squeryl. And added login functions.
Ignore idea files.
Fix for issue 214 bubble hiding behind views on dealwall issue fixed -- Hemant 15/06/2012
Merge branch 'DealWall_Sprint14' of github.com:a2omobile/Client into DealWall_Sprint14

Conflicts:
	A2OHubBeta/A2OHubBeta/ViewController/ViewController.m
BUG 361:[FIXED]
When the user moves to document pane in 'All deals'. User will be shown only those DEALDOCS which was uploaded by the user.
Send the username in login response
Korjattu bugi jossa peli kaatuu kun: Siltaan heitetään shurikeni, joka kimpoaa takaisin, ja osuu suoraa pelaajaan käymättä maassa ensin
ActionScript and MXML syntax files for VIM, I created during 2007.
Added glk 0.7.4 stock files, overwriting current.

Added files from http://www.eblong.com/zarf/glk/ to replace the 0.6.1
versions of the files.
Fixed build to work with new glk.h.

Returned GLK_MODULE_* defines to previous.  Re-introduced
stylehint_Direction, even though I don't know whether it works.
The current glk specification mentions it in passing.
CHG: enable multithread laden_abschliessen for networkmode

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5974 8aca7d54-2c30-db11-9de9-000461428c89
FIX: call calc_bild only once

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5975 8aca7d54-2c30-db11-9de9-000461428c89
FIX: cleanup multithread loadsave mutex mess

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5976 8aca7d54-2c30-db11-9de9-000461428c89
FIX: don't write to not open cache file

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5977 8aca7d54-2c30-db11-9de9-000461428c89
CHG: raise powernet capacity

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5978 8aca7d54-2c30-db11-9de9-000461428c89
intersection check for components now implemented on client and backend side
'B' and 'V' no longer depend on having the whole selected skeleton loaded.
[emacs] add helm
Fix button flickering on chrome
Correctly update dynamic options
Small optimization
Rename data-role attribute in the JQM plugin
JSLint suggested changes
Select setValue bugfix, if used with optgroup
Datetime preset jsLint changes
Italian translation
IE10 and Opera Animation support
Merge branch 'development' of https://github.com/acidb/mobiscroll into development
formatResult optimization
Merge branch 'development' of https://github.com/acidb/mobiscroll into development
Animation cleanup
Merge branch 'development' of https://github.com/acidb/mobiscroll into development
Animation prefixes to keyframes added
Move to value on tap functionality to core added
Code cleanup and formatting in core
Scroll wheel bugfix
Merge branch 'development' of https://github.com/acidb/mobiscroll into development
Select preset wheel default width changed
Canceling camera action returns to 1st tab page (Home)
Some movement corrections to my .vimrc
Fixed merge conflict
Old Yella
Addition of first set of submodules
Update submodule versions
Addition of summary report submodule
Updated man pages
Merge branch 'master' of https://github.com/basis-technology-corp/sleuthkit
Renamed pipeline validation files for consistency with naming convention used to name tsk_analyzeimg
Merge pull request #59 from adam-m/master

SleuthkitCase JNI: escaped attributes strings were never unescaped when getting back from blackboard
Changes to sample config files and working towards synchingup module commits
Synch with latest commit of zip extraction module
Completed updates to sample pipeline config files, adjusting paths and referring to README file for TskHashLookupModule.
Various release and doc updates
Merge branch 'master' of github.com:sleuthkit/sleuthkit
various doc updates
doc updates
Merge branch 'master' of github.com:sleuthkit/sleuthkit
Updating to latest versions of c_RegRipperModule, c_TskHashLookupModule and c_ZIPExtractionModule.
Merge branch 'master' of github.com:basis-technology-corp/sleuthkit
Fixed line endings
Updated schema for unallocblocks, etc
Merge branch 'master' of github.com:sleuthkit/sleuthkit
Splash screen renders quickly and hides properly.
some matching working