labofsahil/github-event-dataset-2012 huggingface dataset:
Removed submodules
Merge branch 'master' of https://github.com/igorfrance/Sage
Merge branch 'master' of https://github.com/igorfrance/Sage
Sage.Build => Sage.Tools
Sage.Build => Sage.Tools
Sage.Build => Sage.Tools
Updated ignore list
Merge branch 'master' of https://github.com/igorfrance/Sage
Replaced the corrupt .gif animations with new versions.
Resolved an issue with saving the view inspector stat within the hash parameter.
Sage.Build => Sage.Tools
Convert the name to a local-name for all xhtml elements.
Fixed broken unit tests.
Added visual studio project templates for a Sage project and a Sage extension.
Added a debug utility to Sage.Tools
Fixed broken unit tests.
Added a better check for cache initialization.
Added locale language property.
Cosmetics and spelling corrections
Updated the thread id generation.
Make sure to insert the resource nodes before any (conditional) comments in the head.
Merge pull request #20 from Alex586/master

french.lua: in progress
vi keys
Minor CSS tweaks mathquill 

git-svn-id: http://imathas.googlecode.com/svn/trunk@889 c89b4f0b-ac2a-0410-9773-c9071ee4f95d
add link to github and very simple README
remove memo.txt from git
changed stale_url function to data_integrity()
changed stale_url_list link to Journal Data Integrity
added in ISSN data integrity checks and redid interface to use select options
view and layout integration
get_power_state now checks for attribute ( because in-flight VMs may not have this set ) and default to powerOff if not found
* bug fixed when extending end repair over multiple cigar operators
Refactored build system to give more fine grained control.
Provide access to parent target.
SDO and PDO sending from master works, tested with canopenmastertest single device
try to fix rtfd
Merge pull request #2729 from Carreau/rtfd

Fix Read the doc build, Again
fix jinja2 rendering for password protected notebooks
Use the correct tornado import as suggested by @ivanov
Merge pull request #2699 from crbates/jinja2

fix jinja2 rendering for password protected notebooks
Add missing encoding declaration to file with unicode in it.
overnatningtonderdk-0.05
Some bugs fixed. Bookshelf added.
Some bugs fixed. Bookshelf added. Images.
Some designs improved
Updated Profiler to fix CSS issues that caused funky rendering on modern browsers.  Also updated to start out as a tab on the bottom right, rather than have it take up screen real estate on every page load.  It has proved far more useful to the people I know who were using it since it was not an inconvenience to leave it on during development.  Added some javascript to prevent scrolling from bubbling to the parent when scrolling inside the console ( it was annoying when you got to the top/bottom and it fired the scroll event behind to the main page ).  Finally, I updated the link in the credit to point to the original Github project since the website it links to has been broken for some time now.
Don't cache Config defaults
Use a better value to check for default
Optimize Arr get default check
Fixed reference to file path.

Previously was pointing to variable $file which was used on prior foreach loop.
Merge pull request #1120 from SicoAnimal/patch-2

Don't cache Config defaults
Merge pull request #1122 from jromero/patch-1

Fixed reference to file path.
fixed bugs introduced by 6b0e64ce93127a375e0ec7bf1a791f31b5e71d20. Closes #1123
have Config::load() return loaded config on subsequent calls. Closes #1114
fixed Form_Instance.get_config() issue when passed an array of keys. Closes #1113
added new method add_type() to Asset. Closes #1109
Better asset type solution. Updates #1109
Merge pull request #1107 from manifestinteractive/1.3/develop

Updated Profiler to fix CSS issues that caused funky rendering on modern...
more profiler CSS tweaks (to fix leaking background colors)
fixed saving language files to a module. Closes #1103
refactored Config find_file(). Related #1098
fixed View auto filter sometimes duplicates array entries. Closes #1087
fixed Cache::delete() error when the cache file doesn't exist. Closes #1089
Error code missing from exception thrown in PDO driver. Closes #1090
Only update the PK when auto_increment is used. Closes #1093
added Math::CDF to perl role
most ops
hehe this is commit button
+ dot files
+ .vim files
+ README
software memory configuration
Put urls in their own directories
url_stats.rb should always output JSON
made the readme more informative
Rebar w eunit
[style ui.buttons] comment updated

Signed-off-by: Jan Pecha <janpecha@email.cz>
[style default] updated window content style

close #2

Signed-off-by: Jan Pecha <janpecha@email.cz>
Fixed .gitignore. Broke out TerrainMesh class from HeightField.
w
Merge branch 'master' of https://github.com/jassoncasey/604
Pdu rules up.
Pdu rules up.
New rules
Reorganised file structure, removed some obsolete files
Moved to a more generic commandline parsing
Initial command / actions are functional
Fixed a bug in the search results
Adding renamed copy of template file
Adding CrumbParse custom function
Use OpenStruct instead of MiniTest::Mock.
Fix mock errors for MiniTest 3.
Fix mock errors for MiniTest 3.
Convert to specs.
Remove fixme.
Update eventmachine to 1.0.0.
Update nokogiri to 1.5.5.
Update minitest to 3.4.0.
Fixes for MiniTest 3.4.
Fixes for MiniTest 3.4.
Convert to specs.
Convert to specs.
Use OpenStruct to avoid MiniTest::Mock errors.
Convert to specs.
Convert to specs.
Use test_helper.
Convert to specs.
More specs.
Convert to specs.
Require test_helper.
- tty changed to 5
- ls aliases
- vi alias
atualizacoes aceitas
Remove int field references from listeners
Make sure key area is the same
Backup all
Correctly shutdown the applet bundle
Correctly shutdown the applet bundle
Fix splash screen to work under osgi
Issue 989: handles transient node-not-found in nodeRunning

Sometimes on aws-ec2, the client returns null (i.e. node not found).
This fix will cause us retry with the correct node-id, rather than
"forgetting" the original nodeId and retrying with null each time.
Merge pull request #690 from aledsage/issue-989

Issue 989: handles transient node-not-found in nodeRunning
Issue #830: vappTemplate live tests improvements
Merge pull request #454 from aledsage/issue-830-vapptemplate-tests-2

Issue #830: vappTemplate live tests improvements
Fix typo
Add named_records.read
Fix timeval.asnumber
Fix timespec.asnumber
solutions for the problem 09
adding python directory for python code
Added format feature to strip out newlines and replace with <br/>
Commented in init's of button class
added file name on download header
push for Sonja to take a quick peek
added undo image
Changed photos user from jcarp to colbybox.
oops, didn't change second occurence of jcarp
added video capabilities
Embedly API wasn't being called for https URIs, fixed.
Trying to fix video display issue on LCD.
Added a Pages Controller
Done with static pages, pag 116
Create books.markdown
add commandManager
Proof finder.
Improved error handling. Continued marking integration tests vs. unit tests.
Rearrange header files for clarity.
Add forward class declarations to avoid circular dependencies.
Make KinectInterface noncopyable
Register plugin to get skeleton data.
Handle void skeleton_data pointer in KinectJSAPI.
Rearrange statement for clarity.
Be more explicit about calling convention for thread function.
Modify singleton object to use weak_ptr internally and return shared_ptr.
initialization of graph happens at creation time of GreqlQuery object
Loop to create the factories.
Use utility functions for summing object property values.
Simplify and re-use.
Use basic properties and make public properties consistent with other interfaces.
Normal Hero Dice.
changed width percentage
Fixing name error
Splitting network messages into seperate files to remove binding errors
subl auto
Switched to a relative load of rake/phony for ruby integration
Merge remote-tracking branch 'origin/master'

* origin/master:
  Switched to a relative load of rake/phony for ruby integration
Merge branch 'master' into next-major-release

* master:
  Switched to a relative load of rake/phony for ruby integration
About Dialog Message fix
Fixed off-by-one which caused history to behave erratically
added 'emr' task to build file: exporting a JAR compatible with Amazon
EMR+MapR
add custom query methods
Screenshots added and README update
changing bashrc to run archey if installed
tests: RUOTE_TEST_SPLIT=true instead of --split
move back to previous #shutdown / #join impl

seemed to get stuck when calling #shutdown in some tests
fix issue with aliased filter

the new 'flavour' trick in flow_expression was choking on replies with nil @msg
Updated on Sat Apr 21 19:18:12 SGT 2012
A+C: Egon Elbre (individual CLA)

R=golang-dev, remyoudompheng, iant
CC=golang-dev
https://codereview.appspot.com/6863055
runtime: re-enable crash test on FreeBSD

It also passes on FreeBSD.

R=golang-dev, bradfitz
CC=golang-dev
http://codereview.appspot.com/6812103
go/build: give better explanation for "cannot find package"

Fixes issue 4079.

Some example output:

% go install foo/bar
can't load package: package foo/bar: cannot find package "foo/bar" in any of:
        /home/dfc/go/src/pkg/foo/bar (from $GOROOT)
        /home/dfc/src/foo/bar (from $GOPATH)
        /home/dfc/src2/src/foo/bar

% GOPATH= go install foo/bar
can't load package: package foo/bar: cannot find package "foo/bar" in any of:
	/home/dfc/go/src/pkg/foo/bar (from $GOROOT)
	($GOPATH not set)

R=golang-dev, rsc
CC=golang-dev
https://codereview.appspot.com/6899057
Commit 731
added restart server
Init
Merge github.com:joelewis/DJPlus
Added ZMQ init check.
Edit
Merge branch 'master' of ssh://git@github.com/joooon3/GitTest.git

Conflicts:
	src/Git.java
moved 'build' folder to project root.
fixed /resources
added sparqlstreamweb, queries for jsi, swissex and bikes
minor change: if we are saying die(), it would be nice to know who called for it
More WIP on such dsl & layers plugin
remove jsonfield imports
Correct poorly written doc string.
Correction to documentation.
Merge pull request #5 from jravetch/master

change --tags to --always to avoid "fatal: No names found, cannot describe anything anything." error
Initial support for dotted names.
Merge branch 'master' into dotted-names
Enforce length constrain in LDH components.
Region support.
Merge branch 'master' into dotted-names
Route53 does not have regions.
Document new region support.
Reformat long line.
Update documentation.
fixes for card state notifications
Import finance/tryton version 2.4.1
Import net-im/gajim version 0.15.2
Import games/xwordpy version 1.0_4
Import security/kedpm version 0.4.0_7
Import math/lybniz version 1.3.2_5
Import net/heybuddy version 0.2.4
Import cad/pythoncad version 37_1
Import mail/mailtray version 1.4_1
Import deskutils/x-tile version 2.2.1_1
Import devel/d-feet version 0.1.12_1
Import devel/diffuse version 0.4.6_2
Import net/nos-ttb version 0.9.5_3
Import games/gbottler version 0.1.7_1
Import math/clarence version 0.4.4_8
Import graphics/dia version 0.97.1_3,1
Import misc/gonvert version 0.2.25_2
Import misc/metromap version 0.1.4_1
Import graphics/mirage version 0.9.5.2_1
Import x11-toolkits/py-gui version 1.7.2_7
Import devel/bzr-gtk version 0.100.0_2
Import x11/libxklavier version 5.0,1
Import textproc/p5-CSS-Croco version 0.09
Import textproc/libcroco version 0.6.2_1
Import security/silktools version 2.4.5
Import net/sobby version 0.4.8
Import net/silc-client version 1.1.8
Import net/pynids version 0.6.1
Import net/packter-agent version 2.5
Import net/netembryo version 0.1.1
Import net-mgmt/yaf version 2.1.1_1
Import net-im/meanwhile version 1.0.2_2
Import net-im/mcabber version 0.10.1_3
Import net-im/loudmouth version 1.4.3_6
Import net-im/libyahoo2 version 1.0.1
Import net-im/jggtrans version 2.2.4_2
Import irc/ctrlproxy version 3.0.8_5
Import graphics/liblqr-1 version 0.4.1_3
Import devel/py-orbit version 2.24.0
Import devel/libtifiles2 version 1.1.5
Import devel/libbonobo version 2.32.0
Import textproc/p5-Sort-Fields version 0.90
Update devel/p5-Sys-Syscall to version 0.25
Tweak textproc/p5-Text-Quote version 0.3_2
Update print/p5-Text-PDF to version 0.29a_2
Tweak mail/listadmin version 2.40
Update www/p5-URI-Title to version 1.86_1
Import devel/p5-EV version 4.11,1
Tweak devel/p5-AnyEvent-I3 version 0.09
Import devel/p5-Coro version 6.23,1
Import www/p5-Continuity version 1.5
Import net/get_iplayer version 2.80
how about a link instead
Check-in start of day 8, start client-side.
A reasonable layout.
+x on setup script
Empty django site
Merge branch 'master' of github.com:jskopek/Blog.py
preliminary API versioning
fixes title function
Distance bug solved, weights implemented
fixed RPC return types and values
CS Fix
Enable write access on mock filesystem (need cleaning)
Update api/res/values-de/strings.xml

Fixed some typos/misnomers.
09.17_1
Update userprog/exception.cc

exception.cc update
[attributedlabel] Add NSMutableAttributedString+NimbusAttributedLabel to the static library.

Closes #251.
Inital badge project created with example
auto fit has been changed to sizeToFit and removed initalizers
overriding -sizeToFit - bad, overriding -sizeThatFits: - good
Added the gloss effect to the badge
Allow better spacing for drop shadow so that it does not get clipped
Allows for custom text color and added a little bit more documentation
Inital badge project created with example
auto fit has been changed to sizeToFit and removed initalizers
overriding -sizeToFit - bad, overriding -sizeThatFits: - good
Added the gloss effect to the badge
Allow better spacing for drop shadow so that it does not get clipped
Allows for custom text color and added a little bit more documentation
Moved NimbusBadge into main Nimbus project with associated target, and fixed warnings
Added more documentation
Fixed docs for methods
Changed licence to Apache 2.0
fixed conflicts: note to self - should have pulled/pushed after master rebase
Missed conflict
Merge branch 'badge' of https://github.com/rogchap/nimbus into rogchap-badge

Conflicts:
	src/Nimbus.xcodeproj/project.pbxproj
Merge branch 'rogchap-badge'

Closes #29.
WIP 3 of work on import rewrite
公告改成论坛链接
Login Page Background Image fixed
focus on account
new navbar to all 3 sites
Added run checkbox
Fixed audio playlist not playing on native player - Mantis 15305
Merge pull request #140 from kaltura/iphoneAudioPlaylist

Fixed audio playlist not playing on native player - Mantis 15305
wp fix bump version
Disabled google analytics quartiles events for entries with no duration
(i.e Live streaming)
added additional descriptive text to leadWithHTML5 example 
Revert "added additional descriptive text to leadWithHTML5 example "

This reverts commit 364d2cde2b710cbfc34f189a4ece08954161561b.
Disable UI while displaying AD - Fixes #116
home work limit
Add a really simple description of the Query Runner project to the readme.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Merge branch 'master' of github.com:karelklic/canal
Integer::Container: constructor now takes only Environment, wip
Environment has constructors.
Merge branch 'master' of github.com:karelklic/canal
Integer::Container: only one contructor w/ Enviroment as args, fixes #70
Fix toposort. Fixes #98
Merge branch 'master' of github.com:karelklic/canal
added set command, fixes #94
Merge branch 'master' of github.com:karelklic/canal
autoreconf
Autotools add relative paths.

mkdir build
cd build
../configure

works now.

Fixes #114.
moved no-missing option to set command, fixes #118
[scenario] Changed tum kitchen to be compliant with semantic map
Added more objects, removed bread that has wrong mesh,

pr2_posture middleware now using updated builder dictionary
Added object-tracker files
Added adapto scenario files
Added first draft of adapto-mansion
Added blendfile for object tracker
Fixed wrong generation of quaternions
Added apartment, new human and textures
Added updated version of IAS kitchen
Added scenario with big kitchen
Added Jido and human to IAS-kitchen
Adapted IAS kitchen scenario to MORSE 0.4.1
Adapted apartment scenario to MORSE 0.4.1
Changed camera setting of scenarios
Added office scenario
Added breakfast objects to scenario
No spaces allowed in object description
Added empty ias_kitchen environment
ROS services for tuck arm
Added garching lab environment
first graphic :)
remove unneeded spaces and blank lines
implement keyword search
Add _samples/highnerd.obj
predator-regre: two test-cases focused on high nesting levels
fixpoint.cc: add compile time option to enable/disable fusion when abstracting
cl/cl_pp: print string literals/chars escaped

Meaning that those characters that affects the output substantially
(as newline) are now printed in an escaped form.

... and fix typos in headers and build-related files

Signed-off-by: Jan Pokorný <pokorny_jan@seznam.cz>
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
cl/cl_pp: rewrite prettyEscaped() so that it compiles and works
Added Khurshidali's seek points code
included a wrapper script that compiles variants
added parallel support for wrapper
q5 is almost working. cannot isolate unique pic_id's in query
Massive Retained rename

'Element' is waaaay too overloaded

So going with 'Thing'
A bit weird, but I couldn't imagine a better option
dart2js
Docs generated for refs/heads/master at e1a1bf8
* Fix some bugs
* Add the JSON utils to parse the output of APIs.
improved readme and Mockins javadoc
Load scipy only if FastInterpolator is used

Scipy can be a bit of a pain to install, so it might be useful
to have the option to generate cartograms (albeit more slowly)
without it.
POC for network graph.
Added math class with abs method to avoid negative numbers which screw over most tests
Merge branch 'master' of https://github.com/kirayatail/mdsd
Created Server class and Server handler
clean seed
Added wiring instructions and physical system design information.

Signed-off-by: Ken Lahm <kjlahm@gmail.com>
Store is nearly complete
Client rebuilt.
Abstracted status bar
initialise with earth gravity to improve startup
make json write lenient
moved file writer management to sink,  write proper array now
guard for race conditions
atom_to_list, not binary_to_list.  duh!
remove use of __() refs #4151

none of the content was actually translated and we dropped
the web interface is future versions.
Revert "Test JRuby's 1.9 mode"

posix-spawn doesn't compile for JRuby's 1.9 mode

This reverts commit 8ece8f49d546379e9408796a7fcc338030f6f99e.
Updated d3.js to 2.9.1
Windows-specific fix
More work on the importer. NOT DONE.
Completed and tested config conversion for import.
Finished game import testing. Screenshots and full-system test left.
add airbrake notifier via uniform_notifier
幅優先に作り替え
add version string.
Experiment with solarized
Cleaned up and added stylesheet to login
Finish twitter example
initial implementation
Added expring clips test with Timecop
Merge branch 'develop' of https://github.com/lightswitch05/clipster into feature/capybara-testing
Added Factory Girl and removed fixtures
Added list clips test
Merge branch 'develop' of https://github.com/lightswitch05/clipster into feature/capybara-testing
Removed deprecated function
Added pagination tests
clean up whitespace
Merge branch 'develop' of https://github.com/lightswitch05/clipster into feature/capybara-testing
Added search tests, fixed database cleaner issues
trun off fixtures
Merge branch 'develop' of https://github.com/lightswitch05/clipster into feature/capybara-testing
Merge pull request #33 from lightswitch05/feature/capybara-testing

Feature/capybara testing
pristine-tar data for redis_2.4.13.orig.tar.gz
Fix addMarker overwrited function
lulz, reconf
deleted ftpusers.py~
updating pom and adding license
订单和产品分开
增加订单状态流水细节
Allow Input::json() to return array instead of object
Merge pull request #1186 from akuzemchak/feature/json

Allow Input::json() to return array instead of object
Added Bulgarian language files

Signed-off-by: Roumen Damianoff <roumen@dawebs.com>
Merge pull request #899 from RoumenMe/develop

Bulgarian translation
Add a Request::time() function.
Use LARAVEL_START constant to calculate request time.

Suggested by @Kindari.
Merge pull request #933 from franzliedke/patch-22

Request::time()
further discussion in the language ref intro
fixed issue with using an event from a machine passed as a parameter in a transition
correctly encode login and password
paste*: Remove some test warnings
Fix many CapVideo-related ConversionWarnings
tests: Save and submit test results

There is no processing of the reports for now,
but the submit part is done.
tests: Better way of handling non-module tests

Some were not caught, and they were ran even for a single-module test.
Also, don't include them in the report.
browser2: Browser load urls, post, track state

With working tests!
browser2: Add a default timeout

Because no timeout is pretty dangerous
browser2: Handle server issues of postbin.org

And move tests outside.
browser2: Add support for relative URLs / BASEURL
browser2: Better tests

Allow using local services, add RequestBin support.
Still using PostBin for the empty POST issue.
browser2: Better redirection fix

We have to redo request building for all redirection codes even if we
don't fix them, for consistency.
And only 302 seems to be problematic.
browser2: Try to have extensive documentation
browser2: More tests
browser2: Handle Referrer, more documentation
reorganize the images in one folded by adding num2 mode in img2video_rename.
fix metro 3
fix responsitive for 1024
Merge pull request #100 from vinilzen/dev

fix metro 3
Pointing MKNetworkKit@0.85 to master"
add smex
add undo tree and smooth scrolling
Updated ShapeTest, having problems with number of folds vs minimum number of labels
Moved stuff around, fixed shit. Fuck.
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5'
Documentation comments
Avoid HTML, PHP mix in lib files
Fix some doc comments
Coding style improvements
Names of protected variables and methods should not be prefixed with underscore
Wrap some long lines
Wrap some long lines and add missing return type
Fix @since tags
Wrap some long lines
Documentation comments
Fix failing tests
Removed 'echo' statements from 'Error' class.
(the 'Message' superclass already handles output)
Coding style fixes
[master]: update ChangeLog.
@leonoel Et, t'as vu ça, mec !
Actualizando el TODO, poniendo checks para ubuntu basados en el hostname.
tweak test
apply equivalent changes from zmq::libzmq2
修改接口API函数，同时在头文件中增加库文件引用
Bug修改以及接口调整
Corrected ignoble regression in prior commit.
Add a test showing that git_status_file gets confused by spaces in .gitignore
Ignores allow unescapes internal whitespace
Merge pull request #759 from libgit2/ignore-line-containing-space

git_status_file returns GIT_ENOTFOUND for files in "foo/" when .gitignore contains "foo bar.txt"
Added Push Function
Commented Crypt
added new guava icon
bug fixed. process is not defined in rhino.
changed personal website on resume
Fixed a few errors, version bump
fix crash while closing a non-existing dialog
added empty wmp functions
Fix to pass empty strings as expected by Bango instead of nils.
Merge branch 'master' of github.com:lolay/investigo
Fixing return of icount for partition flag
Get agent forwarding working on Windows (with Pageant)
Merge remote-tracking branch 'factormystic/master'
Didn't realize I had damage reduction ... Made it so fast spells can take less DR
Removed unnecessary lines from my bashrc
Adding encoding refinement component of AZTDIS algorithm
when using webapp mode to deploy tomee the context was known too lately to get back the deployment exception

git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk@1352040 13f79535-47bb-0310-9956-ffa450edef68
better management of UpdateChecker vars (using a base repo instead of the openejb subdirectory and detecting tomee installation), adding proxy management

git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk@1352175 13f79535-47bb-0310-9956-ffa450edef68
TOMEE-247 TOMEE-248 InitHooks and updating update-checker to be a hook

git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk@1352193 13f79535-47bb-0310-9956-ffa450edef68
display correct time in the time command
change link url in app.
Updated version number. And added the LaTeX2e requirement.
Updated version number. And added the LaTeX2e requirement.
WePay Oauth2 working
ok, kltsim wasn't (nearly) as complete as I imagined it to be..
- Add sunspot.yml
added addAuthInfo()
Forge .445
Module-specific READMEs
glowy things
Code coverage now handle correctly traits.
add some more sintering tests
added middleware checking within Application init
added empty image dirs in test/all
[mr1869] possible fix for double-charge effect. related to #873. testing.
[mr1870] tempfix LockedVector for non-pointer type storages.
[mr1871] some additional features to LockedVector
[11945] Fix a bunch of counter achievements. Some still require more work

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11946] Add commits for death in statistics, fix some engrish

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11947] Improve SCRIPT_COMMAND_MOVE_TO

This changes the handling of SCRIPT_COMMAND_MOVE_TO, to not expect some travel-time, but directly provide the speed for the movement (*100).

Attention to DB-Devs, please check your MOVE_TO scripts.

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/AchievementMgr.cpp
	src/game/SpellAuras.cpp
Merge branch 'master' into testing
Revert "recheck distance for delayed spells at hit v0.4, related to #873"

This reverts commit df6fef0a53fe08723ad99083448930a48504c1e2.
fix crush with incorrect DB data after 11945
recheck distance for delayed spells at hit v0.5, related to #873
Revert "some corrects to StateMgr (safety) after rework map scripting engine. related to #917, testing."

This reverts commit 8a3b5585e07f2a9db30533395266a130d2dbb8bd.
remove wrong part of 1856.
- movementgenerator - not true place for operations with combat/threat, only movement must be.
- part of removed code cause creatures freese (and server freeze with low chance).
- now chase state be dropped if target is not acceptable or target lost (may require additional correct).
some corrects to StateMgr (safety) after rework map scripting engine v1.1, thx to Undergarun. related to #917, testing.
StateMgr v2.5
- implement UNIT_ACTION_FEIGNDEATH
- some corrects to action auras unapply
small AttackResumeEvent cleanup, thx to raynar. close #871.
delink lockSet before sending to player. may affect on #868
std::queue usage in RemoveAllObjectInRemoveList. may affect on #867. testing.
Remove unecessary legend argument; closes #13
code style touchups
add utility for redirecting and formatting child output stderr/stdout to master process
Merge branch 'master' of github.com:mapbox/tilemill
for test failures due to failed http status be nice and show the response
fix #2162
Merge branch 'master' of ssh://github.com/maqetta/maqetta
@2135 - more mobile widgets
#2015 Use a loading indicator for Theme Editor.  Use async xhr for
initial page load.
Add factories to support testing deliveries
Inclusão do campo login na tabela histDispositivo
getting ready
Merge branch 'master' of github.com:markmarkoh/rhok
trying to fix navigation
Merge branch 'master' of github.com:markmarkoh/rhok
changed workspace structure
added docs for NUILayout
Stock transactions should not be deleted when payments are removed
Convert stock app to south
Fix #20: Make stock transactions more useful on their own
Add a simple HTTP Basic Authentication decorator for the API
everything looks about done
Add cache cleaner
docusign comment
Added Tada

und so
more thorough heuristic branch swapping
tree saving works
1-based enumation of trees in file
Twitter bootstrap
Twitter bootstrap
Twitter bootstrap
Added permission node for Iron Grip
Fix Iron Grip calculations using incorrect values.
Reworked a little Users.java
Fixed /mcremove on existing PlayerProfile
Missing space!
git-extras added, acm-specific bin folder created,
custom man folder symlinked in and added to path, and
install.pl updated accordingly.
Make sure we have the current location

A few things to change:1) Make sure you find our current GPC location
before you call 'currentLocationByReverseGeocoding'. 2)Make sure the
location we recieve is the most accurate possible 3) Start searching
for our current location when you add a new deal, ie when you start to
take a photo.
Merge pull request #1 from mcordrey/master

asdf
started investor list function but not working yet
Merge branch 'master' of https://github.com/nmeiring/Crunch
Fix xml _* pattern parsing
Remove duplicate class
Add --quiet option to replace --verbose
Fix parser crash on malformed input
really fix requirements for both pip and distutils
Add selector for methods to add.
all working except for video saving
Site regeneration
Rewrote some of the usability comments
Corrected critic.
update dashboard post pager
add theme support, fix some bugs
[Issue #33] added scopes
Got the response working for the file system device driver, but it may need a refactor. At the moment programs may be loaded into the swap space, however they will not execute, execution trials are pending.
Working on C code generator
Merge branch 'master' of github.com:mfichman/apollo
up a line and kill full path option in kill-where-i-am
Improving file view
Some code clean up
Mock: Added missing require for Deltacloud::Runner (DTACLOUD-298)

* added missing require_relative
* removed unused variable in metrics
made fix to CRUD operations
画面遷移を別スレッドからでも行えるように処理を変更しました
Working on edit and delete item functions
Setting up table to display links better
pytholite/compiler: recognize composite I/O pattern
formula working
Updated webfiles
deploy services from maarten branch and not master
remove ruby_forge_project
Prune non-existent directories from cookbook_paths

This change fixes an erroneous Chef message which is printed if any one of the configured cookbook directories (including the default one prepended by soloist) does not exist:

    FATAL: No cookbook found in ["/Users/username/path/cookbooks", "/Users/username/path/subdir/cookbooks"]

To clarify the example above:

1. soloistrc lists `subdir/cookbooks` as a cookbook path
2. the current directory does not contain a "cookbooks" dir

Note that this does introduce FakeFS into the specs for testing of directory existence, without creating directories on the actual file system.
remove dependency on fakefs in order to get rubinius passing
Formatted the "DRAG ME" text in placeholders
Merge branch 'master' of github.com:mkozakov/PGraph
Renamed coordinate conversion methods, and added additional methods for conversion

The following conversions are implemented:

viewport -> div#"canvas' -> raphael canvas (pan + zoom taken into account)

raphael canvas -> div#"canvas'
Merge branch 'master' of github.com:mkozakov/PGraph
first commit of get score uodate
Merge branch 'master' of https://github.com/mkr9/Dojo-Tests
mudexv2
functions with more than 3 int variables gives correct result.
typing mistakes corrected
Update carousel documentation.

- Code styling for carousel.js
Merge branch 'open-source-site' of github.com:mobify/mobifyjs into open-source-site

Conflicts:
	www/_includes/nav-modules.html
	www/modules/carousel.md
add some initial documentation in markdown for combo
download manager added
Directories, CMakeLists.txt files and bootstrap script which downloads dependencies (boost c++ library for now)
Use the gh-pages branch.
Merge pull request #1841 from Empact/search_delegation_bug

#search doesn't actually appear to be a criteria method (it's not implem...
Ensure we are pulling back the right book
Fix last 1.8 error
R 2.2
Facebook Game based
unstage for submodule
changed teh path to the submodule
max2837: extern additional functions, put test code in ifdef
boot selection table in schematic
Fixing Query Window error tab result
	modified:   TurboBird.lpi
	modified:   querywindow.pas
Adding some alises to projects folder, Apache logs, and Markdown script
added base table styles
Merge pull request #61 from ossreleasefeed/privacy

Privacy - added base table styles
Update apps/mozorg/templates/mozorg/emails/webdev.txt

Add a link to http://whatcanidoformozilla.org/ to catch inquiries un-related to web dev.
Merge pull request #510 from groovecoder/patch-3

Update apps/mozorg/templates/mozorg/emails/webdev.txt
[bug 767788] Exclude redirects from Untranslated dashboard readout.
fixed error when saving case name that has int'l characters
Delete unused test files.
Add .gitignore.
Fix DisplayObjectContainer::addChildAt.
Add Error to builtins
Add RegExp to builtins, fix exposing natives for native call
Allow automatic lookup of native getters/setters
Fix typo in String builtin
Fix |String.{toLocaleString,toString}| and RegExp construction
Merge branch 'custom-builtin'
Cleanup merge bugs
bug747461 - local vagrantfile yaml, r=rhelmer
add an option to delay publishing to submission flow (bug 810009)
reviews detail page work
Update requirements/prod.txt

Add gunicorn.
clearfix styles were chewing up our gradients
personas preview fix (bug 762543)
some base b2g mobile stuff
fix typo in theme install function call
add context
create a context object
add logging and remove maven jars
Added hue and saturation adjustment shader "extra".

Also fixed whitespace in the shader list.
Added brightness and saturation adjustment shader "extra".
Merge remote-tracking branch 'tapio/shader-extras' into dev
quick hack to fix subdivision example for lathegeometry as mergeVertices breaks the UVs..
wanted to fix the + 0.001 issue in `THREE.LatheGeometry` but ended up fixing, rewriting and cleaning up quite a bit of it. I think the UVs now looks better (using webgl_geometries.html) but UV behavior is slightly different so beware (although it should be difficult to support non-complete wrapped lathe UVs). UVs + mergeVertices + subD should be looked at another day, but that will be another issue.
Yet some more minor changes.
Merge remote-tracking branch 'zz85/master' into dev
initial implementation of three and three-math npm module creation code.
remove npm script todos, add credits to npm build and test scripts.
Merge remote-tracking branch 'bhouston/npm' into dev
Add function to update items' attributes using put, add, and delete
rpm centos: update the default MySQL version
Fix bugs when creating a new instance
(Search) Increasing default number of shards to 5 (elasticsearch defaults)
PR followup
Merge branch 'master' into profiles

* master:
  PR followup
  Adressed jsdoc issue.
  Added paging utility.
  Securing the groups API.
  Capitalize CQL keywords
  Adding method documentation for permissions performance testing scripts and libraries
  Fill out additional metrics detail
  Adding performance tests for permissions
Intermittent test failure on principals fix.
Cleaned up test-groups.
(Authz) Added consolidated authz module

* Merges together all group, role, and permissions functionality
  necessary to be a stand-alone authz module
* Refines performance tests to focus just on authz
* Fix some error handling that messed me up a few times

TODO:

* Caching of permissions checks
* Integrate with the rest of the application, then delete:
    * oae-roles
    * oae-permissions
更新DBM.微调filger位置
Adding rdoc generated documentation
terminal defaults to xterm-256color to increase compatibility with our cluster
adding bcrypt as a dependency of the gem
bundling
modified to be included as a submodule
stylesheets for GUCoach
Add getElementsByBBox

This function gets element which have an intersecting bounding box.
web 과 api 분리
모듈들을 libs 폴더로 이동
북마크 웹 기본 모델과 장고 로그인 연동
베이스 테플릿 적용
계정 관련 코드 정리, css 도입, 북마크 추가 기능
Check that kernel class exists before trying to instantiate it.
mbbsh: su.autoreload feature
Flow changes and screen changes to Mobidex.1327656928024.pdom
Need to start submitting daily so the tracker can properly show fixes...

Merge branch 'core' of github.com:mytcg/GameCards

Conflicts:
	FHM/screens/AlbumViewScreen.cpp
	Mobidex/.mosyncproject

Signed-off-by: andrecronje <andre@mytcg.net>
Merge branch 'core' of github.com:mytcg/GameCards
level 7 now has polluted water that divides the level
no-exec switch, for when you need it
save a manifestation before saving creators
Merge branch 'master' of github.com:nabeta/enju_ndl
template spina 1.4
added Emacs Lisp script
implement ,
catch division by zero error
Update singletons
Address all warnings (except missing type sigs)
Adding coverage to Command class unit tests.
Updated annotated source for Command class.
^ Ext.ux
Datagram channel creation in main
changes for debugging.
medialibrary: Show the progressbar label when importing clips

In GTK3, ProgressBar's show-text property defaults to False
Added known host
Added unicorn to authorised hosts
Getting more cypher docs to split off untranslatable content into separate files.
fixes #600: Double optional with no matching relationships returns too many rows
Merge pull request #601 from systay/600

fixes #600: Double optional with no matching relationships returns too many rows
fix error in test #2; reformat
fix early resolving to account for `against` param
add `destroyed` flag; memoize `protostate` lookups
fix `State#protostate` to iterate past intermediate prototypes that do not possess a protostate
cleanup `protostate`
cleanup `protostate`
fix parsing of all-`.` selectors in `State#query`
deprecate `State.Event`
remove reentrancy check
add `changeTo`; redefine `goTo` and `become`; add `direct` option to override restriction of `retained` state
add inheritance of attributes via protostates
add `State#attributes`
add to `State.substates` an option to include virtual substates
return null instead of undefined
add support for virtual states to `State#defaultSubstate` and `State#initialSubstate`
`State#query`: fix pure-dot selector parsing; add support for recursion across protostates
add null implementation of privileged `substates` method
implement `conclusive` attribute
fix `destroy` between root state and controller
move `options` validation higher
renamed struct.h to sugarclass.h
update platform info at test/src
fix ijit package
output FAILED message and exit with error statuscode when test.k.proof is different from test.k.tested
Merge pull request #50 from wakamori/test

output FAILED message and exit with error statuscode when ktest failed
sync
Merge remote-tracking branch 'origin/master'
bugs fixed sugar_glue.c
Merge git://github.com/konoha-project/konoha into package
Algoritmos Configurables
Added facebook meta tags and like button. Provided a description and made adjustments to the page text.
Merge branch 'master' of github.com:nilsnh/InfoSoul
Pulled from remote and merged locally.
boom
Merge branch 'master' of https://github.com/ninjury/Ninjury
Fixed unit tests
Added release information and fixed doc generation
capisce 0.6.2 : Fixed a bug that broke `onceDone` semantics when calling `processList` or `processObject` on empty lists / objects.
Refactoring of relationship following add
disable vulnerability default context menu
fix undo bug firefox

still operate in Opera
Convert copy node to Java.
Asynchronously load Python.
Merge branch 'python-async' into pyvector
Remove useless timeout from getFunctionMap().
rename: views -> ui
Add dummy static dir
add debug messages in test/dev envs
fix delete, add update, move find to public method
Added "bad symbol" case to TE test cases buy / sell
updated doc with functional requirement for UI dep
Indes Galantes : entrée 2 scène 3 [3/3]
Ensure packages are restored
Update notes for submitted changes

* cortex_m: Fix single stepping will not return to debug mode sometimes
gdb_server: Simple close the connection and not exit openocd.

This patch let openocd running and only close the gdb connection
on error.

Change-Id: Ifb88e16834b51207cc4c82210eab904ed8d30b71
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/523
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
scripts: use adapter_nsrst_delay not deprecated jtag_nsrst_delay

Change-Id: Idf98526d64dcba4d8a5b6910bd3c539756753e8e
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/539
Tested-by: jenkins
Add intro draft.
Merge branch 'master' of git://github.com/avassalotti/COMP558
completed upwind scheme section
created a fucking page
NXP-9651: Update user and group icons, from gif to png format
Add cute octocat story
Add all the octacat.txt files
Third Commit
Merge branch 'master' of github.com:o-g-sus/try_git
see if this works in node .6
Merge pull request #11 from oakypinky/master

added eventshow
CroogoHtmlHelper updated and tests added
In node_filter element : label added for status and type
CroogoHtmlHelper and CroogoFormHelper only load on admin
fontAwesome added on webroot folder. It's not a submodule.
Bootstrap css updated
admin_edit.ctp of Nodes plugin updated to work with bootstrap
CroogoFormHelper updated, and tests added
Size of input updated in MetaHelper (used for "add fields in Nodes plugin)
default button added to link method in CroogoHtmlHelper
link of adminRowActions updated (now it's a button).
Buttons forms have the bootstrap style.
Revert "Some other comments tryouts"

This reverts commit f3ecef909b0daee8e3ec74720280a3d226d55847.
Revert "Test Xcode pragma-comments"

This reverts commit 99498fb49d3e82d72a9012331d73a80e894bfb3f.
Revert "Revert "Test Xcode pragma-comments""

This reverts commit bb2877682ff3bdd18cf6595a51a462cf64a30f1c.
Revert "Revert "Some other comments tryouts""

This reverts commit 579e3c0540284cc2628b7063a0a25d6bc4bb5714.
Revert "Some other comments tryouts"

This reverts commit f3ecef909b0daee8e3ec74720280a3d226d55847.
Revert "Test Xcode pragma-comments"

This reverts commit 99498fb49d3e82d72a9012331d73a80e894bfb3f.
Revert "Revert "Test Xcode pragma-comments""

This reverts commit 9c61ed11f1f8a3446d39751a583fac34dea56220.
Revert "Revert "Some other comments tryouts""

This reverts commit bae74b0ddb51a45efc7630aeed2cb20273be30de.
Revert "Revert "Revert "Some other comments tryouts"""

This reverts commit bffb677dc626193e0011617962b186cbada1de72.
Revert "Revert "Revert "Test Xcode pragma-comments"""

This reverts commit be94d8e26c3cb3be5a7a91f48a6354b9c78713e7.
Revert "Revert "Test Xcode pragma-comments""

This reverts commit bb2877682ff3bdd18cf6595a51a462cf64a30f1c.
Revert "Revert "Some other comments tryouts""

This reverts commit 579e3c0540284cc2628b7063a0a25d6bc4bb5714.
Revert "Some other comments tryouts"

This reverts commit f3ecef909b0daee8e3ec74720280a3d226d55847.
Revert "Test Xcode pragma-comments"

This reverts commit 99498fb49d3e82d72a9012331d73a80e894bfb3f.
delete buttons in tabshoplist
add primitive map tab function
add map tab function - map overlay class ShopOverlay
Merge branch 'maponly'

Conflicts:
	MyFood/src/kr/co/taemu/myfood/TabShopList.java
Fixed failing tests
Merge https://github.com/ulope/django-cms into ulope-develop
Added Chris Wesseling to AUTHORS
Merge branch 'master' of https://github.com/CharString/django-cms-2.0 into charstring-master

Conflicts:
	cms/locale/nl/LC_MESSAGES/django.po
	cms/locale/nl/LC_MESSAGES/djangojs.po
Pulled translations from transifex
Trying to fix this JS mess
Massive test renaming, removed the silly numbers
Fixed the rendering tests being borked (not using the api and stuff)
Merge branch 'develop-issue779' of https://github.com/mitar/django-cms into mitar-develop-issue779
renamed some tests
Merge branch 'develop-issue786' of https://github.com/mitar/django-cms into mitar-develop-issue786
Added ability to add nested plugins to cms.api.add_plugin
Fixed cms.models.pluginmodel.CMSPlugin.copy_plugin not setting the new parent
Demined cms.tests.plugins.PluginsTestCase.test_copy_plugins

Fixes issue 786
Added test for issue #477
When moving a page to the root level and it has an INHERIT template, the template is hardcopied from it's current parent prior to moving the page. This fixes issue #477.
Removed invalid CDATA tags from javascript, fixes #747
Made update_site_and_pages_choices 3 times faster and added a test for it
Placeholders are now orderd by their position in the template again (in change_view admin). Fixes #690.
Fixed #722 by failing fast when using non-ascii identifieres for placeholders with a nice exception to tell them how to solve this issue.
Added a test for #722.
Merge branch 'develop' of git://github.com/divio/django-cms into develop
Changed app-hooked page lookup from ``application_urls__gt=''`` to ``application_urls__isnull=False`` to improve postgres perf    ormance and solve some Oracle issue. Properly fixes #790
Fixed multilingual middleware so it doesn't set django.session["django_language"] if it doesn't need to (so django doesn't save the session every time).
ad
12/13
Simplify code.

There too many guards. It's too complex for me.
Use readable constants
Remove an unused constant
Update comment
Use %r.

This makes regular expression readable.
Use case-when
Use case-when
Use Array#include? instead of Array#index.

This makes readable code.
Add guard for reference_type
Use dynamic method call instead of static method call.

This is Ruby way.
Update comment
Add missing bracket.

Hmm, I think "#@instance_variable" is not readable.
Add missing bracket.

Hmm, I think "#@instance_variable" is not readable.
Add missing bracket.

Hmm, I think "#@instance_variable" is not readable.
Add missing bracket.

Hmm, I think "#@instance_variable" is not readable.
Add missing bracket.

Hmm, I think "#@instance_variable" is not readable.
Update comment
Add -n and -v flags

-v is somewhat redundant with -n and may be removed in the future.
added support for reduce over arrays
Partially written Reduce for Objects, I  need improved it paralelizing binary tree communication for operations, scatter need Error control, and it have some problems tetsing with root=1 because error control is not implemented full
pop in queues remove memory
refined Scatter Communication
working in documentation schemas with LibreOffice Draw
Refactor out an iterate_repos helper
Add something that checks our repo hooks for errors
Add error catching on a big scale, cauze Im lazy
Some fixes for custom validator and allow the validator and the program to have different language.
MDL-32249 completion: Make grade criteria more consistent

Also, round course grades and remove hardcoded string.

Note: This patch also removes the ability to update the course grade
from the completion interface
MDL-34044 completion: Fix regression caused by MDL-26626
MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts.
MDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option to config.php + amended lang output in layout files. Added some css to style langmenu + removed redundant loginicon in pagelayout.css
MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php
MDL-31201 wiki: fix a hardcoded string
Merge branch 'MDL-32249c-23' of github.com:srynot4sale/moodle into MOODLE_23_STABLE
MDL-34130 fix data inserts in recordset tests
MDL-34130 test nested recordset iteration
MDL-34130 test interaction of recordsets and transactions
MDL-34130 add missing rs close

Thanks Eloy!
MDL-34130 test recordset data is static

We do not want recordset results to be affected by subsequent update or delete queries.
MDL-34130 prevent some warning in PHPStorm
Merge branch 'w27_MDL-34130_m23_recordsettests' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Merge branch 'MDL-34044-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Merge branch 'MDL-34119_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
weekly release 2.3+
Merge branch 'MOODLE_23_STABLE' of https://github.com/oncampus/moodle into oncampus_23
add a clear button
what?
js
Added base class for handlers
Merge branch 'master' of https://github.com/openMinix/Yocto
Added helper functions to Post model