labofsahil/github-event-dataset-2012 huggingface dataset:
document the shortcut to the root route helper [ci skip]

This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5
minor corrections in AMo::Model docs [ci skip]
Merge pull request #5281 from filipeamoreira/patch-1

Small typo fix
Tweak activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
Fix doc examples for has_and_belongs_to_many association
Merge pull request #5274 from tigrish/master

Update I18n defaults for activerecord.errors.messages.record_invalid
Fix #5069 - Protect foreign key from mass assignment throught association builder
force response body to be read in assert_template
Merge pull request #5288 from lest/patch-2

force response body to be read in assert_template
Add config.middleware.api_only!
Add test case to has_many through association when mass_assignment_sanitizer is
:strict
Added parsing of arbitrary media type parameters.

Based on #4918.

Related to #4127.
Merge pull request #5290 from steveklabnik/master

Added parsing of arbitrary media type parameters.
Fix typo in asset pipeline guide
Add rails glossary of common terms & concepts
Merge branch 'master' of github.com:lifo/docrails
[instrumentation guide] Add introduction + basic outline
Refactored method arel_attributes_values.
Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not set.

This should fix the following issue:

"Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)"
https://github.com/rails/rails/issues/910
Failing test for mime responder respond_with using a block.
a:hover amendments
add listOfTuples, moveKnight and sevensOnly on section13
New v12 functions added; fixed some duplicates and other minor omissions
Closes #611. Fix sharing plugin to work with Ushahidi.js. Thanks @ekala
Closes #658 . File referencing error fixed.
Related to #611 based on changes to functions in json controller.
Merge branch 'v2.5b' into develop

Conflicts:
	plugins/sharing/controllers/json/share.php
Closes #692

Signed-off-by: Linda Kamau <kamaulynder@gmail.com>
Merge branch 'v2.5b' of https://github.com/ushahidi/Ushahidi_Web into develop
Merge branch 'develop' of https://github.com/ushahidi/Ushahidi_Web into develop
Fix issues with HTML error messages when running at the CLI #666

Now we just generate a plain text error and exit
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Starting the SQL manipulations
Reformat admin/users controller
Fix helper functions to give working login and permissions checks

Changed roles_permissions table to permissions_roles - ORM assumes alpha order
Add SQL to backup old roles table
Set $controller->user in MY_Controller instead of in admin/main/members controllers
Change parameter order for admin::permissions() and use current user if none passed

Also stop passing $this->user from controllers.
This is just to clean up and simplify controller code - no need to load the user in so many places.
admin::admin_access() : Default to current user if none given. Stop passing user from admin controller
Remove stray comment
Remove ugly CSRF workaround - just stop clearing the CSRF token in add/edit forms
Redo role admin for new permissions table.
Split reports evaluation into to permissions: approved and verify. Closes #356
Remove roles_user model and move allow_admin() to role model.

Roles_user model is handled by the ORM many to many relationship
and was a weird place for custom code checking roles/permissions.
 * allow_admin() moved to Role_Model.
 * Deletion of user's roles moved to user->delete()
 * Other functions were unused
Merge branch 'develop' into feature/better-permissions-system-222-356

Conflicts:
	application/controllers/admin/users.php
Fix references to form_utils_js now renamed to utils_js
Merge branch 'develop' into feature/better-permissions-system-222-356

Conflicts:
	application/views/admin/feedback/feedback_js.php
Make users, roles and permissions cascade delete related content. All getting permissions by name.
Merge branch 'develop' into feature/better-permissions-system-222-356
Merge branch 'develop' into feature/better-permissions-system-222-356
Create permissions for admin and member dashboard access
Readding nl2br to report description. Closes #546
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
<- and -> buttons seek by 30 seconds.
Edited specification.txt via GitHub
Edited specification.txt via GitHub
Rewrite of Disambiguation section
Edited specification.txt via GitHub
Rewrite excepting non-English items from title casing.
Correction to rewrite excepting non-English items from title casing.
More on title casing.
Rewrite of title case algorithm.
Merge pull request #14 from fbennett/master

Language concerning text-case="title"
Fix error in XML example for cs:name-part in upgrade-notes.txt
Add cite-group-delimiter attribute, discuss cite grouping and be more specific about cite collapsing.
Merge pull request #18 from rmzelle/cite-grouping

Add cite-group-delimiter attribute, discuss cite grouping and be more spe
We shouldn't have style behavior be dependent on style metadata.
Further work on cite grouping and collapsing
Small touch up.
Describe "subsequent-author-substitute-rule"
Bring spec in alignment with schema with regard to style metadata.
First version of CSL 1.0.1 release notes.
Release notes update
Little bit of rewriting of specification, release notes.
I dont this
Add AliasProperty

- also support property setup() hook
- better docs for properties
Made exception handling better. Made Configuration throw a better error message in console upon wrong material name, and skip it propperly so the rest is loaded.
Merge branch 'patch-1' of github.com:roblabla/TradeControl into patch-1

Conflicts:
	src/com/winthier/tradecontrol/Configuration.java
initial commit for others to try
adding the readme changes, and the apitooling-ant.jar which was skipped
Inserindo footer e removendo comentarios
allowing substring search
Solutions to problems 7 and 18
home: tower of hanoi
Added url check in the opengraph template tag.
Add compressed CSS.
a
Merge branch 'gerard' into dev
carregar estat a inici
carregar estat a inici
fixed doc formating
fix lost last register
implement gdb_write_registers cmd
change compile flag from -O3 to -Os to reduce code size and remove inline
reduce code size: do not use snprintf func
minor identation tweak
implement gdb_read/write_register cmds
implement gdb_read/write_memory cmd
implement timer/uart initialization
remove useless interrupt reason member
steal sort algo and test from linux kernel
strictly specify void as arg for function which accepts 0 arguments
Update ActionMenu/it.lproj/Localizable.strings

updated with new ios 6 strings
remove unnecessary parens now that it is single arity
Add problem 13.
Simplified code.
Switched from Sprintf to Itoa for simple conversions.
[readme] js code blocks use gh-style markup to enable syntax highlighting
Supress unsupported vendored declarations in a prefixed keyframe rule.
Try to speed up the initial migration of data
Remove timestamp fields from version_history
Disable stats pages for now
[de894] Added missing file filters on Windows

I don't think this was the cause of the crash that Rick saw, however the file
filters were missing and so I've added them.  Probalby the crash was due to
some other bug since fixed, seems to be working now.
Merge pull request #59 from khogenso/master

Add missing file filters on Windows
Remove useless info from summary regarding TC pixel size

We got rid of that feature, no need to display it in the summary.
Now just display the geocode pixel size if the user specified it
and leave off the confusing "(from geocode)" stuff.
Merge pull request #60 from khogenso/master

Remove confusing and useless TC pixel size info from summary
Merge pull request #61 from rudigens/master

Fix for terrain correction side products.
[DE935]
Some messed up code that read parts of the image incorrectly. Was in there for the last three years.
Moving colours out of var-definitions

Makes more sense to have them in their own file I feel
Moving canvasSupported function to ui file
Moving objectPool and geometriesBank creation

Now situated in the geometry-commands.js file
Changing how working compiled programs are stored
Moving more variables out of var-definitions
build and docs
Merge pull request #108 from rumblesan/var-define-cleanup

Var define cleanup [by Guy John aka rumblesan]
Moving code-transformation code into an object
Number prototype extension in var-definitions

Moving global code into var-definitions
Moving more towards an dependency injection model

Relying less on global variables for the movement of code between
editor, code-transformer and live code lab.
Moved generic data container functions further down.

Functions like Regex::Engine::data_length really didn't belong near
the top of the documentation, so I've moved them down a bit. I'm
still open to moving them, or even removing all but the data_length
function.
More docs updates
Added in some UI tweaks and long-press to get the URL back
First refactoring of atom spec
Added two widgets: one showing open games, another showing your games.
Updated CSS targeting.
Update README.md

Added classes.
Console and logfile logging.
Factor modified to handle semantic routines, also, get_write added
Added some javascript jquery / jquery ui love
Comment set detail title
Set up cterm environment.
SAKIII-5888 - Paging doesn't work in the comments widget
Merge pull request #2253 from nicolaasmatthijs/SAKIII-5888

SAKIII-5888 - Paging doesn't work in the comments widget
KERN-2790 Minor fixes to the Sakai doc to PDF converter
KERN-2790 Minor fixes to the Sakai doc to PDF converter
Merge pull request #967 from bp323/KERN-2790

KERN-2790 Minor fixes to the Sakai doc to PDF converter
highlight type hints similarly to interop forms
Future Work added
Citation added
added a full cassandra passthrough implementation (phew, lots of typing...)
can intercept cassandra commands and send back useful responses

also added capability to turn off health checks
skimpy setup file
compile sigma from c source complete
added fallback image for missing maps
header menu is location sensitive
improved maps search button
New catalog changes
Revert "[maven-release-plugin] prepare release scalastyle_2.9.1-0.1.0"

This reverts commit 5a6a08f18dd09d164049cd33ff111c64b424699b.
Commented out parts of the phpdevtools plugin that duplicate parts that went before (thus causing errors).
Example of xss attack through json. Also an image wall that uploads photos from flickr based on query.
Completed the layout structure
Added a logo
Added a custom stylesheet
Added some partials (including a footer)
Added layouts links with routes
Added layouts links with routes
Added a users controller and a layout link tests
Boom!
Merge pull request #15 from m4tthumphrey/develop

Auto merged develop branch for staging
Typo in gemspec.
raw evaluation data
[MOD] increment not handled after method within the layeredbench
Small fixes
Merge branch 'master' of https://github.com/secretmike/bigbrother

Conflicts:
	app.coffee
[t2819] removed ? at end of regex
[t1783] Abstract Editors
[t1797] WIP status bar almost done
[t1797] most elements showing up - timebar fixed
[t1797] useless timeline file
[t1797] trackhandles working properly
[t1797] trackevent colours and plugin tray working
[t1797] timeline working again

1. Fixed bug in trackevent preventing 0 times from working (possible dragndrop values).
2. Cleaned up dragndrop module a bit to compensate for id-less elements.
3. Removed console.log that were not necessary.
[t1797] timeline droppable reactivated
[t1797] couple of timeline bug fixes
[t1797] WIP plugins/tray
[t1797] Moved the add popcorn tray to an editor
[t1797] removed context-button entirely
[t1881] review changes - no need for padding reset
タグ領域の高さ自動調整ONの時、タグが1行になるとタグ編集できなくなっていたのを修正
first
ahhhh
Merge remote-tracking branch 'origin/master'

Conflicts:
	crazy-arena/main.cpp
color order in settings changed
preparing for color walls
add something :)
fixing last memory leaks in libpropeller
Created pilot episode (markdown) with four stories; Pussy Riot, Paul Ryan, Julian Assange, and App.Net.
Created episode script (markdown)
Updated episode-script (markdown)
Updated pilot-episode (markdown); added the link to Pilot Script.
Created pilot script (markdown) from templates/episode-script
Fixed the script link.
Updated pilot-episode (markdown)
Fixed the rack file.
Tweak ltp
base_group has iterator, arrayaccess + info
Fix locale dropdown location and add some keywords
Testing WTI connection and overwrite
Schema file updated
Finished Tasks 2a6536b85b 030c192f3b
Updated library
Updated library references
it should be README.md
PHPCS
Removed the automatic prefix per request.
Moved liblinear to optimization
re-integrated algolib functions due to an error somewhere :(
initial work on computing p value using gamma distribution for quadratic MMD
added gamma cdf and minor changes
added tests for gamma cdf and minor changes
Merge pull request #573 from karlnapf/master

updated algolib routines and added new distributions...
Need to write tests but this looks good so far.
Tests written for _encode_files new capability.

Work on issue #179
Some pyflakes fixes.

They were just bothering me far too much with vim+syntastic.
Fix python3 errors.
This simplification should work.

Probably should write a test case where it should fail though.
Better handling of invalid files.

I stole the idea from _encode_params in all candor.
FIX 7927 Redirect to the parent controller after deleting an item in a gridfield (edit form)
ReferenceEqual.
Fixed SimpleReferenceFormatter for complex types.
Merge commit 'a2ffd2c79da8f609c6f0cb628c01e343d79b7dd6'
Fixed parsing schema containing nested complex types. Added tests based on MongOData test schemas.
Added Comic type reader to import contentloader
5e48f6c list out non-core features explicitly
5fc7cc8 list out non-core features explicitly
09dbdcd list out non-core features explicitly
Fixed two bugs: (1) compartment for reactions that don't actually name one; (2) CompartmentShape boundingRect and paint relative to the shape's own coordinate system.
moving src down a directory
setting cache config to use APC instead of files
setting base htaccess as later to vhosts.conf
Design done, footer done
Initial commit of timemachine file extraction code.
Update less/dropdowns.less

Adding font-size to .dropdown-menu to account for .input-append setting font-size to 0.

This issue is run into when a search form has .input-append for an appended button and the button is of dropdown type. The font-size 0 causes the drop down options to inherit that property.
corrected DOCTYPE
added branch command
Read README.md

Signed-off-by: snetcher <snetcher@gmail.com>
Change dict-comprehension for python 2.6 compatibility.
Merge pull request #16 from groner/master

Change dict comprehension for python 2.6 compatibility.
rename to connection
added gmailer
CS-4213: Upgrade from campsite 3.3 fails

Fix reload renditions action.
WOBS-1257: Apply new design to the user profile page

Modifying html structure for the send email form
WOBS-1860: Current Issue delivery

Turn off wget output.
hourly display is in the same place as the regular app
Fixed icon transparency issue for File -> Refresh menu item on the main form
Added 'Open containing folder' menu item to Commit form.
Fixed Commit form's menu item descriptions to be consistent with the rest of app.
Merge pull request #964 from Basewq/master

Minor UI fixes and added Open containing folder to Commit form
Fix indentation and use standard logging tools to log proxy header.
Added table headers and removed borders
use the tuple, luke
target top and new tracks
target top and new tracks
Fixing bug where adjusting and animating two different properties on the same view would throw an error after the animation completes.
WIP attempted unit test for adjust/animate error.
Turned untested unit test into an unimplemented test.
Adds test that verifies an animation bug when animating a layout property and then later animating a different layout property on the same view.
Fixes critical bug in animation where animating a layout property and then later animating a different layout property on the same view would throw an exception.  This is because when the animation ended event fired the code would delete the matching layout property from the _activeAnimations placeholder variable completely, but later code that was supposed to clear out any other animations that were part of that same group, would end up setting the layout property from undefined to null.  This was bad, because the _activeAnimations object is iterated using for..in and so we don't want the key to exist.

Instead, when the animation ends, we delete all animations in the group instead of setting them to null.

- closes #810
Simplify PDiag's move assignment overload a bit, the self-move check isn't actually necessary.

This just empties out the diag, which is fine.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@169542 91177308-0d34-0410-b5e6-96231b3b80d8
relax hexagon-toolchain.c CHECK to accomodate mingw32 targets

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@169543 91177308-0d34-0410-b5e6-96231b3b80d8
relax hexagon-toolchain.c even more to accomodate mingw32 targets

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@169544 91177308-0d34-0410-b5e6-96231b3b80d8
Fix IR generation for bool on PPC (and any other target where bool is not 8 bits in memory).

PR11777.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167802 91177308-0d34-0410-b5e6-96231b3b80d8
Use the 'count' attribute instead of the 'upper_bound' attribute.

If we have a type 'int a[1]' and a type 'int b[0]', the generated DWARF is the
same for both of them because we use the 'upper_bound' attribute. Instead use
the 'count' attrbute, which gives the correct number of elements in the array.
<rdar://problem/12566646>


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167807 91177308-0d34-0410-b5e6-96231b3b80d8
Fix the handling of target options in our unit tests.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@166079 91177308-0d34-0410-b5e6-96231b3b80d8
"'Might as well make it static const.' -- John McCall" -- Michael Scott



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@166080 91177308-0d34-0410-b5e6-96231b3b80d8
Implement C++ 10.3p16 - overrides involving deleted functions must match.

Only deleted functions may override deleted functions and non-deleted functions
may only override non-deleted functions.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@166082 91177308-0d34-0410-b5e6-96231b3b80d8
some more facet testings, cleaned up some code.
Beam Frq Prism fix

Nerfed Freq prism
Forcing new css
In the midst of TDD rebuild/refactor of issuer-frame
Continued rebuild/refactor of issuer-frame
Continued issuer-frame rebuild/refactor

Bringing the new components in to the actual issuer frame;
everything's a mess!
Improving abort functionality
Ported over old 'test mode' into a qunit test.
Added default backpack build and issue functions to App.
A lot more; I'm not keeping good track.
Starting to clean up and reintegrate issuer frame code.
Add ability to build badge and still reject overall build.
Testing for needed error message fields.
Added error display to issuer-frame.
Trying to be much more consistent about the data model
throughout, with tests.
Prevent error result from including anything other than url and reason.
Moving, renaming and reorganizing issuer frame components and tests
Renamed issuer-frame js files and updated includes.
Code ready for blog post
renameFolder script now working, updated README
Merge pull request #3 from stevetait/updateRenameFolders

renameFolder script now working, updated README
admin mnu chrome fix
remove dummy js function
selection multiple premiere
Merge branch 'master' of github.com:stopmotionimac/tweedy

Conflicts:
	src/tweedy/gui/timelineGraphic/qml/TW_Clip.qml
	src/tweedy/gui/timelineGraphic/qml/TW_Timeline.qml
update comments in example config
Added rewriteDepositories.py

Rewrites NIST and PrIMe depositories using the standard
rmgpy.data.kinetics.saveEntry format, allowing for easy
modification down the line.
Rewrote NIST & PrIMe depositories using rewriteDepositories.py
Added appendNIST.py script

Takes a family, a PrIMe index and a NIST squib as input, then
appends a NIST entry and removes the original PrIMe entry.

Commit information is automatically generated; push feature
forthcoming along with documentation.
NIST Conversion: 1,3_Insertion_CO2/PrIMe/12

New Entry: NIST/23 (1997CHU/MAR121-124:2)
The non-existant boolean keyword strikes again
Rough client outline
Gated stream sink channel implementation
Always suspend writes on the delegate channel on close even if close is not propagated
Completion handler interface
Simplified blocking exchange
Blocking handler updates: atomics, no sync, use the XNIO worker if no executor is given
Minor changes to read listener
fix rebase
Fix compile error
Use the gated channel
Change gated stream to allow for notification on first write
Fix up completion handlers and get the tests to pass
Request limiting handler
Tabs->spaces
Make HttpCompletionHandler.closeRequest() close the wrapped response channel
Only use transfer queue if it is available
Response code handler
Default to using a response code handler
Add COW map
Implement path handler
show the complete source code not just the function bodies
initial commit of permutate from scratch originally written for tic_tac_toe
Adding endpoints to power clustering teasers
Make the header bars look a little nicer for attachments.
hum. Code review :)
Using global functions.
Merge.
removed account from searchable for now
zshrc: Update PS1

Changing PS1 to display 'named directory' prefixes if possible to display current working directory (%d to %~)
Added responsive design for 320x480 vs desktop
Merge branch 'master' of github.com:synodinos/FourFactory
Added IOC -- StructureMap
dfas
Merge branch 'master' of github.com:szpada/myfirstproject
add hobo_bootstrap_ui, update hobo etc.
Fix directory handling when auto-loading files.
Implemented proxy support
Started refactoring of the GUI
Site ok para apresentação
Increase the table sizes to cover 15000 nodes in dev and prod.
BZ873940 - The rpm package openshift-console should delete the temp file

There were a couple directories that shouldn't have ever been added.
Merge pull request #847 from rmillner/US3050

Merged by openshift-bot
Merge pull request #849 from calfonso/master

Merged by openshift-bot
14 instead of 8.
fix kick auth
motorola changes

Change-Id: Idb25b7bcee3991863660078744466745c9ee4030
property service Motorola additions

Change-Id: Ifb1b0cdd8644ed5d19e7d5eb7c37ed1aec74d5ee
missed moto uids for LTE

Change-Id: I0348901872c3897be78d899431d94907c6aa92a6
modified to match Motorola code

Change-Id: I3a44de42529e7b222ae86f9080e53ba2ff6226b3
merge from upstream CM: 4.0.3 changes

Change-Id: I7f12ddef0377c8cb0a0dafa3d56717e3b0cb78be
merge from upstream CM

Change-Id: Ie152c7c7f72a41a2c4b7f83a5182f9b8743d983e
merge: Change I2fbf7422: init: implement a new log command, useful to debug property events

Change-Id: Id746affc7c92a0c8ddcce6a912efb10fd9575681
add init.d support
fix init.d
merge with CM base

Change-Id: I4242715e10ec254598e545bbc162f6fed07372cb
added BURST_IMAGE flag for camera

Change-Id: I10cd83dbffbfe90e606323f956be928135fcb368
Merge branch 'ics' of git://github.com/CyanogenMod/android_system_core into ics
Bring core up to speed
Merge branch 'ics' of git://github.com/CyanogenMod/android_system_core into ics
Restore init.d, flash-recovery to the original (WORKING) state.
Merge pull request #1 from K900/ics

Restore init.d, flash-recovery to the original (WORKING) state.
Merge branch 'ics' of git://github.com/CyanogenMod/android_system_core into ics
init: Extend the check for charger mode

In ICS, Google introduced charge mode handling (see http://bit.ly/wfs7ck).
Extend this with check for battchg_pause used in legacy kernels.

Change-Id: Ia8fba16efa2a7d9416e38dd68d4fef84d37aea5e
run sysinit during boot

ported from CM7

Change-Id: I08f8e23d83ce45366ff2a994d110dd3431efa017
Merge tag 'android-4.0.4_r1.1' into HEAD

Android 4.0.4 release 1.1

Conflicts:
	init/init.c
Fixed the arffgenerator for the new directory structure
readmes are SO hard!
Use Librarian-Chef to manage Cookbook dependencies
modified arount OGP
metadata library fixed
[fix] Just mmap the whole file
getting ready to tweak piano to play chords instead
saving before i refactor how an instrument is selected
changed my mind. save this
using samples
before adding histogram samples and binning
yay! it is music-like
adding samples
Added partitions for ASD 151 OS and EFI

- Added 2 partition for ASD 151 OS and EFI
adding minitest - we’re using the latest version and it’s easier to manage the version dependencies
rake then rake tests to do coverage
testing git push by eclipse
Remove uneccessary codes
Removed ability of admin to remove its own admin role
fixed bug with pageType (now uses officialName of page instead templateId), extended SectionNumber Logig with h variable
keyboard cursor navigation
Adding brews file to keep track of homebrews.
Refactoring of anyLib.Event; Added tests for the anLib.Event namespace
Use of yumrepo puppet resource type
Added CenteredImageBackground, along with caveats on its use.
Created seed and removed index
Optimoitu editor
styling login and register
commented out organisms sub
add DragListView demo
Remove option 'inherit from parent'  from tiramizoo enable
Fix etherpad dependency.

Name's at https://github.com/Pita/etherpad-lite/blob/master/package.json
added New BSD License for this project
Add IMPACT 2013 to conferences
add tweetmycity sources
Goleador@s ahora solo son de la misma temporada
Carrusel para auspiciadores
Carrusel para auspiciadores
Upload de sponsor img
Bug fix para partidos buscando utima fecha
Merge de development hacia bootstrap
Rename ctx to cipher and publically expose it

Publically expose by changing "cipher" to "Cipher"! Crazy.
intermediate fix for 0.2.0
show/hide perspective windows
listening to visibility changes
Merge branch 'runtime'
adding files for tycho build
adding cssext to the build
removed twitter sample (twitter API useable)
Data Layer DDD
moved jetty related code to jetty-run
add a basic rate limiting strategy for jobs
Merge branch 'master' of github.com:travis-ci/travis-core
initialize missing db config
Pull in nudded/irc-client-fix, squashed

Squashed commit of the following:

commit 069117690fda03ec82aece070884222783bbdd91
Author: Toon Willems <willemstoon@gmail.com>
Date:   Tue Mar 13 18:52:02 2012 +0100

    explicitly close the socket

commit ccde2181a71c21be8f70a91e56c174ac05c32686
Author: Toon Willems <willemstoon@gmail.com>
Date:   Tue Mar 13 18:08:11 2012 +0100

    I tested this on the actual box and it does fix the issue

commit 035a8b074c3a78d4677c57e24d86fae703c6ae43
Author: Toon Willems <willemstoon@gmail.com>
Date:   Tue Mar 13 11:12:19 2012 +0100

    test push

commit 33a11937d6579bd2c999d9fc390e12386aa3de29
Merge: adc4924 0cf95a5
Author: Toon Willems <willemstoon@gmail.com>
Date:   Tue Mar 13 11:09:28 2012 +0100

    Merge branch 'master' of https://github.com/travis-ci/travis-core

    Conflicts:
    	lib/irc_client.rb

commit adc49243a519ff9ee3d16e27cb674dcfe1872567
Author: Toon Willems <willemstoon@gmail.com>
Date:   Thu Mar 1 12:34:33 2012 +0100

    add spec for irc_client

commit cba7c10d212e5d4b7e1c651eb791e98b1efbcc36
Author: Toon Willems <willemstoon@gmail.com>
Date:   Thu Mar 1 12:34:12 2012 +0100

    add implementation using a ping thread
set a :final flag on log parts once we receive a final log message
add a logs aggregation service
Fix issue on JRuby 1.8.
added mailer dependencies
pair of classes to test rabbitMQ with.
mailer class to hook up to rabbit.
bugfix: ignore initial spike

when the plugin has been executed initially, the value should be ignored
because the plugin is designed to be stateful. just return harmless
value.
support optional --statedir
finished chapter 10
finished chapter 10
[Fix] Incorrect check for Defile.
Removed hardcoded part
* never on the first try
* finishing import
* never ending import story ... hope done
* fixed #12: Error when creating new revision without file upload in details
* fix in version info
Merged development branch
* updated Plupload to 1.4.3.2
* Plupload tuned
* upload controls set according to settings
* added setting for max number of uploaded files at once
* incremented version info
* fixed plupload errors displaying
* modified plupload ui max_file_counr behavior
* work on Issue 9: localization of controlers texts possible
* fixed Issue 15: Error with multi upload and locked file
* fixed issue with multi upload without limiting number of files
* activated Plupload's localization
* started main listing view localization 
* small UI improvements and fixes
* separated plupload widget to partial view
* further localization progress
* implemented Issue 6: Improve content of notification emails
* separated user DMSF project preferences
* localized document email sending view
* localized all dmsf controler views
* organized list entries manipulation icons
* organized list styles
* reworked folder manipulation
* folder editation localization
* folder editation and creating fixes
theme: nav revision
theme: removing redundant links
theme: removing broken link to english version
DOCS-290 a couple of improvements to release notes
minor: reducing hierarchical confusion.
DOCS-290 additional modifications
merge: DOCS-290 release notes
database references style corrections and clarification
merge: DOCS-360 nav update
DOCS-351 adding replica set configuration examples
minor: edits
change to description of cloneCollection command
DOCS-362 capped collections _id behavior change for 2.2
DOCS-362 capped collections behavior clarification
theme: minor css tweaks for footnote rendering
DOCS-383 clarification on buildIndexes=false
minor: edits to dbref page.
DOCS-362 correcting capped collections _id index
merge: DOCS-376 clone collection command
Address DOCS-385 by adding an explicit warning about recovery of a replica set member
Fixed double active event on IE9. See: http://msdn.microsoft.com/en-us/library/ie/hh180173(v=vs.85).aspx.
Monotype module: set the script src attribute after the onload event handlers are set up.
Merged master.
Fixed monotype active events using the jQuery way of detecting load events on script tags.
Fixed two references two fontFamilyName that should have been familyName.
Added support for BlackBerry devices and added the BUILTIN_BROWSER constant.
Fix Android webfont support detection to use platform version.
Merge pull request #68 from typekit/bs-fix-double-active-monospace

Fixed double active event on IE9
Merge pull request #72 from typekit/bs-fix-event-js-font-active-example

Fixed two references two fontFamilyName that should have been familyName.
Merge pull request #74 from typekit/bs-add-bb-support

Add support for BlackBerry
Add Bram to the README authors section
Release 1.1.1
Merge branch 'master' into bs-improve-font-watching
Monotype module: set the script src attribute after the onload event handlers are set up.
blacklist
-.google-alaytics.com
+.google-analytics.com
+rd.ane.yahoo.co.jp
+btcs.yahoo.co.jp

+# cookpad
+^http://cookpad.com/iframe/.*
+^http://cookpad.com/assets/ad.*
+^http://cookpad.com/assets/extensions/.*ad.*
+^http://.*.cookpad.com/ad.*
+#^http://cookpad.com/loading/all_in_one.*
+^http://cookpad.com/loading/ct/.*
Docs: Add a paragraph about using same page transition (page-transitions.html)
Docs: Remove forms/link hijacking from data-enhance="false" paragraph (page-scripting.html)
Docs: Replace inline with mini at mini example (buttons-options.html)
Docs (popup): Added function to set max-height on photo examples.
[navigation] Remove click-routing special case for popups and pass link into changePage as an option
[popup] When pagebeforechange indicates that a popup needs to be opened (via the role: "popup" option), handle the link and prevent default
[custom select unit tests] Refine test in an attempt to fix build
[popup docs] Use "bind" instead of "popup"
[docs js] Fix copy/paste error
Docs CSS: Removed rules for popup map example. Style is included in the map html file.
Docs (popup): Improved settings for photo and video examples.
Listview: removed a variable that isn't used.
Docs (listview): Added not about hiding list items. Fixes #2702 - Listview styling corners of "display: none" list items.
Button: Submit buttons should be full width when label is hidden. Fixes #4705 - Input submit lacks 100% width when placed in fieldcontain with .ui-hide-label on wider screens.
Fixes #3296
Version.txt: removed empty line.
Docs: corrected double quote issues for select options (docs/forms/selects/options.html)
Merge pull request #4707 from chetankjain/patch-27

Fixes #3296
Merge pull request #4606 from MauriceG/patch-3

Docs: Add a paragraph about using same page transition (page-transitions.html)
Docs: same page transitions remove details of currently working same page transitions (docs/pages/page-transitions.html)
added a script to install pre-reqs
Implement basic suggestions with MultiAutoCompleteTextView for input of scan arguments.
Exclude our stuff from apache-rat checks
added junit and mockito  dependency
Base of layout.
FIGHT buttons.
Lots of spinner buttons.
+30 exp button
Rearranged exp buttons and fixed maxhp dec.
Begun weapon buttons.
Weapon buttons complete.
Unit draw weapon info.
Change weapon button halfway through
ALL BUTTONS DONE. Layout is finished.
Various minor cleanups for code clarity.
bash profiled added
Add paste + autoresize plugins settings to tinymce

Also sync the config layout between tinymce and tinymce_advanced
Fix TinyMCE initialization with newer TinyMCE versions
added synthesize as it seemed to be missing
first test#
commit

removing demos from framework
reinstal
clean up stats from DP launch
add new fb images for walls that have red border
remove test for showing/hiding 'sign up of log in' on petition page
added nav links for stats/experiments dashboards
Added factory_girl and faker to make creating test data easier
fixed element selectors
ignoring dashboard tests for now
add coffeescript scripts used to interpret svm testing results. modify test_model.sh to generate reasonable filenames for test result files.
add ui server files
reupdate gitignore
Make L() const
Merge commit 'f62d6d7d92b3a550bea0d8bef550441e76ccd2f1' into develop
Merge commit '4510896207ed27d413fcc856bd428a71bec6f229' into develop
Merge commit 'beb34b7ce5eadd4ee22154d4c4cedd7c3bff4b11' into develop
Merge commit '5a68688d8ed8fae7f5b3ecd4746b9c3203485486' into develop
Switch to MIT License
Merge commit 'b7a43c2f66ddaaaef5cd7ecec2d677e82bf36887' into develop
Merge commit 'ece0110e742804334f0964ba97aa137d53ddda67' into develop

Conflicts:
	modules/vf_luabridge/LuaBridge/LuaBridge.h
Merge commit 'bfe6c0988468b6cc230bcb37e52c1270fa633de6' into luabridge-develop
Fixes and tidying for LuaRef
Dodanie initial_data i zmiana przechowywania linku

- Dodanie fixtures, do ładowania danych przy wstawianiu od nowa serwisu
- Przechowywaniu linku do filmu, zamiast samego ID
dejado solo criterias en manage criterias por ahora, manage criterias solo aparece cuando un usuario es experto de algun criterio
further rearrangements
funparse:alt/1 combinator
funparse:maybe/1 combinator
Note on parsers
ratelimit: Better API.
adding stashing instructions to the index page.
support try-catch statement in konoha2js partially
2012.07.07更新
2012.07.07-更新
poprawki w Fortunka v1.0
Merge branch 'master' of github.com:wbzyl/rails4-tutorial
Added JS snippet
Arglists added to body function
Added inital jbossas7 Sun JDK modules configuration.
I've moved handling of PING command to other place.
changes, like links open in new tab
Minor semantic sugar to make the on-page cell initialization the same in all
places.
typo, add missing braces.
Add macros so we don't read the WT_ROW->key field multiple times, it can
change underfoot if a key is instantiated by another thread of control:
closes #230.
__wt_meta_track_off and __wt_lsm_checkpoint_worker create fake
configuration strings to pass __wt_checkpoint so that __wt_checkpoint
knows it's a checkpoint, not a file close. This is because we use
__wt_schema_worker() to call __wt_checkpoint and there's no way to
pass flags through __wt_schema_worker() to the underlying function.

Fix this by creating two underlying functions, __wt_checkpoint and
__wt_checkpoint_close, both of which can call __checkpoint_worker()
with the right flags, and quit generating fake configuration strings in
the places we're doing that.

closes #416
I broke the tree when I merged in the develop branch, I was looking in the
wrong place for the PM flags.
Removed a file that shouldn't be in the repo
step1的页高；连接增加title
Improved install. Closes #893.
Fix notice. Closes #1760.
woocommerce_customer_bought_product
strip slashes advertiser
der arbejdes stadig på split
Break out ai and assets to separate files. Fix clone tween amount.
Rename units.
Sort actor moves. Added selected unit graphic.
Added falling death.
Fixed move sort and added stuck status.
Added level exit.
Add a post on String.format
Add index to email column db migrate file to repo
Add content to users view to get users spec to pass.
little
Merge branch 'master' of https://github.com/xingyinzhu/HelloWorld
Finalitzada la reestructuracio i comentat per a javadoc
Move man page from debian to root directory, it's not debian-specific
Bump debian/copyright version to 1.0
Bump version in changelog
Fixes dir name
New package: qpdf-3.0.1.
grep: update to 2.12.
webkit-gtk3: update to 1.8.1.
autoconf: update to 2.69.
fakeroot: update to 1.18.3.
chroot-fakeroot: update to 1.18.3.
xbps: update to 0.19.
Added riverflow logo v0.1
separate compilation on everything
recompiled flovv with slight visual/balance tweaks
added a .zip build of flovv from 5 May 2012
Cache the min and max element.
Init version with separate tables of region names
Release main features
Disable testing code
Implement enh #4
Adds summary to DbfReader file header
added examples and stuffs
updated db:seed for User
Another octocat test
Merge branch 'master' of github.com:yooyiten/practice_git
Increased size of location arrow image
Built template build system
serving static resources
tips catalog done
new script

let's R&R
update default gestures: DU for reload and RL for unclose
revision #39
fixed issue with validate_doc_update not working on deletes
myflowview
solved a bug caused by reflecting damage
Make the touch events more responsive on iOS
Add test to test generic parens. Even more generic paren handling
adding validations to task model
Updated SpoutAPI implementation, now uses the Spout configuration API instead of WE's
Whitespace fixes, support for allowing any number of generics
Update Bukkit version, delay delayed command registration a bit more
Modified Computronium Moons as an example of my concept of Special Resources.  It now benefits all research-focused planets.

git-svn-id: https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk@4844 dbd5520b-6a0a-0410-a553-f54834df5b05
Merge remote-tracking branch 'svn-mirror/master'
Setup js-routes and gon gems
Manual ajax controller and stuff
Add handlebars.js
Create the Person model
Controller and client-side stuff for Person
Right solution to handle events with ajax
WHISTLE-42: create publisher_usurp for ecallmgr_call_events
WHISTLE-1037: dont try to start wh_alerts
Bugfix

Admin login bugfix
修改了一些参数的小问题，只有赛季还有一点点问题要搞下
Fix sig,data global scope.
First basic working verion
Update notes for submitted changes

* tf101: use bcmdhd as module
Added user login form
Bug when seaial not opened fixed. Still to do more work on "as colour" UI.
Added UIClickableLabel.cs to the project.
Backup rolling script compabillity,verboser config
Update FAQ.rst

jos2 examples
Added LICENCE to file headers
Ajout de la fenetre d'ajout d'un resultat
Added sound placeholders
Removed padding
Corrected an event param
Added logger
Added sounds
[fix] simultaneous error handling in daemon and monitor
[test] simultaneous error handling in daemon and monitor
[doc] fix typo in shutdown documenation
another link.
Lesson 3 updated
Meira brasid mar
Only changing icon per tab for now
did some code cleaning
removed no longer needed classloader reference
Added Succesful Tests
Added 23-766.
Integrated two new items into the Utica pages.
Update installation Instructions
set git autocrlf

重新设置git的autocrlf。
现在autocrlf设为false，
.gitattributes中设置为* text=auto
说有文件手动转换为windows风格换行符crlf
Fixed links in dependencies and added descriptions.
Finally sorted out the threading issue! The problem was the stack size of the thread was being exceeded by the decompression method. Increasing the stack size manually before starting the thread solves the issue.
Reverse logic so that we exclude rather than include.  Include prevents the ability to call on types we are not aware of, i.e. MockRepositories.
Don't barf on text/plain; charset=UTF-8

Content type parsing should be able to handle the
above specification and not relay on exact string
matches.  This is a quick fix to remove ; and
everything after it in content type checks.
Actually use the command line arguments for host and port
changed the handling of zombie entities in list
player death to spectate fixes
Special Blocks :)
Special Blocks :) - with minor bug fix!
opera-adblock-main :: 20121231-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-stat :: 20121231-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-elements :: 20121231-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
doublecmd-svn :: fPIC gets added but we already have it and passing it twice seems to break the build so drop this out

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
librecad-git :: 20121103-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
Fixed compiz.pc sandbox violation.
Add browsers in README.md.
Export snuggle as part of cosy
Add basic first counter example
version 0.4.15
Added raw render
Mon ficjier philippe.php
Merge branch 'master' of https://github.com/CAROLINET/formationPhp
License and new readme
added multiple tokens
removed recipes-generated/
worker animations
make workers stop at their destination
decrease tolerances on tile bounds
remove the old billing cycle code
work networking
fix issues with server-side lobby
adding in application skeleton with first example
Fix the error to get the model data.
adding web2
resolve merge conflicts
resolve merge conflicts - generated css
resolve merge conflicts feature/dev branch
removed obsolete code from figures/subfigures
Chapter Outline restyled
chapter outline restyled - template update v16
updated code for merge
Update css/ccap-biology.less

fixed syntax error Learning Objectives
Update css/ccap-biology.less
Update css/ccap-biology.less
updated generated css code for merge
updated code for merge to master
Merge pull request #9 from Connexions/chapter-outline

Renamed "Chapter Section" to "Chapter Outline" and fixed some CSS formatting
prep for dev
update naginata
no breaks section title
Oops, removed accidentally-added .bk file
implement filesystem
Added max depth to find for speed.  This is also a parameter now.
only allow access to canned qs if they have 3+ friends
getting caught up on migrations, first swipe at update for contact importing
css updates

Adjusting responsive code for portfolio details section
Added verbosity options to tools.
+1 missing
Lag till build.xml
Some work in the file parser for improving auto imports
Cleanup Olds Strings
fix script launcher behind webroot
Merge branch 'master' of git://github.com/mrkipling/maraschino
Merge branch 'master' into backgrounds
Now writing correct header
Generated better .h file
Added template .c file generation
Added generation of external interface of StateMachine
Working on generating the main statemachine file
Improved handling of non parametric State Machines
move header file
New images and minor grammatical fixes to the templates
merge landing changes
support deploy landing+portal
Merge branch 'master' of github.com:Diggerlab/joyplus-site
remove ignore files
Debug: BanRecipe
Sonar Opti #4
removed fake test
Merge branch 'master' of github.com:Doboy/Google-Hackathon
include psub methods in not-yet-supported list
grooveshark.com has plugins and scripts enabled
Added converted svg file
Added simple Input Device
changed abstract class Scene to interface IScene
removed servicecontract declarations from interfaces of non-hosted-services (iuserdao)
fix
fix
Merge branch 'master' of github.com:Earthson/afewords_base
Merge branch 'master' of github.com:Earthson/afewords_base
Fixed RMB currency code error
Add a py.test-compatible test module

The test module is just the server_test.py module
It needs to be reworked to do what I want it to do
Make the test file non-standalone
Split out the imports
Fix spacing to use 4-space tabs, not 2

4 is our standard, and I want to stick with that, so as
I work on modules I'm going to be setting them to 4.
See PEP 8
Merge commit '4eddf4d'
Merge commit 'd4a5312'
Merge commit 'fc0d81b'
Merge commit '0e09153'
add metar
意见反馈
意见反馈
It is now possible to add, delete and change posts.
Allow TSNS and DTEC to detect photons and other energy particles. Set default TSNS radius to 1 to make it easier to avoid detecting the wire connections
Fixed a bug that no chat messages appeared in TeamSpeak if:
- SendChatToTeamspeak is 'server' and the Virtual server ID isn't 0.
- SendChatToTeamspeak is 'channel' and the ChannelID is 0.

Thanks to Buckethead for noticing this bug!
Move build-request module
MAJ organisation et boulot
Modified User
Merge pull request #1 from FranciscoCano/feature/NONFCSERVER-999

Modified User
modifiche nel javascript, mappa nella pagina degli eventi
Adds callbackQueue property
Added logo + changes to header

Some code changes as well, gives notices because some DB code is
missing.
init commit
Merge branch 'master' of github.com:Gowiem/DrinkTV-Android
Finished first cut of the User model
minor cleanup
User model with passwords, and user show page
Modified Vim template, modified gitignore file

+~ Made the Vim file check if running a GUI, if it is then for spell
   checking it will not put a red background, but instead will put a
   curly underline
+~ Added some things to gitignore, in order to ignore system files
initial commit :3
Removed unesseary white space in user.hpp, and created a new class to containg information about the users worktime
Added worktime.hpp and worktime.cpp, which was forgotten in the last commit
Implemented the new worktime class in the user class instead of the old array, no getter yet
add ccs file
add new cup report version with css format
Added .zip to gerbers, fixed couple small silkscreen bugs
scratch that idea
Complete mkdir and symlink.
Merge pull request #1 from Iristyle/master

First take on implementation
Copying base state of zendframework/zf2 (PR 1322)
In case of fault response from network added minimal handling to avoid
nullpointer error.
Minor modification for using Open311.JSON and Open311.XML for formats.
Akka Example for Enflick
Working on login. Still not functional.
added rubyforge project name to gemspec
AutoSync to WoW-Pro.COM on Fri Dec  7 05:09:21 EST 2012
tradelec zip added
Prevent desktop notifications from being sent if you're already viewing the page, add onclick handler to notifications so they focus the window when clicked
Syncing workspaces.

Change-Id: I35c9e000b4f7f516a9ee508aa738c99d88bb3eee
Signed-off-by: Joeri HERMANS <joeri.her@gmail.com>
Updated logger.

Change-Id: If5c70878e808c1eab4ab774061b42aed0c3ac8ca
Signed-off-by: Joeri HERMANS <joeri.her@gmail.com>
CompletionMenu now behaves better by adding a PopupHandler.
added LD variable as the linker, making things more readable

Even though LD == CC in this case, it still looks odd to use $(CC) instead of
$(LD).
added a cpp makefile!
Added design psd files
Merge pull request #3 from JunkieLand/master

The CityGML writer is integrated and works.
Modifies filefilter to accept stl or citygml files
Style corrections. Few javadoc has to be finished by Nicolas.
Finalized the Javadoc of the writers.
fix format date in sitemap
Keep history of changes to Rsvps
vesion_block_boucle_marche_pas
libui: remove BOARD_CUSTOM_OMX_16BPP_YUV temporary flag

Change-Id: Iabb8fa540b2d325ea516859cdaf31964f192e9ef

Conflicts:

	libs/ui/Android.mk
Cleanup before tagging version `1.2`
Перевод на русский язык и обновление

Перевод от @KostyaKozak
Автор @Idiot
Added Mac implementation
starting over from scratch.
Removed xref plugin
improved naming of tabs