labofsahil/github-event-dataset-2012 huggingface dataset:
Bookmark now is a list of links, not just text
refactor params to functions, remove mht

Simplify passed function parameters by pulling in a hash reference
instead of a bunch of strings. Separate closeAll task into its own
function (does not appear to work, but that condition is not a
regression). Put fIEsta default params into a hash as well. Remove MHT
file creation.
Merge pull request #2 from bklaas/master

Organizational changes, see longer description
brush pa thru weibo_server and do_auth
[Controller] Added route and redirect shorthands.
[Controller] Resolver: handle callback controllers as controller-factories.
[Application] Fixed route shorthand methods, added resource and root.
[Application] Don't generate new controller names for resources.
[Template] Events: remove automatic CSS inclusion. Updated Response check. Customizable template names.
[Template] Events: fixed layout name. Only decorate formats that need it.
[Factory] Corrected setParameters' merge algorythm.
[Application] Add default configuration.
added association rules
update quartz config
nuevo commit para remplazar archivos de la aplicacion en heroku que presentaban problemas
Fixed Templum
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Merge pull request #20 from tetrakai/master

Fixed Templum
Added basic Nero tests
Fixed package name of Nero test
Added basic Basilica test
Added basic Templum tests
Added basic Haruspex tests
Added basic Onager tests
Added basic Velites tests
Added Scaenicus basic test
Merge branch 'master' of https://github.com/bwright/acceptance
Merged in master
Merge branch 'master' of https://github.com/bwright/acceptance
Merge branch 'master' of https://github.com/bwright/acceptance
Fixed too many victory points being taken error
Fixed Templum too
Merge pull request #16 from tetrakai/master

Fixed Basilica test
Fixing reflections as they didnt compile
edited prompt arrow and git dirty
Add .pill files
add v: completion support
make local buf completion find a#Foo_Bar234() functions, \I does not contain the # by default
do no longer use c-x c-o cause it collides with VAM's completion. Instead use c-x  which is easy to remember cause vim's builtin completion is using c-x c-v
Add sine table calculation.
Change DistortionMapSet singature to use floats.
Rewritten tunnel generation.
Add sine distortions.
More flexible time slice descriptors.
Assemble RGB from individual components.
Safety check in palette linking.
Fix (almost) obvious bug.
Make feeding even easier.
Playing audio stream as an effect.
Make the help button do the tutorial instead of the weird menu.
Update nag button. (Change Main.RELEASE to 0 to test).
[ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject

I also added tabindex 1 to the buttons for adding the recipients.
Also note, that duplicated tabindex are fine:
http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex

PHPBB3-9089
[ticket/9089] Add tabindex to pm/topic/post icon-options aswell

PHPBB3-9089
[ticket/10762] Changing version format in style.cfg

Splitting version into style_version and phpbb_version in style.cfg

PHPBB3-10762
[ticket/10762] Check for phpbb_version when installing style

Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch.

PHPBB3-10762
[ticket/10688] Changed 3.0 to 3.1 in docs

Replaced all the occurrences of phpBB 3.0 with phpBB 3.1 in all the doc
files

PHPBB-10688
[ticket/10688] Updated version to 3.1

Replace phpBB 3.0.x to phpBB 3.1.x

PHPBB-10688
[ticket/10688] Changed version 3.0 to 3.1

Replaced phpBB 3.0 to 3.1 in the stylesheets

PHPBB-10688
[ticket/10688] Update readme for 3.1 and current practices.

PHPBB3-10688
[ticket/10688] Update install.html for 3.1 and current practices.

PHPBB3-10688
[ticket/10797] user rank is displayed in mcp_warn.php

When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
[ticket/10767] Revert unconditional unfatality in commit-msg hook.

Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic."

This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26.

PHPBB3-10093
PHPBB3-10767
[ticket/10767] Default to non-fatal behavior.

PHPBB3-10767
[ticket/10767] Use warning/error language as appropriate.

When commit-msg hook is fatal, label the message as an error.

When it is not fatal, label the message as a warning.

"Syntax error" is still always an error, not sure if this
should be changed.

PHPBB3-10767
[ticket/10767] Clarify what happens at the end of the hook.

If there are problems and fatal is true, print that the commit
is aborted.

If there are problems and fatal is false, print instructions
for fixing the commit.

PHPBB3-10767
Merge remote-tracking branch 'github-cyberalien/ticket/10762' into develop

* github-cyberalien/ticket/10762:
  [ticket/10762] Check for phpbb_version when installing style
  [ticket/10762] Changing version format in style.cfg
[ticket/10759] Fixing style in database updater

Fixing error in database updater caused by style components merge

PHPBB3-10759
[ticket/10759] Fix whitespace in database_update.php

PHPBB3-10759
[ticket/10759] Retrieve style_id after INSERT since we cannot set it

PHPBB3-10759
[ticket/10759] Clarify comments a bit

PHPBB3-10759
[ticket/10759] Don't select imageset_id, it's not needed

PHPBB3-10759
Doc: I meant dice, not nice. nice dice
We have an infinite cylinder!
user extension views updated. lots of cleanup.

Signed-off-by: drsii <dan.syme@gmail.com>
thanks ben, thanks.

Signed-off-by: drsii <dan.syme@gmail.com>
moved scss files to their own folder, removed useless files
Update AWSTool/App.config
Add a torus to the matlab surfaces
one more test for the torus code
Colin's comments on the petsc howto doc
Fixed typing in ArrayProxy
adding div element to write the text
Add Plist renderer and some tests
Complete Plist tests
Assert that plist engine respond to #dump
Merge pull request #11 from ccocchi/plist-renderer

Add PList renderer
Third commit
Forth commit
Fix setDone
Merge branch 'develop' of github.com:cedricpinson/osgjs into develop
while jumping player should not move
Ooops typo error
增加登录，注册模块
comment
eliminate dupes
ProducedType: added isRaw for ceylon/ceylon-compiler#689
fix test
fix #367
ups!
fix #358 two members with the same name inherited by Java supertypes
more specific error code
validate refinement for "object" declarations!
validate refinement for object declarations!
test refinement validation for object declarations
return langauge module and jdk matches
fix #368
test for #353, which was apparently already fixed
Merge branch 'descriptors' of https://github.com/ceylon/ceylon-spec into descriptors
更新0.5.5版本POM.xml文件
Almost ready to assign to TAs..
added last modifications of pr2 (Spring 12) material.
Snapshot after setting up and using pr1fal12
Merge remote branch 'origin/master'
later transport
fix sequence layer (add test!)
layer request instead of request
fix layer spec
moving js files one folder level upward
Add bochs example
fork to detach the process executing the app
Added the configuration from the toy language and some first attempts. I might
be possibly starting to understand some of this stuff now.
Split CudaSpawn into parts for the different argument configurations. I doubt
this was necessary.
fix a typo, add gem_sync feature and configuration
update
add gem_sync feature
bump up version
only draw line for events that contain memory information
handle 'B' as memory unit
Convert some raw glReadPixels to use piglit probes

V2: don't introduce bogus indentation; use real bools

Reviewed-by: Paul Berry <stereotype441@gmail.com>
Merge branch 'print-form-plugins' of https://github.com/chrismayer/geoext2 into print-form-plugins
Merge branch 'print-form-plugins' of https://github.com/chrismayer/geoext2 into print-form-plugins
save state.
Merge branch 'master' of https://github.com/geoext/geoext2 into print-form-plugins

Conflicts:
	src/GeoExt/panel/PrintMap.js
Merge branch 'master' of https://github.com/geoext/geoext2 into print-form-plugins

Conflicts:
	jsduck.json
	src/GeoExt/panel/PrintMap.js
Adding tests.
Let PrintPageField mixin the Observable and some enhancements. Also ported PrintProviderField
Add the tests to the list of tests. All tests pass in Chrome 12, andf FF 12.
Fixup merge conflict markers
Use the Ext.create()-method everywhere. All tests now pass in IE 8 as well.
Merge branch 'master' of https://github.com/geoext/geoext2 into print-form-plugins
Merge branch 'print-form-plugins' of https://github.com/chrismayer/geoext2 into print-form-plugins
Example cleanup.
API documentation.
Use Ext.create only in example.
Merge pull request #7 from marcjansen/print-form-plugins

Print form plugins
Tilesets now have a string id.
Fix the receiver here.
gitignore для Visual Studio
Added Some IDE Project folders to gitignore
Added warning to Else clause. Added history.
renaming found on function to song name
Track recently freed device allocations.
added basic try and catch ability
[maven-release-plugin] prepare release 0java_grandparent-1.0.122-120713812-RC1
trying to upgrade to new maven-3.0.4 after eclipse workspace corruption
En hel haug med greier...
Merge branch 'master' of github.com:clario/QT-prosjet-
Traits are pretty cool, really i already love them :). Optimized XML Stuff
modify gui.py
Autodoc commit for master/55183b4c
Autodoc commit for master/bf6fa09a
Display the correct IP address on machine list, based on switch ip. Still doesn't support non/24 CIDRs
[cmgd_hack_day] Added brew instructions for installing monogdb and
redis; added command for starting redis
[cmgd_hack_day] Removed extra CSS background declaration
Merge pull request #80 from nthdegreeburns/cmgd_hack_day

Added brew instructions for installing monogdb and removed extra CSS declaration
Setup timeout
Test failed :(
Folder structures for the paths testing

Created an empty directory tree that should pass, an empty one for the
"should fail" tests…could probably use one where there are files
specified instead.
file re-org in prep for gem inclusion

sprockets-ready
implement blob garbage collection
Closes #5
update readme, add gearman
Updated clearance to use Global Cookies
Forgot to apped
Add MP3 Tagging and Basic Search
Merge branch 'master' of github.com:crushedhat/X-Hypem
Fix issue #861 (and previous commit, for that matter)
Merge pull request #1436 from jjaffeux/tests-text-helper

Tests text helper
Removed UserVoice link
Merge pull request #1440 from jjaffeux/patch-1

Removed UserVoice link
replace get_config by config_item
tests for encryption class
Merge https://github.com/EllisLab/CodeIgniter into test-encryption-class
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlite
Some more minor improvements
Merge pull request #978 from narfbg/develop-db-sqlite

Improve the SQLite database driver
Merge upstream branch
Fix a syntax error
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-mssql
Add a changelog note
Merge pull request #972 from narfbg/develop-db-mssql

Improve the MSSQL database driver
Merge upstream branch
Merge pull request #975 from narfbg/develop-db-sqlsrv

Improve the SQLSRV (MSSQL) database driver
Merge upstream branch
Merge pull request #980 from narfbg/develop-db-odbc

Improve the ODBC database driver
Add ics files support to mimes.php (issue #1441)
Try to rip out hte sdf
aaaand uncommmit
tcp: compile net_helper-tcp correctly
Removed overrides that give compile warnings
modified postfic origin code generator to handle operators and sin/cos/etc
Merge branch 'scriptgen' of https://github.com/ctn-waterloo/nengo into scriptgen
Exclude jsp servlets from the OSGi manifest imports.
Put a GUI on it
Adding Child repo as submodule
broken for OS X
add favicon and fix array offset
110701_10110.py
Updates the name, derp.
specyfikacje
remove failed test from the test results if found the same method
remove failed test from the test results if found the same method
Not sure what I did
Merge branch 'master' of git@github.com:danishbelal/Primes.git
Formatting. Removed custom buffer, using a custom Document or Content
will probably perform better. I'll try this later, right after I
visited university to study "swing internals" so I understand at least
one-tenth of their code.
oops, fix project name in LICENSE
require/define AMD support
some new files.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>
better markup
adding yaml
Fix pod documentation
added some bashrc things
Bug 808231 - Let the window manager wait for mozbrowsernextpaint before starting transitions
Merge pull request #6612 from ttaubert/system/bug-808231-window-manager-nextpaint

Bug 808231 - Let the window manager wait for mozbrowsernextpaint before starting transitions r=timdream a=blocking-basecamp
Bug 820702 - Handle foreground homescreen crash r=timdream
Merge pull request #7012 from lightsofapollo/bug-820702-handle-foreground-homescreen-crash

Bug 820702 - Handle foreground homescreen crash r=cjones
Get settings lock from SettingsListener
Move settings_listener.js to shared dir
initial versions of asyncStorage and its tests
reduce code clarity to comply with style guide rules on else placement
give functions unnecessary names
update the asyncStorage docs and add tests for storing objects
Addressing review comments
Remove settings.getLock() call from settings_listener.js
Merge pull request #4449 from timdream/settings/housekeeping

Get settings lock from SettingsListener, get rid of settings.getLock() in System app; move it to shared/js
another attempt at a generator-based test
Merge pull request #4468 from davidflanagan/asyncStorage2

asyncStorage utility
Updated duplicated table
changes for 1.1.0
Descarga de base de datos del servidor
[DRIVERS] Updated the Exynos4 UART driver
[TOP] Updated .gitignore to ignore my test file
[ARM] Updated openconf.cfg in arm/cpu to support the EXYNOS4 CPU on the ODroid-X dev board
[ARM] Updated The openconf.cfg in arm/board to support the new ODroid-X board
[TOP] Added defconfig file for the new ODroid-X dev board
[ARM] Added the folder for ODroid-X specific stuff
Updated the readme to that BitAuth has been compiled against
Bukkit-1.4.5-R0.2 and run with Craftbukkit-1.4.5-R0.5 successfully.
Added a pages controller
added rspec
added remainder of pages controller after rspec add
added adsense to about page
changed index
done with static pages
added daemon plist file and edited the logging of reachability flags
added daemon plist file and edited the logging of reachability flags
Simpler animation method interface and implementation
Implement container view hierarchy management methods
Implement better view hierarchy management for containers
Fix container animations

- Must replay animations when resurrecting a view
- Fix flow animations when applied twice in a row
Implement delegate method calls for placeholder containers. Fixed -insetViewControllerAtIndex: method. Prevent from adding a heavy view controller twice in placeholder demo (still buggy)
Add demo for a stack controller displayed in a popover controller
Update FakePatois.py
Added styling to the default-template
Semplified and PEP8'd ``core.utils.is_number``
Merge pull request #3 from fcurella/patch-0

Semplified and PEP8'd ``core.utils.is_number``
minor fixes and proper nginx configuration file for 0.2.2pre
Added JUnit 4 to classpath
Site updated at 2012-06-16 20:26:20 UTC
Merge branch 'master' of github.com:devclub/devclub-eu
Site updated at 2012-06-16 21:03:23 UTC
Edited by TODO author
TU-135 - HowTo store and restore
replace TypedFrame to Frame in some other tests
Ekotuksen kuntoon myös CLI-puolelle. (Laitetaan nää ny suoraan masteriin)
Korjattu rahtihintalaskenta. Nyt hae_rahtimaksu funkkari palauttaa kaikki tarvittavat tiedot.
Ekotetaan ale vain jos ale > 0
Merge pull request #367 from devlab-oy/juppe/rahtimaksulaskenta

Juppe/rahtimaksulaskenta
Dropdown tuunauksia.
Näytetään keikan tulosta paperit -ohjelmassa vain kyseisen keikan sscc-numerot. Vahvista kolli -kohdassa ei tehdä suuntalavaa, jos vahvistetaan laskua.
ZF-case: huopausta
Jos ytunnus = '' niin tyhjä, muuten ytunnus = FI + ytunnus
Ekotukset kommentoitu
New build script
Support for importing from a shared frameworks folder anywhere on the system using #import <framework/file>

Set the frameworkPath to the folder of frameworks
New command line tool
added some new features

ability to specify min. image size for inclusion. also ability to
specify minimum number of images before cloning occurs.
Include mod_posix
the redme file
Merge branch 'master' of git://github.com/dirn/When.py
fix #47

-- New Practice charts border now properly visible.
fixed namespace use
usr corehq, casexml
attempt to add logging to touchforms
Add statistics stub
Add border
Merge branch 'html-main-page' of git@github.com:dimhold/beeper-web.git into html-main-page-statistics
Merge branch 'html-main-page-statistics' into html-main-page
Add styles for button and Statistics
Reg Form popup
Merge branch 'html-main-page'
Servlet mapping added
Merge branch 'websocket-server'
allow comma separated list for formats and codecs, and pick the first one that works
fix incorrectly named parameters and methods for offices
listallgames
Merge branches 'gameslist' and 'master'
got local update button working
added an uber result
Add support for go lang
typo fix
spaces
Merge branch 'DDC-2028' into 2.3
Fixed typos and PHPDoc
Merge pull request #194 from pborreli/typos

Fixed typos and PHPDoc
re-added my local database.yml file + change set_configs to symbolic link in shared dir instead of copying
got database yaml file linking from shared dir on deploy properly now it seems, after it does a bundle:install
Fixed line length

Change-Id: Iad5116c7e4e50bb088d570b7db4baba3903e8592
Adding UniformType enumeration
implement CalculatorViewController and stub CalculatorBrain
now equiv functionality with end of walkthrough
Assignment 1 Task 2: add . button
put . text in decimal button
add buttons for sin/cos/sqrt/π
implement sin/cos
add sqrt and π operations
Assignment 1 Tasks 1-7: Full first round calculator implementation.  Includes test suite
for the app using RubyMotion spec.
add clarity on why there's an Xcode project
REAL SDL1.3
devssay json file added
PID provider fixes.
     716* Archive: 1.0139
[Lua] fix: CCCallFunc : public CCActionInstant declare typo error
changed backup string
Too much of the other project
Don't include the push date in the doc hash.

I'm caching these things, so that sucks.
Report the rate limit when polling.
Consider all changes feed errors resumable.
Fix CAS bug in a poorly timed disconnect.
Removed include SFML library from main.cpp and changed markdown in readme.
added horror script
Added 'dequarantine' bash function

* Removes the com.apple.quarantine (Quarantine, Gatekeeper) flag from
  files
Updated .slate configuration

* Now specifies a window name for iTunes
Added DirDiff vim plugin
added APP_SID to README.md
Merge branch 'master' of github.com:eanderle/trytwilio
Handles multiple input files.
Adjust SingletonApiResource to avoid prototype conflicts

Stripe_SingletonApiResource::_scopedRetrieve previously conflicted
with Stripe_ApiResource::_scopedRetrieve due to having the same name
but different prototypes, which caused errors under runtimes that
enforced E_STRICT. Rename the function to _scopedSingletonRetrieve in
Stripe_SingletonApiResource to avoid that conflict.
Fixed syntax errors in init functions
Zooms in and shows current location!
Use hashlib correctly :)
Pair is no longer generic
support current and future FreeBSD releases

Also removed some unnecessary imports. This closes #225
typo fixed
Merge pull request #993 from bev-a-tron/master

Fix typo
Fix bug in pcolorfast introduced by #901
Merge pull request #994 from efiring/fix_pcolorfast_quadmesh

Fix bug in pcolorfast introduced by #901
Handle the edge case in matplotlib.axes.vlines, where an empty list or array is passed in as x.  Previously,
the vlines routine would raise an exception when min(x) was called, if x was an empty list.wq
Handled edge case for hlines also; if y is an empty list or zero-length array, the routine
would raise an exception.
oops; failed to commit after fixing this little bugaboo; should have been len(y) instead of len(x)
Merge pull request #1000 from dhyams/fix_vlines

Fix traceback for vlines/hlines, when an empty list or array passed in for x/y.
Merge pull request #985 from ivanov/alternative-to-982

Support current and future FreeBSD releases in the setupext.py build script.
fix for bug #996 and related issues
Merge pull request #1011 from mdehoon/fix_for_issue_996

fix for bug #996 and related issues
create item_plan.xml with items for plan
Slotify produceHelp()
Fix tabs/spaces in python tests
Get the spacing for comments right (fixes #122)
Fix #44, inline comments get put on following line
Another art fix

- Fixed art not being sent in response JSON
- Query for songs is very slow because of the art join... Gotta fix
that.
Need to update the db schema...

Add the art id to the respective media object tables.  Doing a left join
from the item_type_art table is crazy slow in SQL CE.
Performance and bug fixes

- Moved art ids out of the item_type_art table into their respective
tables
- Improved handling of forcibly closed connections
Fixed media folder id not being recorded

- I should really clean up the code that adds folders someday.
Improvements to cover art

- Added support for non-embedded cover art.  The first image file in a
folder is used as the cover art for the folder and also for the files
the folder contains.  If there is no image, the image in a song's tag
data is used.
logger spec
Added menu launcher
nv_path_rendering
nv_path_rendering
fixed token types
fixed token types
glPathCoordsNV was exported twice
PathGlyphRangeNV
Merge pull request #12 from ozelis/master

nv_path_rendering
Merge branch 'develop' of git://github.com/haskell-opengl/OpenGLRaw into develop
Setup Game Class and Add Aspect Resolution and Offset Support
INSTALL: Recommend installing kernel modules with "make modules_install".

Reported-by: Valentin Bud <valentin@hackaserver.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Refactor auth basic, digest and post
Updated look of login page

(and added link to root index.html page so it's easier to get to /classroom/tablet)
Merge remote-tracking branch 'upstream/master'
Merge pull request #58 from pchen/master

Login page updated
Erase old equations.json
Added MathJax JS library to format math equations.

jQuery Mobile pages are also in individual html files now.
Merge pull request #7 from pchen/master

Added MathJax stuff to tablet pages.
Hooked up to handle message that triggers second reshuffling
changed some stuff?
1st attempt to fix another conflict
Inclue all the files of openvpn,you can use it
The routes include china IPs,created on 2012/11/14
adding generators for migrations and seeds
Resolved issues #120 and #122 by enabling 'child' data sources to inherit their parent data source's shouldSelectRowAtIndex and shouldReloadTableForSearchString methods as well as its filterFunction.
Merge pull request #140 from justindarc/master

Resolved Issues #120 and #122
Replaced box with reticule, fixed some conventions
Implement CommitsProvider
Implement commits dir as an instance of the new Directory class
remove ravendb for now. added settings collection
home -> timeline
Adding show and destroy impl
Added GanttChartPanel with scrollbars.
Added rtl-sdr package to the repo. For more info: http://sdr.osmocom.org/trac/wiki/rtl-sdr
add glue2 otherInfo attribute, more support for optional endpoint
attributes
Aula 05...
updating menu pages
Add support for tabindex in Ember Controls.

For power users, having a well defined tab order on controls is a
must. The 'tabindex' property of HTML adds support for this, however
there was no way to add the attribute when using Ember controls.

This patch adds tabindex support and tests for all the major HTML
controls in Ember.
Added train and some css styling
refactored customer spec
finished new inv and inv_item methods
automatic numbering implemented, commenting out instance inspector
Added missing SQL to upgrade Oracle database to eZ Publish 5.0.0alpha1
Removed outdated doc/dev

Topics here refer to implementation back in 2011, look for 'before_ezp_removal'
tag for the state of the API back then.
Fixed: phpdoc type hint
Use ontouchstart instead of ontouchend
,t for taglist
Update TCC article
Updated qnxEmptyExample project for BB10 Native SDK beta3
Updated demo projects for BB10 Native SDK beta3
Updated changelog and BB10 platform instructions
deleting files.
Merge branch 'master' of https://github.com/fannar82/Confusion
Merge branch 'master' of https://github.com/fannar82/Confusion
deleting a file
Making a special folder for the program
Merge branch 'master' of https://github.com/fannar82/Confusion
Maybe a subshell will do the trick?
titanic puzzle
minor change to carbonTarget.java
fixed some errors in AbstractCountry and NonAnnexOne
Merge branch 'development' of github.com:farhanrahman/kyoto into development
fixed erros in NonParticipant.java
Merge branch 'development' of github.com:farhanrahman/kyoto into development
Fixed constructor arguments
updated EUCountry.java constructor - removed constructor error
Merge branch 'group1' into development
Merge branch 'development' of github.com:farhanrahman/kyoto into development
Merge branch 'development' into group1
Uncaught exceptions (exceptions ignored) for non-recoverable runtime errors. Now throws runtime exceptions
Made significant changes to carbonTarget.

Closer to working version but not quite there yet. TODOs in comments.
Añadidos mas comites
changes to the wrong file... these changes are duplicated in origin
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
removed comfy class from latest_articles widget loop
Merge remote-tracking branch 'origin/master'
Move geometry parsing code to the Parser class
Merge pull request #302 from croquiscom/master

Refactoring code of parsing geometry
changed ls folder color, and added githelpers
and pretty git log by gary bernhardt
Merge branch 'mac' of github.com:fespinoza/dotfiles into mac
Change srand() to srandom()
Merge pull request #13 from thoughtbox/patch-10

Change srand() to srandom()
Added the NTP package to the image.
Add new data to README.md
* fix function cPragma;
Moved a few methods around
error handling in WFSDescribeFeatureType format
incorporate @ahocevar's suggestion
Remove Handler.MouseWheel mozilla workaround.

This workaround was created because of a mozilla bug [1] with
clientX, clientY on wheel events (DOMMouseScroll).

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=352179
URL switching for all REST encoded WMTS layers.
Don't reuse tile images unless we have a new url to load.

Without this change, some browsers don't cache the images. See #454 for a discussion about this issue.
Removed fix for Opera < 9.2
Merge branch 'master' of https://github.com/openlayers/openlayers into remove-old-opera-mouse-wheel-fix
Remove global variable 'overflow', no functional change.
Merge pull request #499 from fredj/global-var

Remove global variable 'overflow', no functional change.
Merge pull request #483 from gregersrygg/master

Improve analog mouse wheel zooming
Merge branch 'master' of github.com:openlayers/openlayers into upstream/master
Merge pull request #498 from gregersrygg/remove-old-opera-mouse-wheel-fix
Call the callbacks if the cursor is over a div with an 'olScrollable' css class
Remove mouse wheel work-around in tests for Opera < 9.2 (see #498)
Merge pull request #474 from fredj/2685

Remove Handler.MouseWheel mozilla workaround.
Merge pull request #500 from fredj/scrollable

Handler.MouseWheel: don't always block the handler
Remove deprecated reproject property in Tile.Image tests
make SelectControl.unselectAll safer
make SelectControl.unselectAll safer, use @ahocevar's implementation
more tests for SelectControl.unselectAll
Merge pull request #92 from firefox007/master

manage version
add VersionManager Interface for View
~ another ci on b1
Added itemprop="offerDetails" to category product list
einige aktualisierungen
修改了 random_file_line.py 中可能出现的问题
README: details about the configuration
Item11808: add TIDY flag file to various extensions

git-svn-id: http://svn.foswiki.org/trunk/PerlPlugin@14774 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11808: perltidy them all, so people are not accidentally impacted by the new enforced rule

git-svn-id: http://svn.foswiki.org/trunk/PollPlugin@14680 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Created a Users resource
Simplified the Users controller
Added a Microposts resource
Cleaned up Micropost and linked User and Micropost data types
Fix a bug of sending multi-line text on IRC
Improve startup time by running initialization process on another thread
On ViolenceMotor and Score integration
to insert comments
fix2
Merge branch 'testing'

Conflicts:
	rotc
Prevent PTable.materialize from pulling entire contents into memory
Merge pull request #9 from dhgarrette/master

Prevent PTable.materialize from pulling entire contents into memory
Merge pull request #8 from gabrielreid/master

Support Avro specific data
Simplified PTable.materialize with a view
Merge pull request #10 from dhgarrette/master

Simplified PTable.materialize with a view
Add some more methods to Mem object to make using it from the console _awesome_
Have scrunch.py tell you when you need to run assembly:assembly
Move some logic into the PageRankData class in PageRankClassTest
Add ScalaSafeReflectData impl for working with reflection serialization from Scala Console
Make in-memory the default mode for PipelineApp traits that are loaded into the REPL
Some more preparation for making the Avro ReflectData impl swappable
Move ScalaSafeReflectData into the scrunch build
Add protobuf and thrift derived PTypes
Change the signature for Writables.tableOf to make it less annoying when working with derived types
Refactoring to prep for the fact that I'm going to need to modify the DatumReader/DatumWriter to support Scala collection types
Mammoth change to get Avro reflection working for Scala collection types
Add a TestCounters utility class so that Counter calls inside of DoFns will work in unit tests
Fix the TestCounters to allow counter clearing between consecutive tests
Merge pull request #11 from tzolov/master

Clear TestCounters between consecutive @Tests 
Add support for updating gh-pages w/mvn site command
Changed create -> create! for vertices. Worked on creating tests for
vertices as well. Upsert is proving more difficult to work than
expected. Indexes aren't being created during tests and this needs to
be fixed before upsert can work.
Added reminder for test for with-graph macro.
Merged before I pulled from master.
added timezone field for UserProfile
editing calendar item now uses nicer widgets
Reader controller and view. First experiment with turn.js
Added a link to docs

Link to http://kilianc.github.com/node-apiserver/
reviewed ex8
Added a readme for chinese compilation
Merge branch 'master' of github.com:gastlygem/lcthw-cn
just try to translate
Update ex24.tex
add more about printf and scans description
remote english
remove part and add more
Merge branch 'gh-pages' of git@github.com:gastlygem/lcthw-cn.git
Merge branch 'master' of github.com:gastlygem/lcthw-cn
ex21.tex 17% in progress
tr to l54
tr to l56
tr to l63
tr to l80
More TODOS.
Finished ex0
Merge branch 'master' of git://gitorious.org/learn-c-the-hard-way/learn-c-the-hard-way
correct makefile
Fuck GFW. Some changes failed to be pushed last week.
trying to see if delayed job caused issue
update
update
Merge pull request #3 from gengsu/master

clone
hasil testing
Merge pull request #17 from Kangoby/master

update hasil testing
python style
fixed possible AIOOBException
Merge branch 'master' into booksdb
fixed cover image loading (media-type xml attribute is now used)
Merge branch 'master' into booksdb
modified install_all for new release testing
modified install notes
pretty readme pretty
Bug 40668 - "Return to Array." when logging in

Change-Id: I847684cdc474d0694bf4fa5eddaa0d0b19e7be4e
Additional indent-pre and template interaction tests.

Change-Id: I445247130dea266beb8b94e2fa1f039f1886446a
Merge "Bug 40668 - "Return to Array." when logging in"
Merge "Additional indent-pre and template interaction tests."
Bug 811116: updated BMM scripts; r=dividehex
Bug 811395: log mozpool to /var/log/mozpool.log; r=dividehex
Merge branch 'master' of https://github.com/mozilla/build-puppet into 803823
updated includes; removed refereces to $master_basedir
Added base methods for javascript push implementation #404
bumped versions
Fixed encoding issue flagged in findbugs
Updating site
Merge branch 'master' of github.com:getlantern/lantern
Changing first commit message & adding Hello_World.txt
Merge branch 'master' of https://github.com/gfctkim/codeschool
instalator alpha 1.0.0.1
Fix setting monitoring urls depending on deploy type.
Add cacherequest limits.
DAS to use optional authentication.
Update rsync rules to keep releases.
Update PKGTOOLS to fix problems with git sources.
Enable logging for dbs migration
Enable DBSMigrateModel in dbsweb
Delete C-Compiler folder.
visualizing z buffer
z buffer to framebuffer, passing through frag yeehaaw
burn burn burn
0.25.2
Add visit_count to activity_object
Add visit_count to activity_object
Merge branch 'vish' of github.com:ging/social_stream into vish
Search API compatible with ViSH
Fix obsolete javascript
Links population

[ci skip]
Change :default_path for video files to let us include posters while a file is processing
Change :default_path for video files to let us include posters while a file is processing
Merge branch 'vish' of github.com:ging/social_stream into vish
Fix :default_url as per @atd
js for Following-Unfollow buttons
SocialStream::Views::Location for easier customization of breadcrums
Add doc to initializer
Remove trace
Tabulate view
Restore search.js
Unify document representation on the wall
activity_object_index
ActivityObject Audiences
refactoring FileSystem for readability.
more flexible fixemet radnio
Add some vim stuff for Rust.
added Console2 settings
vim additions for python, slickrun magic words
add submodule xoutputfilter
add submodule developer
add submodule rexsearch
Removed textarea styles.

Core themes all have textareas set as width 100% by default.
so what does server uri tell you anyway
change yield method name to capture to satisfy strict mode
make changes to properly test and build with coffee-script 1.3.x
Use sourcegear diffmerge for 2 and 3 way merges
Removed unnecessary argument.
Renamed maxremain into srs_maxremain.
Added development option sortmaxdepth.
Add lcp-computation for radixsort.
Make radixstring sort work with mirroring.
Added GtRadixsortstringinfo-object.
Call radixsort for strings only for buckets of some minimum size.
Use GtRadixsortstringinfo in gt_radixsort_str_insertionsort
Simplified computation of lcpvalue in insertionsort.
Removed unnecessary assertions.
Renamed variables in insertion sort to be compatible with other versions.
Replaced BS_SWAPARRAY in insertionsort.
Perform lcp-computation in insertionsort as side effect of insertion.
Removed one occurrence of modulo operator.
Renaming of vars. Store reoccuring expressions in tmp var.
Fixed problems when using sortmaxdepth with radixstringsort.
Remove unnecessary assertion.
Corrected function to decide if radixsort is applied.
Moved computation of lcp value inside the lcpvalues != NULL case.
add GtMD5Encoder
Add update to fav
+ FileNameCasePreserving added - see #18066 in Mantis

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20894 3ad0048d-3df7-0310-abae-a5850022a9f2
* fixes support for cpus with cpunodefaultint for unary minus nodes

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22838 3ad0048d-3df7-0310-abae-a5850022a9f2
now the tools are meant to be run from within the wiki directory
a bug with duplicates
db_now in database does not require a timezone boolean to be added - we always want to store unix timestamp in the DB
Pass around bugData objects not id's
Remove mapping to mb_substr - this is no longer required due to change of php mailer backend
rename static variable
Optimise file_path_combine
optimise config_can_delete
optimise filter api
增加因为修改系统时间导致系统中有些文件的时间戳大于当前时间，导致的make不过

更新目录中的时间
Updating algorithm
Merge branch 'master' of https://github.com/grg-n-sox/Project1
removed period from number of people
add scaffold for Artist, Genre, Album
0.48 change log.
version bump.
Merge branch 'release/0.48' into develop
Cleaner Makefile
Use iff in print functions
Enviando pasta CSS
Tweaked README.md and prepared a new package for Nuget. Also
upgraded the solution from VS11 Beta to VS 2012 RC.
Se añadio la carpeta contenedora de la aplicación móvil
Initial commit. Generated Android project skeleton files.
Fix comment to match the text
Fix typo

The variable for the merged file is named $MERGED, not $MERGE according to the mergetool man page.
More precise matching in sed expressions
Extract local and remote names and add the to the filename

This makes it much easier to recognize with window shows with version of the file. It requires to enable the status bar in vim though.
Added protbuf.el
rails generate scaffold article title:string content:text
Updated scaffolding
Updated scaffolding and added validation
Updated views and console
Added "Home Page"
Updated content and added "Trends"
repo: don't allow force retry when already syncing
Fix broken link on transport page
COMMON: Replace OptionsDialog::renderType2GUIO by API in rendermode.h
COMMON: Move language GUIO code to language.h
KEYMAPPER: Add non-key inputs to HardwareInput
KEYMAPPER: Map non-key custom input events

This also makes the keymapper be in charge of keymapping logic
KEYMAPPER: Add delays for *UP events coming from non-keys

Delayed entries are in a queue where each entry stores how
many milliseconds should pass based on the last entry.
SCUMM: Several detection fixes for mostly dutch HES games/demos
SCUMM: Fix duplicate MD5 warning
GOB: Add a class for CMP sprites with RXY coordinates
GOB: Use the CMPFile class in DECFile
GOB: Use the CMPFile class in ANIFile
GOB: Extend ANIObject to also handle CMP sprite "animations"
GOB: Add a way to add sprite coordinates to CMP files

Because the meter bar and icons for Penetration are not
even in the CMP's RXY.
SCI: Add detection entry for KQ6 French DOS Floppy.

See bug #3503425.
JANITORIAL: Remove unnecessary empty default constructors/destructors.
JANITORIAL: Do not convert false to a null pointer.
JANITORIAL: Use appropriate type for loop counter.
JANITORIAL: Avoid the ugly operator invocation syntax.
JANITORIAL: Make getters const.
JANITORIAL: Replace (x ? false : true) by !(x).
JANITORIAL: Remove dead code.
integrating libtap testing
decided to just copy the files in, rather than using a submodule
using libtap for testing (git://github.com/zorgnax/libtap.git)
test harness hooked into make check
upgraded phoem paths
hove li ova rijesiti probleme:

- root owner gitlab/logs/production.log ?
- post-receive pristup od strand gitlab usera
Supplied a default base template meant to be overwritten.
Recreated the package with default base template.
Supporting last tag
Merge of new-registers-models from mapa76

If you have an old dump, remember to run the conversion script
located at script/dump_migrate_old_registers_to_new_models.rb in the old
Mapa76 repo.

There is a small change in Mongoid::References to comply with the new
version of Mongoid 3.
smbtamonitor-cli shall be a simple command line client
for smbtamonitor-gen, more to be used for testing, not yet
fully done and cleaned up
Added some ruby stuff.
add the factory object of creating the object list.
first commit
test
merge c
t
test
SSHFP parsing.
Some random stuff i have not commited? not really sure whats in there. :)
Finally fixed orientation of these motherfuckers
olimex_reset allowing the use of ADM-USB-TINY-H to reset the board and let it boot from SD
Added docs to the test wrapper.
TRANSLATION :: Documents...
Creando una pequeña animación en el ejemplo de habilidades para disparar.
Added the timezone configuration to the config file.
Changed prepareForSegue to correctly select the place from the places by country dictionary
Adding NetBeans Project Files
Now you can add ontologies again
Just a quick fix.
kicked IE7's butt into submission - all IE bugs should be fixed now
Fix User Listing
added appledoc style docs
Putting all AWS-data in a subdirectory called aws
Not showing instance types with missing data, and with better warnings
Added (partial) support for the hs1 family, and better handling of missing instance info
CHange scm URL
Has near-empty home page, one test, README
file not found rendert nun eine seite mit dem namen 404
	modified:   app/controllers/goldencobra/articles_controller.rb
Merge branch 'master' of github.com:ikusei/Goldencobra
ActiveAdmin initializer
Removed unfinished sentence that was accidentally added
Added rackspace note
Removed personal support incidents
Publishing v3.2.4
sra: tiny changes
[feature/revisions] Use specific getter methods, not a global one

In other words, instead of get('property'), use get_property().
Apparently that's a better coding standard, though it clutters code more.

PHPBB3-10755
[feature/controller] Reorganize logic, move method determination to resolver

PHPBB3-10864
[feature/add_events] core.posting_refresh -> core.modify_posting_paramters

The event now lets extensions modify the posting paramters, not just refresh

PHPBB3-9550
it's called "deploy" not "hot swap"
Create SmsHandler
add ukrainian localisation
localisation
sync media support
added some copyright notes, switched Logs to RuntimeExceptions, linked to Media.close()
Merge branch 'master' of https://github.com/nobnago/Anki-Android
Bumped version to 2.0alpha21-EXPERIMENTAL
Files for Huawei HiSpace market
Removed unnecessary file
better error handling when downloading localisations
update locliastions
libanki as of April 16
a bit late but Zeemote seems interested in featuring AnkiDroid
Bumped version to 2.0alpha22-EXPERIMENTAL
sync media enabled
Merge branch 'master' of http://github.com/nicolas-raoul/Anki-Android
some bugfixes on cob_base_velocity_smoother, to be tested on hw. still contains some couts to be removed
nils the file handle aggressively
Move projects imports to tests

Avoid possible import errors of project. Defer it to tests.
Paths for alpha2
Merge branch 'master' of github.com:ixchow/rktcr-paths
Replace the zennity popup with a PyQt4 one-liner.  This works without requiring zennity, and doesn't require the jack-dssi-host to be compiled with g++ either...
Stopping playback was creating an undo state by moving the cursor;  Prevent this from happening by rearranging the order that setting the playback state and moving the cursor happens...
a straggler from the last commit
Add a tool for shifting the time of notes events...  Like transpose, but for time...
refactor
Merge branch 'master' of https://github.com/j5ik2o/server-misc
refactor
bug fix
Now search result rotation has a perspective view
Removed unused configuration option
actors
split classes
trying this in a new place
Generic Page Development

This template establishes the basic framework for all pages in the
application.  The only thing required would be to link the required code
module in the body of the page.  The header, footer, css, js, and
includes are already linked and modest and proper adjustment may need to
be applied.
Merge pull request #1 from jadams13/css

Generic Page Development
Code & structure improvement
Implement HTML fragment support.
Merge branch 'npm-package'
Updating to the latest version of mustache, which fixes guava incompatibilities.
I think I have a reasonable first stab at a representer.
Generating representations by using the representer, although it doesn't quite work yet.
Started writing tests for FILTER_VALIDATE_INT
Delete docs when gems are deleted
Initial commit of new attempt
Fix bug in docs. Close #33.
Listing 8.24, Changing the layout links for signed-in users.
Able to generate heuristic pattern table. Will test during the night.
Added syntax to !help poll and vote
consistancy
Got some dumb denizens
Golem!
Many Many Things to Make Levels 1 through 3 Awesome
New Level 2 Map
Changes to Scripts for 1, 2, and 3 - small, mostly music-related
New Patient Entity
New, but not final Golem
New Dialogs for levels 1, 2, and 3
New image files to go with those dialogs
New, plainly described Conditions (e.g., "AP -2")
small fix to Lvl01 script
Actually, THIS is the correct Lvl01 script
Also, deleted useless scripts from Versus folder - all scripts should be in Scripts folder
merged with rick
Merge branch 'bjosh'
Fixed golem animation
Working on denizens
Added new .fev
Fixed an unresolved conflict
Initial turnin for lvl05 (broken)
Fixed a couple of bugs.

There was a (tiny) memory leak caused by a list of entities to delete
never being cleared after the entities were deleted. This list is now
cleared every update.

Selected entities weren't being destroyed after dieing because of a
shared pointer reference to them in the HUD. Refactored this to use a
weak pointer reference.
add DB like interface for mongo
dbomatic also runs as the aeolus user, stop it as well
fix more merge problems
fixed git submodule mistake
Added Player Game Bat Stat model
add two folder and first hello world code
update up_polyline to avoid crash if the coordinates are a variable which contains only one point
Added a whole bunch of packages but probably going to blow it away and use prelude
lots of stuff including removing personal githubconfig out of my git config
Removed the rm rf alias as it is pretty bad
Bundle dependencies for easier development. Pin rspec to an older version that works.
Disable timeouts by setting :timeout => nil or :open_timeout => nil
instead of -1. Fix bug with :open_timeout => -1 not working. Add tests.
References #85.
Bump version to 1.6.8 for timeout fixes
Jeweler really wants to change the position of webmock/rspec deps in the gemspec
Exclude Gemfile.lock
Refactored the Bubbles demo a tad.
More doc renames.
More Token documentation.
Betting handling of :read_only and :deferrable options for PostgreSQL transactions

If they are given and set to nil, ignore them instead of assuming
they mean the same thing as false.
Namespace indexes when copying databases in some cases

If copying from a database without a global index namespace (e.g.
MySQL) to a database with a global index namespace (e.g. PostgreSQL),
the previous copying could break if you had indexes with the same
name in both tables.  To work around this, prepend the table name
to the index name when copying.

Note that if the index name exactly matches Sequel's default name,
it will not do any additional namespacing.
Add MySQL Table Dump
Merge branch 'releasefile'
Fixed gemspec
Merge branch 'releasefile' of github.com:jeroenr/deb_deploy into releasefile
Create empty Packages file to satisfy apt-get
added unix-print-auto.f90
[bower] updated main
Release 0.0.2
added a line in test2.md
Moved makefile and setup changes to their own patches
Relleno de poligonos, dibujo de varios poligonos
Se puede crear varios poligonos en la misma ventana y la ET considera
siempre todos los vertices
max value bug fix
event msgs
Merge remote-tracking branch 'origin/stage' into dev
Not a very exciting change.
Merge remote-tracking branch 'origin/joseph' into dev
This is a bad commit.
This is a bad commit. (reverse-merged from commit 2906cfbeeecf455101c41be8a924a669d46c967c)
Added production build properties
Added production build properties
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into stage
o dev"

This reverts commit 2a07aa7aef6001eaee3724e31595a5aa0eaacce4, reversing
changes made to 622d061e6a9a8a14c68cb044e3239b6e5d2504fd.
Revert ""

This reverts commit 7220c289427d560222b8cd5378f2958feaa06f16.
fix history and search pages