labofsahil/github-event-dataset-2012 huggingface dataset:
réglage des pbs de l'index, affichage du cadenas seulement sur les parties privées.
problème de l'id du deck réglé
débug deck
création de partie opérationnelle (sans vérifs)
Premier essai de flipcards
Début gestion js room
Merge branch 'master' of github.com:PCreations/Dixit-Online

Conflicts:
	controllers/users_controller.php
ajout du dos de la carte basique
Ajout de l'object Dixit en js

Ajout des notifications des joueurs qui ont rejoint/quitté la partie au niveau de la room
version non mise en forme mais opérationnelle du remplissage du dos de la carte
Merge branch 'modifTom'

Conflicts:
	controllers/games_controller.php
	models/deck.php
	views/games/index.php
	views/games/play.php
	views/themes/default/css/style_partie.css
Généralisation à toutes les parties de la fonction _roomAjax
Ajout notif erreur à l'a création de partie et modif HTML games/index.php
Modification CSS et JS sur les flips card pour ne pas modifier le css sur les autres étapes.

Modification de la fonction de récupération des cartes du joueur.
Modif config
Merge branch 'master' of github.com:clejeu03/Dixit-Online
Merge branch 'master' of github.com:clejeu03/Dixit-Online
affichage des decks
share
Merge branch 'master' of https://github.com/clicker360/ebfmex-pub
remove IPrintable from defrecord
* src/clj/cljs/compiler.clj: double check namespaces for :excludes and :use-macros in get-expander
irb configuration
Removed post blog button when not logged in.
Updated TODO
Fixed import order command.
Updated TODO
Fixed mailer exception
Text without corresponding functionality (3)
- removed
Fix another import for 3.2
fixed #1391: change cc.Log() to cc.log
issue #1391: change cc.LogXxx to cc.logXxx
Merge pull request #465 from linshun/iss1391_cclog

Iss1391 cclog
Adding "edit" functionality to the example app
changed Employer to Payer and added payer_type
3 more calculations done
Update app/controllers/auditions_controller.rb
Adjust song speed

Closes #21, prvent pause menu from being activated when game is over.
Update README.md

Added newline to end of README.
inlineForm

simple page contains an example of accordion and form with inline
validation
[feature] conf dsl add sub and @sub - done
test feature modif
Добавили navbar
updated routes and folders with new volunteer_rspvs name, added index
Completed exercise 5.6(1): using shared examples to reduce duplication
Completed exercise 5.6(2): testing lapplication layout links link to correct places
Completed exercise 5.6(3): test full_title as application helper to eliminate duplication in spec
#79: implemented removeEventHandler
Q041
Correcting filename in the instructions.  There was a transition in the demo code from style.css to desktop.css (other alternative is to rename the files and update the html, but this is much easier)
basic ldap auth
Finishing photo management sequencing
Changes for the output of mcmc cycles
updated the todo's
Configured the initial set of documentation using sphinx
configured the initial sphinx docs
added some other aptana ignores
Added documentation stubs
decided that the example file shouldn't be a package

to avoid namespace problems when it is installed.
documented the example usage
started to work on loading Shared Preferences from SQL DB
Merge remote-tracking branch 'origin/master'
DbHelper replaced hard-coded strings with references to xml
Merge remote-tracking branch 'origin/master'
keys in pref.xml are now referenced via strings.xml
final changes
Merge branch 'master' of https://github.com/cwi-swat/php-analysis
sdklhjfl
Added beyond compare for git config
xtensa: add sigcontext.h

Signed-off-by: Chris Zankel <chris@zankel.net>
xtensa: use atomic instructions instead of a syscall

Replace system calls with atomic instructions for 'compare and swap'
in linuxthreads.old.

Signed-off-by: Chris Zankel <chris@zankel.net>
xtensa: add a set of atomic intrinsics

Add a new file that provides various atomic intrinsics, which use the
conditional store instruction.

Signed-off-by: Chris Zankel <chris@zankel.net>
xtensa: fix a misnumbered register in sigsetjmp

Signed-off-by: Chris Zankel <chris@zankel.net>
ldd: ELFCLASSM was not defined for the Xtensa architecture

Signed-off-by: Chris Zankel <chris@zankel.net>
xtensa: add a stub user.h file

Xtensa only supports the ELF binary format, so the user.h file isn't
needed. However, it's included by other files, so provide a stub user.h.

Signed-off-by: Chris Zankel <chris@zankel.net>
xtensa: sysdep.h needs to include sys/syscall.h

The Xtensa version of sysdep.h didn't include sys/syscall.h. This header
file is, for example, needed by not-cancel.h, which uses the
INTERNAL_SYSCALL macro.

Signed-off-by: Chris Zankel <chris@zankel.net>
xtensa: add missing atomic intrinsics

Add more atomic intrinsics. These are mostly non 32-bit versions, which
are not support by Xtensa. This file needs some more clean-up and
consolidation.

Signed-off-by: Chris Zankel <chris@zankel.net>
Open files in binary mode for Windows portability
Get ZI into the PYTHONPATH of the local feed
adding prototype article scraper code
Fixed bug in expandRng logic.
Fixed typo and added a unit test for a future bug fix.
Replaced the fixed 1250ms timeout with an event handler on the body to resize the editor when actually ready and removing the need for the throbber to be shown.
Fixed so the space is included when removing word formatting.
Fixed bug in IE where editor in a frame doesn't give focus to the toolbar using ALT-F10
changelog - Fixed bug in IE where editor in a frame doesn't give focus to the toolbar using ALT-F10.
Inserting a table in IE8 places cursor in the second cell of the first row.
Webkit - Cursor positioning does not work vertically within a table cell with multiple lines of text CONFEXT-42.
Fixed build failure due to unfinished conflict merge.
Fixed a few caret formatting bugs, added unit tests for them and cleaned up some of the other tests.
Fixed bug with not being able to remove formatting on the last word of a table cell.
Updated the changelog.txt and added a new version of the moxieplayer.swf.
Fixed bug where a TH selector got lost while merging.
Fixed issue where formatting wasn't removed if pressing enter after removing it from the caret.
Updated moxieplayer.swf with another version.
Fixed bug where scrollbars where visible in the character map dialog on Gecko.
Fixed issue with missing translation for one of the emoticons.
Fix white space in between spans from being deleted. (CONFEXT-23)
Fix bug where caret cannot be placed after table if table is at end of document in IE
Fixed issue where the caret events where bound each time formatting was applied.
whoops, forgot to add back [category]
Fix size/alignment of URI input in webbox setup
Dont fail when there isnt a web browser (e.g. console linux)
lesson 17 - deploy with capistrano
update fwts
took capability images out of panels
Added mongodb binaries to Ardustat.app
Merge pull request #8 from xgalvin/master

updated fix
Updated ListEditor to work better in Chrome.
Better consistency with usage of LiveEvent.
Created basic AutoCompleteInput.
Added additional efficiency functionality to LivePage.
Added additional functionality to key events through LivePage.
Fixed bugs regarding ignoring of property changes coming from client.
Fixed bugs regarding disposing of session.
Contents of web from commit 423a1e92
Added Assert. that does not fail, only reports.
Renamed issuer-frame view to badge-accept
Update issuer-frame wording in a test comment
Renamed static/js/issuer-frame dir to badge-accept, and corresponding tests
Renamed issuer-frame.js and issuer-frame.css
Merge pull request #264 from stenington/issuer-frame-rename

Issuer frame rename
social-media.js integration
social-media.js integration. Still needs a nice look and feel
minor styling
fixed the height quirk
moved css to its own .css file
oops >_>
more port confusion reversion
reverted spacing
removed commented-off code
Merge pull request #369 from Pomax/social-development

Social development
Added a open badges favicon
Fix share page information table column widths to avoid huge white space bug
Merge pull request #374 from finnp/development

Added an open badges favicon
added href to google+
css changes to make FB like button work better
- fixed : bug church show
finishes phantom jasming reporter
only generate behaviour interfaces and factories for classes with events, setup static initialization of behaviour factories in classes
bash addin for tmux setup when developing rally apps
Fixes bug in header removing Edit User
moved techniques to a different namespace to keep documents and techniques from overlapping in url tags
Revert "moved techniques to a different namespace to keep documents and techniques from overlapping in url tags"

This reverts commit 38d93c4574616372978f32abdc16d64ab8a48fc4.
template overlap between techniques app and documents app was causing problems, should be resolved now
less generous literal parsing
ASC purge: t/06order_by.t
simple literals get detected and turned into nodes
testing whether JS gets stripped
Merge branch 'master' of https://github.com/dcowan/Cmgui-RTD-docs

Conflicts:
	cmgui/mathtest.rst
Merge pull request #1490 from galthaus/pull-req-master-86818e726a

Start porting tempest to cb20 fix some nits for ubuntu start working rh62 [4/7]
Merge branch 'master' into hadoop-os-build
Add updated submodule references for master
Merge branch 'master' into hadoop-os-build
Add updated submodule references for hadoop-os-build
Merge pull request #1497 from galthaus/pull-req-hadoop-os-build-745f3823ba

Modify redhat barclamp dependencies for cb20, add package cleanup, bdd fixes [9/9]
Merge pull request #423 from VictorLowther/pull-req-hadoop-os-build-47024670e2

Pull in several correctness fixes for the dev tool [4/4]
time_ago_in_words
Merge branch 'master' of github.com:dementrock/datehelper
the majority of html helpers -> html partial views
* fixes to JOIN clause
* fixing number args in WHERE clause
Updated middleware docs
rss and template fixes
Updated README to contain simpler example code
- List Templates, List Documents, Template Details and Document Details implemented
- Templates retrieval tests
Fixed erroneous readme changes
- switched to a whitelist for filename validation
- dont crash if no video/src object tag found
Add package swaks
Update the i-dont-know section.
Use the RSpec let function to make the tests less repetitive
Moved the hook_ding_library_menu_links() "about" link into main module
Added basic information about the ding_library_menu module in a read-me file
Added comment to ding_library_module code
Removed custom menu blocks as the menu blocks module will do the job
Added the new field names and removed custom menu from panels
Added field groups to ding_library
Updated custom code to new field names
Updated views and panels to new field names and removed old fields
Removed the old field_slug
Fixed geo-encoding and map views/panels to use new fields
Merge branch 'refactored-ding2tal' into development
Botão fechar
Path das imagens
Rename utillinux to libuuid (we use only that part)
Make generic companion libs script
Rollback configure file
Merge branch 'generic_libs'

Conflicts:
	scripts/crosstool-NG.sh.in
openssl and libuuidl in companion libs now
Update .gitignore
Add ignore
Add openssl companion tool
remove vocab readme.txt
new gradle snippets to make life a little easier
Return invoice from Invoice.create
Updated data. Fixed date issue.
added event searching
Application boilerplate

Brunch with Chaplin is a default application skeleton for Brunch.
Add module Devel::Cover::Dumper

This new module is a wrapper for Data::Dumper that uses the right flags,
locally (to avoid impact on other modules).
use Devel::Cover::Dumper instead of Data::Dumper in lib/
use Devel::Cover::Dumper in scripts
Changes: fix typo: April 1th =>	April 1st
Update Changes for the Devel::Cover::Dumper stuff
Changes: add RT reference and author
Major documentation overhaul (Pau Amma).

With a few changes from me where the original documentation was confusing,
outdated or just wrong.
Merge branch 'fix/RT76531-Dumper' of https://github.com/dolmen/p5-Devel-Cover
Minor tidyup of Olivier's Dumper rework.
It's 5.15.6 that's the problem.

Of course, 5.16.6 may cause problems too, but we won't know that for a while.
Add Pau Amma's documentation work to Changes file.
Clean up README after documentation changes.
Reorder dzil Git stages.
Tiny whitespace nit.
Add version and basic pod.
JSON is not required, JSON::PP will do.
Add more Moose method names to ignore.
Ignore Parser.yp from Template Toolkit.
Add get_options to Html_subtle

Add outputfile option to Html_subtle to make it work like the other
Html reporters.
Add -launch option (currently only html reporters)

Add Html_Common.pm module for common HTML reporter code
minutes hack
moar time hacks
input readonly
Fix slot rendering logic
Some more currentversion stuff
Now checking for updates (download link only so far)
Updated icon and primary graphic
collections constructor
wsdsgf
Removing src/main.o
General styling mods
rebased GTK theme off of newest ACID by sixsixfive, re-added SLiM themes, added Nemo configurations to GTK theme
Adjustment for share container on linux.
renamed CSS to reflect this project
Derp. Failed at testing for wget/curl
status box: querying by report date
Parser now returns returnable Hash

Hash contains:
  :found => the date found
  :text  => the submitted text
  :cleaned_text => the cleaned-up text, by definition,
    this is equal to :text unless :found != nil
Update UI version 0.06.
adding explicit version spec to avoid confusion between Allegro 4 and 5
rebase deleted my changes
Merge pull request #27 from RiotGames/uppercase_latest

rebase deleted my changes
Merge remote-tracking branch 'upstream/master'
Take date range as input.
374018 correctly handle requestperminuted underflow
PdbMiddleware only enables itself when settings.DEBUG is True, by default.
Runserver command now works, even if other apps override it.
Test command now works, even if other apps override it.
Declare dependencies in setup.py
Merge pull request #1 from edgeware/declare-dependencies

Declare dependencies in setup.py
Install chef-server on ubuntu 12.04
backout 69243e829931 due to OSX 10.7 bustage
Bug 765409 - Make sure we reparent all child frames on our principal list (when lazily setting the parent), and no other frames.  r=bz
Bug 788842 - Mirror mozbase to m-c, r=jhammel
Bug 601912.  Implement <ol reversed>.  r=dholbert
Bug 785174: Refactor DebuggerFrameEval to be useful for Debugger.Object.prototype.evalInGlobal{,WithBindings} r=jorendorff
Bug 785174: Implement Debugger.Object.prototype.evalInGlobal, .evalInGlobalWithBindings, .evalInGlobalWithBindingsAndABrandySoakedMaraschinoCherry r=jorendorff
Merge the last PGO-green inbound changeset to m-c.
Merge m-c to inbound.
Bug 774209 - Don't make DoorHangerPopup focusable when it's not showing. r=sriram
Bug 784236 - Ensure chat windows don't end up in history/places.  r=mixedpuppy
Bug 780975 - Remove window parameter for anyElementFromPoint and elementFromPoint. r=mfinkle
Bug 784563 - Investigate being lazier about removing things from the purple buffer, r=mccr8
Bug 789344 - osfile.jsm referenced by wrong url. r=nfroyd
Bug 789360 - devtools references to modules using wrong url. r=past
Merge inbound to m-c.
Bug 789711 - #include mozilla/StandardInteger.h instead of stdint.h to fix building with MSVC9 and lower; r=me
Bug 783025 - Replace String.indexOf(...) != -1 with String.contains(...). r=dao
Backed out changeset 9c6782197172 (bug 783025) because of test failures
Bug 783025 - Replace String.indexOf(...) != -1 with String.contains(...). r=dao
Merge inbound to m-c.
Deleting bash precision in doc
Now there is a user with a secret and secure password, so our data can be nice and safe and toasty warm and it's like learning to lock the door all over again.
Fix a couple details in the Sif banner rules.
Some rules page cleanup.
Commit Inicial del index de la Pagina
added command to find unmapped faces.

git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7975 bb5eec90-091a-0410-bc89-db79c2cf2c7b
cleaned up face mappings in js2

git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7976 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7977 bb5eec90-091a-0410-bc89-db79c2cf2c7b
xmsi-math-symbols-input.el fixed a bug when any abbrev involving tilde ~ won't work.

git-svn-id: http://ergoemacs.googlecode.com/svn/trunk@825 f1309a34-a24b-11de-ba4d-5dbaeb624ccf
Merge commit '813911dfb7879f08be15619c03c62e54c5b149c3' into paul
Added some comments + organizational things
Merge commit 'a51a79bf5c438b6254243715d3430b65384bec6a' into dev
Skipping inner <object> tags with Firefox to avoid SwfObj conflict. (to avoid wrapping with <div> nested <object> tags like <object>...<object>...</object>...</object>. This was already released in my http://themes.svn.wordpress.org/responsive/1.6.1/js-dev/jquery.fitvids.js Theme. Patch was proposed and sent to me by Oriol Arcas.
More additions for cloud.
Signed-off-by: enohl <e.nohl@arcor.de>
translations misc
Android.mk: limit to olympus

Change-Id: Ib5522d32bff4376a1f2ff8e94d2389e9d05f2646
Android.mk: define modules (incl wlan) modversion

Change-Id: I2a69b6fdf13c6c45207faf6d922cd3c3ec75d81e
allow to override the uts release

Change-Id: Ie353237e66984ebb78bf4ac84c1bbd4e2f8cf2ca
some fixes for json alpha release part 2

Change-Id: I7256a563a953e77a96a921d8c7ee0a644360dbc4
Added solution for p11 - modified runlength encoding.
moved DOM creation logic from Stage constructor to a private method
moved .get() method to Container so that all containers can use it, not just stage.  This allows you to select nodes within other nodes
Gemfile.lock added because heroku asked for it
even NEWER gemfile.lock
ugh
now we have new yml
changing mongoid.yaml again
fuck
testing somthing
now with procfile
this should finally work
new omniauth init for heroku
trying to turn on dynamic asset compilation
utf8 encode risolto
Merge branch 'staging' of https://github.com/erlapso/survey_system into staging

Conflicts:
	model/survey_data.php
test 5
sdfs
Correct dependencies scope
Merge branch 'master' of github.com:esmasui/AndroidJUnit4
refactor remove unused code
refactor final layouts into string format
#482 Add Document field for news
Change lisps' file structure, and el install scripts
Squashed commit of the following:

commit 8efa6bbedf92c51c4972fd776e0ceda0b7006693
Author: chris grzegorczyk <grze@eucalyptus.com>
Date:   Fri Nov 23 21:30:50 2012 -0800

    Fixes EUCA-2199 Track and update network tag state.

    - Adds tracking of active network tags (NetworkGroups.ActiveTags)
    - Adds NetworkGroups.updateExtantNetworks to update tag state and prune unused tags.
    - Fixes naming in NetworkInfoType to reflect the actual contents.
Removed key short-cuts from UI
A blog post about sponsoring
Minor text changes
Starting to add config
12/25/12
Added checkdisk_critical and checkdisk_warning parameters
major overhaul, starting much from scratch
export InitMode constructors as well
better parameter order
dont use STEM_SOME, this adds the Z-prefix...
remove print stmt
back to STEM_SOME, because of index_text. make SimpleSearch and SimpleIndex work
ability to stem single words
Add bullet model

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Iterate the Antimatter form model to make it brighter (but failed)

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Update Unity to use the new bullet & character models

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Update the model for power ups

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Update power ups models
Create Character prefab and Character Camera prefab

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
[+] Added subdirs
gems for refinery in heroku
ruby 1.9.2 instead of 1.9.3
renzi 2
-Dates sequences dates where not correctly valorized due to missing call to Parse method.
-Bumped version to 1.0.6
init_functions: use a consistent default rootdelay

init defaults to a rootdelay of 10, but poll_device falls back on a
default of 5 if rootdelay is somehow manage during the hook run. Keep
this consistent and use 10 seconds in both places.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
baseroot: add flagfile to indicate we're in an initramfs

This is used by udev to deal with firmware requests for firmware that is
not available until the real root. It will also be used by systemd to
detect what to do, if that is ever used.

ref: http://www.spinics.net/lists/linux-wireless/msg94522.html

Signed-off-by: Tom Gundersen <teg@jklm.no>
gem rebuilt
Use more robust way of stopping services
Updating files to gather facts.
Vertical origin offsets
inicio da geração do boleto
README: travis-ci build status
All good in the hood

"A milli a milli a milli a milli"
Added tmuxinator to bash_profile and some vi style commands to tmux.conf

Added tmuxinator to environment path in order to have it working in all user sessions
Added configs to use tmux in vi style. Changing windows with <bindkey> h|j|k|l
making searches with /?, entering selection mode with v and copying (yank) with y
Fix listener sorting for partially-ordered dependencies
Merge into master from pull request #91:
Fix listener sorting for partially-ordered dependencies (https://github.com/floodlight/floodlight/pull/91)
Really really really small fix
Making Python jsbeautifier reentrant

Removed use of global variable parser_pos to let Beautifier reentrant
Pushed latest revision 14469
Pushed latest revision 16118
Pushed latest revision 14637
precompiled the assets for production use
strict C
prepare version 0.08
Lose more unnecessary :calls.
- New port: p0f2 Passive OS fingerprinting tool p0f version 2 gives better 3

PR:		ports/169855
Submitted by:	Denis Pokataev <catone@cpan.org>
This port adds the Sale Opportunity Module to the Tryton Application Platform.

WWW: http://www.tryton.org/

PR:		171465
Submitted by:	Matthias Petermann <matthias@d2ux.net>


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304430 aed309b6-a8cd-e111-996c-001c23d10e55
This port adds the Sale Price List Module to the Tryton Application Platform.

WWW: http://www.tryton.org/

PR:		171466
Submitted by:	Matthias Petermann <matthias@d2ux.net>


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304431 aed309b6-a8cd-e111-996c-001c23d10e55
Add a temporary mirror
- Fix AUTO in daily_status_smart_devices parameter (skip arX devices).
- Bump PORTREVISION.

PR:		ports/172480
Submitted by:	Leonid Nevecherya <nlv@imbera.ru>
Approved by:	samm@os2.kiev.ua (maintainer)
Feature safe:	yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305739 aed309b6-a8cd-e111-996c-001c23d10e55
- update to 0.92
  This release features pkgng support.

while here:
- convert Makefile header into two-line format
- remove shlib versions

PR:		171860
Submitted by:	Grzegorz Blach <magik at roorback dot net> (maintainer)
Fix build on !i386 && !amd64.

PR:	ports/171253
Fix path to the tix dependency.

PR:		ports/171599
Submitted by:	Alfred Bartsch <bartsch@dssgmbh.de>
Approved by:	Alex Deiter <alex.deiter@gmail.com> (maintainer)
Update to 1.8.2.  See
http://www.wireshark.org/docs/relnotes/wireshark-1.8.2.html for the changes
in this release.

Security:	See http://www.wireshark.org/docs/relnotes/wireshark-1.8.2.html
typo in openstack_registry config file
openstack_registry should run migrations
micro bosh job with openstack_registry in
remove chache for windows
Bugfix: NPE while parsing world.yml
Remove listening socket on bad connection?
Minor cosmetic cleanup of spaces
Start work on config
Add news item for funtoo profiles
Adjusting new Portage mask
portage unmask
Masking consolekit-0.4.5-r3 as it depends on udev-182
rabbitmq-server update
latest zmedico fixes to vekin traceback
nginx 1.1.17 to current cause of volunerable problems in 1.1.16
Initial commit for Arfrever's stuff :)
perl 5.14.2 to experimental
dev-python/anyjson-0.3.1 using 4-python EAPI
dev-python/carrot-0.10.7 (4-python EAPI)
dev-python/kombu-1.4.1 and 2.1.0 (4-python EAPI)
updated glance from openstack overlay. Moving to sys-cluster. EAPI 4-python
EAPI 4-python dev-python/eventlet from openstack overlay
dev-python/nosexcover-1.0.7 EAPI 4-python
wsgiref for python-3.1 and earlier. EAPI=4-python
dev-python/python-novaclient-2012.1
dev-python/nova-adminclient-0.1.8
updated nova from openstack overlay
prettytable from openstack overlay, converted to 4-python EAPI
Adding kombu missing manifest
Added Travis CI build image to readme
tried xml mapping for computer... still not running
Implementação básica de log por AOP
refactoring sharding logic into its own component
creating a generic sharding logic handler for store interface
Merge branch 'store' into store_db
Merge branch 'store' into cache
Merge branch 'cache'
Merge branch 'store' into couchbase
Merge branch 'couchbase'
Merge branch 'store' into stockpile
Merge branch 'stockpile' into souk
Merge branch 'souk'
Merge branch 'store_db'
add mysql running and installed checks to mysql test
removing output buffering from shard test. not needed.
Merge branch 'store' into cache
Merge branch 'cache'
Merge branch 'store' into couchbase
Merge branch 'couchbase'
Merge branch 'store' into stockpile
Merge branch 'stockpile' into souk
Merge branch 'souk'
Ported Qt4 viewport
Finally got around to adding the engine namespace
Added marshmallow_input with Linux evdev support (for Raspberry Pi)

Still need to add more key translation codes, added a few for now.
fix a bug of nos_wuyan
Fix the notice of skill final
Merge branch 'NewQSanguosha' of https://github.com/gaodayihao/QSanguosha into NewQSanguosha
removed the get fiels function in index as it did nothing GF
Added run-command-on-git-revisions
comment on where to find example usage.
The files picard_1.py and picard_2.py have been
deleted.
removed unneeded line
added revKeys for fast removal in Map
fixed lowercase issue in x3dom
Filtering '.prune', '.' and '..'. Closes #51. Closes #52.
Added in models for Facility and Activity. Added in icons for Playground
and Swimming. Added in .9png for buttons
inserção inicial usando cópia do HDA Março
Created emergency contact plist file for hardcoded data
Created EmergencyContact model and tableView. Also import contacts plist into an array of contacts.
EmergencyContactsTBV loads contact data into its rows
Minimum Document Architecture
Added slides directory, modified present.sh accordingly
Made transacrions automatically sort descending on timestamp.
Added script to make only data plots
Removed unnecessary comments
add Chris Ford's blog
changed gideros.class to Core.class
vdr-addon: bump version
Merge branch 'master' of https://github.com/OpenELEC/OpenELEC.tv
Generate config files
Pretvorba do poglavja določanje ničle...
Updated gui behaviour
implemented tramp-adb-handle-file-writable-p with test

seems to be available in ics
removed `add_fotos` dir from tracking
multiline conditional if parent is block
added all ant targets and corrected paths
xmlrpc now allows marshalling of None values
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnowsys
Clean up squad memory on match end
Disable automatic line breaking and add keybindings for filling paragraphs.
Working with more than one biker.
fix for _validate_and_insert
display correct value in array for additional habit
Inline unconditional branch
moving old code
Updated CHANGELOG for 0.4.4
Bump version to 0.4.4
translations in the app have a higher priority than those in activeadmin
make sure I18n load_path does not become a nested array
Merge pull request #1775 from caifara/1775-override-i18n-translations

Impossible to override I18n translations
Merge pull request #14 from gregmolnar/how_to

Added a howto and some tidy up
added normalization constraint to full line jacobian
Merge branch 'master' of https://github.com/grisetti/g2o_frontend
Fixed an improperly tabbed line.
Ajout du répertoire de tests.
Added flash erase function for Atmel SAM3X.
Atualização da lógica de StateMinhasSugestoes.
Tentando fazer funfar no nodester
Arquivo server.js para testar no nodester
Acerto do debug output dos arquivos
still compiling but looks good. this is for debugging the latest one. try dpkg-buildpackage -j150
another function using changes to libcurl and libevent that are not standard
adding the debian packaging
Add a refresh button and styled it.
Upload post images to Amazon S3 cloud for #32
Audio Play Implementation
check null MediaController
Handle Error & Loop of AudioPlayer
Change invoking logic of audio and video
Add Menu Item: Exit
Ask user to restart after get lots of play error
implement the menu_end item
release video onStateChanged to avoid impact to animation
Fix: release paused video on back key pressed
remove project basedir so jenkins can buid
paginator completed
Logparser patch
added serial lib
Adding the member function-call identifying code to the repository.
added call to dump paths
map style add
map class add
Merge pull request #137 from bithin/gsoc2012

map style add to screen.css file
Fix proposal map error with OpenStreetMap
Fixed OSM and added toggle effect
Added slicing and "more" links to the space index
Added polls and voting lists in space index
Changes to space index, now voting tab styled as should.
Merge pull request #138 from TamaraAtanasoska/gsoc2012

Changes to space index, now voting tab styled as should.
Fixed the poll detail template style
Added installer for development environment
Merge branch 'gsoc2012' of github.com:cidadania/e-cidadania into gsoc2012
Modified lod knockouts to use 1000 updates as the max.
[site-to-site] allow for site-to-site tunnels
[site-to-site] space delimited subnets
[site-to-site] exclude localhost from subnets
[site-to-site] subnets need slash netmask
[site-to-site] strongswan doesn't have a "leftsubnets"
Write strongswan.conf, modify site to site config opts
Merge pull request #1 from sniperd/site-to-site

Write strongswan.conf, modify site to site config opts
[site-to-site] charon modules attribute is an array
[site-to-site] quote ocd
Merge pull request #1 from portertech/site-to-site

Allow for "site-to-site" (A WIP)
company pages, main-menu,  publications, banner images, layout details
Added API calls for learning and also started getting the Registration process reimplemented ... but better
Cleaned up code to be more logically seperated. Dependency injection being used in all awesomeness
Added activity CatVias (Categoria Vias)
Update to ibVerVias
Add Categoria de Vias menu to project
added completeLAB cred & removed COke keys
Disable resolv-replace for ruby 1.9.3

@see issue with spork https://github.com/sporkrb/spork/issues/133
csrf error when delete migration
wait=>sleep
vo作成 XMLparser選定中
Initial commit
Merge branch 'master' of https://github.com/hotchemi/WeatherHacks
XMLパース完成､requestDateのエラーハンドリングした
Exception修正
jar追加
add jar
modified gitignore
aaaaaa
merge
remove spinning wheel, keep it simple
remove extra return value in mock
- Fixed the broken image link on GitHub page.
更新common.jar
modified:   Software_design/class_diagrams.tex
Merge branch 'master' of github.com:hypesystem/SliceOfPie
Added JPEG and floyd/steinberg dithering
Made rocketpack.config.php optional
Made rocketpack.config.php optional
Corrected version string check
Minor changes in footer. Added copyright.
sorted the __DIR__ issue with autoloadinf in 5.2
adding card form
log-file option is obsolete. Set default out to stdout
Added try-catch for getting stream from Slide via WebDAV
Add the logic for selecting the battle music.
Add the Gym Leader checks for battle music.
Add the region checks for battle music.
Add labels for ram values discovered while disassembling battle music.
call load_asm in scan_for_predefined_labels
generate labels.json automagically in gbz80disasm
Merge pull request #27 from iimarckus/battlemusic

Battlemusic
Confirmed: this RAM location represents link battle.
Merge pull request #28 from iimarckus/battlemusic

Confirmed: this RAM location represents link battle.
Visual datapoint editor, improved/safer feed conversion script, some cleaning up
readme update and a few other default states that are not runnable unless enabled
Update dev
Merge branch 'dev' of git://github.com/openenergymonitor/emoncms3.git

Conflicts:
	Controllers/api_controller.php
	Controllers/feed_controller.php
	Views/en/feed/feed_view.php
	Views/en/feed/list_view.php
	conv.php
Localization of some strings and spanish complete translation
Fix view manager code.
Bump lein plugin version.
Might as well use the real version here as well.
Added Crystal Castles Vanished
added --noheader and --quiet option
no css changes
Merge remote-tracking branch 'origin'
Get start, doc, home fix
For heroku
Committed with gemfile.lock
my identityprov in doc
ISPN-2102 Disable randomly failing test
git ftw!
option renamed to omitNull. Ignores both null and undefined. Tested and working for postgres and sqlite
* WIP: Add NAudio sound library
* Before adding waveform provider
* Improve audio playback

* Add cursor and click-to-seek to spectrum
* Remove redundant audio screen - live waveform display is too hard to be worth the limited usefulness
* Improve audio playback
* Add cursor and click-to-seek to spectrum
* Remove redundant audio screen - live waveform display is too hard to be worth the limited usefulness
* More documentation
* More documentation
Added sub-template for language
Added language information in the template.
Merge github.com:metashare/META-SHARE into media_view
Added language information in the template.
Added language information in the template.
Changed the frequency of search engine crawling.
Correctly rendering media_info.
Correctly rendering media_info.
Merge github.com:metashare/META-SHARE into media_view
Passed correct information in media info tabs.
Passed correct information in media info tabs.
Merge github.com:metashare/META-SHARE into media_view
in general, let only superusers see the delete action

This makes sense as currently deleting would mostly not work anyway due to related objects which can’t be deleted.
remove unused imports
fix PyLint warning for overridden method signature
update Solr schema with recent search filter changes
Included toolService.
Added language info.
Added language info.
Added size info.
Psalms and Ezekiel fix
cob_scan_filter: cahnges needed to run new scan filter in simulation
setup cob3-4
remove dep to cob_lbr
camera handyed/stereo calibration adjusted to zero offset in head_v3 change
torso calibrated straight with all zero joint angles
torso and arm origins are calibratable in calibration.urdf.xacro
tosro urdf change: moved head axis up (as in cad)
new files for icob for new repository structure
default robot calibration added
moved sdh up by 1.2cm to correct mount position
Merge pull request #4 from ipa-fmw-sh/master

torso length changed, arm and torso position added to calibration, sdh moved
added dual arm support for simulation
Merge remote-tracking branch 'origin/master'
Merge remote branch 'origin-ipa320/master' into automerge
Merge branch 'review-ipa320'
new launch file for rviz and config file
moved camera calibration yaml files from config to calibration folder
gitignore added
Merge pull request #5 from ipa-fmw-sh/master

moved camera calibration yaml files for cob3-3
calibrated and verified
machine selector implemented on report tab for iPad
minor changes
Add support for XML comments in elementflow.
unicode strings on tests.
Also, bump up the version.
Address the comments of Ivan for the pull request.
- Remove escape_comment function and put the replace in the comment function
- Rename _value_formatter() to _format_value()
Merge pull request #3 from klobucar/master

support for XML comments in elementflow
getting closer to wonder source
in built validations completed
Host and VS validations complete
add support to {% raw %}..{% endraw %} blocks
Revert issue #16, it is not a good idea.
Some analytics and I18n to options page.
Nozzman done
升级hybrid到最新，集成一些效果

升级hybrid框架到最新，集成slider和jcarouse效果
ADDED DJANGO TAGS TO HTML! WHOO! working on customzing recent_projects.html (/projects/recent'
removed empty swiftmailer folder
added swiftmailer as a submodule
JavaDoc for AI interfaces
JavaDoc for GameState and Game interface
JavaDoc TODO geklaert
JavaDoc TODO geklaert
Format fixed
Extracted MovePreparationPanel to own class
Adapter for PlayerListener
Javadoc corrected
GUI/MovePreparerBar
Prototype for Ticket Selection
Copyright notice added
Weitergearbeitet an GUI
Kodierungsfehler: In tools/ war noch nicht UTF-8
New package for my Layouts
BoardPanel corrected
Size and Location
Another design change
GUI elements added
Fehler gefunden: Vor notifyObserver muss setChanged stehn
Aufraemen
deleted:    bundle/csapprox
deleted:    bundle/solarized
deleted:    bundle/supertab
deleted:    bundle/ultisnips
Implementando Mensajes y Otros
fixed error in return twitter post
fixed error in return twitter post
responsive master detail list -documentation for inline-block-grid
Add perl-5.16.2 results for OpenBSD/sparc64.

NO-PATCHES logfile will follow
save_results working for trafficStats, gots to figure out how to run multiple queries
Replace PixelsType by PixelType
Remove ref to Category and CategoryGroup
Replace PixelsType by PixelType
Replace LogicalChannel to Channel.
Remove reference to LogicalChannel.
Remove reference to pixelsType.
Replace Illumination by IlluminationType.
Replace ROI by Roi
Add color to generate omero color.
Add Format enums and missing links

Add link between settings and object e.g.
DetectorSettings and Detector.
Remove initial comment, links now added.
Remove comments now that the links are back.
Remove comments now that the links have been added.
Add base case for arg_min_list.
Structure and entity attributes now stored solely in json.
New deleted tags stores for undo/redo.
Removed _struct attribute.
Fixed validation.
Header tag and children hidden in editor.
Transitions between levels. Remembers last selected node.
populate email addrs for subsequent steps
[maven-release-plugin] prepare release proxy-printer-0.0.9
replaced proximanova and fanwood references in example 2 with droid from google font directory
Now configurable!
npm start now works.
Persist long values too...
Removed dumb styles
Merge conflict
Added spork
More merge conflict
Working like incrementor/decrementor
Working server-side like-system
Fixed merge conflicts
Removed a useless function
Some comments
Tweaking code
Fixed security hole: admin could be mass-assigned
Merge pull request #3 from jhm15217/like-system

Like system
add eventemitter dependency for amd version
Changed .loader.json to .earlybird.conf in keeping with EarlyBird changes
comment much js
New modman configuration file.
Merge pull request #121 from aligent/modman

Allow installation with modman
Check for OnOff/OffOn earlier. Limit number of output tables.
Merge branch 'release/0.3' into develop
removed commented-out code from the original
removed old original commented-out code
String.format is so slow. Replaced but simple + concatenation (also faster than stringBuilder I guess to due to compiler optimizations)
formating only
avoid autoboxing and once again boxing (NOTE, this DOES NOT improve performance)
removed old original commented-out code
profile time for bc2gm small test
Major improvement in loop to get prefix/suffix: avoid 2 stupid ifs and replace format by simple string concatenation. --> Makes jeniatagger to run 100% faster
formatting only
removed all references to rvfeatures as they are useless (they are never added anything!)
semi-complex concatenation with stringBuilder instead of string (note, it DOES NOT affect performance. I guess the comipler optimizes this)
changed formats to simple + string concatenation (note, it DOES NOT affect performance)
minor formatting
avoid unnecessary recalculations of label and feature. Keep them, the are given!
formatting only
removed unused usless code
ME_Feature. Do not keep the feature, it's not needed
solved TODO. it works
removed check for _ref_modelp. This field is always null (and could be safely deleted)
Single slice of brain displays, rearrangement of code.
Update so that s3 backend will automatically enable if environmental variables are set
Added Story Class
Standardized name to use hyphen, not underscore
Set class-level compliance
Instance method to check parsing compliance
Console interface to the library
Accept 4- and 5-digit datetimes in loose mode
renamed file
created project notes
adding toolbar css, changing username, changing registration toolbar
changing foreign key name
Issue #RAXAJSS-110 - Create Lists of Patients using REST calls
Updated README and deleted pesky Vim swap files
changed Sms to Say
Fix conflict with static open() methods and instance open() methods.
Accepting file from command line.
Added a change during daily work.
Made a change in the branch.
Made a change in the master branch.
Fixed merge conflict.
Removed finished TODO.
Update README file to be more relevant.
OS-1378 add "%H" to mdb_printf() for human-readable sizes
missing images of template
Bueno ahora en teoria se puede dibujar solamente una branch
Groove feature (code is 99% identical to Revolution feature)
Updated comments and added tester classes
Disable LaTeX auto-hyphenation and fix resulting issues. Enable super- & subscripting
add link to front page
fixed urls joverson->jsoverson
Change ship position as waves come and go
Fix typo in FileUtils
Switch fuzzyfinder to command-t and upgrade vimux-ruby-test to be compatibile.
Move activate script into Rakefile. Update README.
Upgrade NERD Tree.
use a different colorscheme for diffs
Autoremove trailing spaces when saving the buffer
Clean trailing whitespaces for html too
Add an alias to copy to the end of the line.
Merge branch 'nerdtree' of https://github.com/pgr0ss/vim_dotfiles into pgr0ss
Merge branch 'braintreeps_enhancements' of https://github.com/pgr0ss/vim_dotfiles into pgr0ss
Don't remove whitespace automatically.
Ignore .pyc files in Command-T and others.
Update color scheme.
Set vimux defaults and unbind arrow keys
Change color scheme back to virbrantink
11762
Private parts were blured
Include twitter-bootstrap
Adding a quick alert message about the point system being cleared.
add a torrent download method for Synology Download Station
Merge branch 'SynologyDS' of https://github.com/bradallred/Sick-Beard into torrentProviders
use the host sanitization provided by webserve.saveSearch() to ensure the host always has trailing '/'
Merge branch 'torrentProviders' of https://github.com/bradallred/Sick-Beard into torrentProviders
Fixing login cookie that expires.
going to add action buttons
Fix minor bugs in XMPP presence and logging.
lfo sync setting dish-file save fix + env tracking range error detection fix
Test calling search from cs client
also check if IPYTHONDIR env variable is set
fixed rest of pages
Fixing a typo, and adding the AUTHORS file
Merge pull request #6 from kalpakrg/master

With updates to CompetencyGroup and the test case.
def: 6119,6072 | Implementing code review

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@91455 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
Gestionar Consultoras Completo
Merge branch 'master' of https://github.com/karencita2410/sispfgl
Add a bit more Javadoc.
Fix up a bit how ImageViewer handles image mouse motion events caused by things other than mouse motion.
muestra actualizaciones aleatorias en dashboard
extracting out a module
added negative votes
gdsii terminal environment
Merge branch 'project-master'
Merge branch 'master' into hock_phase3
Extra weightage column added for plan
Merge branch 'hock_phase3'
Merge branch 'master' into project-master
Added form parameters for mcollective calling any agent/action
Switch back to jquery 1.6.2 for a problem with context menu
improved issue pull
Merge branch 'ember' into dev
Merge branch 'dev'
Split the tests into separate files.
Shortcut for comments
Merge branch 'master' of https://github.com/khani3s/my_vim_config
started efficacy
Removed mention of summing in wave generation
Added support for different result file names to the web ui
Small change
Small change
Merge branch 'bench_erl_ui' into test2
Merge branch 'bench_erl_ui' into test2
Fixed bug in UI.
Merge branch 'bench_erl_ui' into test2
Fixed text on index page.
Merge branch 'bench_erl_ui' into test2
Changes to css.
Added support for sorted run list
Merge branch 'bench_erl_ui' into test2
Changed order for run list
Merge branch 'bench_erl_ui' into test2
Benchmark for new table type
For testing purposes
updated layout
Better coverage for the repository page test
Updating CodeMirror to 2.32, fixes #102
simplify file type detection, fix phpdoc
Merge pull request #87 from Partugal/patch-1

simplify file type detection, fix phpdoc
has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Merge pull request #7217 from freerobby/no_password_requirement_if_validations_skipped

has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."

This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370.

Conflicts:
	activerecord/CHANGELOG.md

It will be deprecated only in 4.0, and removed properly in 4.1.
Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.
Add `Relation#load`

This method explicitly loads the records and then returns `self`.

Rather than deciding between "do I want an array or a relation?",
most people are actually asking themselves "do I want to eager load
or lazy load?" Therefore, this method provides a way to explicitly
eager-load without having to switch from a `Relation` to an array.

Example:

    @posts = Post.where(published: true).load
Refactor a bit

This doesn't change the exernal behavior, but it moves some code around
to where I think it properly belongs.
Use explicit delegations

This makes it easier to see what the documentation refers to.

It also means that we are not doing unnecessary work for delegations
that have no args / splats / block / etc.
Add CollectionProxy#scope

This can be used to get a Relation from an association.

Previously we had a #scoped method, but we're deprecating that for
AR::Base, so it doesn't make sense to have it here.

This was requested by DHH, to facilitate code like this:

    Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do
      @topics      = @project.topics.scope
      @todolists   = @project.todolists.scope
      @attachments = @project.attachments.scope
      @documents   = @project.documents.scope
    end
s/scoped/scope/
Fix categories sorting
Merge branch 'master' of https://github.com/korolevdima/united-it
y4m format output support
1) Results panel only shows when results are displayed.
2) Beginnings of prefilling function.
Added ElectricalGrid.class
TableRowComparator + subclasses: introduce default constructor + setters

All subclasses implement a default constructor. The base class
implements setters (setChild, setSuccessor) so as to enable object
configuration after creation. This will be needed later by a planned
static factory method.
New static factory method TableRowComparator.fromStrategy(String)

The new method can construct a nested hierarchy of comparators by
parsing a String like "Foo(Bar, Zot(One, Two)), Baz, Bla". Therein a
comma designates a successor, an pair of brackets designate a child.
Structures can be nested like in the example above because the factory
method is used recursively.

The factory method expects all concrete comparators to be constructed to
live in the same package as TableRowConstructor, to have an empty
default constructor and to have a class name ending with "Comparator",
i.e. a short name like "Foo" becomes my.package.FooComparator.

Class Ranking was refactored to use the new factory method, so please
see there for usage examples.
Started debugging Maxcompiler code using javasim
update v1.6.21a build-1915

・t.co展開の方式を変更し、Timeline表示を高速化
consistent code style, refs #49
Merge pull request #50 from kvakes/stacey

consistent code style, refs #49
merged from stacey
Add dependancy list
Forgot that rows/collumns were counted from 0 not 1.
remove ga block, do some stuff in css
remove cssrefresh.js
Revert "Preference dialog changes and improvements"

This reverts commit 3262bede291fa641f80a14cad404169352a898eb.
Proper preferences dialog fixes, without the bugs

- Add size adjusting to dialog creation to stop the size-change
jittering
- Fix the orientation of the user name in the accounts tab
- Changed the language after adding a user fails
- Lowered the size of the general settings ui