labofsahil/github-event-dataset-2012 huggingface dataset:
CycleCancelling runs through... but gives absolutely wrong result
Also accept rounded floats
Automatically scan for list of all loaders
Display information about graph
Sort graph information
Properly merge parallel edges in both directions
Helper to get minimum edge weight
Fix typos
Menu option to print vertex information
Rethinking it a bit
Changes to a more common adjective preceding dick.
Merge pull request #78 from Fugiman/master

Fix a lot of stuff
Remove cooperator
Fix nick mangling on mode changes
A few filter fixes
+ Filters demo

Signed-off-by: Steven Hoffman <git@fustrate.com>
Delete Main Method of UI and merge with main program
adding structure size tests
Justfy fix
Justify fix
BAM-112: upgrading drools version to 6.0.0.Alpha6
Fix issue with variable resolving for filters
Remove fix errors
test pour explorer les attributs avec OGR
major errors //SUPER COMMENTS NA RIN

to be done: add IDs of Area, Building, Floor, and Room to the resources
entity (pag-iisipan pa to)

separate resource models, views, and controllers
added .gitignore and moved example configs to new dir
front page feature (#80)
update inventory image the other was very small
Updating inventory
polisena distributor
Wrote the report on the first part of the exercise.
Branch change and more mod
new file:   Research/research_move.txt
Added javadoc to the Channel class
Added tests for TimeStringToSeconds()
Clear string in TimeStringToSeconds
Have the panoptes tests run with a good debug logfile location.
We can now load the Panoptes library using the bare name.
Work out the code needed to start up a test server for testing views.
Refactored the testserver code to make it usable across tests.
Added a real test for the connect view end point.
The POST for the peering connect now sets the hostname in the acanthurus
database.
Requesting the localhost beanbag now gives the host database if the
hostname has been set by a peer.
Show the local name in the basic machine information.
Disable unused interrupts for now
UserPrfile admin and DatePicker
Split out the graphite persistence code into a separate backend
module.

This provides a basic framework for adding multiple, pluggable,
backends for persisting stats.
Flushing must be handled at the global level and invoked for each
backend. Also only clear counters and timers after flushing stats to
each backend.
Add more docs to graphite backend module.
Add an error parameter to the stats write callback.
Slight cleanup of the backend API by converting the flush interface to
a top-level module export.
Update readme with backend documentation.
Fix botched cut-and-paste.
Prefer named functions over anonymous functions for more readable
backtraces.
Switch the flush and status commands to an event listener model.
Fix the race condition to detect if the time out has fired. Simply set
a 'timed_out' flag true instead of testing the wall time duration.
fix typo in ruby example
Merge remote-tracking branch 'rawpatch/master' into justraw

Conflicts:
	README.md
	stats.js
Add the requirement for the sys module
Fix sys -> util
Merge remote-tracking branch 'librato-statsd/feature/backend_mods'

Conflicts:
	README.md
bump to v0.2.0
Fix minor issues I thought I'd already fixed.
Merge commit '9c5bada34cee79' into raw_and_averages

Conflicts:
	stats.js

Move raw type into the graphite backend.
Correct variables that were out of scope in backends/graphite.js
Fixed re-setting stats.
Added commands to view+delete raws and averages (untested)
Remove xdo_version.h when cleaning
Merge pull request #6 from KoFish/master

A bunch of fixes
Unified naming convention for all functions of the API

Changed naming of functions so that they all comply to the
`xdo_verb_object_[...]` as far as possible. Some funny things
might still happen due to the name changes.
Changed the behaviour of xdo_get_window_property

renamed xdo_get_window_property into xdo_get_window_property_by_atom
and created a new function called xdo_get_window_property that
takes a string instead of an atom for naming the attribute. This for
the function to look and act more like xdo_set_window_property
Unified naming convention for all functions of the API

Changed naming of functions so that they all comply to the
`xdo_verb_object_[...]` as far as possible. Some funny things
might still happen due to the name changes.
Merge miss
Fixed an error in xdo_get_window_property
Fixed merge conflict
Fixed merge conflicts
Bug 8904: fix Plack scoping for overduerules.pl

There are 2 Plack scoping errors in tools/overduerules.pl:
the local sub blank_row require that @rule_params and input are global

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>y
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bug 9167: Increment version number

Database update for bug 9167 has been given version 3.11.00.006
Merge branch 'bug_9167' into 3.12-master
Merge pull request #10 from Laller/master

Fixed typo.
Merge pull request #11 from Laller/master

Fixed pull tags.
Merge pull request #12 from Laller/master

Tags, mainly...
Merge pull request #13 from Laller/master

Delete tags implementation.
Admin design.
Added permissions class
Merge branch 'master' of github.com:Lamonte/fframe
Permissions class updated
Changed cron to onstartup trigger, added loading indicator
Add solution to problem 10302.
Signed-off-by: LiuJi-Jim <jimnox0491@gmail.com>
Merge branch 'master' of https://github.com/LiuJi-Jim/misc.git

Conflicts:
	src/Tunnel.js
Fixed bug in get_files
Ajout d'un ingredient  wrap
Added "Features" to readme and add new minified v.
fixed err and readme-edit stuff
Update vendors to Symfony 2.1.2
Moar formatting. (23)

Package: org.newdawn.slick.tests
Files: AlphaMapTest - GeomTest
Remaining: GeomUtilTest - UnicodeFontTest
started css for phone
Added quick UUID format check at startup
cool
Merge branch 'master' of github.com:Mashewnutz/Slo

Conflicts:
	Slo/src/phases/Fractal.cpp
	Slo/windows/Slo.vcproj
.once() now also has object with info about event
Remove the very thin wrapper function arch_register_get_name().
Remove the very thin wrapper function arch_register_get_index().
Remove the very thin wrapper function arch_register_get_class().
Let be_foreach_definition() declare the value variable.
Change Room.public to boolean
Remove redundant and broken validity check
Added a skeleton key sorter
Added an exception handler so that when a hoop crashes in a way we
couldn't know about we can still show an error to the user in the error
panel
found an issue with httplib and the version of python, so changed to requests instead
fixed scatter plot
fixed nvd3
first version untested
fixed nvd3 event selection
Merge branch 'virtualmodel' of https://github.com/Moviri/recline into virtualmodel

Conflicts:
	src/view.nvd3.graph.js
added css for moda
Merge branch 'virtualmodel' of https://github.com/Moviri/recline into virtualmodel

Conflicts:
	vendor/bootstrap/2.1.1/css/moda/bootstrap-responsive.css
	vendor/bootstrap/2.1.1/css/moda/bootstrap.css
Modified the name in the README to reflect repo name
improved css incorrect style regex
Added the "camtasia_relay" as a submodule
Final fixes for UKI not clearing the DOM links.  This final patch should clear all links that are made from the UKI JS tracking on destroy so that GC can cleanup both the DOM and the UKI object that is being destroyed.
Set git editor in global config
Travis file fix
Fix critical typo
Add more data to cache screen
Merge pull request #172 from joesondow/ASGARD-1022-Incorrect-zone-mismatch-message

Asgard 1022 incorrect zone mismatch message
moved loading of actionHelpers from Bootstrap.php to application.ini
reactivated and minor adjustments of the userControllerTest
add questionnaireController test, should fail on php 5.3
Merge branch 'master' of github.com:Nivocer/webenq

* 'master' of github.com:Nivocer/webenq:
  Testing setup improvements (but tests don't all succeed yet) - Don't load default data in bootstrap, slows down tests - Remove dependency of Form tests on database - Only look at 'dsn' to determine test database name

Conflicts:
	tests/application/controllers/UserControllerTest.php
disable indexControllerTest, it seems we are always logged in, so no redirection.
disabled testLogin test, it seems phpunit is always logged in.
use data fixture for tests a little longer, till we have a better solution.
merged three kernels together
Updating mpi communication monitoring code to support temp dats
improved debug that's all
Dialogs

Added dialogs for the entry view
Updated 0.25.2 ebuilds
Updated 0.26-pre ebuilds
feature #1303: bug in downloader.rb (reading stder for local files)
I kid, last time. cvs != csv
Zmiany, zmiany.
Prevent a double dealloc if a depfile_group contains the same depfile twice.
Error management + modify style views
Generating Eirin:Appearance (Entity)
Linking entities (Eirin)
Generating Eirin:Role (Entity)
Started the Nyhet module, added even more to gitignore (webconfig in media folder)
check in bundle for gh-pages
Fixes test suite
updated gitignore
Removes pinning of requests package to specific version for python 2.X
Using grequest for async_search
typo error
Merge branch 'dev'
Upgrading to 0.7.2
[maven-release-plugin] prepare release gaedo-0.2.22
Several bug fixes, TextImage now working
hero1
without Prod
postgresql-work
Added a Pages controller
Done with static pages
man-page added
man-page changed
CChat_Server: minor changes
sdjklgfhdfjkgh
Merge branch 'dev-3Lu' of https://github.com/SLCoding/SLive into dev-3Lu
CQUEUE: fixed Type system
finish the rudimentary implementation of chat_server
Merge branch 'dev-japortie' into dev-3Lu
logout command implemented, some bugfixes
Change the structure and use of thread-handling!!! now every new client get 2 threads and if the client close the connection both threads close!
implement the commands for communication, add a thread that forward messages, now clients can chat with each other on the same server
Slive_main: minor changes
add a copy-constructor to cdatabase_connection class
add the server2server communication, delete the messagequeue_processing function, it was useless, seriously ;-), add a logout function for cleanup the client-list, now the server has 6 threads in normal state without any connections, every client get 1 thread and the thread closed after disconnect, delete all references from cserver, in the next commit the class is finally removed from the project
Des modifs sur le desktop!
Merge branch 'master' of github.com:SNAP-NF28/SNAP
densvr's part
temporarily fixed an android 3.0 rendering issue.  tweaked style.
Merge branch 'master' of github.com:Sakartu/marvin
Adds handle_yesno and handle_choose
Fixes some bugs in the choose and yesno handles
fix informers.tpl
Функция Старт не вызывается, так как intent!==null.
Revert "Revert "1""

This reverts commit 76bebca88ac18aebc70f82ca132d100a0735e602.
Revert "1"

This reverts commit da77856c9437c852eaa04a2e53cf907f2fd18cd5.
added raven...

doesn't work yet
Fail Allies01/Allies02 if the extraction helicopter is destroyed
add common Makefile for Windows (32/64)
suppress warnings: include io.h and define lseek as shortcut to _lseek
suppress warnings: assign default value to some HANDLEs
suppress warnings: do not "use do{}while(0)" for Win64
remove redundant source: vimstack.c is included from proc_w32.c
suppress warnings: add explicit cast
suppress warnings: disable "unused argument (C4100)"
suppress warnings: add explicit casts
Merge pull request #37 from koron/improve_msvc_support

Improve msvc support
wishlist css
commit
reveal offset, started dev on entry parser
Lint facebook/self

Just whitespace on this one
Lint facebook/likes
Lint facebook/proxy
Refactor facebook/photos

- `async` wasn't used
- Put the FQL query into `lib` like the rest of them
Lint facebook/friends
dropbox has landed, not syncing anything yet, but proxy is working, solid
Cleanups to sharing.  Photos still not working.
Make File Implementation extend Base
Voila @ZNickq said! Bug fixed with ghosty players sitting around.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Vertex Buffer testing code
Accedentally the infinite loop
Unit tests for FilteredChunk
RST tweaks
subtitleelement aangemaakt + gepositioneerd
Merge remote-tracking branch 'origin/master'
updated swig default wrappers, and added experimental ExecuteCustomComand method to the unit object
Merge branch 'master' of git@github.com:Tarendai/Shard.git
Initialise
wipinit
client2
client1
public version
Merge branch 'master' of https://github.com/Tarim8/testgit
fixed update offset
Move a string to strings.xml
Audio fix was merged in CM
Fixed Continous Redeployment in obj_Drones
Added roid count debugging
Missed the while statement
Added some plugins & some options.
Ok, the only remaining problem is, I think, with the backpropagation part.
Setting the distributionManagement settings.
Still not quite perfect, but better.
Configured company pom to support maven release and cleaner scm properties.
Configured issue management a little better, and screwed around with the distributionManagement more.
Four divs
v. 0.3.7

* FB Metrics fixed
initial code checkin
fixing readme
merged
Merge branch 'master' of https://github.com/Urthen/DCH-Nav
BUGFIX: client can connect to hub with empty nick.
v-0.99

TODO:
only custom input type number
up to date alerts in the country search page
Disables regrowth layer. Adds regrowth icons and colors
Disables regrowth layer. Adds regrowth icons and colors
Fixes bug that prevented showing the filters on safari
Fixes white shadow
Fixes weird bug with sites and organizations logos
Merge branch 'master' into staging
NUnit 2.6.0
finished installer
removed ajax callout script
ajax calls should be done using jquery (like in CustomPage or Test)
Nav still needs to be ported
adjusted ajax call in nav + moved javascripts to scripts.js
improved internet explorer notice
added lightbox to the cms (works)
added basic gallery class + removed  from interface)
added gallery managmenet, not finished yet
added features to readme
removed a line from features
finalized gallery
Merge branch 'dev'
removed test component
New name and functions

This time BashBird will help you discovering people who don't follow
you on Twitter.
revert of edit for test
Add form editing.
show-link in meine Todos
Added servant.js :)
+join method
+leave method
Application/Libraries : Update Assets Manager
Import Bootstrap Twitter
Application/Views :Adapt bootstrap twitter
Fjernet flere kommentar + indsat makeError i default in/out
costume error msg
Add ntp, eucadw, and eucalyptus-console to install; disable dnsmasq
* cuda is now weakly linked on os x
 * only enable gl timers when in debug mode
make yle-dl more robust
Bump version
add config to gitconfig according to ihower's slides
Imageview refactor
removed status code from HttpResponse, modified handleHttpResponse() method from HttpResponseListener to receive the status code of the HTTP response to know if everything went right or there was an error and should be processed.
lab02: add README to drawing example program
mkvtoolnix: use Boost 1.49
Remove clearLog.
added models
Merge branch 'master' of github.com:adlnet/ADL_LRS

Conflicts:
	lrs/models.py
Merge branch 'master' of github.com:adlnet/ADL_LRS

Conflicts:
	lrs/models.py
Merge branch 'master' of github.com:adlnet/ADL_LRS into modelWork
updated fields to remove python reserved keywords
Merge pull request #5 from ljwolford/modelWork

Model work
fixes for 2386; jslint fixes for 2375
code review fixes for CommandManager-tests.js
Added a space between "function" and "(event)" (JSLint)
Merge pull request #1777 from DennisKehrig/dk/issue-510

Added a space between "function" and "(event)" (JSLint)
Fixing the test-jsapi test suite, make test-all should pass now
Merge pull request #465 from adomokos/fixing_make_test-all

Fixing the test-jsapi test suite, make test-all should pass now
mongodb.py: added import of Index to allow data model to initiate index creation
trying to build .l fild
hi
Merge branch 'master' of https://github.com/agale123/Catan
fixing more bugs
merged files
genfiles.sh: changed notification messages
genfiles.sh: minor changes
genfiles.sh: minor changes
More attempts at fixing the stale element reference error.
Changes to main.py
New commit
new commit
deleted translations
updated
updated
Update gems
Update jQuery
* update search count if field value is empty
Update GT
Pack core and ext plugins
Stash
* have a minimum height in the autocomplete
Merge master
Update APF
Stash
Stash
Stash
Merge branch 'master' into ui/packed2
* add folder support for reveal in tree func
Stash
Update packaging, move files around
Merge master
Fix up ACE mode/theme error
Fix Makefile errors, consolidate ide.tmpl, remove useless worker dir
Remove now useless dir
Fix comment
Remove erroneous commit
Add starting slash
optimized sipp read-in code
hook: Store unencapsulated function pointer

struct irc_hook { irc_hook_cb_t *cb; } is redundant
UVa 10309 11195
implemented range symbols
Merge remote-tracking branch 'origin/master'
fixed some bugs of range symbols
added cachable simple event store
removed unregister events from car aggregate
Fixes issue when dealing with users with not declared AppRole level
Restoring preferences.js
Merge remote branch 'origin/feature-contacts' into feature-contacts
Improving pull effect
Fix bug scrolling up
Removing misspelled char
[doc] minor,ci,status: included ci branch name beside build status picture.
[build] cmake,install,targets: lib and binary install targets added.
Merge branch 'dev-0.1.0' into release-0.1.0
ajouter notes pour 21 novembre
Added [copyright year="2012"]Poison Technologies[/copyright] tags.
added VERSION field
Fix: 404 launch before the domains.config parsing is done.
Fix: Label literal definition.
First steps in implementing the collapsed graph idea.

... which is to use the NNC graph for k=1 to find the equivalence
classes and collapse each to a single node in order to calculate
a weighted matrix on that graph, using information for higher k.

The way to do this is to add up the number of edges between
each two classes and divide by the product of the sizes of the
classes. This gives us the corresponding entry in the weights
matrix.

Intuitively, this should group subclusters of the same party
together. A problem arises because the top_k function was actually
implemented in an arbitrary way until now: instead of taking all
neighbors the agreement of which is among the top k agreements
for some node, they took only the first k of them from some
underlying ordering. Altering this behavior is now possible with
the nnc_arbit flag in nnc.py. However, including all maximal neighbors
in the k=1 case leads to a large cluster consisting of major parts
of two parties.

This sucks. It happens for min_sessions=100 but not for
min_sessions=200. A more careful investigation is needed.
Added support for Ruby1.9
Fixed tests
RAP/RCP single sourcing
my db cfg
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Merge branch 'master' of /srv/git/naughty
Simply White scheme h1s were fucked
Embedding is now more robust and less vulnerable, ToC module is refactored
merged with Simple White live change
embedding invocation was passing in a nil instead of an empty string
No longer doing round-house monkey markdown render hack on embedded content
some view refactoring
Revert "MDL-31914 Ensure that completion criteria are deleted when removing a course module"

This reverts commit 3bf0bb64fd7696cb0d0f9b88de1dda632e122f3e.
Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE
weekly release 2.2.2+
Automatically generated installer lang files
Add cookie support to casperjs filter.
Allow bundledocs to be created in config files located in subdirectories. Add sibling parsing to YAML (probably redundant).
Improve error when hashstring has not been initialized. Add 'except' feature to exclude matches from pattern docs.
Speed up caching, remove overzealous dependencies.
Fixed demo deployment failure.
Change demo/01 to work independently on the demo/01 directory.
Added a _remove method to views
Wiki support
wiki: Do not bother listing deleted editors.
wiki: typo.
wiki: Add requirement for alloweditor action to be del or add.
subreddit: Change logic for detecting a wiki friend page action.
wiki: Semantics.
wiki: Properly localize revision by statement.
templates: Use None as a default instead of {} for extra_config.
subreddit: whitespace.
builder: Semantics.
wiki: Replace wraps_api with wraps.
wiki: Allow admins to create restricted pages, and mods to edit them.
wiki: Make settings for restricted pages less confusing.
wiki: Ensure that page names which can not be accessed are not created.
wiki: 'max_separators' should be lowercase.

down
wiki: Move required and fatal into prototypes.
wiki: js cleanup.
wiki: Use a VWikiPageName.
wiki: Use VPrintable for reason edit reason.
wiki: Cleaner doc style.
wiki: Silently replace space with underscore in page name
Whops, do not extract all images, just invalid ones
Rebase down
Revert "Fix GECKO_OBJ_DIR for gonk-ics"

This reverts commit c7af523597d5f97bfd2e69d1c50c38d08d3da30c.
Line removed within travel
line change in travel
Some changes to Gameplay Screen
Fixed some issues
Background sounds working for Main Menu screen and Game Play screen.
Sounds are now on repeat
Working sound effects for picking up power-ups, gun shooting, question pop-up.
DONE[solved merge conflicts]

Merge https://github.com/jeala/DEPW

Conflicts:
	MathInfection/MathInfection/MathInfection/GamePlay/Character-Enemy.cs
	MathInfection/MathInfection/MathInfection/Screens/BackgroundScreen.cs
	MathInfection/MathInfection/MathInfectionContent/MathInfectionContent.contentproj
cleanup, remove JExpression
make DEF evaluable
cleanup
Merge branch 'master' of https://github.com/animotron/core.git
initial commit
manually merged .gitignore
Set all poll timeouts to 0 to get it functionally correct first.
Credit only first packet and reset tokens to 0 on empty queue. Upto 10Mbps, accuracy is 0.1 %
1000Hz timer to avoid busy wait. Works well for schedule-link and cbr-link (0.1% error). For traces, error is ~10 %.
Fixed issue with trace-link by accumulating more than one timestamp.
add nxparser
add bigdata-sesameloader implementation and test
fix for bug madlib-382
Lots of little things: We can now clear out the TransactionQueueManager whenever we get a @Queisce request. The TransactionQueueManager won't reject any sysproc now either.
Restored support for TestSystemProcedureSuite regression test
Merge branch 'master' of github.com:apavlo/h-store
Renamed the OLAP procedures used for the MR experiments to have the prefix 'OLAP'
Merge branch 'master' of github.com:apavlo/h-store
Merge from master to mapreduce branch and resolve the conflicts
Revert "Add supoort for Multi-aggregates,but do not support AVG and Join right now, Fix them later"

This reverts commit 5f26818cbf1e084c58e739b0323222b8e3237ce7.
Fix the broken MR transaction after merging from master branch
try to fix broken unit test
Titanium Studio TISTUD-2582
First Launch : After installing the 32-bit zip on Ubuntu 12.04, when
launching for the first time I received an error opening dashboard

If browser libraries are not avaialble to SWT browser, then we fail with
NPE. Now, we catch those exceptions and show the corresponding
documentation link for workaround/fixes.
Incoporated Chris' review feedback for APSTUD-4745.
Merge branch 'release' of github.com:/aptana/studio3 into release
Fix shalom bug with having two com.aptana.ui.ProjectSelectionDialog
classes
fjernet fjertaxi metode som  hadde feil, hanne fikser
leggTilOrder metode
fikset merge med remote
Now supports direct (adapter-less) injections.
CSPACE-5397: Additional experiments, still not working.
CSPACE-5119: Began revising Person schema with term info group; this work is in progress and as yet incomplete.
CSPACE-5119: Term Info Group block in Person now closer to actual; still haven't removed equivalent top-level fields.
CSPACE-5119: Nuxeo and JAXB schemas for Person items are now believed to be close to complete: term info group now contains all functionally-specified and provisional (under discussion) fields.
CSPACE-5116: Add authRef for Place - GeoReferencedBy field
NOJIRA: Removing lines inadvertently added to master, rather than to place-2.4Fixes branch
CSPACE-5119,CSPACE-5135: Modified Person service client tests to reflect addition of Term Information Group to Person item schema.
CSPACE-5119: Updating services tenant binding config to reflect change in indexed field due to term info group schema changes in Person.
CSPACE-5119,CSPACE-5135: Client tests of the Person service now run with what appear to be only server-side errors.
CSPACE-5116: Add authRef for geoReferencedBy field
CSPACE-5119,CSPACE-5135: Updated common fields in repeatable term information group in Person item schema, to reflect recent discussion/decisions on the Work list.
CSPACE-5119,CSPACE-5135: Updated common fields in repeatable term information group in Person item schema, to reflect recent discussion/decisions on the Work list. Adding additional changes not yet reflected in last commit.
Merge pull request #21 from rjaffe/place-2.4Fixes

Place 2.4 fixes
CSPACE-4813 - Removing comments around of functional test code.
CSPACE-5119,CSPACE-5139,CSPACE-5138: Initial foray into authority item base classes to reflect term info group changes. These classes do not yet compile.
CSPACE-5119,CSPACE-5139,CSPACE-5138: Additional work on authority item base classes (and other framework classes) to reflect term info group changes.  More classes compile; some still do not.
CSPACE-4813: Just getting things to compile while Aron and I work on this branch together.  Calls to PersonAuthorityClientUtils.createPersonInstance require a new term related param.  Passing NULL in most of the places for now.  We'll need to change this as we get all the tests working again.
Merge branch 'cspace-4813' of github.com:collectionspace/services into cspace-4813

Conflicts:
	services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
CSPACE-5130: Adding implementations of abstract method getItemTermInfoGroupXPathBase() to authority resource classes.
CSPACE-5130: Adding implementations of abstract method getItemTermInfoGroupXPathBase() to authority resource classes.
CSPACE-5130: Adding final implementations of abstract method getItemTermInfoGroupXPathBase() to authority resource classes.
let groupby handle a header line (starting with "#") as do other
bedtools subcommands.
Merge pull request #26 from brentp/groupby_header

let groupby handle a header line (starting with "#") as do other
Overwrite version in page object with last committer from log
Merge branch 'fix_author' into power_wiki
Updating Makefile and executable
[Future] added: error string for default Wait|Cancel objects
Fix README markup
Edited README.rdoc via GitHub
Change examples URL
Add Travis config
No jruby-head on Travis for now, it doesn't exist.
Enable 1.8.7 and 1.9.2 also
Isolate environment
Bundler should load jruby-openssl only under JRuby, allow to tests to run under CRuby
Deal with Gem::Specification#full_gem_path changes in RG 1.8.x
Detect and deal with deprecated Gem.source_index and #search
Merge branch 'master' of github.com:jruby/warbler
Silence hoe warning
Fix --version spec on JRuby by using ruby_install_name
Capture subprocess output with backticks and suppress DRbServer output
Fix stuck DRb connection issue on 1.8.7
Deal with private Kernel#gem method in recent RubyGems
Update to Rake 0.9.2.2
Move all jars to WEB-INF/lib, and leave an empty jar in the original place
1.3.3
Updates to handle README.rdoc as main readme file in docs
shorten readme, add new image
add current people's notes
PG: move merge_log, rewind_divergent_log, merge_old_entry

No other changes.

Signed-off-by: Samuel Just <sam.just@inktank.com>
PG: make merge_log area static friendly for douts

Signed-off-by: Samuel Just <sam.just@inktank.com>
PG: all callers of merge_old_entry have dirty logs anyway

Signed-off-by: Samuel Just <sam.just@inktank.com>
PG: merge_old_entry is now static

Signed-off-by: Samuel Just <sam.just@inktank.com>
DNM xattr interface
DNM adding xattr impl
unit test updated for xattr
FileStore support for omap xattrs
Added xattr bench
DNM trying pathless objectmap
correct 4S channel url
added Remote AT sample for xbeeZB
Add some more dot files
Change color on a conky heading

Also, comment that feature out again, so this is pretty pointless.
Add/change a few shortcuts
Add a few more configuration options to Vim

Add line numbers and coloring of such, better search highlighting and a
few other bits and pieces.
Change Vim color scheme
Replaced relative paths with absolute paths in the install_files recursion code to fix mkdir mishaps

The tests for links and directories in install_files recursion code were relative paths so
when more than one directory was specified for recursion in a .dfminstall file the tests
would be run for the wrong locations.

This fix uses absolute paths which ensures the locations are correct.

This fix also adds the absolute paths to debug output for the recursion code in both
install_files and uninstall_files for clarity when debugging.
update tests to work with latest git
testing parallel recursions
set fetch_updates to use the appropriate upstream

not hardcoded to origin anymore
removed all hardcoded origin refs
Add shortcut for Music On Console
Add color to git by default
Set a dark background as the default in Vim
Add less busy colors (Tango) to Gvim
Make heading color legible against new wallpaper
Add Vim settings directory
Update .netrwhist
first test for non-origin remote
Merge remote-tracking branch 'nsp/master' into non_origin_remote
more robust way of finding upstream (@{u})
Limiting upload to 1 file for now
use date instead of stat? done for now.
Adding LongCount method support to LINQ provider
Removing json.net dependency that is no longer required
Allow to use empty JsonProperty in queries
Do not translate the names of fetched properties - They are loaded from the document, not the index.
Merge branch 'linq-long-count' of https://github.com/abombss/ravendb into 1.2
We don't need to load even 1 doc to get the total results
Making sure we can get count on dynamic queries when using page size = 0
Workin on decrypt
added tournament view on admin;
Error message layout changes
ul correction
Añadido archivo de configuración para Crunchbang linux en live USB
Añadido archivo de configuración para Crunchbang linux en live USB
Heh
Added files
add Object#is_a: to FancySpec
guide, part 2
Finihs HW #2
Document signed repos
Document basic usage examples for pkg-create
Only count dependencies that matters!

Fixes issue #225
pkg-create.8: Update date
Remove invalid comment
changed some styles and installed rights module
Implementing processing for the grammar of function invocation.
Renamed files to be more clear about their purpose
everything should work except for minor bugs and for prepaid no credit navagation
Prepare to use puppet.home.tld as generic puppet server hosts name
Refactoring required for building with SDK 10.7+
Changing grabbing/skipping to symbols +/-
fix social link sprite `background-position` bug

可能是sass新版本的功能或bug：`-$social-link-width -$social-link-height` 没有得到预期的`-48px -49px`
而是的得到了`-97px`，所以我用括号把它括起来了
include fixed
variable renammed
added references file and removed pgfplots
wls module supports now more installations on 1 host
Fix copy-and-paste NPM breakage of build.

Closes #25.
Merge branch `build` into `travis-ci`.
[darwin] updated xrefresh.binaryage.com via binaryage/xrefresh@d79a179
https://github.com/binaryage/xrefresh/compare/5592d5a0f439...d79a179a7aa7
[darwin] updated restatic.binaryage.com via binaryage/restatic-web@97bf038
https://github.com/binaryage/restatic-web/compare/6edc650a5927...97bf0386d18f
section/Section -> Sec.
add armv7s back to VALID_ARCHS
point SVProgressHUD to c637c71989 to avoid deprecation warnings
Insure print out errors and consistent in style
Merge pull request #8 from hines/libdablooms_error_printing_8

print of errors is not consistent in libdablooms
last uploads
refactor to dot source scripts on startup
Added some vector operators
Add of differents files (StatsPMVController, ParserXML, ...)
We can now download an XML file from NantesOpenData and take this data.
Next step : create statistics database 
Add of differents files (StatsPMVController, ParserXML, ...)
We can now download an XML file from NantesOpenData and take this data.
Next step : create statistics database
Add of differents files (StatsPMVController, ParserXML, ...)
We can now download an XML file from NantesOpenData and take this data.
Next step : create statistics database
Merge branch 'master' of https://github.com/bmael/Webappli.git
first upload
Merge branch 'master' of https://github.com/bmars003/cs165
First upload
updates to llr_pros function.
Adds to problem 8, LLR application to prostate data.
Merge branches 'llrpros' and 'master' into llrpros
Work on problems 8 and 9. The only part not done: I am suspicious of why
the equivalent kernel is so different from the original weighting function.
Merge branches 'llrpros' and 'master'
adds grid form layout and other utils
Initial check-in of Slugy-0.0.1
Changing README over to README.md
Highlight menus correctly
No longer shoot at any enemy in range, just at one!
Bug fixs : faire attention quand on change les conventions de nommage
1537 May16 bucketsort OK. But multithreading gives Bus Error...
Add initial class files for interface classes

All are subclasses of standard AppKit classes
exlist and fread implemented
Forgot pointer
got confirmation email working locally
testing semantics/structures
Revert "Use debugger gem instead of ruby-debug19 if ruby19"

This reverts commit 49fb638aed8a45544d7031f2c08c601774fa6b1c.
Revert "Re-add hook for including spree/analytics helper into Core::ControllerHelpers".
Causing stack level too deep errors

This reverts commit a4d7cb1c5fba217af2c2bafe170d1015f0b4f4e5.
Revert "Revert "Use debugger gem instead of ruby-debug19 if ruby19""

This reverts commit 64ca40d62b6275682927a2e9eab8fb6269e91233.
cleared out extra debug printfs, found memory leak
Minor changes
Merge branch 'master' of github.com:bsorav/ppcvirt
work on parser lib
algorithmic function generators
applier is in another namespace now
gitignore file
Merge pull request #1 from bsteuber/hacksession

Moved logic to more general function compostion library and cleaned up/extended parser library
fixed algo test namespace
added times parser with upper and lowner bound and tests for that parser
use pre condition instead of if
distinguish between parse and generation time errors
added some more unit tests
lazily build parser instead of reducing it all together at once
fixed an issue in times which caused too many maybe parser applications
Merge pull request #2 from jkrueger/units

Reviewed by Benni
shortened some names and introduced parser protocol
fixed parser protocol and some typos
added tests for all basic parser functions
changes from comments by benjamin
- renamed ! -> not
- updated doc string of parser-m
Merge pull request #3 from jkrueger/test-and-protocols

Unit tests and parser protocol
fixed unit test for ! -> not
added contains? and fixed doc string in collections
to russian
fix header
iv_handle: Fix HANDLE leak on iv_handle unregistration.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Don't lose HANDLE active status when setting handler to NULL.

When the handler of an active iv_handle is set to NULL and then back
again to a non-NULL value, and the underlying HANDLE is of the auto
resetting variety, we would fail to invoke the newly installed handler
in the next poll cycle, and the active status of the underlying HANDLE
would effectively be lost.

Fix this by putting iv_handle objects that are active but currently
have no associated handler on a separate active list, and moving them
to the main active list when their handler is set to a non-NULL value.
(And skip calling WaitForSingleObjectEx() in iv_handle_poll_and_run()
if there are active HANDLEs when we enter the function.)

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Die if CreateEvent() fails.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Remove unused 'numhandles' variable.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Terminate poll threads via SetEvent() instead of via APCs.

iv_handle's rewait_handle becomes signal_handle, which will signal
not only that the iv_handle callback has been invoked and returned
and that the poll thread should resume polling the HANDLE, but also
that the poll thread should terminate (via the iv_handle ->polling
member).

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Keep poll thread running as long as handle is registered.

This simplifies the handler setting logic somewhat.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
iv_handle: Make iv_handle_unregister() return active status.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
重新调整权限模型

Signed-off-by: Zhang Jing <byrdkm17@gmail.com>
Make servers regenerate much more quickly
Added Conversion.py
make lp do more processing and get the block
Longpolls now trigger clients, information is available for mine_lp etc...
Added response for drop down question
Refactored deletion of questions so that the views pick up from the model's event rather that custom events
Add default value for User's role
Organization#default_locale defaults to I18n.default_locale (in migration).
Organization validates its default locale to be one of the Rails available locales.
Builds a basic login style
Language change
Language change and login style
experimenting with go-metrics
add sso services
SFV-1121

Fixed formatting
OSCAR-0 Changes to POM to deploy RC1
Added the barebones for the player class class
REad,e Update2
Strip top level 'data' json param. Needs to still be extracted out to config setting.
load venvironment-burrito in zshrc
added if logged in, shows username in UI
added a no show indication option, like the test completed indication
added an extra info text area box

- allows free form info between teacher and exam room
- e.g. actual exam start time and end time
fixed report email function to account for no shows and extra infos
Merge branch 'cheng-dev'
COMMIT:
I was FTPing to wrong folder. Trying again!
Merge transport configs. Updated reset() to unset transport configs. Fixes GH issue 1019
+viewport metatag for pages
modified:   .screenrc
	256-color
- Flackr and widgets
delete admin module
fixed postcontroller bug
Started social integration.
Oops
Facebook integrated.
Updated readme.
Added heroku.
merge master in, add factory girl
add trophy model, add test trophy
add horribly hacky trophies
finish with hacky trophies
trophy spec
directinput
removed beer image for heroku
updated admin site
put index.html up again and take down home page
add bdb count key
Update action for questions (non-ajax) works fine now. Working on making the ajax work.
enabled c++.tags
add copy _pentadactylrc.
Merge branch 'chusiang' into n900
Re-organised into Makefile
Remove 1.8.7 testing and force 1.9.2 to pass
Adding a mailcap file

This file handles html emails. The "application" and "image" types are
handled by the mimeopen program. So, that would be a great idea to have
the libfile-mimeinfo-perl package installed :)
Finished fixing loan and device apecs.
merge with unstable, fix conflict in buildtools
假装实现了shell的解释执行动作
添加Lex到项目，完成了简单的词法分析功能
new file:   eclipse.ini
fixed distance of time in words to be more accurate
Introduce multi-assignments

Forms can now also render assignements for has_and_belongs_to_many
and has_many relations. The StandardFormBuilder will render you
a simple multi-select collection_select which you can stylize further.
Note: From version 3.2 on Rails automatically fixes the empty params
      list problem for multi-select lists -> no need to handle that
      in the controller.
make respond_with extensible

dry_crud's new and show actions weren't easy extensible with
additional formats. By making respond_with extensible we make it
convinient to add additional format handlers to these actions.
open up dependencies upwards
open up dependencies upwards
add rubyracer development dependency
Properly build the nested resources

If we have more than resource we should properly follow it up to
the top level.
content_tag_nested, little refactorings
Merge remote branch 'duritong/master'
use has_many helpers in test app
define named instance variable for crud entry/entries
get rid of @entry/@entries instance variables, use helper methods instead
fix time zone handling for timestamps, returning for cancel link
Added hashCode to classes with equals overridden
Merge pull request #3 from kinow/add-hashCode

Added hashCode to classes with equals overridden. Thank you @kinow for the patch
Simpleauth config and removal of admin user from migration. This is handled by the installer.
cleaned up docstrings a bit
added op and voice commands
BH FDR correction now based upon clusters loaded.
Add sha1 to end of crypt file, encode with wabbit
delete naher)) zendtests
MongoTest create
stdlib.h and assert.h are system headers: Use <> instead of "" when including
Merge pull request #10 from devurandom/fix/system-header-includes

stdlib.h and assert.h are system headers: Use <> instead of "" when including
Variables

1. foo[ <expr> ] => Default to Array
2. foo{ <expr> } => Default to Object.
Oops, forgot infinality-settings.sh. Here it is
updated to gtk3
Get rid of weechat
lul what am i doing
Trying to fix untracked content problem
Re-adding acp as proper submodule
Remove _hgrc
Removing acp as submodule
Removing more submodules
Upgrade checkstyle plugin

 * new checkstyle also support JDK7
 * fixed few problems that new checkstyle plugin found
added coffee-mode, restructured plugin directory
attempt on getting own auth
Added console view to the JDEECo SDE Tool

Signed-off-by: Michal Kit <kit@d3s.mff.cuni.cz>
Begin 5.5.3
Add changelog in update notify note.
Add forgotten "s for %phpbin% in RUN-Contra.cmd
Change AI command's default access to 75 (Moderators).
Fix: Bots can't send notes to itself.
Fix notes. Bots can no longer send notes to itself.
Fix buggy botinfo command.
Fix update notify notes; Don't add to new messages count if there's already new messages.
Unset $this->botinfo[$ns] instead of setting to false.
Add better desc for 'enter code'.
Move oauth.json into storage folder.
Add comment for moving oauth.json if exists.
Update .gitignore file.
Re-add oauth.json into .gitignore to prevent oauth.json in main folder from accidently commit to git.
Merge branch 'master' into stable
Merge pull request #10 from DeathShadow/stable

Contra 5.5.3
renommage habiTv
Update Output/.gitignore
countries added
Merge branch 'master' of github.com:Wirgis/P3
Corrected undefined variable $response

In method \Chill\Client::getViewByGet, undefined variable $response.
Corrected it by renaming $rtn to $response.
Merge pull request #5 from sylvainfilteau/bug-undefined-variable-response

Corrected undefined variable $response
Multi-part download
Fix pretty results
update wizard with validation and comments
First lab (exercise 1-12) done. Challenge task not attempted yet.
Merge branch 'master' of github.com:daoli/ose-labs
Volvemos a dejar el struct readStruct como estaba y ponemos un chivato más
Refactor the pub tests.

The goal of this refactoring is to make it easier to flexibly set up the
filesystem before Pub runs and validate it afterwards. To do so, the pub tests
are made more modular by moving creation and validation out of the monolithic
testPub method. The declarative philosophy of testPub is maintained.

This CL also includes several changes to the unit test library. Most notably, it
causes stack traces to be displayed for errors that are thrown during tests.

This was first submitted as r7566. That was rolled back due to a test error that
is fixed in this CL.

Review URL: https://chromiumcodereview.appspot.com//10382137

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7573 260f80e4-7a28-3924-810f-c04153c831b5
dart2js_developer is not in the SDK.

Review URL: https://chromiumcodereview.appspot.com//10304008

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7232 260f80e4-7a28-3924-810f-c04153c831b5
cambio GUI
Login Management progress
updated README.txt to include AMD/require inclusion
Remap ,dx to :find
botao da foto do vinho alinhado
Make pandoc test case not fail when pandoc is not available
add 'strobj' option to allow 'new String()' and 'new Number()'
updated server
removed player_stats.json
easier to switch tabs
oops.  did not mean to commit the ppt
sendQuery( string ) added
added request assert matcher
Override do método contains, acelerando significativamente as
verificações.
Criação da classe que será a base de toda a codexCollections.
Melhoria da documentação.
Sobrescrita do equals e hashcode e criação da constante None.
Criação da classe helper para lidar com arquivos.
Classe com operações comuns de String.
mudança do gitIgnore.
[maven-release-plugin] prepare release codexCollections-0.0.14
ooops :)
Merge branch 'master' into blogivandemarinome-configuration
Removing the rich editor: it doesn't offer an easy way to disable it without "thinking" with my Markdown. This project is for "devs": never designed for "normal" users. I don't see why it should have such an editor.
Merge branch 'master' into blogivandemarinome-configuration
- Value parameters stubs
- ToString methods for stubs
- Some test fro stub tree construction
KT-2176 non-nullability is not inferred after !! or "as"
 #KT-2176 Fixed
refactored the standard library so most of the collection APIs in the standard library can be compiled to JS
added some documentation on how the JavaScript generation and testing of the standard library works
KT-2231Fixed: No executable code for a super-call
Remove ILightStubElementType implementations for now
Filter creating stub elements
Pass DataFlowInfo through when-conditions
KT-2146 Nullability casts in when.
 #KT-2146 Fixed
breakpoints for multi-file namespaces
extract DataFlowInfo from when-condition + more tests for kt2146
fix for test broken on windows
Merge pull request #84 from udalov/kt2176

KT-2176 non-nullability is not inferred after !! or "as"
"!is" now works correctly in when-clauses
Merge pull request #85 from udalov/kt2146

Kt2146
added location information for when the assertion fails
EA-36814. Do not repeat annotations resolve
for primary constructor parameters as properties
(annotations are already resolved for parameters themselves)
simplified the library code to avoid some JS compile errors
added better error reporting, showing the real location of the kotlin code that causes the problem
enabled the compiling of most of the collections based standard kotlin library to JavaScript
objectAsConstructorParameter
KT-2205 our ExpressionVisitor translate if as conditional if possible otherwise create temp variable
Added node.js server.
Merge branch 'master' of github.com:devmao/mytodos
updated JSON headers
Add examples from chapter section
Make clean and inline kernel building for CM9
Link to .config
Default to launching app's preferred device if bundleˆ specifies.
Fix how Victor discovers whether an SDK version is installed
Descriptive messages for missing app bundle files
Slightly better diagnostic message
Log when 'preferred' SDKs can't be found
Conform to tighter IntelliJ inspections.
Merge branch 'develop' of github.com:dhemery/victor into develop
Add option to normalize light vector in shadeLambertian
Move shape data creation functions from shape-from-smear
Added c.vim, cpp.vim and taglist plugin. Wombat added and modified. Also added support for more highlighting in c.vim
removed buggy integration tests
bugfix for view unapproved projects
Merge pull request #142 from dimagi/exchange-bugfixes

bugfix for view unapproved projects
fixed errors on building a remote app with unparsable xml
added dependency to forked jasmine-stealth-node
Same typo - OMG NOOB!!!11 Headshot!