labofsahil/github-event-dataset-2012 huggingface dataset:
Adding request tests and making Request more defensive
Improve internal error logging
Adding request tests and making Request more defensive
Adding tests and support for jscoverage
Updating route and request tests
Merge pull request #140 from walmartlabs/user/eran

Improve internal error logging
Improve internal error logging
Fixing monitor constructor to require new and related tests
Moving server initialization into setup function for docs test
Merge pull request #141 from wpreul/feature/tests

Adding many tests and making code more defensive
Fix cache rules compile bug for non-cached rule in a set
Merge pull request #142 from walmartlabs/user/eran

Fix cache rules compile bug for non-cached rule in a set
Adding more unit tests
Adding caching tests
Merge pull request #143 from wpreul/feature/tests

Adding more unit tests
Changed request tails to issue a function
Merge branch 'develop' of github.com:walmartlabs/hapi into user/eran
Update tails example and doc
Adding batch endpoint
Adding tests for batch endpoint
Updated git checking method
Formatting.
Removed unnecessary safe-guard.
Whitespacing and tightening of logic.
Updated macros.
Tightened factory's code.
Removed the magical includes in favor of using *private.*pp.
Re-did the private data inclusion scheme for Wintermute.

This re-writing scheme was done largely due to an issue that was noticed by
Adrian Borucki <gentoolx@gmail.com> with Boost 1.48, so we'd fix it now then
do it later.
Formatting and more verbose debug output.
Merge branch 'master' into wapi-data

* master:
  Formatting and more verbose debug output.
  Re-did the private data inclusion scheme for Wintermute.
  Removed the magical includes in favor of using *private.*pp.
  Tightened factory's code.
  Updated macros.
  Whitespacing and tightening of logic.
  Formatting.
Formatting and a bit of touching up within CMake.
Revamped a lot of the lexically specific code.
Touched up D-Bus.
Tapped up the ontology code.
Updated the plug-in's code.
A bit of formatting and tightening of logic.
Formatting, updating MOC and fixing includes.
Updated CMake.
readDeviceTime function fixed
added basic collision code
WIP collision
correcting movement bugs with CC + slow, for example Psychic scream + C…
…hains of ice
updated solr to 4.0.0-BETA
starting on encounters
* mindmap
* mindma
- images
+ lettre à Faber
Change service suite name
Added bootstrap section to service's creation manifest
Creates CreateInstanceHandler
Improving services' CreateInstanceHandler by checking if a user has access to the service and if the service exists
Created test skelet for vm creation in CreateInstanceHandler
Creates basic ec2 actions structure
Merge branch 'master' of github.com:timeredbull/tsuru
Testing ec2 api authentication setup
Merge branch 'master' of github.com:timeredbull/tsuru
go fmt
Changing test suite name in service api
api.service: moving app update to end of bind function, after the service's endpoint call, partially fixes #91
Merge branch 'master' of github.com:timeredbull/tsuru
Fixing changed padding on CheckBox default styling and adding padding into ToggleMenuItem
Oude material terug gezet in Core.
Now 60 FAR questions in the final database
updates to build tweets
iptables enhancements
1. generate rules for all listen ports
2. add recipe to generate rules
fix a bug: UnicodeDecodeError occured when xml attribute name and value are unicode string
added a option: 'nosortkeys'
Merge branch 'release/2012-06-14'
update omup pkgbuild
django-piston: fix wrong path
Change similarities for Transportation.
Merge branch 'master' of github.com:tohojo/cbr-system

Conflicts:
	attribute_names.py
1
1
Merge branch 'master' of https://github.com/tokarevv/BeerShop
first entities
add index.html
work version
fixed recall
Merge branch 'master' of github.com:tokko/cprog12lab3
added actors and hero
Ivar declarations are better now.

Reviewed by @tolmasky.
Add documentation to new NVP
Use cache RSS, index and entries
+hero
www: -updates & +news
+hightlight.js styles
README falando sobre a documentação
post_tags#index functional
post tag forms and settings
ignore the journal (exists while running tests)
post related to post tags
edit post tags
quick edit tags. create tags on the fly
filtering post datatable by tag
тест для макса
fixed pages to work in IE and Firefox
fix gitignore

fix gitignore to not ignore bin, kind of need that
Added additional error numbers for bitarray index creation
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.y
unittests
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
bug fixing for http://www.concrete5.org/developers/bugs/5-5-1/login-and-error-pages-dont-use-the-menu-logo-settings/
bug fixing for http://www.concrete5.org/developers/bugs/5-5-1/login-and-error-pages-dont-use-the-menu-logo-settings/
added .project into the .gitignore - this is the project file created by Aptana Studio
Fixed password reset workflow description

The description of the password reset workflow was incorrect; I fixed it so it's accurate.
fixing path to update concrete5
Merge branch 'master' of https://github.com/concrete5/concrete5
Revering radio() function in form helper because new isCheckedOrArray causes problems with backward compatibility
updating version
faster intelligent search; added 'check for updates' button
reverting concrete5.org url
Revert "removed bulk password reset stub & fixed some list re-loading for other bulk user operations"

This reverts commit f6568d22957b9b9002419dc56546fe335dc71baa.
Revert "improved messaging in bulk user tools + added bulk group add/remove"

This reverts commit feff53ee3ae393f017399e462fc28978ec9b286a.
Revert "bulk user functionality, user activate, deactivate and delete"

This reverts commit 1de1c7d707b69695855bb512a77367eb101d0dd0.
Merge branch 'master' of https://github.com/concrete5/concrete5

Conflicts:
	web/concrete/js/ccm.app.js
rebuilt the ccm.app.js file
Merge pull request #483 from janscarton/pwd-reset-txt-fix

Fixed password reset workflow description
updating version number.
Fixing request errors in certain PHP/Fastcgi configurations
fixing double slash and broken pretty URLs in content block.
adding a period to the image helper thumbnailing code
Added file submission to the API too. #20
apka i serv komunikuja sie wreszcie
add two new model for new table
modify ContentNode model to comply with code standard
add new dependent tables for Product model
Fixed deps
First checkin of indentation checking on modifiers working
Some clean up
Added tests for #modifier_keyword? and did some clean up
Added docs, added a test and refactored tests for #modifier_keyword?
Added trailing newline to the file
Renamed config file to ~/.tailorrc
Added coverage/
Fixed bug in #multiline_brackets?
Added spec for #current_line_indent
Added spec for #current_line_indent
Added spec for #current_line_indent
Added specs for #line_of_only_spaces?
Added specs for #line_of_only_spaces?
Added specs for #update_outdentation_expectations
Added some documentation
Added specs for #multiline_braces? and #multiline_brackets?
Removed extra trailing space
Fixed failing tests
Added use of fakefs for some tests
matchit removed
Rotated the default view
チャンネル表示時に jk で要素移動
ヘッダの高さをちゃんと考慮するように
Refreshing prior to merge from dev
new loli: Shinobu from Nisemonogatari.

Cries are taken in episode 4, first one around 9:40, the second one
around 17:40. The picture is extracted from a few seconds before the
second cry.
SQL scripts added...more laters
Added Xml files and the latest db script
Merge branch 'sqlscripts'
mais uns ajustes
fix para o mosaico no iOS
Styling fixes for videos
PlaapPageBundle created
HSV to file. trackbar&real time refresh
Derniére encapsulation
Merge branch 'master' of github.com:utcoupe/Coupe2012
Added .box-sizing +.user-select & Updated .rounded + .border-radius
Do not display man page on SubCommand error
Registered num.hankel
Everything trade-related works except decline and delete
Minor typo in CHANGELOG.
RFC 6228 (199 response) implemented in Proxy#drop_response(response). Fixes #22.
adds object id to symbol names
Update README.markdown

Added small description on main plugins
Switched to installing drush from pear
Python based GFF parsing program. version 0.1
Merge https://github.com/vipints/deseq-hts

* https://github.com/vipints/deseq-hts:
  initial commit
Started packing Galaxy based DESeq program. version 1.6.0
add linode rebuild to puppet
maybe this will work
add component.json

not working yet
Gravity -10 ;) / Added fun package which can be completely ignored
during further implementation, just as reference
Set up static dir
Implement _PS3 for dimm

This will allow us to update dimm state on OSPM-initiated eject operations e.g.
with "echo 1 > /sys/bus/acpi/devices/PNP0C80\:00/eject"
models

gitignore: .mat explicit
The solution pf #124( A )
The solution of #131( A )
The solution of #133( A )
The solution of #136( A )
The solution of #141( A )
The solution of #148( A )
The solution of #151( A )
The solution of #133( A ) in python and haskell
Add dummy local mongo service for offline presenting
+ sound: testing
+ merge old changes -> net
+ testing: "Replace VSYNC uevent thread with a custom IOCTL." - thx @mcm811 -> https://github.com/mcm811/android_kernel_samsung_smdk4210/commit/737c7db4c9465a06e083577cd2518ed3e29c6dfb
+ missing change from last commit - my mistake ;)
Kernel 5.77 +Restored CFQ +Name change! :) ICS out, PWR CORE in!
+ testing some old changes ...
+ testing: more restoring ...
Merge branch 'master-3.0.y', remote-tracking branch 'dorimanx2/master-samsung' into master-3.0.y

+ ...
#2439:Donetest commit
another readme rendering fix
deleted sf logo, fixed accented char
New config parameters to configure movie replay
Added unit test for GCC::UserData::SCCore
archivos del src modificados
Agregue mas constantes
le puse pMAx
constntes
update opnly the profile
Add NodeListTest.
delete missing files from remote and only upload stale files
Minor tweaks to Grids.
Modified the build script so theme-gcwu-fegc uses responsive*.css file from grids rather than having an embedded local copy. Corrected a few mistakes in the CSS Grid System examples.
Added gitignore, fixed StdPeriph #define
Added email messages for users and admins. Call of the sendmail method is missing
Merge pull request #1 from withaspoon/master

Support for transient attributes as getters.
Added support for retry handler in RemoteService.
Introduced new annotation for virtual attributes instead of @Transient.
#2 PreAuthorize 어노테이션 대신에 Spring Security 2.x대에서 사용하던 Secured 어노테이션 사용

spEL을 사용하기 위해 가급적 PreAuthorize 어노테이션으로 전향하는것이 좋을듯 하지만 일단은 이대로 진행.
Initial Upload of Dotfiles
Initial Upload of Dotfiles
Initial Upload of Dotfiles
Merge remote-tracking branch 'origin/master'
尝试使用backbone进行代码的开发.
Fixed buggy implementation of SOAR.schedule() and SOAR.unschedule().
Added SOAR.reschedule().
bug fix: parse error for describe images #7
Implementing uitableviewcell activity indicator.
add annette's
Improved status handling in Job
Added database schema
tabbar-ruler RULES
- autoloader improved (you can add/remove dirs)
- a lot of base.php functions have been grouped in classes
Merge branch 'master' of https://github.com/xaguilars/picophp
mount process, sockfs vs normal fs. namespace
Merge branch 'master' of https://github.com/xanpeng/kernel-fs
add osgrvo2 example;
add osgdb_otl for database reader/writer but not finished
add osgmicropather example
Merge branch 'master' of github.com:xarray/osgRecipes
kernelized speed up
auto download program for next three days
unnecessary files
Removed obsolete openmax demos. JOGL has demo/test code for GLMediaPlayer
Adapt to JOGL's ShaderUtil API changes commit 62e5686fb583ad991d5811baf242d40d21952e27
Merge pull request #3 from xranby/master

RAW JOGL2 OpenGL ES 2 demo
Remove GLProfile.initSingleton(..) calls and JNLP argument 'NotFirstUIActionOnProcess'; Adapt to CapabilitiesChooser API/generics change; Misc

- Remove GLProfile.initSingleton(..) calls and JNLP argument 'NotFirstUIActionOnProcess'

- Adapt to CapabilitiesChooser API/generics change

- Cleanup some generics use .. etc
setenv-jogl.sh: remove LD_LIBRARY_PATH settings .. no more required
Adapt to changes for Bug #598 - JOGL ALL JAR File Change incl. it's Native Jar URL Derivation

- Depends on GlueGen commit 9a71703904ebfec343fb2c7266343d37a2e4c3db
- Depends on JOGL commit a393e45613d87101dbb13763df263c2f9291d2d0
Added trivial test
Adapt to FBObject changes
Adapt to JOGL changes commit 00bef95008b02cc71e166da122884402e9381f44
es2/RawGL2ES2demo: Remove AWT dependency to allow running on a Raspberry Pi; Make syntax BeanShell compatible.

- Raspberry Pi: Removed dependency of com.jogamp.newt.awt.NewtCanvasAWT
                to allow running on -Djava.awt.headlessi=true systems,
                we can do this by using NEWT directly to open a window.

  You can run this demo on a Raspberry Pi
  using the JogAmp JOGL auto-build aggregate from 20 Aug 2012 and later:

  wget http://jogamp.org/deployment/archive/master/gluegen_577-joal_347-jogl_790-jocl_653/archive/jogamp-all-platforms.7z
  7z x jogamp-all-platforms.7z
  cd jogamp-all-platforms
  wget https://raw.github.com/xranby/jogl-demos/master/src/demos/es2/RawGL2ES2demo.java
  javac -cp jar/jogl-all.jar:jar/gluegen-rt.jar RawGL2ES2demo.java
  java -Dnativewindow.ws.name=jogamp.newt.driver.bcm.vc.iv -cp jar/jogl-all.jar:jar/gluegen-rt.jar:. RawGL2ES2demo

- Beanshell: removed final in function arguments
             and changed float array declaration
             to become BeanShell compatible.

  You can run this demo interpreted using Beanshell:

  wget http://www.beanshell.org/bsh-2.0b4.jar
  java -cp jar/jogl-all.jar:jar/gluegen-rt.jar:bsh-2.0b4.jar:. bsh.Interpreter RawGL2ES2demo.java

- Vertex and Fragment shaders: remove #version lines to make the shaders compile on more drivers.
inital
- fixes translation
- merged 1.7.0 release
- applied changes from internal diff, most changes had been worked in
epic user reg
role user
pre reg
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
add datepicker
form name
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
update js lib
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
add language in js config
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
add js valid
Audio Visualizer.

Wrote new audio visualizer. Created help functions to operate on a 3D
image buffer.
coupla cuties
- Forgot to delete some files from copy/paste of projects
Crash fix, when not connected to a network. Minor refactoring to sensible names
Fixed hang when non-supported key (only KEY_XXX in your input.h) is detected.
[maven-release-plugin] prepare release csvengine-1.3.5
regeneration fix (I almost forgot it)
[maven-release-plugin] prepare release hw0-yipeiw-0.0.7
[maven-release-plugin] prepare for next development iteration
addverb to Gen
frontend functionality
色々編集
Added basic support for TVs

TVs not fully functional. Everything else shaping up nicely but not
fully tested.
repaired broken classpath
fix parse_mixed and this in closure
Merge branch 'master' into gh-pages
bugfix payload test.
NERD_tree will not show automaticly in gui mode now.
use later npm version for node v0.8
rewriting sweep2wake. Added switch callto and implimenting switch structure
issue 18 and test cleanups
improve button position
More Readmes
fix was to were
Don't add separator if not prefixing columns

When not prefixing columns with the table name
don't add the platform's identifier separator.

Fixes #2599
Merge branch 'hotfix/2716'

Close #2716
Merge branch 'hotfix/issue-2599' of git://github.com/robertbasic/zf2 into robertbasic-hotfix/issue-2599
Zend\Db\Sql\SelectTest
* Moved test for columns without prefixing into the data provider
Merge branch 'robertbasic-hotfix/issue-2599' into develop
Remove need of setter
Simplfy code
Toto
Updated tests
Merge branch 'hydrator/remove-setter-need' of https://github.com/bakura10/zf2 into hotfix/2426
Merge branch 'hotfix/2426'

Close #2426
initial commit of code for prefix
rk27xx: use generic fallback of lcd_blit_yuv()

Change-Id: I4d6834c8caa9037938d6291041f14cf9d2888e2b
sbtools: add support for the stmp36xx format

The STMP36xx series also uses .sb files but with a different
format. The main differences are the encryption and the lack of
sections, making it basically a list of commands: fill, load,
call, jump, switch mode, set sdram settings. Currently only the
sbtoelf has support for the sb1 and can only dump the list of
commands. Actual support for elf creation will come later.

Change-Id: I1f2e0230c91ac64efd0e8430e0c5212098c599fd
sbtools: add forgotten file

Change-Id: I701a301efa369c9e1247e10d226ba69e6064d1b2
sbtoelf: implement sb1 loading and dumping

Implement actual loading of a sb1 file to a structure in full
generality. Also implement dumping for debug purpose

Change-Id: I320035ea628719480a79aaccb05dce9a83256927
sbtoelf: implement sb extraction for sb1

Load, fill and call/jump instructions are extracted as elf files
like for sb2. Because of the size limitations of the sb1
instructions, the resulting elf files can easily have hundreds of
sections. The (currently) implemented elf simplification method
will hopefully reduce this to a few sections only

Change-Id: I8fd6ed935ac3128f244bbd71c782e2a0a1c6d44a
sbtoelf: implement elf simplification

Change-Id: Icfac5a2aa6a7b3582054321df003c6bb217b59d0
sbtoelf: also simplify elf files for sb2

This is less useful is most cases because sb2 doesn't have the
size restritions but some elf are produced with one section per
file and still yield dozens or hundreds of sections. And this free
anyway so we can do it.

Change-Id: Ia5ca83a8375063ecc7052d1ea73b2b21c00be730
sbtoelf: add switch to prevent elf simplification

While elf simplification is a powerful tool it can be useful to
prevent it from happening for debug purposes. Also add a missing
switch description in usage() and missing static.

Change-Id: I80a1904dc4340c412bd3de1c124a2e38d6ac11a2
Merge branch 'master' into equipment
slot system
added getEquipmentSlots function to MWWorld::Class hierarchy
more inventory sanity checks
added getEquipmentSkill function to Class hierarchy
implemented new equipment functions in MWClass
don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.
Merge remote-tracking branch 'scrawl/master'
fixed an orientation problem
don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.
Merge remote-tracking branch 'scrawl/master'
Fixed typo on openmw.cfg that caused launcher crash on OS X
Merge branch 'master' into next
Merge branch 'master' into next
Task #400 Review GMST access
everything uses find now
Mascots
added some file handlers.
Linux-0.01-1.x

- need gcc 1.4
- few change from official linux-0.01, only some bug fix, + minor change
  to build it in a linux system instead of minix
Linux-0.01-2.x :

- same version as linux-0.01-1.7, which was just ported to work with
  gcc-2.x and gcc-3.x
linux-0.01-3.x :

- need gcc-4.x
- use elf binary format instead of a.out, and you have some program
  working on it
add unregister options to disable preprocessor
Stores and registers users
Update tool/CordovaBuilder/CordovaBuilder/CordovaBuilder.cs
Update Activity to handle default activity indicator style
Refactored show action.
Add ability to display demo image
alteracao no calendario
Rabbit MQ addatper - almost finished
Uploaded Files

All files and installer uploaded
update id&emails
added attribute to kabupaten female percent
Merge branch 'master' of https://github.com/AIFDR/inasafe_data
Update notes for submitted changes

* CameraService: Adds support for burst compressed images
I master fast i en sub
avancement db
plop
Conflic resolved
More debugging.

Signed-off-by: Chris Sanders <zidane@outlook.com>
fixed bug with hugher statistics level calculation
moved measurementNames manager to core plugin. minor fixes for charts view.
fixed NPE when mouse moving
Fix operator< for Location
Fix it better.
Make clangtest double-visit. This seems to work.
Compile, with clang
ignore the things we don't care about in both visitors
constness of 'this' needs to be printed when calling properties.

Remove stray bool, and change property to property function in error message.

kind() should not be touched.

Add diagnostic test-case.
Added Projectile Icon
Merge branch 'master' of https://github.com/Arbuzov/ant-github.git

Conflicts:
	build.xml
	debug.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.gitignore
	build.xml

Signed-off-by: Arbuzov <arbuzov@mcn.ru>
Added website field to form
updates
0.4.4
clean up in package physics/object; package util is moved in root package
samba: update to samba-3.6.7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: update to linux-3.2.27

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc: remove not needed patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
iptables: update to iptables-1.4.15

Signed-off-by: Stephan Raue <stephan@openelec.tv>
e2fsprogs: update to e2fsprogs-1.42.5

Signed-off-by: Stephan Raue <stephan@openelec.tv>
systemd: update to systemd-188

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xf86-input-evdev: update to xf86-input-evdev-2.7.3

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
eglibc: update to eglibc-2.15-20165

Signed-off-by: Stephan Raue <stephan@openelec.tv>
connman: do not remove existing routes on startup
xf86-video-fglrx-legacy: use the control file from xf86-video-fglrx-12.4, thanks to 'nephdrasil'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
connman: update to connman-1.5

Signed-off-by: Stephan Raue <stephan@openelec.tv>
fuse: update to fuse-2.9.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
libcec: update to libcec-1.8.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
servicegroup
-a
Bugfix #0000120
with supressed output
gemerged
- made unzip() be less chatty, only report errors
Cracker-ng 2012.07-24 released
Cracker-ng 2012.07-24 released
Removed yucky nano stuff and added vim stuff.\n ZSH: Got rid of osx stuff, added some colour, increased history and fixed home and end
в эксклюде юзеров больше нет nil
7.6.3 Release
Control panel fixes.
SMTP fix
Daemon echos result.
Activation fix.
Secondary logon fixed.
Datetime Parslet Hotfix
absichtserklärung mit anschrift
Added image for query.
fixed wax
added a custom loader
some messages in publish script
fixed problem in gmaps IE
wax
changed examples
renamed vis example
isEqual function changed + fixed Nokia geocoder test
Merge branch 'release/2.0.0' of github.com:CartoDB/cartodb.js into release/2.0.0
fixed flickering in plain layers
support for JSON for ie7
explorer compliance on some tests
sinon ie library
Merge branch 'release/2.0.0' of github.com:CartoDB/cartodb.js into release/2.0.0
missing returns in stringify
be able to get the native map
load image using https when https
Merge branch 'release/2.0.0' of github.com:CartoDB/cartodb.js into release/2.0.0
Merge branch 'release/2.0.0' into develop
add an option to not autoappend when rendering
Print out serial.stdout
Limpiar NAMESPACE, agregar readme y añadir funciones de manipulacion de CSV
when deleting markers also check newly created ones
Upgrade to Leaflet 0.4
@@acts_as_rocket_tag should be stored on actual class instead of module
Fixed reload method:
* Needs options parameter to handle locking
* Don't call super to be compatible with ruby 1.9.2
Beginning of ImageManager with changes made by Michael Daniels.
D3Bit and D3BitTest, updated README.md and added TODO.md, passing NUnit tests
Merge pull request #1 from ttdonovan/d3bit-and-d3bit-test

D3Bit and D3BitTest
update_index in celery
again try to compile 32bit version
Merge branch 'master', remote-tracking branch 'origin' into fixdb
Merge branch 'master', remote-tracking branch 'origin' into fixdb
changed index description
Merge pull request #21 from DEADBEEF/fixdb

Fixdb
Ajout de la fenêtre permettant de créer sa propre grille au démarrage de l'application

Changement du curseur lors du positionnement/suppression des bateaux sur la grille.
Un appui sur la touche "Echap" lors du placement d'un bateau annule l'opération et repasse en mode suppression

Transmission de la grille à l'adversaire lors de la connexion

Ajout d'une constante représentant l'icone à afficher sur les différentes fenêtres

Affinage des dessins de grille et des pions.
Ajout de bordure aux pions

Centralisation des couleurs dans la classe Constant.java
New syntax interpretation installed for all aaxioms and theorems, now working on
putting the proofs back in order.
Fix explicit specialization error

- Clang throws an explicit specialization error if intersect<2>
  templates are declared after its instantiation in interesect.h
* copy boss plugin before run
refactoring
Fixed incorrect detecting screen layout
Minor changes in comments
Changed bruteforce to tsp-algo
Merge remote-tracking branch 'origin/master'
:D
:D
Merge remote-tracking branch 'origin/master'
Repair the parser
Changing gender in the edit panel works (closed #56)
fix bug with afterCloudRender callback and update examples
updated CSS to deal w/ spacing in IE
Fixed makefile and typo inputs to calc accels from integer DT to float DT
Hatte das App Icon vergessen ;)
string_types
Rename Makefile

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
to test
Merge branch 'master' of https://appharbor.com/vocabextendertest
minor
default template
0.0.2-beta
0.0.3-beta
corect import statement
Update README.markdown

Added copyright notice.
Pb with score leak
move back to regular to_json functionality
initial kickoff
Merge remote-tracking branch 'github/master'
SYNCNOW Command support.

The SYNCNOW command is used for conditional SYNC operation that succeeds only
if no other SYNC is in progress, thus providing a guarantee that the RDB
received is up-to-date at the time of the SYNCNOW command.
New Ajax Framewrok
Add missing include
Use puts instead of printf when formatting is not needed
puts adds a newline >.>
Bump buildID to match MOULa
Change PublicAges to a listing of AgeInfo nodes

A race condition was discovered on the Gehn Shard where duplicate ages could be inserted into the public ages table. Rather than fixing that, I opted to convert it to a giant vault search. This allows us to fix a few issues.

- The total popluation (number of owners) is now correctly reported. This means that player created Neighborhoods will now show up in the Nexus.
- The current population is now discovered via a search of PlayerInfo nodes. This will prevent weird integer_overflow populations from appearing in the nexus.
- New members of default Neighborhoods are forwarded to clients.
- Fix some PGresult* leaks in the old code.
- FEATURE: You can now configure the default hood user and instance names in settings.h
Implement score creation and fetching
Implement score point accumulation
Implement Score Transfers

This is the final leg of the score saga. Note that SetScore and DeleteScore should never be sent by the client, so I'm not bothering to implement them at this point in time.
Merge pull request #64 from Hoikas/pub-ages

Change PublicAges to a listing of AgeInfo nodes
Merge pull request #65 from Hoikas/scores

Game Scores
Update db/functions.sql

Fix an error in add_score_points
Update AuthServ/AuthDaemon.cpp

Use C++ cast, as pointed out in the review.
Merge pull request #66 from Hoikas/scores

Scores Part Deux
Tell us what Plasma Message crashes (if any)
Fix catch lines
Merge pull request #67 from Hoikas/debug

Better Message Debug-Prints
Merge remote-tracking branch 'origin/master' into gow_server

Conflicts:
	AuthServ/AuthVault.cpp
	settings.h
Bump buildID
added game model and ai bot
fixed potential race condition with receive message
Cleanup and sample setup for scripts
fix dependency
Edit users+definse
Adhearsion: drb server added
bug fixed of bar plo
remove wangMethod, infoContentMethod and combineScores,
   import them from GOSemSim. <2012-06,14, Thu>
Created a Users resouce
Added a Microposts resouce
finished the demo app
Fix der Mermory-Scheduling Strategien
add magazine.
Merge branch 'master' of https://github.com/HUSTDAVID/wuhan-dm
Added rockspec file.
Merge pull request #1 from max96at/master

Added rockspec file
More courier mission goodness
fix bug on video still playing while adding/removing from portfolio
Change requiring of the bootstrap css.
no constraint
[blockdiag] 1.1.6 keyworded x86.

This is rushed to fix reverse dependencies.

(Portage version: 2.1.11.9/git/Linux x86, signed Manifest commit with key C0174749)
Merge branch 'feat/x86_keywording'

* feat/x86_keywording:
  [blockdiag] 1.1.6 keyworded x86.
Pushed amd64 stabilisation back 45 days.

Waiting on upstream to stabilise pastescript.
Merge branch 'feat/amd64_keywording'

* feat/amd64_keywording:
  Pushed amd64 stabilisation back 45 days.

Conflicts:
	support/stabilisation.rem
[aaargh] 0.3 keyworded amd64.

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key C0174749)
Part I of changes for #58. Feedback welcome.
4.24 in school
add misultin webscoket
fix bugs caused by bad return state of gen_server client_proxy
os.error
EXT_blend_minmax proposal
fixed the case of the function
Merge pull request #109 from pyalot/master

EXT_blend_minmax proposal
Edit to the licencing infromation on createalice.py.

Kids copy/pasting licencing information is bad.

Removed git confict markers from zerxis_twitter.py and settings.py. 
Horrible fail during demo day.
Cleaned up the unused imports in zerxis_twitter
Thanks to eclipse and pyDev.

Resturcture of models.py.
The twitter app to get oauth information from the database.
Storing api-keys in code is dumb.
Get api keys from local_settings.
Time to release
Pick and Drag mode introduced. User can switch to Drag mode during quiz and rearrange kanji.
Dictionary and map updated
Added really crappy character animation. Dear god is it ugly.
Check for tun < 0 on Linux

While here, clarify a bit test3{3,6}.sh
Removed cordova/ folder
Updated .htaccess to not pull in files etc and removed, css, js and image mehtods

Made it more normal so that css, js and images don't get parsed by PHP.
Should make the class smaller and load things faster. Might need to
revisit if implementing less or sprockets or smushing..
Got INT-SHIP working
Added old files.
Integrated the SHIP networking with the INTManager. New (Dis)Connections can now be determined through looking at the two HashSets in the ShipNetwork. One set shows connections that have shaken hands and are ready to interact and the other shows connections that unexpectedly disconnected (these may reconnect). Connections that have disconnected for good do not appear in either set.
migrate to item
修正搜索引擎。
Mk/bsd.efl.mk: Remove deprecated ports
Different copyright shit
Tagit bort Position
Merge pull request #73 from Slugslime/master

Tagit bort Position
added a broadcast for an animation frame
New information in myBranch
Made where to find documentation in source files clearer
rename server.js to dronecontrol.js
Rename server.js
Ajout fichier xml.
Update plugin example.
Scripts/Sholazar: Fix quest Kick, What Kick? - Closes #370
DB/Misc: Fix DB startup errors - Closes #6666

Also add a missing break; to previous commit
Scripts/Dragonblight: Fix quest Strengthen the Ancients - Closes #2043
DB/SAI: Fixes for Quest 9738 "Lost in Action". One NPC left to script
Core/AI: Remove "enforced override"-check in the EventAI-manager in case of AI not being set to EventAI.
Docs: Re-add descriptions for the PREFIX, CONF_DIR and LIBSDIR cmake parameters to the Unix installation instructions
Core/SAI: If spell id in SMART_ACTION_REMOVEAURASFROMSPELL is 0, remove all auras instead

Signed-off-by: Nay <dnpd.dd@gmail.com>
DB/waypoints: Add a few missing paths
DB/creature_text: Add text for Drill Sergeant Steamcrank
Core/Movement: Properly handle cases when jumping from one transport directly to another
Core/Movement: Add missing SplineFlags / SplineTypes to enums
DB/Loot: 100% Rework of all loots in Hellfire Peninsula and Zangermarsh

Closes #2161
Commit: Add newlines to end of files
DB/Loot: Fix WOTLK items dropping off level 20 mobs

Closes #6692
DB/Commit: reference values are negative, im jumping a cliff, bye
Merge pull request #6696 from Vincent-Michael/spline

Core/Movement: Add missing SplineFlags / SplineTypes to enums
DB/waypoints: Fix up Dragons around Wymrest temple
DB/misc: Fix up some flying creatures and remove some creature_addons.
DB/waypoints: Pathing for Frigid Proto-Drakes
DB/creature_transport: remove dupe spawn
cleanup + checkstyle fixes
zoom en schuif knoppen voor de niet-javascript versie toegevoegd
#3
fix omlaag schuiven knop, teken ikoontje ipv paarse driehoek
fix failing unit test
fix failing unit test
todo in de viewer toevoegen mbt. parsen featureinfo response
#14
CDATA sectie om inline javascript aanbrengen
oplossen html validatie problemen
close #13
toevoegen van remove functie aan de cache
formatting als onderdeel van debug config
ondervang geen voorgrondkaart situatie

De start situatie wordt er een kaart zonder thema geladen, dat ging niet helemaal goed.
javadoc fixes
doc en style fixes
formatting
Updated src/main/webapp/index.jsp
geen js class aan html hangen als er niet om gevraagd is

Hierdoor is de kaart ook zichtbaar als er wel javascript in de browser
is, maar de gebruiker expliciet om de niet interactieve versie heeft
gevraagd
update test logging config
Merge remote-tracking branch 'origin/master' into zoekformulier
merge master

Conflicts:
	src/main/resources/LabelsBundle.properties
	src/main/webapp/css/style.css
	src/main/webapp/index.jsp
	src/main/webapp/js/script.js
toevegen van zoomTo aan de Viewer
adreszoeken voor javascript client

De AdresZoekServlet geeft een json array terug als daar om gevraagd wordt.
#5 Zoeken werkt nu voor hits die bestaan uit 1 adres.
A bit nicer with a url for 1.2.4 users.

Signed-off-by: Robert Xu <robxu9@gmail.com>
Fix spawn timers on Berserk and Regen buffs in warsong glutch to be like retail.
Custom : Set Warsong glutch to 125 minutes long instead of 25
Custom : Disable warsong "Focused Assault" on flag carriers.
Custom : Moba .talent, .arena and .bg commands
Custom : Beastmaster NPC
Custom : Disable default starting gear + Actions bars
fixed the terminalFunc
sync script change
use common config assembly
Merge branch 'p-18.feijoa' of github.com:MoveInc/red-kitara into p-18.feijoa
Redoing Config stuff (WIP).
help and some cleanup.
remove unused directories.
Added an about window under Settings
change recipe #1 values
forgot to commit some things for ands data set registration (including html skeleton)
forget the tablet colormap button
CSS Rewrite, Updated Markup

Restyling work in progress. Responsiveness comes next.
Fixed 'max-length' bug
correções da primeira release
3.1.3 версия
Removed my username and password from file
Lighten the table background hover
Fix diagrams not displaying on ajax requests
Add 3D transformation on business-card
Remove the html minifier
Fix opera issue in bootstrap
Update the HTML Logo
Change portfolio design
Change the warning message
Change the size the HTML Logo
commit num3 dia 7
Remove iPad splashs
Create the WinLocalization with MapView and an Annotation
Create the Config.json of application
Create method to get Config informations
Include Maps UI methods
Create all Windows in the ApplicationWindow of iPhone
Create initial template of WinTalks
Create initial template of WinTwitter
Clone 63 Added: Laura palmer
modify readme
solve issue#1 and issue#2
Balvinder, Shruthi | #86 | Creating requisition and requisition line items domain. Initializing rnr on select of facility and program.
Balvinder,Manan |#87| Displaying line items with mandatory fields on rnr
ah, silly, it's a Markdown file
Rename Tests folder as Examples folder
Finish static pages cont
provide context clearer for template engine and use it
Dancer::Moo::Types was renamed to Dancer::Core::Types
it's no longer moo-specific
fix wording
RegexpRef instead of Regexp
replace ObjectOf with InstanceOf and test better
change the expected handling of undef
correct error message
Merge branch 'fix-core-types'
Traitement des méthodes point chainées dans les fichier R-PHP
Request DELETE ok
init.d fix (bajee11)

Change-Id: I02b5699dea155a5462668af8f39741d12b9c263c
[Fixes bug #992771] Handle the OSX dock quit event.

Imported the Mac interop code from MonoDevelop, which should also allow
us to be able to handle files that are dropped on the dock.
Add in a plugin hook "handleClientMessage_<MSG_NAME>"

The new hook will accept only the message named in the hook call.
It will be used primarily for adding new message handlers, but it
can alse be used to handle existing message types.
Merge pull request #931 from MarkTraceur/hook/plugin/handleClientMessage

Add in a plugin hook "handleClientMessage_<MSG_NAME>"
fix #722 by better argument checking in PadMessageHandler.js
Merge pull request #723 from fourplusone/fix/fix-722

fix #722 by better argument checking in PadMessageHandler.js
Merge branch 'develop'
Update CHANGELOG.md
No longer need bin/installDeps.sh
Merge pull request #757 from redhog/aceEditEvent

Ace edit event as hook to modify changes as they happen
Fix pad.js' customStart.

Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
Bugfix to setPadHTML. resolves #764
Merge pull request #767 from jhollinger/master

Bugfix to setHTML
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
Merge pull request #773 from jhollinger/master

Bugfix to setHTML
Lock down npm version to avaoid bug in later version
Merge pull request #775 from jhollinger/master

Fix npm version
Merge pull request #763 from cboylan/fix_padjs_customStart

Fix pad.js' customStart.
The pad name sanitizer shouldn't drop query params. issue #779
Merge pull request #784 from jhollinger/master

Pad name sanitizer shouldn't drop query params
Merge branch 'master' of git://github.com/Pita/etherpad-lite

Conflicts:
	src/node/hooks/express/padurlsanitize.js
Merge pull request #837 from redhog/master

Changes from pita/master not in develop :(
Sync PBI scripts
Fix stray DOS carriage return.
Add IP alias support to GIF interfaces
Remove whitespace
Merge pull request #287 from bcyrill/alias_gif

Add IP alias support to GIF interfaces
Make the script rc.linkuip compatible with ipv6 as well.
Properly setup array
Various fixes to removal of pipes
Restore needed code
Merge pull request #9 from Pomax/gh-pages

re-enabled the share button
FaceBook -> Facebook
renamed lateSocials.js -> late-socials.js.
Changing the cursor help highlight color to white for now, as it's very hard for me to dogfood the editor due to #8.

Also removed the !important property, which was overriding the text selection highlight background color, making it impossible to see what your selection was regardless of the cursor help highlight color.
Added tipsy jquery plugin, and displaying a tooltip when restoring saved content that says "We've restored your changes to this page from earlier, but you can click this button to undo them."  It disappears after 6 seconds.  This is just a temporary stopgap to avoid confusing users until we figure out a better solution.
Now using lscache (see https://github.com/pamelafox/lscache) to store saved pages for 5 minutes. This should help limit the surprise factor ("why is my page from 3 days ago still in here?") and reduce privacy concerns ("whoa, look at this crazy thing the last user did!") while still helping users with the most frustrating use cases (accidentally closing tabs/browsers/etc). Using lscache also helps ensure that we don't bloat the user's localStorage.
Don't refresh the parachute's original data value immediately after restoring saved user data; it might be the case, for instance, that a user activates the parachute but doesn't touch their open tab for 10 minutes (perhaps because they are reading it), then accidentally closes it, in which case they'll probably want to see their old data when they open the page again.

In other words, we only really want to purge the parachute data if the user hasn't looked at it for more than 5 minutes.
Removed late-socials.js's reference to $("#share-container"); it's now passed in, so that the code is completely decoupled from index.html.

Used $.each() to iterate over the keys in socialMedia, avoiding the need for another non-inline function (and its associated comments).

Also removed accidental 'medium' global.

Changed the constructor signature for SocialMedia() so that a function called getURL() is passed in, which returns the URL to share (the original purpose of 'selector' was confusing me so I thought getURL() was more straightforward).
Use ES5 strict mode on all our own JS files, reducing the possibility of accidental globals, etc.
Updated slowparse version.
made social media load on mouseover
Add gitignore
Set heartbeat to 0
add examples in the code, use them in the readme
Twsited reactor now installed, Working on actual functionality
Merged chances to main.py
Replaced logging, (wx.GetApp().logger.msg) Fixed a sneeky import error
Merge branch 'master' of github.com:Python-Forum/pfIDE into unittest

Conflicts:
	pfIDE/editor/gui/main.py
Fixed crash if no user is authenticated and navigates to TextNode.
jython docs actual version zipped
prepare Mac target
Add Game class and spec
Check for winner
Set up tic-tac-toe game
Create players with the board
Add computer player
FileIO: Initial add
List: Fixed syntax
String: -New minor version 1.0.1
	-Added fact code loops to r_memcopy_asm method
	-Fixed crash bug in split method where chunk length ended up being 0 in some circumstances
	-Added int* parameter as a way of keeping track of number of splits

Dict: Added setKey() to allow for replacing, or adding key values without having to append
first build plus dlls
first build plus dlls
using github/spree_multi_site
using github/spree_alipay
add more cities.
1. add devise's zh-CN.yml
2. fix seed cities
Update index.html

Cambio de altas por bajas en la palabra ...
Merge pull request #1 from jclema/gh-pages

Cambio de altas por bajas
更新tab组件
实现IoC容器!
solitions of two problems
styled and modified form a bit
Merge branch 'master' of github.com:STRML/securesha.re
Now emits connection and disconnection events when in server mode
Add phonebook support
breadcrumbs
nav
traits
generalised breadcrumb view
generalised nav views
Specify the endianness of the data inputs. Thanks jnorwood for reporting
Updated README dependency list
Be always login as super user.

Thanks to this running tests outside of Zope has similar conditions: Manager
is used.
Trust testSlapOSMixin

afterSetUp logs as superuser, do not repeat it.
Introducing watchdog
Added test and entry-point for slapos-watchdog
Import bootstrap modal library for popup element
New feature: Bang an instance
YAH: Yet another hack.
Avoid needless check.

In Vifib configuration invoices are simple.
hopfully works now
auto retry!
next if not find movie
DEV Theme
Dev Theme .2
Use parser.parse_known_args() to ignore unknown/ROS arguments
SJMount.lua and SJMount_Init.lua changes
yes
New Features: News Edit + delete function, Headline “News Flash” and Link configurable, hide news ID on GUI

Signed-off-by: Taggic <taggic@t-online.de>
Untabify, dos2unix, remove whitespace
Default filter class
Implementing default filter class
Code refactoring
Renaming default step classes
Renaming default step classes
Code review
Renaming frameworks to profiles
Renaming frameworks to profiles
Renaming frameworks to profiles
Renaming profil to profile
Renaming profil to profile
Renaming __toString method to generate method for generator classes
Spliting generated wildcard into array('command', 'wildcard')
Reworked new member interface
Created Impl dir for implementation objects
added some kind of edit view for environment
Removing all post_key_exists since it duplicates existing CI functions and forces another file to be read for every page load.
Removed duplicate meta code during user code in the admin area. Also purges meta on user purge. Fixes #688
Revising sysinfo lang names to allow for saving within Translate. Fixes #664
Removing the Update module since it's not working currently and didnt do much anyway. Will revisit next release.
Fixing Migrations library. Fixes #695
Removing leftover debugging code.
Removing the updates permissions from the system to clean up now that the module no longer exists.
Bugfix in Migrations library so that the proper paths are found for updating to a specific version.
Fixed bad localization string in migrations module.
Create Permissions can now properly save new permissions.
Fixing the path to user created modules so they will actually run now.
default theme: fix topbar link (issue #698)
Remove a couple of short tags

PHP manual advises against them for redistributable code.

http://uk3.php.net/manual/en/language.basic-syntax.phpmode.php
Removed global-var.
Removed $OUT from function-description.
Merge pull request #702 from ColdIce1/smallfixs-v1

Removed global-var $OUT.
modificados el settings.py.default y el Readme
fixed save question and added implementation of KS graph
Improve logging configuration for serve command
Tweaks to HUD.

Signed-off-by: aPunch <theapunch@yahoo.com>
Merge pull request #348 from aPunch/master

Tweaks to HUD
Added slot index map translation and made everything more generic

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Update Vanilla to Minecraft 1.4.5 Pre-Release.
Server-wise nothing changed with Minecraft 1.4.5 besides bug fixes
(including protocol changes) so just bump the number up. GG Mojang.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Start implementing client handlers.
Signed-off-by: Karang <arthur.hennequin@free.fr>
Merge pull request #357 from Karang/master

Start implementing client handlers.
Did 3 entities obj.
Human was done but strangly, i did it again.
I did the zombie/pigzombie the same as human, but with horizontal arms.
Don't know if it's usefull or if you prefer to use human model for all
of them.
Creeper is done.
Merge pull request #384 from Tomlabete/master

entities obj : human - zombie - creeper
test commit
test file
Remove test file. Ready to go
Utilities and pending update

Updated a few pending tests for user confirmations.

Rearranged methods in utilities.
enable chrome canary
Merge branch 'hotfix/capital-XLS-fix'
Merge branch 'master' of github.com:Vizzuality/cartodb
Merge branch 'release/staging'
regexp to purge cache at table level
add lock for deploy
Merge branch 'purge_trigger' into release/staging
merge conflicts
update news
Merge branch 'develop' into release/staging
remove zombie for now
remove commented tests
ensure cache is cleared on table update, privacy change etc
Merge branch 'develop' into release/staging
add gemfile to repo
flush cache on create too
update displayed url to v2
Add note about addition of CDB_QueryTables
Merge branch 'develop' into release/staging
Merge branch 'release/staging' of github.com:Vizzuality/cartodb into release/staging
all imports will fail now if a proj cannot be determined. previously it had defaulted to 4326. fixes #799
Fix support for 3dm shapefile imports.
Make main.py and run_tests.py executable
Set base parameters of a vehicle
Move base paramters of a vehicles types to DEFAULTS dict

P.S.: Still don't like the way it look, though...
Move vec2d tests to libs subfolder
Add default slots in Vehicle
Append 'Vehicle' in each vehicle type's name
Call onAttached() and onDetached() after it actually happens

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Merge pull request #363 from W1ndwaker/detach

Call onAttached() and onDetached() after it actually happens
Fix unit tests again

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>