labofsahil/github-event-dataset-2012 huggingface dataset:
add start and reset button
make private method "Controller#setComponents"
add member "location" to Bug
modifs jon
Removed aria2c.rst from the prerequisites of $(HTML)

$(HTML) is the root directory of html documents and since we don't
remove $(HTML) when re-building htmls, it is useless to use aria2c.rst
as a prerequisites.
Removed dependency on inet_aton

Implemented inetPton as a replacement of inet_aton. inetPton is
implemented using net::getBinAddr.

This change fixes bug#3525424.
Modified activationkey tests
Merge branch 'release/0.2.5' into develop
Incorporate vbox's API function/attribute name changes for 4.2.x
Adapt vmfest to VirtualBox 4.2

  - Removed `find-medium` after the removal from the API. Use
    `open-medium` instead
  - VMfest now creates all nodes in the "vmfest" group (new feature of
    4.2)
Merge branch 'feature/vbox-4.2' into develop
Update README to version 0.2.6-beta.1 + VBox 4.2
Bump project version to 0.2.6-beta.1
Merge branch 'release/0.2.6-beta.1'
Make vbox download link in readme to be version agnostic.
This is actually working, holy shit.
PT 2
Added login system for admin panel. Needs CLI tool to add users
Fixed router bug where 0 var routes weren't being matched properly
Added SQL queries to error page
Added validate, processForDB and processFromDB functions to Field

Implemented for/from DB in PasswordField. Used in Model getAll and
create. No implementations for validate yet.
Removed processFromDB for PasswordField. Converting password into stars when fetched from database was a dumb idea
Added some documentation to Model::GetAll because I felt it was needed
NumicalField now uses the number input type and respects min, max and step
Admin user model now uses EmailField instead of TextField for storing email addresses
Merge remote-tracking branch 'origin/exoticfields' into uopcomputing
[AS7-5093] Allow JDBC driver deployments as OSGi bundles
Bugfix on map parser
Merge branch 'master' of github.com:tdubourg/spylight
Updated X-related stuff.
Comment out missing components in .bashrc
Configure compose key.
Updated license.
Updated License.
fix tag in xunit nuget package
added tehmasp
Add the right Header (C) and AGPL
update settingsdb
Merge pull request #2292 from gregorwagner/master

Update settingsdb binary
Inclusion of the latest visuals and refactoring of the app (UI and functionality).
Edit mode for messages included
Transition restored
Linting
Merge pull request #2553 from borjasalguero/sms_refactor_step2_2

SMS Refactor. Edit mode for messages included.
Fix Cut the Rope on 800x480px devices
Merge pull request #2571 from timdream/fix-cuttherope

Fix Cut the Rope on 800x480px devices
Merge branch 'feature-homescreen' of github.com:telefonicaid/gaia into feature-homescreen
Merge branch 'feature-homescreen' of github.com:telefonicaid/gaia into feature-homescreen
Fixing corrupted js
bug 799440: avoid CSS conflicts between the different dialogs
r=etienne
a=vingtetun
Merge pull request #5726 from fabi1cazenave/bb-dialogs

[BB] bug 799440: avoid CSS conflicts between the different dialogs
Merge: Create user on anon custom form submit

commit d8ba01137de1d84b92113cec42c387a4ba75c54c
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Nov 27 19:17:23 2012 +0800

    added a fix for multiple profiles with similar email

commit defde41a03ffb4724610d18aaa1e404f60c5b6ec
Author: John Eddie Ayson <je@bixly.com>
Date:   Thu Nov 22 16:23:25 2012 +0800

    creates auth user for anonymous custom form submit
Update the addons adding to accept the addon folder as an argument.
Update the query filters to only return items with status=True to prevent inactive stories from showing up on home page.
my bira theme
add gem snippets
add c extensions
parse meld tree
Set Find and Go to Line dialogs to “join active space”

If user opens the dialog on one space, moves to another space (with a TextMate window) and then re-activate the (already open) dialog, it would previously switch back to the space containing the dialog, whereas with the changed setting, it now moves the dialog to the active space.

This should address issue #599.
before the entries in the page segments table were filled with zero, which caused problems with the page numbering. now everything after the last segment we accept is moved up in the file, to fill the holes in the page header.
Do not include line numbers in error messages.
removing individual notices, replaced by global notice
stip common prefix from filename and namespace-prefix
only clear search cache on conflict
Cherry pick perf fix from master
Fix bug involving source ordering and pinning
it turns out we only care if they are the same
fix backwards change-detection logic

pairing with @wycats and @indirect
turns out arrays are sensitive to order
unlock when gems are added to a path
slightly less obtuse than carl
update changelog for 1.1.rc.8
Version 1.1.rc.8
fix the changelog date
support post_install_message when using the endpoint
update changelog
prevent duplicate sources
#1694: add failing test for duplicate git sources
Merge pull request #1695 from geemus/bundler

---
Clean up corrupted lockfiles

Bundler 1.1.pre.5 introduced a bug that could
introduce duplicate GIT sections, which then
caused duplicate copies of gems in the GIT
sections.

This commit makes the LockfileParser aware of the
bug, and has it clean up any corrupted lockfiles.
Bump version
update changelog
Version 1.1.0 \o/
Update pear install location.
Refactoring of the caching decorator.
Some early cleanup. It's still crashing though, hence it's commented out.
Added support for hemi lights
Depend on mocha 0.13.0

* Change to `require "mocha/setup"` per release notes for 0.13.0:
  http://gofreerange.com/mocha/docs/file.RELEASE.html
missing prefabs from rearrange
fix for overrelease of tableDelegates
No more 1.9.1 for travis
correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT
Correctly update visibility for transports, author GriffonHeart
Merge pull request #7886 from tibbi/transport_visibility

Correctly update visibility for transports, author GriffonHeart
Closes #7132
Closes #6395
Merge pull request #7883 from tibbi/shield_generator

correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT
Core/Script: update creature_text for Custodian of Time (quest 10277)
Merge pull request #7890 from durotar/master

Core/Script: update creature_text for Custodian of Time (quest 10277)
Core/Battleground: Change notice about unhandled areatriggers to debug info and removed the GM notice.

Added comment for a field in HandleBattlefieldListOpcode. And removed useless bool in BattlefieldWG::OnGameObjectCreate.
Add 'system' to require's phantomBuiltins
api/auth: typo on test
api/app: added teams field to the App struct
api/app: added methods GrantAccess and RevokeAcces to the App type

The method GrantAccess adds a team to an app. If the team has already
access to the app, the method returns an error.

The method RevokeAccess removes a team from an app, returning error if
the team does not have access to the app.
repository: changing directory before pull, and improve Pull test
api/app: change RunCommand handler to cd only if directory exists
Removed authentication required handler from clone url
Added extra fields to unit struct
Merge branch 'master' of github.com:timeredbull/tsuru
.txt to .md
Revert ".txt to .md"

This reverts commit 0d5ff72dc182dc7f6fdd2a0613888f68a9c1ab5e.
added info
Interim commit to introduce some classes and structure to support the account service
Tidied up some dependency entries in pom.xml
Corrected naming of test class
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	pom.xml
Interim commit to add support for WithdrawalRequestBuilder and associated objects. A simple demo can be found in xchange-demo WithdrawalDemo.
global organize imports
global source format
added account service, rearranged package structure
placing orders now returns the order number, not boolean.
added Id to Order
removed line
changed exception
renamed method
moved
fixed comment
removed Gary's MtGox withdrawal classes
removed Gary's MtGox withdrawal classes
enums worden herkend
Merge branch 'master' of https://github.com/LinkeTony/HUSACCT-Tool-2012-Project
Test commit
semi-working thing
working AOIs
Finalized Core Functionality (Added lines)
JUnit stuff added
Merge pull request #2 from shuntress/master

Moving the bulk of the project onto Github!
Uiteindelijke versie informal.tex
Eerste lobby listeners geimplementeerd, gamelist listeners pas aangezet nadat alles is geinitialiseerd.
Genre brainstorm toegevoegd
rich mine assets added
CrossHair asset toegevoegd.
CrossHair toegevoegd.
Merge branch 'master' of github.com:timvdalen/OGO-2.3

Conflicts:
	src/game/assets.cpp
Rewrite RexsterClient.
Merge remote-tracking branch 'origin/master' into groovy189
Basic code cleanup and some renaming.
Added something to better handle the write queue in rexsterclient.
Merge remote-tracking branch 'origin/master' into groovy189
Refactor unit tests.
Refactor unit tests and remove need for self-xml reference.

the self-xml reference was injected into the rexster.xml at runtime and referred to the location of itself so that servlets could get that information as a configuration to configure graphs.  Since the graph list is now injected into the servlets programmatically there is no longer a need to have servlets self-configure.
Changed turn_left() and turn_right() behaviour.
Project is now accepting to generate code from e.g. universitySimple

Project is now accepting to generate code from e.g. universitySimple
my commit message goes here.
?
null stuff almost works
changed speedcontrol scaling by load and not by temp
temp is now only for security
split profile in functions, exports, bash_prompt, use bash_profile for sourcing all others
 remove windows dotfiles
improve cmake check for boost and jansson. fix hash_ring test and timer_event_loop benchmark. remove ucontext.
Merge branch 'master' into new_task
fix build flags. improve task api
Moved DialogUtils
Added SplashActivity
Add CalcAvailableSpaces()
Add CalcAvailableSpaces().
test with more number
Option to hide value text
дофига чего
Merge remote-tracking branch 'origin/master'
remove the steller.js folder
Added build option, by default to MinSizeRel
Modified OCE paths i nsmesh-5.1.2.2
Replaced PI with M_PI in smesh-5.1.2.2 to comply with coming oce 0.11.0 release
Updated boost headers to latest 1.52.0 release
Reduced SMESH to only one library
Modified SMESH 5.1.2.2 makefile
Renamed SMDS_MemoryLimit.cpp
Updated smesh-5.1.2.2 to compile with oce-0.11.x
Updated Modules spec
Updated win SWIG files
Removed gp_Pnt equality test
Updated paths in environment.py
Merge pull request #99 from tpaviot/tp/pre-alpha-improvements-fixes

Tp/pre alpha improvements fixes
another touch up
Tweak tweak the content.
prevent compile warning
Trying to add Devel to Travis
removing unnneeded patch
some transaction changes
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Changed default db to HSQLDB.
Fixing test boostrap for new composer autoloader
generalized scripts, now can call any page. Added steps to validate page content
Licenses added to creating bundles on the webUI.
better grpah
add nmep model
nmep model to use nmep group
add new route
modify the order of trim string
Clean Spaces
Picked fix from v4.0
[state_interface] doxygen: move short explanation to group
Merged v4.0 into master
tudelft goes locm3 ... well that is will TRY to go locm3.
Starting to convert to locm3
Cleanup
Un expected finish bug fix
:adding SIGINT handling
setting the plop-server to use the main method instead of the server method
adding gevent-zeromq
Updating minor documentation errors
Merge pull request #86 from lukewaite/master

Minor documentation fixes
Don't blow up the queue if one metric fails
get tests passing for typeahead :P
Updated bashrc and gitconfig; support for local bashrc and gitconfig files
Loading feedback, flexible data time range, cleanup
Poor Invoice class changes. Oops :(
odstranenie body z dialogu
Merge branch 'master' of ssh://github.com/u1v3r/tam-android
Adding treatment supporter concepts
Fix uid/gid for delayed_job start
Хороший пример с табами
Heroku fix: rename jquery mobile js and css
синие слова слогана, остальное чёрное
всё синее
Bugfix in lists of links and companies models
FIX: Updated api
NEW: Events and statistics
Turned field into local variable.
Introduced a (currently unused) method to determine
the packagename from a compilation unit.
See what we can do with this later on ;-)
Extended the interface by a method to inspect a package.
Provided a default (= empty) implementation.
Removed a test; it was dysfunctional anyways...
Introduced PackageRawData and inserted it between
Project- and FileRawData.
The WrappedTypeBinding of the tree entry type is 
now created much earlier, already in the WorkspaceRawData. Maybe this saves us some time because invalid entries are rejected earlier...
PackageRawData automatically determines the number
of classes per package.
Hotspot infrastructure for single packages
(looked at in isolation)
New statistic for size of package per project
(uses the new SinglePackageHotspot)
- Result visitor method "inspectProject" now also takes a project.
- ProjectRawData now knows its project.
- SinglePackageHotspot also knows the package's project and returns its name.
UsusTreeColumn.header -> IColumnDesc.getHeader()
Code Proportion now knows which columns it wants
to get displayed.
Reverted previous commit:
Now header label is back in UsusTreeColumn annotation
Configuration pour inspircd2.0
Merge branch 'master' of github.com:utcoupe/Coupe2012
HSV save to file; Matrix save to file;
Tweaked NotificationWindow a bit.
add db backup
task layout
finish popout commit
excepio
registro de llamada ui
#5 added example view in GameScreen, updated images
NewPathFindingState

and new test map yay¡¡¡¡¡
Tradução de Eventos
Added stackMode constants.
Issue #432: Handling kvm => :vm_options

Add support for network_type (network default, bridge).
Add (pre)support for volume_pool_name (but there is a bug that is preventing
this to work with fog 1.7.0).
Add some doc (about vm_options and kvm)
Merge pull request #437 from vdemeester/issue_432

Pull request for #432
fix openbsd50 architecture customizations
add openbsd 5.2
Merge pull request #438 from mpapis/master

OpenBSD fixes + new templates for 5.2
Synced templates into doc/template.md
Merge pull request #439 from winks/master

Synced templates/ dir with doc/templates.md
Runnable, gofmted
Publish a listing sign in link redirects to game page
modified API for veos
[Fix #56, Fix #58] Remove the SHELL argument

This fixes the tmux launch_msg() error.
[Fix #54] Disable less' alternate screen

This reverts commit 34a57437894628c29fac0c38c20fd54a21e3c833.
[Fix #35] Add a comment on enabling mouse scroll
Merge branch 'master' of github.com:sorin-ionescu/oh-my-zsh
Added lesson07 and lesson08 with required(minor) additions to the API.
Changed lessons 6,7 and 8 to have pinch zoom instead of the accelerometer for zoom.
Add lesson09. Will be the last lesson in a while since it's not exercising too many new WebGL APIs.

Minor fixes to lessons 7 and 8.
added some models and controllers
Python script to split image into fields

> seed fill in corners to eliminate borders
#3473823: SetWidth methods not so friendly

added static factory methods to create px and percent more easily
and readable:

public static SizeValue px(final int pixelValue);
public static SizeValue percent(final int percentage);
public static SizeValue wildcard();
* Update version info get place to be voidref.com/orangered/orangered_version.txt
 * Fix update get when there's no site to get the version from.
 * Fix the goto site button to go to voidref.com/orangered/Orangered!.html
 * Updated the todo.txt (famously misnamed at this point) with this section
Updated to New STweaks APP by GM, + auto md5 mod :)
Merge remote-tracking branch 'dorimanx/master-jelly-bean' into master-3.0.y

+ ...
Added NEW wireless: bcmdhd: Update to version 1.28.11-2 NOT WORKING!
This driver from NEXUS kernel. need to mod it!
ROM not booting! stuck on BlueTooth INIT... it's also connected to WIFI.

I will try to fix it, it's compiled OK, but with wrong name bcmdhd.ko
and should be dhd.ko (changed name still no boot) so it's more complicated!

- Improve filtering functionality
- Fix PNO notification
- Add sched_scan
- Add proper handling of AMPDU frames: -DAMPDU_HOSTREORDER
- Add HT40_GO support
- Fix p2p stability issues

Change-Id: Ibee7e2e3de0451fe326cd25087a30a67425376e7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
+ fix no booting after "make clean -> build kernel" ... !? it doesn't boot with "-O3" and some other flags :p ...
Merge branch 'master-3.0.y', remote-tracking branch 'dorimanx2/master-samsung' into master-3.0.y

+ ...
Removed plural references to Snarker class.
Estado de la app luego de la reunion
Merge branch 'master' of github.com:vsantacoloma/GPDS
Handling non numeric values in the URL
Merge pull request #177 from wangxiao/dev

修复注释
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram2 into dev
修复show和hide的bug
added linking script for new installs and some other files that may be useful
Fixed formatting in motivation chapter
Formatting / Spelling errors in Design / GUI
Initialised Drupal theme 'ib'. Note that it requires the zen parent theme.
Many fixes trying to find mongo heisenbug.
Better test_isolated
Add JSON compatability mode for mongo adapter
Fix bug in dispatcher by adding callback to dump_link
Run redeye tests in fibers
Make speed test wimpy.
Add fancy @get method.
Switch back to redis for now.
LastWork 10 08 12
[bash] Add fancy newline handling in prompt

The newline detection hack is heavilybased on the information at
http://stackoverflow.com/questions/2575037/how-to-get-the-cursor-position-in-bash
[bash] Move __git_ps1 config outside prompt command

...so that individual shells can override/change it.
[bash] Split PS1 assignment over multiple lines

...so that it is actually legible.
[bash] Improve assembling code for terminal title
[bash] Move color codes around
[bash] Condense PS1 a bit
[bash] Also colourise $PS2 (continuation prompt)
[bash] Remove newline hack for initial prompts

An empty line at the top of fresh terminal windows is not that bad.
Improvements in the builtin indexing.
just tested additional widget
added info about html binders

Signed-off-by: Reza Akhavan <reza@akhavan.me>
29. September 2012
Use MultiJson instead of Yajl

Yajl is CRuby specific and not always what people are using in their
application anyway. LET THE PEOPLE CHOOSE!
Fixed tests to be MRI and JRuby compatible

The debugger gem doesn't (yet) work on JRuby because of a C extension it
uses. Load the appropriate gem for the platform.
Adding JRuby to .travis.yml
Merge branch 'master' of git@github.com:welle/JMetaagents.git
Fix bugs found by robert
Add comments for 'set winfixheight'
Replaced the progress polyfill with a new one that supports IE7
Merge branch 'master' of github.com:wet-boew/wet-boew
Modified the progress polyfill attribution comment so it doesn't get suppressed through minification
Merge pull request #185 from LaurentGoderre/master

New progress polyfill that supports IE7
Travis build 3703954 pushed to downloads
Fixed Autocomplete in mobile view. Optimized same-page link handling in pe-ap.js.
Removed CSV files.
Initial working picture plugin (no IE support)
Merge remote-tracking branch 'upstream/master' into picture
Linted picture.js
IE9 fix with commented <source> elements
$.get request for IE to get raw HTML
Merge branch 'master' into feature-picture
Switched to latest picturefill dependency, updated demo
Renamed plugin to responsiveimg
Updated demo content
Merge remote-tracking branch 'upstream/master' into feature-responsiveimg
Merge pull request #892 from patheard/feature-responsiveimg

Responsive Images
Grouped theme-gcwu-fegc CSS include files into an includes directory.
little fix
recursively retry when getting google auth timeout and opt main page
removed blocking message from index
added some compatibility shims for IE
updated jquery to fix http://bugs.jquery.com/ticket/9033
linked up html5shiv
added temporary alternative fitText
removed zoom and scroll on IE
added fixed position support and piecss for bubbles
added storage polyfill
added fitText alternative
removed background colour dev
updated test suite, and added fitText spec
serve css3pie include
simplified filter bubbles
updated activity bubbles
updated bubble css and IE fallback
updated bubble text fitting to solve double insert bug
corrected scroller check
code linting
code linting
Merge branch 'feature-ie' into develop
Removed unused js
Thank you page modified
Shipping detail page modified
Shipping details page modified
Misc style modifications
Added order confirmation page
Minor form fixes
Alternative bg and separators
Product image for order details
Some minor fixes
Added colour pallete
Added simplesamlphp library for SAML authentication support
Some configuration changes for simpleSAMLphp
Configured simpleSAMLphp to work with the Test IdP Server
 - added Metadata and certificates
integrated simpleSAMLphp into the CodeIgniter framework, created the base wrapper class for the library and edited the autload fileintegrated simpleSAMLphp into the CodeIgniter framework, created the base wrapper class for the library and edited the autload file
Added base methods for the SimpleSAMLphp Wrapper class to provide the simplesaml authentication functions to the whole application.
Creation of an simplesaml object in other controllers to provide sso functionality is not needed.
Added base login function in simpleSAMLphp Wrapper
Modifications on main login page to give the user the chance to authenticate over shibboleth. Modifications are not styled, yet.
Merge branch 'login-as' into shibboleth
Modified authentication-library to perform single-sign-on.
The username and the already hashed password is assigned for the login. The regular login function does not work for the sso authentication.
WARNING: Database Modifications and the Shibboleth-server are needed.
Modifications in app controller for providing automatic authentication if the user is authenticated at the idp, has got an linked account in the local user db and visits the main page of the meinfhd.
Implemented Single-Sign-On-process for linked accounts.
If the user has got an global account, that is linked to an local identity he can authenticate himself over the Shibboleth Idp.
If he has an established global session, the local login will be done on the fly.

Linking local identities to global accounts is missing!
Implemented auto logout(), if the global session for the local authenticated user is closed.
removed debug outputs
Fixed an error with too many redirects, when an global session exists.
added account-linking between global and local identities
removed auto_login for global sessions and visiting the site
Added security protection for account_linking function if the user is not global authenticated.
Added displaying error message if an error occurs while linking the account (wrong username and/or password, or account is already linked)
Fixed validation errors in account linking view
Created security helper and implemented authentication check in the helper to avoid code duplication.
The authentication check is called in every controller, that provides functions for authenticated users only.
Re-implented and fixed auto-login: If an linked account and an global session exists, the user will automatically logged in.
If an global session but none linked account exists, the regular login page will occur.
If the global session is closed, the local authentication will be closed, too.
bug fixing and syntactic sugar
remove git.log from get-codebase.inc
not compatible with safe_exec
changed white color to real white color (fg_bold)
added a comment for modifying the installer procedure
Updated detailed info render to match new data format.
fix bug by using the static images
This was committed with the new version of Quartus 12.1
Hope this works
tulloch gorm
run 'rails generate refinery:cms --fresh-installation' task
add deploy file, custom theme, add database config file
Fix potential username conflicts when creating users through facebook
Create new method for handling flash.now messages
Begin moving strings to locale files
Add more test quotes for prepopulation, add tests for users index pagination
Merge branch 'release-0.1' of github.com:Vocaluxe/Vocaluxe into jukebox
Show cover if preview is enabled and the song has no cover
New timer settings (start delayed 10 secs)
on_receive_init no longer destroys the msg
Added empty project and a dependency of ToolChest
deps 変更
てすと１
test1
add elo doubles unittest
example_user added
Use skin variable in template path.
General resolution employed.
added configuration integration test
photoupd.php
Added a CMake
gabor2d
rainia.org - removed non site related contents
make specs pass with latest rakep
enable xvdr, but manually :(
Add missing dependency to cinnamon ebuild
Added new version of pymacs
加入一些新shader ：浮雕，彩色边缘素描
add basic mm model
fix getter failed in nmsetting_ip4config
add sanbang to connect_wired/wireless
remove vim-colors-solarized
Fixed some bugs with avatar upload form
passed image reading test
determining pixel size
modify: stripping tail line feeds
CompositeProvider taken ownership of the added providers.
ComponentProviders taken ownership of the added components.
kobuki_driver : Added a feature to detect presence of serial device. It is initial implementation of #148.
#20: applies the turtlebot_description structure, proper gazebo simulation still TODO
Merge branch 'master' of github.com:yujinrobot/kobuki
Require docutils for all environments
* Add one more excepion.
 * Add an entry point information.
Add rake to the development dependencies
assert in path cost method when number of passengers is not 3.
Merge branch 'master' of https://github.com/zahanm/pool-karma
removed pesky php.ini file residue from Bluehosed once and for all
KERN-2653 handle a missing 'page' element on a document being migrated
Remove duplicate case statement
Add body of case that was accidentally removed
Shift case statement around
Merge commit 'refs/pull/3138/head' of github.com:zendframework/zf2 into hotfix/remove-duplicated-case-statement
Merge pull request #3138 branch 'hotfix/remove-duplicated-case-statement'
Merge branch 'hotfix/2688'

Close #2688
Cache: added tests for get[Total|Avail]Space
fixed getTotalSpace of filesystem adapter
fixed getTotalSpace of dba adapter
allow total space of 0 bytes
Merge branch 'hotfix/2680' into develop

Forward port #2680
fix for setJsonpCallback not called when recieved JsonModel + test
cs-fx
Merge branch 'hotfix/issue-jsonstrategy-omitted-callback' of https://github.com/basz/zf2 into hotfix/2643
Merge branch 'hotfix/2643'

Close #2643
Change JIRA Url
Merge branch 'patch-1' of https://github.com/Maks3w/zf2
Chapter 11 - Stage 2
only loading service-oriented files when in unbundled mode; removed canvas / painter oriented functions to non-service specific files, excised painter from legend creation, general code cleanup
keys: completion in cc-mode/cperl-mode is remapped to dabbrev completion
moved TileMap to separate header and source file.
Adding Gamesprite code.
Everything i just forgot
Replace @dracutdir@ with $basedir

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Phantom Field Tests
Update proposal/proposal-example.tex
fix issues and add profile
finish the test Hash macro
不直接根据interface和class的name在this中创建对象
fix the race selection escape crash
re-use the texture across preview instances
oops
fix the weather not changing when sleeping/waiting
Merge branch 'next' of https://github.com/zinnschlag/openmw into next
fix the global map updating when pinned
moved README to markdown format
adjusted formatting in README.md
added RELEASE file
Trivial, fixed typo in a comment
Merge branch 'master' into dev
Merge remote-tracking branch 'origin/dev' into dev
Changed default sqlite db setting to simplify quick install process.
Merge branch 'dev' of https://github.com/ninuxorg/nodeshot into dev
Merge branches 'dev' and 'master'
Minor changes to make the quick install process simpler and smoother.
Merge branches 'dev' and 'master'
Added storage engine hint
Merge branches 'dev' and 'master'
fixed minor typo in 404 and 500 html error templates
Merge branches 'dev' and 'master'
Update README.md

Added mailing list.
adding all new files for test
INIT REINSTATE WEBKIT SUPPORT
- Biggest mistake when starting this: removing it.
Though, too be fair, removing it allowed me to focus
on accomplishing what I've gotten done this far. Now, though
it's going to bite me in the ass because no conflicts are
currently known, though I know for sure they will exist.
For instance, unless things have changed, checkboxes still

cannot have `-webkit-appearance: none;`. I'm not quite
sure what that will mean until I install this thing into
Chrome/ium, so that's the next step.

Woo~~hoo~
change assembly name
rename directory
implement Parameter
add Parameter Sample Node
add city select base on javascript
upgrade dependency
Merge branch 'master' into better_plugin_test
fix: more patch for Opera's toString bug
增加加班计划
Version 0.7.BETA

Best release yet with bug fixes and enhancements.
Site updated at 2012-12-23 20:21:52 UTC
analyze one word with pyMorphy
Update notes for submitted changes

* JRO03L 4.1.1_r4
Refactor: Added Plugin logic to an IIFE, and extracted the tests and TestSuite into another IIFE
Add: "use strict";
Fix: Assert was assigning variables to the global window object.
Remove: 'with' statement block no longer used, and instead explicit object reference is used
add ajax reload only for states
Java 7 is nice...if you remember your strings!
Signed-off-by: Chris Sanders <zidane@outlook.com>
Correctly set the tooltip of the Unlock button.
Signed-off-by: Chris Sanders <zidane@outlook.com>
rename images. some refactoring
Upgrade to uDIG 1.3.2
Product build
Add Laravel
Add Bob bundle
Add Generator
Pregenerate core architecture
Register bundles
Merge remote-tracking branch 'origin/master'
/wall admin
killing typos in readme
prueba de Spring con collections.
Merge pull request #5 from ArcBees/vr_pagination

Add pagination to the visualizer
Merge branch 'master' of github.com:ArcBees/gae-studio into vr_appstats
moving Filter in his own package
Extracting request filter in his own presenter
Add an abstract FilterValue object that hold information about the statements, execution time of a filter value.
Generalizing filter selection event.
Method filtering
Switch between filters
Filtering by type
Clear profiler
Cleanup
Add some meaningful domain objects
Merge pull request #13 from ArcBees/vr_profiler_filters

Statements filtering, clear profiler.
Prevent old multisessions from overwriting current session

The initial behavior of this patch was to have expired multisession
generate a new cookie. The thinking was that once an old session came
in that we would want to ignore it and therefore generate a new cookie.
However, if a request had a significant delay, or if many requests were
coming to the server simultaneously, then from time to time an old
session would hit the server alongside the current session, which
caused a new cookie to be sent back to the client. This resulted in the
session being dropped.

To get around this, expired multi-sessions are no longer longer
forcibly deleted when they are encountered, and garbage collection now
deletes them only when they have passed the session expiration. We
cannot count on networks to behave nicely all the time and it is too
easy to cause dropped sessions by assuming that we won't see a
particular multisession again.

We still need to make sure that we don't allow expired multisessions to
be treated as the current session. To deal with this I've added a
function named "multisession_expired" which returns true if we are
dealing with an expired multisession. This allows us to test a cookie
to see if it is still valid. Note that once a multisession has expired,
we are not longer allowed to change any of the data associated with it.
Use indexOf() instead of search() to avoid regexp issue with (x86) parens
Merge pull request #1532 from adobe/jason-sanjose/live-dev-parens

Use indexOf() instead of search() to avoid regexp issue with (x86) parens
Only show the 'error fetching update info' dialog when doing a forced check for updates.
Merge pull request #1533 from adobe/glenn/issue-1530

Fix for issue #1530
803 Build version advanced to 2491-102

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

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@126407 eb64e737-3616-4df0-8941-5ee2ae88103d
Merge git://github.com/CloudifySource/cloudify
GS-803 GigaSpaces build version advanced to 6696-1013

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

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@122470 eb64e737-3616-4df0-8941-5ee2ae88103d
Fix CRLF
CLOUDIFY-1219 Introduce bootstrap-cloud -no-web-services.[boris]
Merge pull request #18 from itaifrenkel/master

CLOUDIFY-1219 Start byon without rest/webui
Build version advanced to 3481-61
Merge git://github.com/CloudifySource/cloudify
Skip screen if not present

Change-Id: I018249c415fa91ca6461a8f9d236767aa57a8fbd
Merge "Skip screen if not present"
Remove unused rake tasks, make cumber rake file the vanilla one
Merge pull request #3611 from MrZYX/feature/cleanup_rake_tasks

rake tasks cleanup
updated spec to fix to_datetime issue

Conflicts:
	spec/lib/diaspora/fetcher/public_spec.rb
trying to stabilize issue with datetime in test suite
some small code style changes + final fix for postgres (milliseconds)
+ updated changelog
Rearrange startup order and start server as part of install-app.
Menus Plugin: fixes
stubs for Calendar
Merge branch 'master' of github.com:BDSAMacGyvers/AS39
Current lexer : set, boolean/string/number options, mappings
updated security. moved icodec to abstract, and fixed securityEx default encode/decode
Make sure that bypass node only kicks in if the kick is due to a full server
Forgot that I could do it in that way ... Using the player instead of
the event. Fixe #70
New way to catch every interaction with an item. See #42
New way to deal with compatibility and bans. When we ban an IP it's
added in the banned ip file of bukkit to be sure if the method is not
there in the event, the ban will be proceeded. See #70 & See #63
Should be the workaround for the blacklist. See #42
Revert "Should be the workaround for the blacklist. See #42"

This reverts commit 0b538779871ee3f5cf5fcc50850ca0f33b6a61d6.
Revert "New way to catch every interaction with an item. See #42"

This reverts commit b4493d9b65b0231d8fa0c441cbc0adee3c6fd713.
THANKS Lathanael :D (the student have surpassed the master :D). Using
the right click in air working perfectly to avoid drinking potions :)
Not needed anymore. See #42
adding thinkpython ch8 notebook
Adds Mouse, a library that promotes the mouse to a first class citizen.
CODE COMPLETE
Move data to date.php
Add untested Ride API.
Added Lesson 2, and completed it.
add an initial config file to work with the Model Development Lab
for splach screen
trying to fix build issues
build issues
Class for outputting sale history by champion, dates.
Class for storing champion data.
Class that represents a champion's 4 stats.
Fire HangingBreakEvent when explosions remove hanging entities. Fixes BUKKIT-2764
Perform permission removals after the quit event. Fixes BUKKIT-3303

The player would have no permissions (other than their OP status)
when checked in the Quit event. This is because we removed permissions
before the event occurred. By calling it afterwards, we can persist
the data until the server finally removes the player.
Update maxhealth for entities that have variable max health. Fixes BUKKIT-3308

Slimes and wolves have health that can change based on certain
conditions. So we check if their max health should be updated, and if
it has been customized in any way.

We also scale the wolf's health for their tail
fix panelbar positioning
Forgot files again....
method to get sql api domain from config
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop
license text changes
robotium-solo 3.4
testBrushToolBackPressedFromCatroidAndUsePicture sleep(2000)
removed .hgignore
testManualCropping and convertFromCanvasToScreen coordinates
manual crop but not finished
CropBox min and max, correct Tests 
improve tests
temp comments
Merge remote-tracking branch 'origin/master' into
7.3P_Manual_Canvas_Resizing_(Cropping)

Conflicts:
	Paintroid/Paintroid/src/at/tugraz/ist/paintroid/tools/implementation/CropTool.java
	Paintroid/PaintroidTest/src/at/tugraz/ist/paintroid/test/utils/Utils.java
CropTool - using float instead of integer,
test added
correct tests, relocate android version
add an action, add method getAction
add method move
improve test for moving box
improve tests, moveable borders after cut
refactor CropTool and IntegrationTest
Merge remote-tracking branch 'origin/master' into 7.3P_Manual_Canvas_Resizing_(Cropping)
Merge pull request #13 from Catrobat/7.3P_Manual_Canvas_Resizing_(Cropping)

7.3 p manual canvas resizing (cropping)
Developer: @schmidiM (MS)
Acceptance: @galstc05 (SG)
Merge remote-tracking branch 'origin/master' into design_implementation

Conflicts:
	Paintroid/Paintroid/src/at/tugraz/ist/paintroid/tools/implementation/CropTool.java
	Paintroid/Paintroid/src/at/tugraz/ist/paintroid/ui/implementation/DrawingSurfaceImplementation.java
	Paintroid/PaintroidTest/AndroidManifest.xml
	Paintroid/PaintroidTest/src/at/tugraz/ist/paintroid/test/integration/CropToolIntegrationTest.java
	Paintroid/PaintroidTest/src/at/tugraz/ist/paintroid/test/utils/Utils.java
Almost done, but not compiled.
Update neuralNetwork.ml
Relocated Ray's engine, added new directory
change pdo.db_options to session.db_options
defer the 'show' triggering after browser has finished the current job (actual dom rendering)
Create Pressure.class.java
Adding license text to tests.
implemented tag cloud
added links to tag cloud
email settings and post emailer
fix merge conflict
Added EAGLE library with  some components, and order list

Lib contains:
STM32F100RBT6B
enc28j60
HR911105A
CD54NP-101KC
Completed HttpEngine object
tokenizer sets proper TokenCategory for "${" and "}" inside string

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C3291
* Initial commit
* Changed to use default "id" field instead of an extra, useless "student_id" field
* Improved login stuff
* Stuff?
* EVENTS!  Work in progress, but proof of concept for drop-down list is there.
* Event registration now pulls entries from database and populates drop-down list for event selection
* Fixed event registration not updating user database entry
* Fixed event registration error creating duplicates
* Got rid of old and defunct register_event
* Now it looks all sparkly!
* We don't need /log and /tmp, really...
* Made it so that we don't need to precompile CSS in production mode
* We don't *really* need all the Regis style sheets in here
* Terminology - "event" to "site"
* Let's use Thin instead of WEBRick.  Much more efficient - think nginx over Apache.
* Production database contains ALL events!  I think...
* Better text size and such
* Flashes better contained and less wordy
* Pre-Sunday modifications
* Stuff!
* It works!  Password validation and persistent registration working.
* Events.yml
* Events.yml
Made the RJHS logo work with the gradient

  - Added DS_Store to gitignore
  - Deleted assets/rjhs-logo.jpg
Made the RJHS logo work with the gradient

  - Added DS_Store to gitignore
  - Deleted assets/rjhs-logo.jpg
* Stuff?
* Stuff?
Correcciones a la alta de tarea, todo el flujo de tarea terminado
Update portfolio/settings.py
Added built vignette.
add ~/.w3m/keymap
Changed mailer host to heroku
Merge branch 'master' of http://github.com/DevangS/notyourmom
Changed default_url_option to heroku
Merge branch 'master' of http://github.com/DevangS/notyourmom
Changed configs
Merge branch 'master' of http://github.com/DevangS/notyourmom
new file:   11.304 Magnetisches Moment/pics/Gravitation.png
	new file:   11.304 Magnetisches Moment/pics/Praezession.png
	new file:   11.304 Magnetisches Moment/pics/Schwingung.png
	modified:   11.304 Magnetisches Moment/protokoll.pdf
	modified:   11.304 Magnetisches Moment/protokoll.tex
bone, alpha and scale support + refactoring
Set up automapper map config. Added basic test log to add measurements to set up what we need for the measurement models.
God. Damn.
UTF-8!!!
Fixed bugs on editing schedule.
Added new teachers field to schedules list.
[2]Se sube el preview del Frontend Desing, la cara del sitio.
deleted duplicate CAD file
v 0.1 patch 13 - issues #7 #15
new pp test
test cases environment and some basic tests
something
use teh testdir
set up a fake episode file
added a testclass for tv -> episodes and shows
fix copy an paste error. and comment
clearer skip msg
pep8, pylint (all above 9), and license block
i took the liberty to use my name as author
Attempting to fix Synology index when creating folders
Attempting to fix Synology index when creating folders
Added option for Synology to remove files from index
Added file remove option from the Synology index
Rewrote notifier to align to full Synology syntax
Updated references to new Synology notifier code
Corrected syntax for move as this would be for both files and folders
Added wrapper functions for separate file and folder moves
Converting most of the functions to wrappers with arguments to simplify future maintenance
Cleaned up whitespace on line ends
Minor update to variable references
trying to save a sound and store its url in the db
added morphology operators and support for thresholding methods
Move all images into img/ dir

*favicon.ico: move into img/
*.htaccess: add rewrite to display /favicon.ico from new location
use feature names instead of failing branch names in "git flow feature"
fixes #1474 add zeus to bundle exec listx
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
Merge pull request #1477 from madsgraphics/git_prompt_showstashstate

Add Stash toogle to display if there's some stash or not in `git_prompt_status`
Merge pull request #1475 from westonplatter/master

fixes #1474 add zeus to bundle exec list
Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion

use feature names instead of failing branch names in "git flow feature"
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
lhtml indexing
Resolve todo (#145)
CMake fix
New API for config events, maintain old API, port examples, fix event related issues (#145)
Merge branch 'endian' of https://github.com/Eyescale/Equalizer
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Fix 2_0 API build
Add DB support to seqPly, make RenderContext accessible in Sequel
Disable strict aliasing, should fix Eyescale/Collage#5
Merge branch 'master' of https://github.com/Eyescale/CMake
Merge branch 'master' of https://github.com/Eyescale/CMake
login check and error status
numUpVotes and numDownVotes now decrement when the user changes his/her vote
Figuring out newline on README.md
add a data file in order to compare the results with the original MINE app
Merge branch 'hotfix/v1.0.1' into develop
fixes Travis IRC notification
Delete files & update gitignore
Added io checks when writing checksum into rdb.
Fixed rdb merge progress cacluation - ignored checksum bytes.
Renamed merge progress callback to have a more generic name so the callback can be used in other places.
/fishing command will now also display the bonus gained from lucky perk
About time that this got changed to 1.3.12
New Salvage ability for Repair!

Added a fully working ability to Repair. With this ability you can
salvage items and get bars in return.

- Added new permission node for Salvage ability
- Added new config options for Salvage
- Added new locale strings for Salvage
- Added a check to make sure that Repair Anvil != Salvage Anvil
Revert "/fishing command will now also display the bonus gained from lucky perk"

This reverts commit 1bf0cd1d154940c7a128759b91d75d21bf24cf05.
Small error fix - As mentioned by Glitchfinder
Moved Salvage check to ItemChecks
Hehe, you were soo right. This is MUCH cleaner to look at. :)
Merge pull request #3 from TfT-02/master

Salvage ability for Repair
Se elimino index
Add Bitcoin Wallet for Android to the clients page.
Rewrite macro system to get a more complete artity dispatch and clojure like rest arg capturing.
Rewrite macros to a new style.
Update examples.
Update readme to follow new clojure like conventions.
Rewriting special forms into macros.
added a distance check to rendering labels and health bars
All the stuff i forgot to add
Series of crash fixes
Fixed water pokemon not getting lvl on init
Implemented PC and Healer gui
PhoneParser updated
Tropo Save file handler added
gentoo 编译nginx所需文件
Checkpoint. ROughing in the new layout for the Places/ETA display
Checkpoint. Removed current CSS stylings.
Checkpoint. Cleaning up and connecting Routes/Places
More UI fixes
Restoring the "click on route description" to show route on map
Layout of bottom app bar
removing commented out html
background colors on the Places Div
Roues section styling
Removing the front-page settings panel (debug)
tabbar新功能
Пустые категории больше не ошибка
Merged conflict resolved
Финальный коммит. Яваскрипт, блоки, запрос блоков и тестовая страница.
bug fix in case of empty tasks array
Fixed bug where Iface Pane wouldn't reflect selecting another action.
Fixed new user bug, was always showing the about screen thinking that a new user had just run the bot.

Jar Hash: 183AC3EA4BC279E3279497ABEE473C38
Updated metadata cache for upstream's eclass changes.
Added copyright notices for task code.
Updated copyright info in ebuilds and eclasses.
Updated group copyright data in licence.txt.
Added COPYING file.
[blessings] Supports Python 3.3

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: C0174749
Added help for task subcommands.
Merge branch 'feat/copyright'

Check the incredibly long bug with legal to see why this has finally been done.
If you think it looks like pointless busywork, then imagine how it felt doing
the pointless work.

* feat/copyright:
  Added COPYING file.
  Updated group copyright data in licence.txt.
  Updated copyright info in ebuilds and eclasses.
  Added copyright notices for task code.

Conflicts:
	metadata/md5-cache/app-misc/Hammertime-0.2.4
	metadata/md5-cache/app-misc/hubugs-0.15.0
	metadata/md5-cache/dev-python/blessings-1.5
	metadata/md5-cache/dev-python/rstctl-0.4
	metadata/md5-cache/dev-python/schematics-0.5
	metadata/md5-cache/media-gfx/sphinxcontrib-mscgen-0.4
	metadata/md5-cache/media-tv/ontv-3.2.0
	metadata/md5-cache/sci-geosciences/gpxviewer-0.4.3
	metadata/md5-cache/www-apps/mnemosyne-0.12
	metadata/md5-cache/www-client/httpshell-0.8.0
Adding gesturerecognizer
refactoring modifications to be more self-documented
20120412--jwd

MODIFIED artbollocks-mode, g-client, org-mode, package24, and paredit.
Fixed rendering loop
Fix for navigation links when adding subdirectory

The code for build_links needed to be sublassed in DirData, as the two
cases are handled differently.
Added glossary files
Merge branch 'master' of https://github.com/JonasGoldt/TDGD_TD
Merge branch 'master' of https://github.com/JonasGoldt/TDGD_TD
listen to 3001
testovaci verze
useless
Merge pull request #2 from JrIdeA/x

useless
remove advertising clause from files owned by UC Berkeley, since it was
rescinded in 1999.
Question Mark is added

-add question.png
-plist name is changed to UI_default.plist
-Question mark appears when action is unknown
trash
fixing clients causing server errors
Spremembe formatiranja in prestavljeni razredi.
Automatically register entity repos into DIC
Merge pull request #7 from KnpLabs/feature/register_entity_repositories

Add compiler pass to automatically register entity repositories into the...
Add IRC channel to the README
Made AggregateRoot.Apply() static.
Some MongoDb data access stuff
replaced timestamped apps with named apps
changed create word to show bitmaps
Build shared library too

Solve task {T115}
General Refactoring, nothing new added
Compiled version with gcc4mbed/Tosqa image
Finish statements, need test
Fixed Xcode templates script
separated configs to config file
sgu updated
Refactor of requests in action module.
Debugging the cache implementation
Updated with Chest task
jinja2 error messages
implement FuelOrderLog in client
implement FuelOrderLog in client 2
Some changes made to the layout