labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #90 from vshchebeniuk/master

TestIsContainedInArrayOfEnumValues test added
Fixed #90.
Merge pull request #91 from vshchebeniuk/master

TestQueryWithInterface test added
Task #2697 - BLToolkit Pull Request. Fails to compare a property and a parameter of Enum type
Fixed a bug where only the content area was rendered; pages now inside the rootpanel div
gdpp bug fix
bug fix
Merge branch 't/support/game' into refs/top-bases/t/support/usf
Merge commit 'refs/top-bases/t/support/usf' into t/support/usf
yaml增加选项去除编译告警
去除测试用例中定义未使用的告警
Merge commit 'refs/top-bases/t/3rdTools/yaml' into t/3rdTools/yaml
1.0.4 版本

修改nodejs版本，支持载入一个页面作为模板
few more improvements : securesocial-custom 0.2.4.2
lens 2.6
Added a more realistic run
Remove call to non-existent meta tag helper. Is already run in parent theme anyway.
Merge branch 'master' of github.com:web-arts-unimelb/gshss
fix nextSong bug.

currentSong.onclick()->currentSong.firstChild.onclick()
fix filter adding/removing.
add a warning, don't select a directory include too many songs.
publish.
完成了数据库的设计
Version available
More accurate error locations
Fix column location in test
Clarify public domain source of murmur3 hash function.
Add primitive XDR array serialization/deserialization
Merge
Merge
added comment to readme about test
Spanking new readline based login system! - test 7
Add backed and percentage to goals.html (#217)
Bump version to 5.4.29
Bump version to 5.4.29-dev
Fix three more regressions with #406
Setting version to 5.4.17 in gittip/__init__.py.
Resetting version in gittip/__init__.py.
Constrain Twitter lookups to Twitter (#398 sort of)
Let admin see who anonymous is on homepage (#329)
Setting version to 5.2.36 in gittip/__init__.py.
Resetting version in gittip/__init__.py.
fix for working with multiple machines… host was return the local machine rather than the one the registering service was running on.
Added API rules
fixed most findBugs bugs and fixed all the yellow signs with old code
Added supporters' logos to footer. Fixes #1063
login 0.9
Modified gemfile include pg file in production env
Ajout d'une dezaine de technologie
Modification des beam player et network
add categories and archives page
Fixed mismatched closing div tag
Merge pull request #22 from joshzimmerman/patch-1

Fixed mismatched closing div tag
Criacao das models do projeto
Merge branch 'master' of github.com:xandee1977/betaproject
Added a for loop around the connection logic to retry on failure before admitting defeat.
完成文件输出。
sjaiog
Merge branch 'master' of github.com:xoflora/Doodle-Tactics
asgdog
Vinyl button enables scratch
D:\GIT\git\10_18_homework\10207180569_谢真真_作业
Update src/Pathfinder
update go syntax tabwidth support
OGC parameters support
add vm_install section in main toctree
Added ruby 1.8.7 to travis.yml.
Update joomla/ru-RU/ru-RU.tpl_warp.ini
Merge pull request #6 from Alldar/patch-1

Updated Russian translation
Modify QueueTest1 (User can selected. debug...)
renamed project to projects
fixed tree links
Almost fixed polygon glitch
for #34: make screens compatible with both iphone 5 and previous models
dont need this as we're moving toward multiple layouts screen
new gitignore file
fixes #35: use settings to change whether to show or not to show
dima
changes
When secondary top level require calls are made and no new dependencies are discovered the callback is not always called
Reverted streamer to localhost.
fos comment removed
Updated readme
Updated readme file
Updated readme file
fixed header
tweeking build script
built index.html
build html
and whitespace
more on collaberation
added anchor
reoganization, more on git and SHA1
changed sidebar to normal section
more on short forms
compiled js
added a paragraph on using GIT from the command line vs a GUI client
more on using git
added shortcut LESS watcher bash script
add compiled version of app.less
add details on less watcher script to README
bin/qunit: use xml for reports.
included additional settings for transposition and speed
Add feh key bindings.
Add missing / in url route examples.
Merge "sync the serialized temp file before close." into services-r7
Implement redis snapshot/lifecycle API

Change-Id: I7e03b954730f6d31a5b2bc9f5f72ff8574c66d40
Update vcap_common gem

Change-Id: I8781d4a53b8d00ff1f5390ca0020ed2fd6c3215a
Merge branch 'master' into services-r7

Conflicts:
	base/lib/base/base.rb

Change-Id: I1fcd6ba88437fe65314345e69653da577d516585
correct variable name

Change-Id: I6df8c3c680316860e233c4472bf2c093104c75e0
Merge "mongodb snapshot/lifecycel api" into services-r7
Merge "Merge branch 'master' into services-r7" into services-r7
Merge "correct variable name" into services-r7
Merge "Update vcap_common gem" into services-r7
Merge branch 'master' into services-r7

Conflicts:
	atmos/Gemfile
	atmos/Gemfile.lock
	base/Gemfile
	base/Gemfile.lock
	filesystem/vendor/cache/daemons-1.1.2.gem
	filesystem/vendor/cache/json_pure-1.5.1.gem
	filesystem/vendor/cache/little-plugger-1.1.2.gem
	filesystem/vendor/cache/logging-1.5.0.gem
	filesystem/vendor/cache/nats-0.4.10.gem
	filesystem/vendor/cache/rack-1.2.2.gem
	filesystem/vendor/cache/yajl-ruby-0.8.2.gem
	mongodb/Gemfile
	mongodb/Gemfile.lock
	mysql/Gemfile.lock
	neo4j/Gemfile
	neo4j/Gemfile.lock
	postgresql/Gemfile.lock
	rabbit/Gemfile.lock
	redis/Gemfile.lock
	serialization_data_server/vendor/cache/nats-0.4.10.gem
	service_broker/Gemfile.lock
	tools/backup/manager/Gemfile.lock

Change-Id: I576b9c15b65f0a44a2f6003e0d7aa5c3a7470826
mysql2 connection pool enhancement

1. add connection validation before checkout
2. correct the keep alive function

Change-Id: Ic29b48019e7dfa090d5bfa2683f49976b25a31bb
Merge "mysql2 connection pool enhancement" into services-r7
use right symbol for log

Change-Id: Id024c9afa780e8ef5d429c315bd9ad9d33974fc1
make redis unit test pass with dev_setup

Change-Id: Id3a7c188ac1d46aef32eb02d998dc8477ccfa1cc
Harden postgresql migration

Don't unbind user on dumping db in case the
migration doesn't succeed so src node can recover
from the failure.

Change-Id: I4c7a24201aacfcbbc7594d63ff68dc645c59b6bb
Merge "Harden postgresql migration" into services-r8
Respect CLOUD_FOUNDRY_CONFIG_PATH if it is present

Change-Id: I2ed12dd5e6095ab2702470bfbe91799937cf2ddd
Merge branch 'services-r7'

Change-Id: I40284b13bc1c309713f5c5a283c8db9e57b6363e
Merge branch 'master' into services-r8

Change-Id: I7998de1d3d9c5f896cba5531416d23b8cb46d8e4
fix postgresql user access problem

Change-Id: Ica95ca06e4d1a3030e88dd26f3bc65c4fd53e538
implemented cat utility. However you will need to specify the full path to file. Autocomplete with tab is not implemented.
Added tools.
Added website starter package
Fixed a bug
Merge branch 'master' of github.com:Aelorix/cis521-Projects
I have no idea why this was ignored
Completed part 13 of the tutorial.

Added a LoadGameScreen and a ListBox class.
raw translate 1250/6500
Created new branch. Different update system that doesnt rely on order numbers to update stock. uses PHP server sessions.
Components can now be updated through the order number search aswell. by now the original update script is redundant as this method is much easier, quicker and effective. Also components without order numbers can now be directly updated through the program and doesnt require potetntial harmful modification of the .csv files
Fixed a few bugs involving component types not getting passed to the update() function, I would say nearing the end of alpha testing now
Fixed
beta testing stage
removed some debugging tags
Added some social networking APIs
refactored. added more tests
UTF-8 fix for Tip page
Removed some junk from the Makefile.
Changed "make push" to "make put".
Git now ignores the correct files.
Git no longer ignores the bin folder.
(helpful for people pulling from the repo)
Add mastery rating
Adding style to README.
Fixed RHEL6 string per DOC-361
advance registration page
Added production tests. Moved a base setting up to base.
Updated metadata and refactored appointment suggestion counter
made the lager and statues scenery
work on part2
Merge branch 'master' of https://github.com/BergarSimonsen/Calendar
remove mocha
add db/seeds.rb to Guardfile
add TODO to user.rb
add admin user in db/seeds.rb
more specs for AccountController
Added mute and unmute commands. Fix #2.
Add missing utils.py (required for tests)
add default charset to .htaccess
add overflow-y to html
split "int" search query on spaces
make labels more useful for search
add tools/fonts.py
add getFonts to Codepoint
add webfont locally and render SMP CPs with own fonts
add Twitter and about to footer
don't include Private Use characters of fonts
restrict footer text width
make cTextBright a bit dimmer
need to make WRITABLE files… dummy..
..
fix restart_act_devel.sh

Signed-off-by: Thiago Berlitz Rondon <thiago.rondon@gmail.com>
testando jenkins/deploy

Signed-off-by: Thiago Berlitz Rondon <thiago.rondon@gmail.com>
Update wwwdocs/2012/css/style.css
Merge branch 'devel' of https://github.com/Brasil-Perl-Mongers/Act into devel

Conflicts:
	wwwdocs/2012/css/style.css
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
divs patrocinadores
Extra initial data for user creation
Removed references to city
Merge branch 'master' of github.com:CIRB/django-fixmystreet
DM_SETEDITPOSITION fix

git-svn-id: http://farmanager.com/svn/trunk@9048 72235d2c-c60c-0410-a47a-a0032694dc5d
Trying new formatting for wiki
Add examples
Fix default routing not working
Add setAccessControlAllowOrigin
Fix request handle
fix day mappings
upped grunt-hustler version, no longer require dependency on nodemon
Fix events.deregister
803 Build version advanced to 1194-158

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@113800 eb64e737-3616-4df0-8941-5ee2ae88103d
CLOUDIFY-1052 Added validation and tests for service without an icon.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of http://github.com/CloudifySource/cloudify
803 Build version advanced to 1196-131

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@117043 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@117044 eb64e737-3616-4df0-8941-5ee2ae88103d
Added HMAC, tried to unbreak things
Expression closures re #12 re #51

http://wiki.ecmascript.org/doku.php?id=proposals:expression_closures

Works for:

* FunctionExpression
* FunctionDeclaration

(includes tests)
Merge remote-tracking branch 'gregglind/expressionclosures'

Conflicts:
	test/test.js
Add esprima-harmony.js
Remove browser-based test code
Fix precedence in ConciseBody and cleanup code

Close #68
Added FF15 patch for '-' sign
Clean up this horrible mess
Removed setup_reference() from smalt wrapper.
added testbench markups file and template for report
updated CommandArgs' documentation
changed the base command to show the command usage if the command returned false
Fixed bug in pgn parser
adding qwebirc and tetrinetx

Signed-off-by: Deleterios <deleterios@gmail.com>
Fixes a bug caused by name changes in boost::filesystem library.
Workaround added if only V2 is avalailable. Fixes issue #327 and Rashers
complaint.
add cache and logs dir
Finished collision layers.

#### 2012 07 08 - v0.1.3 ####
* Finished collision layer interpreting.
* Started Tiled enemy data layer interpreting.
removed currentMenuItem function that is no longer being used
LightZone version of dcraw.c 9.17
Added Fuji X-E1 and XF1 Raw Tone Curve templates
Merge branch 'master' of github.com:Doug-Pardee/LightZombie
Kevin added some functions he's been using
testing inverse
Add support for #defines in expressions.

Also add an algorithm to iteratively solve all unevaluated expressions.
Merge branch 'master' of https://github.com/ElNox/Kfet---e-Commerce
Creation Login OK reste verif password
Rapport : Django
Merge branch 'master' of github.com:ElNox/Kfet---e-Commerce
added error 404 and 500 pages
Added project checking to some commands
Zmiany dotyczące diamentow
Initial work resurrecting search
Get article search working
Add fulltext search back, now obeying what the instructions say
Move people seach to ezsql
If a persons full name is provided in the search, disregard all other people search results and only show that person (as we want to find that in particular).
Merge branch 'themes' of github.com:FelixOnline/FelixOnline into themes
expose request
Merge branch 'master' of https://github.com/rgrove/node-elastical
set request options
Merge branch 'master' of https://github.com/Filirom1/node-elastical into request_options
modified:   code/game/mecha/mecha.dm
Update code/game/mecha/mecha.dm
Update code/game/mecha/mecha.dm
uncommented some missing supply datums

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
compile fixes, more tweaks

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1572 from caelaislinn/master

various misc
Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert

Conflicts:
	code/game/mecha/mecha.dm
Added ability to reorder dictionaries
Updated translations
Changed "blue" color to "lightblue" in rendering word articles
Version bump (0.7-1)
Integration vom UI
Remove all apostrophes as they break message formatting.
maven: upgrade plugins
Merge pull request #301 from FranciscoBorges/fail-back

Remove all apostrophes as they break message formatting. Formal language is IMO better anyway...
Merge pull request #302 from FranciscoBorges/simple

maven: upgrade plugins
moved rest examples to main example directory
Add message to the failing assert. Fwiw, these tests were broken by 186c0a59da6d4b7c5f53a4f9be65a8a3ed9adc67
locator: concurrency review and fixes:
- on close(), wake staticConnector.connect() from retry sleep,
- remove `readOnly`, a duplicate state field
- add a stateGuard to stop races between initialize and close.
Add consistency correction to the test setUp.
HORNETQ-720 Remove incorrect consistency test. Simplify test code.
do not flag hasBeenUpdated in the getter methods
Merge pull request #305 from jmesnil/RA_hasBeenUpdated_fix_master

do not flag hasBeenUpdated in the getter methods
Merge pull request #303 from andytaylor/master

moved rest examples to main example directory
Merge pull request #304 from FranciscoBorges/fail-back

Review concurrency of ServerLocator (+ fixes), fix wrong consistency check in replicationEndpoint
updated examples to allow setting of udp address via system property
Merge pull request #307 from andytaylor/master

updated examples to allow setting of udp address via system property
HORNETQ-962 - Set a user ID on messages sent by HornetQ REST
Merge pull request #308 from jbertram/master

HORNETQ-962 - Set a user ID on messages sent by HornetQ REST
reverting compiler plugin as it breaks mac compilation
Merge pull request #309 from clebertsuconic/master

reverting maven compiler change as it breaks the build on mac
this commit is just separating a very large Handler into a separate inner class. I never liked huge anonymous objects and I wanted to do this here for some time already. No semantic changes on this commit (simple refactoring). plus adding a TODO block on HornetQServerImpl
Merge pull request #683 from FranciscoBorges/version

set hq version properties to SNAPSHOT as well
Place await() inside while loop with condition check.
Fix findbugs warnings
Move version check into Version itself.
Cannot wait for sync in this test as there are extra backups
Changes to XER for e instructions
Normailized line endings and trailing whitespace.
Updated phpCAS include location
New parseAddress() function
Add Singularize filter.
Little refactoring.
Word will add to static if it not found
Move Roles to library.
Move ResourceInterface and AbstractResource to Assertion\Resource namespace.
AbstractRoles and tests. for Roles
Tests for Roles
Remove unnecessary spaces
Getting empty Roles object instead null
Move Roles from Assertion namespace
Merge pull request #22 from GeometriaLab/feature/userRole-37093795

Add Singularize filter.
URL hibakodok hozzadva.
Hibakod kezeles finomitasa. (200-as kod is)
Fixed places in RigidBody where `this.linearFactor` and `this.angularFactor`, which are of type `Bump.Vector3`, were being treated as scalars
Provide sensible defaults to clone so that mass is not undefined

This only matters for testing, as RigidBody.clone is not used in
any of Bullet's internal code, and it immediately copies over the
correct values.
Port EPA Evaluate and friends
Fix incorrect order of operations
Merge branch 'develop' into use-typed-arrays
Remove application specific functions out of Vector3
anchor sync
Corrected connection plugin
2012/8/26
updated version
deleted
add build.sh script for Endeavoru
Have (hopefully) finished making a derived type in Object.c with which to broadcast ObjectDynamics.
Remove databus.xml dependency from DatabusConsumer
Remove databus.xml from conf
Add databus.consumer.rootdirs to conf
Add log4j.properties to Scribe
Use SHORT_LANGUAGE_CODE everywhere that needs it. This saves us from quite a lot of boring repetition...
Moved SQL Files already included in updated JZY DB to 'old'
Added a substitution for standard generators from standard generators.

Also added some more base enumeration functions so they can be used in
test modules.
label added.
New line at the end of a file
Changed the name of the Main class and the project to Makoid instead of MainActivity
Adjusted things for Eclipse and Android 4.0.3
Merge branch 'master' of https://github.com/JohnEarnest/androidMako

Conflicts:
	AndroidManifest.xml
	src/com/rtg/makovm/Makoid.java

Adjusted MainActivity name to Makoid, merged feesh's changes.
some license upd
some license upd
some menu.navbar fixes
added hello world example
Merge branch 'master' of github.com:JoshuaEstes/ServerTools
Second Draft of the iOS tutorial outline
Fix 'red snapper' typo
Merge branch 'ios-training'
Added a Server
Specify application/json content_type when uploading manifest.
Allow users to specify exclude patterns using --exclude option.
Also require directory option to be specified.
Bump version.
Added sql and config directories.
Added base class for the configuration
Tested the config class on the full page.
Added a directory for generating static documents.
Initial check in for an authorization class.
Initial check in for a data base class.
Added directory for the xml processing
Added a first draft of an xml parser.
Added empty base.css file.
Added path update to import classes that are in a subdirectory above.
First rough sketch of how the front page will look.
Initial check in for the login re-attempt page.
Updated the file modes to be executable for python scripts
Began the process of setting up a way to escape strings consistently
Added new methods to escape lists of items and arrange them for use in a sql statement.
Added an empty div to the front page. A place holder to allow javascript addition of text.
Added a routine to form inner join parts for select statements.
Added a routine to stitch together a list of items to query in a select statement.
Added a way to easily put together commands into a transaction.
Added a sql script to create the database.
displaying channels
sink input display
in the middle of event handling
some small checkbox fixes, working on options widget
some minor fixes and vertical padding
Ignored 'disabled' users when getting user info from phabricator.

Summary:
This way, when someone does '--rr csilvers', they don't get prompted
to choose between me and the (disabled) 'csilversadmin' account.

Add a unittest for the 'disabled' test.

Reviewers: benkomalo

Reviewed By: benkomalo

Differential Revision: http://phabricator.khanacademy.org/D88
Config keys cleared
Application extension block to make animation loop forever
add sqlite3 and sqlite_pdo
Build 38.2
- Заметное ускорение работы с применением кеширования и "ленивой загрузки"
Fix IE9 video playback when wrong MIME type

IE9 is failing to play using the <video> element because it's
detecting the wrong MIME type for the videos (text/plain).

Fix checks for existence of MediaError and falls back to flash if
one exists.
Fixed JSLint error
Fix for IE9 multimedia .wb-mm-overlay click

Added CSS required to detect clicks on on .wb-mm-overlay.  Using
rgba() for supporting browsers and transparent .png for IE7/8.
Fixed conflicts in generated files.
Merged changes to multimedia.scss/.js and rebuilt
Merge branch 'multimedia-ie9' of github.com:patheard/wet-boew into feature-multimedia-player

Conflicts:
	build/js/css/pe-ap-ie-min.css
	build/js/css/pe-ap-min.css
	build/js/pe-ap-min.js
Intégration 14_pourquoi_idlistes
Added success_response?
Nickname using Document class
ntlm_client optionally takes the name of the user to check membership for, when it is different than the user used for authentication.
Added verbosity flag to ntlm_client and description in the troubleshooting section of README.
http_client stops after first failure.
DC connection was not being established: server string is no treated as an URL only if it starts with the scheme (ldap://), otherwise urllib will get confused.
Updated MANIFEST file according to the new structure
Updated setup.py with new version (2.2rc1), description, URL, and classifiers
Commented and moved log point.
Update to Changelog and TODO for 2.2 version
Corrections to Readme, thanks to Kerry
some more fixes and clarifications
Adding some GWT tests
correct some GWT
Some more unit tests
Add readme to unit tests
FogBugId:12345 test igen
(okay) and (yey)
[IMPROVEMENT] Add toString() methods to SFilter/SQuery/SSort classes
update to kindeditor v4.1.1 & bug fixed
jumping/collisions. Still more changes to come

Still need to fix falling through floor, and need to move collisions to
Sprite
添加 libindicate
添加 libindicate-qt
Styling on pasts/comments done
all files in place
back button test
back button test
test mobile
test mobile
Merge pull request #5 from ManuelOlvera/androidBackButton

test mobile
Added new git email plus alias for starting dev environment
lista de especialidades
formatting markdown properly
Added new atom image ( By Boxmein )
Improved the reaction algorithm
Added atoms
Added Electronegativity in the Templates
Finished electronegativity and started more bonds
Space now Pauses and Unpauses
Implemented Basic Atom Adding
Travel + test
Basic work on a user add system started
changed too specific description
added class stub for an advice that executes a callback
added test stub
added test stubs
added comments
added test stub
added helper methods
implemented test
implemented some tests
refactoring: introduced helper method
refactoring: introduced constant to avoid usage of method name strings
implemented interface
added stubs for required methods
implemented test
implemented tests
added constructor stub
changed test as isIdenticalTo() does not work when using mock objects
implemented callback advice
Link to PHProjekt Space in confluence
updated calls to be server side.
added backoffice folder and mastepage
Add utility functions for managing an account (adding friends, marking episodes...)
num FFTW threads automatically uses num CPU count.
Optimized getNumEl
The function was executed very often
pushing deleteing of assetes
added russian and itialian localization to project
always present spashscreen to protect enteries even when PIN is disabled. Issue #75
Remove dummy deps
commit Mon Nov 19 01:59:56 GMT 2012
build conf moved to tools folder Mon Nov 19 02:01:00 GMT 2012
tests updated Mon Nov 19 03:52:05 GMT 2012
Migration Started

Updated All Pages....still need to work out some of the data
handlers....not sure what strategy to use if I switch it to a full MVC
approach or just use the data repository method I started.
Fixed SessionParseMapper tests
Removed stacktrace from warning when NServiceBus performance counter for CurrentThroughput not set up correctly.
Renamed Powershell cmdlet to adhere to naming convention Verb-NServiceBusNoun.

NuGet init warns for non existing Raven even if the user is running it manually on the console, fixed #742
Separated Powershell cmdlets to include a Test and Install instead of both in one.
Added cmdlets help file to zip + msi
Removed scanning of tests folder.
Fixed formating of help file
add missing / from check_load command
Some tidying up of chunk_list handling
update 2012/04/30
update 2012/04/30
update 2012/04/30
update 2012/04/30
Prepare for a SSL environment
Fix a couple of table rendering issues in Firefox
Update links to the shortcut icons
Remove version from CSS file
adjust win32console gemfile
blurbl
added dependencies to package.json
splitted liesLieferantenDateien, added readFile
Ignore Procfile
final touches to MUC pending! but all tested and good
Added preview screen
daily scrum
Added comments, and fix buttons
Added some comments
Adicionada um metodo para preencher as categorias na atualizacao
centered text on board.php
Added the method to NET35 too and also added tests for adding columns using the new method
added: node.js support
Add fields to k1api unsubscribe sms receipts request
Some code formatting
Updated Play! to 2.0.2

Conflicts:

	pom.xml
	qibud-server/pom.xml
Add comment about copied function signature
Use the new plugging functions in cosy
Make sure rootDir variable does not conflict with quantocore's

If ../core/ROOT.ML ends up being included, it destroy's cosy's rootDir
variable, and breaks the build.  Solution: rename cosy's rootDir
variable.
Don't pretend to limit the scope of rootDir

We need it to be global anyway because, for some reason, print_depth and
PolyML.Project can't be used from within a local scope.
Graph/JSON: treat null values and missing values the same

We avoid writing out entries whose value is null, and we parse entries
whose value is null as though they weren't there.
Functors to deal with annotations in JSON graphs
importing io functions from old code
admin users cannot go to the edit user page if user is master; fixed user photo positioning when printing request form
Mondalete
Merge branch 'master' of https://github.com/RMS-TEAM/SoapWebService
skill and heroes
uiUpdate
zuoci: huashen fix
Add #validate method to classes including validatable

Allows for block style declaration of validators
You must add to errors yourself.

Also fixed up some whitespace

TODO: Add documentation.
Actually its 2 seconds
Alter lock description
Fix suffix and prefix issue
3.7-rc7-imx2 release

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Close #94 - this isn't really an issue, it's an ongoing task
Applying new configs(listen on, send have)
Refactoring the hello world program to be including in the package
'main'
Editing settings for build and javadocs.
Package name change.
Added configurable rate limit to teleport home.
Changed home locations to be saved in another yaml file.
Fixed mismatched command names.
Minor refactoring to enable testing.

- Renames the rot13.MainPage to Rot13MainPage to make it a unique class name.
- Adds first test.
- Adds bin, include, and lib directories to .gitignore. Files in these
  directories assist in development and may be unignored later.
Update Upload/inc/plugins/gomobile.php

Added code to allow the mobile theme to overwrite forum-specific themes, although it may cause conflicts with certain plugins (but that remains to be seen).
empty cpp main file
自动更新验证
自动更新bug修复
add door_cage.png
Removed unused variable I forgot about.
Map reloading implemented.
Removendo a pasta .metadata do repositorio
ticket:10 - allow disabling of CSS transitions

I've added a new configuration variable, "animate" that turns CSS animations on and off.
Refactored to service manager implementation instead of dependency injection.
Renamed FileSystem as Network because it starts multiple file systems
Cleanup + directory structure change
Reply by Email: If there are multiple email addresses in the 'to' or 'cc' fields, add them as respondents on the ticket as well

See #72
start of mongodb
zencoding-vim追加
Added draft of lecture on <2012-12-18 Tue>.
Fixed a few typos and changed heading
Allow Custom Lockscreen Icons with new custom lockscreen image picker, update LED color options, ColorPicker fixes - romanbb , bitmaps conversions lockscreen -teslacoil
More debugging of event.c, fixed camoy's code, some additions to physics module.

Was a major pain to get an issue with event.c resolved due to wrong backtrace, camoy's code is added to the tupfile and now links with liblua5.1 and assumes that the lua libraries are in your include path under lua5.1/ (as in the debian repository dev package).
file

Added readme
Extended store module.
Implemented Publisher Editor.
Implemented Publisher Picker for App Creator Dialog.
change .emacs.el to init.el(for emacs23 or higher)
Update to use singly-zf2-module
Core/NPC: add essence infused moonstone, key to the focusing iris (and hc) to the list of keys gettable from locksmith npcs. (per aokromes)
Core/Battlefield: more cleanup
Merge pull request #5693 from thomas33/wintergrasp_cleanup

Wintergrasp cleanup
Finished work on the first complete version of shiphealth
Turned out simply using '/' for divisions didn't do the trick so i tried '* pow(x, -1)' instead and it got all my issues working ^^
Also added a functionality that selects colors for the appropriate condition of shields and hull.
Added the failsave-functionality to the entity for shield reenstatement

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
Merge pull request #37 from UweTrottmann/minparameter

Support user-library-movies-watched and support new min parameter for various library calls
Rename MovieService.checking(imdbId) to checkin.
Use new rating values. It is recommended to always send the new ones, so removed Love and Hate and modified Unrate to be 0 instead of 'unrate'.
Do not encode user name

Trakt does not support URL encoding application/x-www-form-urlencoded as
used by URLEncoder.
Merge pull request #40 from UweTrottmann/fixtypo

Typo: Rename MovieService.checking() to checkin().
Merge pull request #41 from UweTrottmann/newratings

New trakt advanced ratings
Ignore IntelliJ IDEA files.
Merge pull request #42 from UweTrottmann/noencodinguser

Do not encode user name
Fix failing tests. If only they had a test endpoint...
Fix failing tests and checkstyle.
Merge branch 'dev' of github.com:JakeWharton/trakt-java into dev
Update change log for 1.4.0-SNAPSHOT
Merge branch 'dev' into seriesguide
Hide SAC_LexicalUnit in CSSPropertyValue.
virtual CSSPropertyValue::cssText() function.
BackgroundCSSPropertyValue::cssText() method.
Added comments in MainMenuViewController.m

BUG: Multiple alert notifications are shown when fall is detected in activateAccelerator method.
Allow translations
Powered by Ohm
Fix footer border width
Previous and next page links
Next page link : "Creating Static Pages"
Pre source
Write the static pages tutorial
Pre colors
Adjust to OCaml formatting
Pre color fix
SocialEngine 0.0.9.3
kron 4
Don't prevent the use of the scroll wheel when the build / research / design / whatever window isn't up yet.
Don't spawn artifacts in campaign games, that is only done via scripts, since they serve a specific function in the campaign.

fixes ticket:3375
Don't scale the font, just use the regular size when displaying meter.
Make it more obvious the game is free to anyone who wants it.
Thanks to Kreuvf for the wording.
Added managers!

Signed-off-by: Wolftein <agustin.l.alvarez@hotmail.com>
pridan controller a view findvideo
Started MediaCache class.

Started MediaCache class.
Cleared out editor and server projects.
Made improvements to the FileSystem class.
day job :P
Made skeleton for adding a file/folder
add packages for 3.0.0
Item attributes.
Remplacement variable
Commit before attempting to implement String array of names representing the file as a whole to solve problems with processing time for the GUI. Nameley that the order of accepters is set by the order of the first line in this implementation, which means the GUI will have to recieve Strings of names as input from the solver and use a bimaps to figure out where they are in the String array.
Some improvments on parsing emu_scripts xmls
support (bug|bz) <id> <query> ... - multiple search
Merge branch '#11-bugzilla-enhance-feature'
uses white-space: pre-wrap for formatting shell output and minor code formatting
StatusBar angepasst.

Die verschiedenen Effekte werden nun auch in der Statusbar angezeigt.
App_perfekt
String hinzugefügt
gitignore/matt.txt blank
npminstall for mac and qrcode depedency
Adds image structure
Adds jQuery
Added bit rate, sample rate, artwork count
Move to single index.html

The JavaScript should be injected directly into the html to reduce
number of calls to the server.
Dodanie przycisków w drugim kroku do przechodzenia do pozostałych kroków.
Poprawka w MainWindow.form po rebasie.
Evolution#init() musi być metodą publiczną, żeby dało się ją wywołać z kontrolera.
Usunięcie zmian Mazura z MainWindow i dodanie EvolutionControllera (błędy z RepairFitness).
BZ 811639 - during permission multi_update, change error message if no modifications needed
Merge branch 'master' of git+ssh://github.com/aeolusproject/conductor
Actually hash passwords, rather than storing in plain text. #smrt
some jquery magic and more locale stuff
docs: fixed a typo in the sample code. thanks xingxing for reporting it.
Slider done, needs readjustment
adding Sonatype OSS parent
typical set of ignores
IcoMoon Fix
Changing some directory names, isolating themes, adding jGrowl
Tiny changes
Attempting to merge
adding back in tests folder.
codepro
Merge remote-tracking branch 'origin/master'
just the name change to differentiate between CPU and GPU code
change from .rc.local to .rc.conf
First commit
2nd commit
Merge branch 'master' of github.com:akshayratan/GitDemoRepo
Switched drupal-vim plugin over to the 7.x release
Fixed check to avoid null argument passed to gethostbyname_ function.
Reflect the transition of transform-attributes
Remove :edit to :edit-text for consistency
Fix :constructor-args as being taken as attribute
Prepare 2.0.0-alpha3 release
Fixxed Bugs
Fixed paths to source files in test suite.
Back first clears, then finishes.
Preparing for new version.
Defined style as LilFinger.Theme.
Export directory.
Added action items: camera and share.
Save option working, share option in tests.
move to redis + refactor
Added necessary subdirectories to package description.
Uncommented ssmtp
Add high demand licences section to start page.
Refactor sectors page to prototype.
Refactor activities page to match prototype.
Merge branch 'master' into slicker-ui
Refactor tests to use helpers and tidy controller.
Make language more consistent
More usable interface, 50% speedup.
Merge pull request #2 from aleator/master

Expanded interface, snappier code
adicionando teste 2
Added Import/export function for node types
Take out bad input image in training set.
A face cannot be detected in input image.
Only free a newly created grey image from preProcessImage.
The input image passed in to preProcessImage should not be freed.
Fixup training portion of program to only use preprocessed detected faces.
Add in generated facedata.xml file.
Parametros da permissão e correções no script de criação de tabelas: Escola_Possui_Funcionario sem chave primaria.
commented code main methods
Singleton updates
Updated AGHungQueueDetector
without 2nd while loop, increased performance, no daemon process after boot
changed out the video
Merge branch 'gh-pages' of github.com:androwis/MotionVideo.js into gh-pages
Updated package.json
Updated package.json
Updated modules
Removed some margin from nav pills
Sign in test cases
delete erwin
Updating code to include new live buttons
Ограничение права собственности в App\Context
Ограничение права собственности в App\Context на Read по-черному
Исключение про дублировании join модели
Модели для тестов
Ограничения собственности на чтение данных
Фикс ReadOnly appContext
Доделал модели js для создания через api
Add suggest project ( change all of the file with create new file -db.php)
refactored account actions
Stuck. need file path completion
Added fresh examples for WTF Code @ TopConf
started working on header
Registered Pulverizer TileEntity
search syntax for recipes is "recipes:..." (missing the trailing s)
Script correct fasta sequences based in a .VCF file
Deactivated some error log to prevent flood on vouchers.
create separate folders for all challenges
simple fix syntax error
Links to contributors graph as more accurate.
Updates version to 1.1.0.

See HISTORY.md for details.
fixing some image sizes
Use dot's -ofile and not > for portablility.
Added Broad and Illumina licenses
Change mock contact phonenumber
Fail the radio test early if headphones are not plugged in, and provide a manifest attribute to filter out tests requiring headphones
PEP8 fixes
Tweak waits in test_calendar.
Merge pull request #194 from zacc/test_cal_tweak

Merging to see how it fares in CI.
Disabled cell data test on CI
Merge pull request #196 from zacc/xfail_cell_browser_test

Disabled cell data test on CI
Merge pull request #192 from zacc/unique_phone

Change mock contact phonenumber
Merge pull request #193 from davehunt/radio-fail-fast

Fail the radio test early if the headphones are not plugged in
Merge remote-tracking branch 'mozilla/master' into delete
update go to first page
add wifi startup
das muss anders aussehen
Added XOR calculator
Transform the Silex app into a Symfony2 one

- add users list for administrator
- add drinks list, add and remove for administrator
- oauth authentication and registration
- connection by password
See #23. Upped Xore key length as cae0ac5 dramatically increases the likelihood of key repetition
Did some more koans...
Let multi_config_name be overridable
Fixed paging issues
A bunch of fixes for multipage draws, and statuses
found and abandoned mine
NavigationState test suite
Adds possibility to query for specific client identifiers
first 1.0.0-dev commit - updated version strings
added rebuildIndices to SparseMat
Ignore .rbenv-gemsets file
Rename binary and use simple array append operator
Added convention to add the local lib dir to the PATH
Rename lickjen everywhere
Merge pull request #5 from daytonn/fix-executable

Fix executable
H2 1.3.165, jOOQ 2.1.0
wrap rescue in begin end
Bring in util and templates from older awestruct.
Force OpenCascade to transform_entry in-place for Arrays, instead of replacing
with a new array.
fix up tests and union impl
Make minor edits to css
Basic make file
Seeing if message passing works again
don't center on the search page
Because old habits don't die.
Updated Drag Drop

Abstracted some of the pieces. Now supports swapping items, and grid
layout. (Implement in subclass)
changed image loader to async
Har kollat lite mer med scopes och tror att det finns en chans att sökningen kan funka med requestscope, måste skriva riktig kod för sökning bara så att man kan testa, men om man undviker att göra en redirect till samma sida vid sökningen, så är requestscopen fortfarande aktiv typ (sökfältet är fortfarande ifyllt).
2 koans
suppression de la parite de gauche dans la page html
larger images in result page
Gosu::Keyboard.register
Login in and out functionality
fixed update example
Initial tests for ProjectHours model and list view
Starting the Story
Merge pull request #7 from calvinmetcalf/seperate

Seperate
updated readme
logo
logo
added interval
Merge branch 'self' into gh-pages
set interval works
Added support for YUI lang modules.
Removed unused variables

Were needed for joining friends' chat, cba to implement properly
Chosen select plasmature types added

* chosen_select (single)
* chosen_select_multiple (multiple)
* not functioning in chrome on admin
Merge branch 'hackdoc' of https://github.com/carleton/reason_package into hackdoc
Fixed descriptions of new plasmature types
Merge pull request #20 from wilburb/hackdoc

Chosen select javascript - plasmature
Using REASON_PACKAGE_HTTP_BASE_PATH instead of CHOSEN_SELECT_HTTP_PATH
zapped undefined variable notice
111612_0912

Converted to Python 3.3. Changes were made in code to accomodate Python
3.3 including:
- enterprise and api login methods
- api calls in some methods throughout library

Optimized subscrptions. Subscriptions now show correct subscriptionid
when the current group is changed. Also, subscriptions display info
correctly after being created.
Wire up load Transport Extension event handles (Without this change it's not possible to load transport extensions)
Merge pull request #95 from Stonie/WireUpTransportExtension

Wire up load Transport Extension event handles
time test runs and include in output
remove wysiwyg_etherpad_lite dependency in the profile, add ace
add space selector to sitemap
fix URL in spaceSelector
Improve style of item descriptions
updated readme
added helper method without upload priority
Doku cleanup
ok640: nand: disable ecc
mtd: nand: workaround nand oobsize issue for ok6410
CUDA stddev & rnd version
Added third argument to callback, position in provided octets/string
raise TokensExhausted when maximum ShortUrl objects are reached
silly bugs fixed
no validation in original URL, that's supposed to be done elsewhere, so
URLs like "/without/domain" could be added
Merge pull request #8 from unaizalakain/master

Merge pull request #8 from unaizalakain/master
Cause stream.php to actually iterate along the string rather than repeating the beginning.
Avoid modifying pass-by-reference string in stream.php.
Cause stream.php to actually iterate along the string rather than repeating the beginning.
Avoid modifying pass-by-reference string in stream.php.
Merge branch 'stream' of github.com:aaronschmitz/joomla-platform into stream
Allow JApplicationWeb::render() to receive params for a theme
fix issue #1190
Merge branch 'staging' of https://github.com/joomla/joomla-platform into stream

Conflicts:
	libraries/joomla/filesystem/stream.php
Make the log package fully autoloadable.
Fixed an error inside component.php file, coming from an old change.
Added sqlValue method inside PostgreSQL's driver, added its use inside
insertObject and inside UpdateObject.
Added sqlValue's test.
Removed old commented code.
Changed "jos_" prefix with general "#__" .
Improvement on "boolean" type, added "numeric," type, comma inside type
is not an error but is returned by getTableColumns.
Tested all the cases.
Checkstyle
Merge pull request #1202 from mbabker/webRenderParams

Allow JApplicationWeb::render() to receive params for a theme
Remove the eAccelerator handlers for session and cache.
Remove some excess code in the session package.
Improve security for sessions a bit.
There's no reason for JSession or JSessionStorage to extend JObject.
Register session_write_close as a shutdown function.
added fold example//bug
2012-03-13:Modify the button style and debug
Fix race condition in RpcChannel::CallMethod()
Median by binary searching
Added Fubarino mini avrdude.conf definition to Mac OS X, and Linux.
Bit of cleanup. Continuing to cleanup language. MPIDE is multiplatform derivation of the Arduino IDE.
Map `jj` to escape

Props:
http://danielmiessler.com/blog/enhancements-to-shell-and-vim-productivity#escape
updates readme doc links

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>
Remove .ssh folder from git
creado server
Updated to run within postgres. Changed syntax for refering to lists in rule descs
fixed checking previously expired masrk
Release 81

Change-Id: I8eda7b7e416adee31dc887e659e62520e0412da5
Update notes for submitted changes

* Bump cf-release/src/services to reduce mysql hangs.
Update notes for submitted changes

* bump dea_ng
Update notes for submitted changes

* upgrade dea_next to ruby-1.9.3-p194
* some framework changes
Requests MFS & Table CSS
add functions that query nodes which match regex or prefix
Análise, correção e alteração do Cadastro de Equipamentos, análise, correção e alteração do Cadastro de Fornecedores, finalização do Cadastro de Cargos dos Funcionários.

Signed-off-by: construti <tcc.construti@gmail.com>
Fixing an issue with a misnamed hiera parameter that is bombing the xinetd service.
change from another branch
resolve conflicts
Implemented gauges in the mock statsd server
Allow decimal/float values as gauges too

0.98 would be silently truncated to 0.
I have verified js statsd server and it treats
them as Number(), which allows floats AFAIK.
Added testing of new gauge feature
Update docs and bump version for CPAN release
Update t/get-perl6-org.t
Merge pull request #11 from ronaldxs/patch-1

Update t/get-perl6-org.t
Load script engines

Fixes "package sun.org.mozilla.javascript does not exist"

http://www.innovationontherun.com/compilation-struggles-with-java-6-scriptengine-javascript-and-maven/

Change-Id: Idcb95954758093fa7941bfe5f8b142cf51feb252
Reviewed-on: http://review.couchbase.org/16147
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Jan Lehnardt <jan@couchbase.com>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
removed debug printf in maybe_start_engine_shutdown

There's no need and printf is harmful and it may in certain cases
printf too often.

Change-Id: If38da7d7ce96dceb81e208d7e1b4cf5bd62ac397
Reviewed-on: http://review.couchbase.org/13873
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Added new detailMap (same size as info boxes)
optimize le path by iterating once
Merge pull request #2 from fuelxc/master

This code is uglier, but faster. We'll use it.
Added milestone 5th vsel stuff

And new row in layout..and i broke the buttons
Fixed translations
Added Hungarian translation

By zakoo2
Updated the changelog for new build
Use revisions instead of adding numbers

For now...we will use revisions instead of adding numbers. Its more
practical!
When we reach 1.00 we will go standard (numbery) way!
Need sass-rails too.
check for textarea before acting on it
added the pry in development
adjusting new form buttons
added address country to project
Prueba indirectList
created auth.php with default settings
Day #17 Code and Article Complete
Fixes

Final fixes for version 1.3
createElement wrap updated to ensure dynamically created elements are parsed and event bound immediately
Fixed some memory leak bugs formal version of Pthread Panda code
use Rails.root to determine alle_api.yml location
small profile fix
idk:
can't join game without waiver
Modidy git repo for rails-cookbook
adding cats to budget schema
Forming the bundle into a library.
Merge branch 'master' into dev-dan
Now has working add for flights
Merge pull request #41 from danharibo/master

Web view for polls
nother space in thing?
votees stores vote, can change vote
fucking typo
fucking typo
fucking typo
fucking typo
output changes
pdesc and output change
link back to poll list
style on backlink
fix link?
Updated backlinks
rcbops
Made sure that ships can't collide
Added conditionals for input fields as well as the add and edit links for individual coupons.
Update CMake files for SDL
登录检查优化
noise profile: use unbiased inverse instead of asymptotic version.
noise profile: don't allow strength==0
Fix case where recipient was not collected on postfix servers because the Sent status in in lower case. Thanks to Kalpesh Patel for the report.
Improving exports.
Export some variables.
tmux: resize panes with C-hjkl
Resources for the restful service
added the export payload and prefixed each call with wither M or P. this
will need to be refactored later
Main resource checkin
Stable version with heartbeat resource added and a flag on the server to
indicate it's running
Working cut which contains the route dimension resources
moved helpers in binary to helpers.js
corrected name
added update test
restructured update tests
fixes for linked_to if passed an array
additional fixes to linked_to field type
added additional tests for MY_model
added additional documentation for model relationships
Move the bg image
NO Title
Added configurable reporting.

You can allow/disallow reporting now. Also, commented the config.
f - inventory updates
a - sockets only replace those of their own color
lol, lots to commit
tq"T"
Working device registration and removal on driver unload
created RSS feed
use QUnit.deepEqual instead of deprecated QUnit.equals
another way to fix, without changing  this.optional (onfocusout handler
changed)