labofsahil/github-event-dataset-2012 huggingface dataset:
FIxed mistakenly checked-in conflict
Add a more detailed survey response name
abstract js console for browsers that don't support it
Made the text sound less like me
Merge branch 'sa-web' into bicycle-coalition
Fix long title text on mobile.

- Prevent the site-header text from wrapping
- Position the nav-bar menu button absolutely, relative to the right side of the page.
Merge branch 'sa-web' into bicycle-coalition
Merge branch 'bicycle-coalition' of github.com:openplans/shareabouts into bicycle-coalition
Add an install shell script that installs gcc, which gevent requires
add view to save file to the db, and tests
Update openaction/action/exceptions.py

typo fix
include original data API in index
wlc conversion: typo
data directory for sources and one possible way of dealing with original works for Open Siddur
remove outdated code
more code removal (required for running)
remove old tests for navigation API
update to eXist 16634, may fix 'too many open files' errors that occur on the server
test module: copy command for setup
basic original data directory for the database
override for data/sources
WLC transform: minor corrections
add Hebrew morph analyzer config to where we will keep original hebrew documents
indexing for English texts
include embedded ISO Schematron in make schema
schema: some additional constraints and fixes
upgrade to eXist r16647, fixing a bug where collection() would return resources, independent of access rights (and failing some tests in the new original data API)
first pass at incomplete original data API and tests; 2 functions added to user module
Basic original data API with tests, closes #53 and closes #54
Merge branch 'master' of github.com:opensiddur/opensiddur: updates to READMEs, etc.
presentation: list style on main slide
rails31 branch: remove smtp config from preference object. don't assume gmail
Fix issue #1582

Add some penalty for highway=stop, highway=give_way and ford=* (also its deprecated old value of highway=ford)

Also make it avoid barrier=debris (used on abandoned and blocked roads) and barrier=block.
Merge pull request #4 from naoliv/patch-1

Fix issue #1582
Fixed bug upon installation
bugfix generate hash
Merge branch 'develop'
add backbone-buster
Almost gemified.
Add loggedin username to security filter query
removed unused security measurements
renamed isWritableByGroup to isWritableByMolgenisRole
refactored code and configuration
Address routing spec now reflects nested resource of User.
minor fixes to group controller and add/ edit and remove
added post editor column functions
modified:   aspell-uk.spec
	new file:   aspell-uk-1.6.5-2.src.rpm
mnist matlab stuff
Added Moq and Specflow
prevent slow clients from postponing shutdown indefinitely
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-3727
merge from 1.0
have loadTokens expunge all tombstones
patch by jbellis; reviewed by slebresne for CASSANDRA-3579
Merge branch 'cassandra-1.0' into trunk
Make stress.java insert operation to use microseconds
patch by Yuki Morishita; reviewed by Pavel Yaskevich for CASSANDRA-3725
attempt to humor tests that try to stop and restart MS
reset callbacks map in MS.listen to allow RemoveTest to restart it
merge from 1.0
Have isIndexBuilt expunge all tombstones
Fix mistake in NEWS file
Block on flush before submitting compaction for hints.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3733
Merge branch 'cassandra-1.0' into trunk
Block on flush before submitting compaction for hints.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3733
update changes for 3733
update changes for 3733
update createHardLink calls
Allow DynamicCompositeType to compare components of different types

patch by slebresne; reviewed by edanuff for CASSANDRA-3625
Bootstrapping nodes never use the hibernation state.
Patch by brandonwilliams, reviewed by vijay for CASSANDRA-3737
Bootstrapping nodes never use the hibernation state.
Patch by brandonwilliams, reviewed by vijay for CASSANDRA-3737
update CHANGES
build script grouper:  make sure the kernel gets rebuilt with every build
fix 'anythin' bug.
* Post a notification when an action is about to be dropped because the 'levelsOfUndo' limit was reached. The userInfo dictionary associated to the notification contains the to-be-dropped action for the GCUndoManagerActionKey key.

Two notifications are, in fact, posted: GCUndoManagerWillDropUndoActionNotification when dropping undo actions, or GCUndoManagerWillDropRedoActionNotification when dropping redo actions. The latter is only posted when setting 'levelsOfUndo' to a number greater than the current count of the redo stack.
added missing package dependency to puppetdashboard module
switched dev env to use x-new-puppet-setup branch until merged
Merge branch 'dev' into production
first commit
Merge github.com:peggychi/Kinectograph
AsyncronousModule: add DataBlob lock/unlock mechanism and callbacks
Fixed build scripts for the case when NDK is referenced by a synlink
Fixed leftover "app-data" path in SDL settings
New power icons
Merge branch 'master' of https://github.com/pennomi/polymorphable
Moved unarmed stats from hardcode to config file; tweaked barracks.
Add basic billing functions
removed error in formula for objective function in grid search
Merge branch 'master' of https://github.com/percolator/percolator
fix for issue/#3
Travis.yml + Makefile
Decoupling MUSIC interface

Removed 268 lines of code from techstrategy_eval and created a new
module that writes the MUSIC simulation file. The writeresults2music.py
file works now for both results from techimplement and
techstrategy_eval.
Began parameter-definition for MUSIC, updated __init__ and getsystems to
reflect new attribute names and values.
added terminal enums
Replaced require with twitter-bootstrap-rails
No such files
It is enough to check for existence here
Store boolean rather than string
Move spacer creating outside of loop
Do not build indentation, it is anyway wrong in most places
Less local variables
No need to store this explicitely, we already have this information
Should be defined on top
One place to set default function
Use foreach loop instead of indexing array all the time
Docblock
[artf459264] Sharepoint functional test case failure issue fixed
fix bson link
embed media into the gallery
mailinglijst voor 50plus groep
civicrm upgraden
aegir opruimen
ldap voor OTRS herstellen
as found
makefile
dag van de download + kombuis standariseren
merge
downlaoddag redirect weer aanzetten
ipv6 voor webserver kombuis
cron voor drupal
percona levert zelf geen my.cnf
Revert fix for #10
ToDo is now called Todo
Shut off URL calculation/caching if DEBUG is true.
try/catch for tables
Updated package.json
Updated queue to use azure library
Migrated table to azure API
Remove unused requires
Beginning migration of blobs to azure
Continuing migration of blobs to azure
Finished porting to azure SDK
Removing no longer used util.js
Emitter and prefix support to listQueues
Add emitter and prefix support to containers
Minor queue test fix
Minor fix
Added prefix and emitters to table storage
Extract arg parsing and callback setup
Added test for deleting a blob
row insert tweak, continuation test
Move long tests into separate dir
Make non-value callbacks optional
Support for merged options, emitters with limits
Updating docs, configuration
Finished vote frature
Anon fixes, and more
fixed administrative gender to sex
プロジェクトパスが壊れていたのを修正。
Add mimemap
webBook element being replaced by all its children and not just range.toString()
Add Static Pages
finishing static pages
set modules to be https URL
removed old protocol file
targeted Privly posting to privlyalpha.org, added icons to context menu, and consolidated context menu
bumped version to 0.2.5
php-modeのインデント設定を変更
Merge branch 'master' of github-programan:programan/dot.emacs.d
Added ebin.
Added note about known bugs.
Improved menu effect.
Revert "[mr2310] WorldStateMgr implement part 15 - implement phase support (mostly for feature) - correct DBC loading - support for multiple view for one WS - final correct capture_point checking of condition - some cleanups."

This reverts commit 31c8169a2e8e2b1eb5e61d8c84b73bb216a6373b.

Conflicts:

	sql_mr/custom_mangos_tables.sql
	src/shared/revision_R2.h
intermediate commit in case I delete everything like an idiot
fixes #651, pulls in latest AF, modifies to_solr stuff in line with latest AF changes re RDF term prefixes, removes :login from User model
Break requests up into multiple writes to support longer pipelines (i.e. avoid very long string concat).
Cleaned up type-hinting for string-charset.
Cleaned up request fn args. Removed #() fns in tight loops.
string-charset -> charset.
Updated todos. Added Lua-script commands. Fixed typo with request fn.
Default to the working RAMB16_S9 models
Don't load latest date for ablauf in sitemap generation
Fixed citations in vignettes
Add haml - gem, configuration and layout
Handle empty and nil arguments.
Stricter integer parsing.
change sign :)
fix permissions statement
Change the link title to this great link
CODE STYLE changes
files modified:   workflow/engine/methods/cases/cases_Reassign.php
                  workflow/engine/methods/cases/cases_ReassignByUser.php
                  workflow/engine/methods/cases/cases_Reassign_save.php
                  workflow/engine/methods/cases/cases_Redirect.php
                  workflow/engine/methods/cases/cases_Resume.php
                  workflow/engine/methods/cases/cases_Save.php
                  workflow/engine/methods/cases/cases_SaveData.php
                  workflow/engine/methods/cases/cases_SaveDataSupervisor.php
                  workflow/engine/methods/cases/cases_SaveDocument.php
                  workflow/engine/methods/cases/cases_SchedulerGetPlugins.php
                  workflow/engine/methods/cases/cases_SchedulerGetProcesses.php
                  workflow/engine/methods/cases/cases_SchedulerGetTasks.php
                  workflow/engine/methods/cases/cases_SchedulerValidateUser.php
                  workflow/engine/methods/cases/cases_Scheduler_ChangeStatus.php
                  workflow/engine/methods/cases/cases_Scheduler_Edit.php
                  workflow/engine/methods/cases/cases_Scheduler_List.php
                  workflow/engine/methods/cases/cases_Scheduler_Log.php
                  workflow/engine/methods/cases/cases_Scheduler_Log_Detail.php
                  workflow/engine/methods/cases/cases_Scheduler_New.php
                  workflow/engine/methods/cases/cases_Scheduler_Save.php
                  workflow/engine/methods/cases/cases_Scheduler_Update.php
whole of elephantbird/proto directory can be removed.
cleanup comments
Merge branch 'master' of git://github.com/rapila/plugin-journal
Added telepointer OE
Synced both the UI's
Merge branch 'master' of github.com:ravikiranj/coursework
fixed alphaTab jquery plugin's error finding alphaTab script tag
MDL-31510: MDL-31510 patch/bug fixed
Merge pull request #56 from kbader/ubuntu-precise-glance-refactor

Ubuntu precise glance refactor
Merge pull request #199 from rcbops/sprint

End of sprint merge
Merge branch 'master' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Adding new rabbitmq-openstack submodule, and updateing role[rabbitmq-server] to use this cookbook
Merge pull request #215 from galstrom21/sprint

Adding new rabbitmq-openstack cookbook submodule
actualizacion coloreo
Merge pull request #12 from arredondin/master

Coloreado
asdasd
Merge branch 'master' of git@github.com:rdemirel/StringParser.git

Conflicts:
	compile.cpp

Signed-off-by: Rasit Demirel <rrasitt@gmail.com>
Extracted logic to symbolize hash keys into a method on Hash.
描述信息国际化；
Added function to check for all -3000s in training period, tweaked dynamic-filter to drop such pixels; tests
Merge pull request #259 from reddmetrics/feature/fix-250

Added function to check for all -3000s in training period, tweaked dynam...
Removed notes - migrated to Wiki
Merge pull request #247 from reddmetrics/feature/remove-notes

Removed notes - migrated to Wiki
update output of --help
added --delete-cron to man page
added -q|--quiet to man page
Almost there…

TODO: Email validation & Feedback
Adding back skyline and loading images to gh-pages
Merge branch 'gh-pages' of https://github.com/refreshmunich/website into gh-pages
created helper for page placement
Merge branch 'master' of https://github.com/regedor/GMS-Prototype
Automatic update [Tue Nov 06 06:10:43 CET 2012].
Automatic update [Mon Apr 30 06:08:57 CEST 2012].
Automatic update [Sat Apr 07 18:10:13 CEST 2012].
changed buildproj
Fix a bug with a non-existent `construct` function being called
Fixed bugs in compiled shaders.
Changed Performance Tests to enqueue parallel with configured number of threads
Document tty_lock config option.
Allow disabling the bell on authentication failure.
Merge pull request #13 from aartamonau/beep

Allow disabling the bell rung on authentication failure
Announce abandonment
Clean trailing whitespaces
Unlock lockfile before close it
Update 'spork' gem and re-configure it.
Adding some extension and new query builder
Fixing password reset spec

Don't really get it but oh well
EMI: Support looping chores
EMI: Implement missing SetChoreLooping opcode
EMI: Properly play short animations
EMI: Implement Actor::{Get,Set}SortOrder
EMI: Sort active actors
EMI: Update depth buffer for invisible objects
EMI: Handle duration-1000 chores
Merge pull request #637 from Botje/support-looping-chores

EMI: Support looping chores
Add a setting so the device can stay awoken when the app is running.
one more thing to debug
Adding myriad little features.
Link to post, change to use homebrew-alt
Further API refinements.
We now have an ugly API, but one that is easy to make concrete subclasses from.
Add default non-operable methods for setting the state
Update typecaster to call class methods on typecaster's type classes
Add README
Bump up version
oops forgot to add the .vimrc file
added file for next post in ebook sausage series
Drafting ``Ebook Sausage, Part 2''.
Still working on Part 2 of the ``Ebook Sausage'' series.
Added a function to rip email out of .gitconfig if it exists
Added an exception for mingw32 to avoid ruining the prompt
refactored Vnm.code
various minor additions.
refactored.
Cleanup
Cleanup datetime properties
Missing colon in related
Don't assume properties exist
Add save and delete hooks
Update docs and version
That file doesn't exist anymore.
Added support for dir.glob
Refactored copy file
Refactoring
Refactor run_tests
Alterações no branch parte2.
bug corrigido.
Modif not important
Before submition
Reservoirs finished
Modif
added protocol bit
added nonce sending to signup and sign in; refactored so there is a single SharedKeyCipher class.
Add codes from content_shell
Rename shell_resources to nw_resources to avoid conflict
Content shell version with package support
Migrate with all manifest stuff
Fix mac compilation error
Replace copyright headers
Merge branch 'shell' of https://github.com/rogerwang/node-webkit into shell
Fix compilation error on Windows
Merge branch 'shell' of https://github.com/rogerwang/node-webkit into shell
Add webkit patch
resource pak name should be nw.pak
Init uv in shell_main
[WebkKit] Use WebKit's console and setTimeout function
Remove cef-based code
Merge branch 'shell'
Add name field in the quick start
[API][GTK] Implement window events.
Git Fix to merge problem
do
git add -f <filename>
git commit
Anther attempt to fix GIT!!!!
Merge remote branch 'origin/master'

Conflicts:
	deadlocks/.gitignore
Loading banned domains and monitored strings
on my way to a cleaner
Uncommented mysql connect
jquery rails update.  2.0.0 is gone.
Using foreach for ocLapply
Merge branch 'collab' of github.com:rscharpf/oligoClasses into collab
Using foreach for ocLapply
Using foreach for ocLapply
Fixing docs
Fixing docs
Fixing BioC Repos for automatic download
Fixing BioC Repos for automatic download
Fixing other errors
Deprecating delCluster/setCluster/getCluster
bump version
Documents for deprecated functions
Documents for deprecated functions
Documents for deprecated functions
Adding more deprecated functions
Adding more deprecated functions
Adding more deprecated functions
Adding more deprecated functions
Merge branch 'collab'

* collab:
  Adding more deprecated functions
  Adding more deprecated functions
  Adding more deprecated functions
  Adding more deprecated functions
  Documents for deprecated functions
  Documents for deprecated functions
  Documents for deprecated functions
  bump version
  Deprecating delCluster/setCluster/getCluster
  Fixing other errors
  Fixing BioC Repos for automatic download
  Fixing BioC Repos for automatic download
  Fixing docs
  Fixing docs
  Using foreach for ocLapply
  Using foreach for ocLapply
  Using foreach for ocLapply

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/oligoClasses@64200 bc3139a8-67e5-0310-9ffc-ced21a209358
Add a --no-compress option.
Add --line-breaks option.
Document --safe.
Add usage notes.
Added move bonus and win values
fix uppercase command bypass
Typo fix.
Imporve search results.
Merge branch 'master' of github.com:ruby-china/ruby-china
note some web pages

Web pages for everyone!
Configured for deployment to Heroku
name conflict fixed
css precompilers
css precompilers
css precompilers
css precompilers
precompile
precompile
postgre style queries
postgre style queries
events removing
events removing
mail settings
error messages set
TPP-1 Добавить систему классов для проверки доступности приватных переменных из классов-наследников
One more Uncovered function
added store names to locations index
Update motion paths to apply only to current selection
VideoExport should pull the animation duration dynamically from the document

A previous check-in added a "duration" property on PSDrawingDocument.
This check-in updates the PSVideoExportController to use this value to
dynamically match the length of the video.
Decrease the number of frames per second that we snap the timeline to!
Added dogrades.sh, which grades/enters everything
Merge branch 'master' of github.com:saasbook/course-tools
remove user public repos label to desc.
make wathing authors unique.
make follower unique.
make following unique.
add daemons status cap task.
gemfile is updated
some change in application.html.erb in view/layout
Merge pull request #15 from manijain/master

gemfile is updated.
[maven-release-plugin] prepare release taggable-2.9.0-b07

git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@111340 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@111342 66ffb92e-73f9-0310-93c1-f5514f145a0a
Jenkins pre-build: Auto-updating master version to 2.9-SNAPSHOT for next release http://builds.sakaiproject.org:8080/job/taggable%202.9.x/

git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@111343 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21524 merge r111458 from trunk


git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@112290 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare release taggable-2.9.0-rc01

git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@113535 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@113537 66ffb92e-73f9-0310-93c1-f5514f145a0a
Jenkins pre-build: Auto-updating master version to 2.9-SNAPSHOT for next release http://builds.sakaiproject.org:8080/job/taggable%202.9.x/

git-svn-id: https://source.sakaiproject.org/svn/taggable/branches/taggable-2.9.x@113538 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAKIII-5784 made infinite scroll an aria-live region and added an alt attribute to the loading img
Merge pull request #2366 from jsloane/SAKIII-5784

SAKIII-5784 made infinite scroll an aria-live region and added an alt attribute to the loading img
SAKIII-5544 Featured Content widget does not honor configurable sharing settings
SAKIII-5545 Quick win: Fix regression in styling of 'no results' messages around the system
SAKIII-5544 Featured Content widget does not honor configurable sharing settings
SAKIII-5544 Featured Content widget does not honor configurable sharing settings
Merge branch 'SAKIII-5545' of git://github.com/bp323/3akai-ux into SAKIII-5545

* 'SAKIII-5545' of git://github.com/bp323/3akai-ux:
  SAKIII-5545 Quick win: Fix regression in styling of 'no results' messages around the system
SAKIII-5548 - Fix display issue in content permissions
https://jira.sakaiproject.org/browse/SAKIII-5548
SAKIII-5550 Right side padding is absent from thumbnail picture element on contacts page
SAKIII-5549 - incorporate editors into content profile
https://jira.sakaiproject.org/browse/SAKIII-5549
Merge pull request #2041 from bp323/SAKIII-5550

SAKIII-5550 Right side padding is absent from thumbnail picture element on contacts page

* bp323/SAKIII-5550:
  SAKIII-5550 Right side padding is absent from thumbnail picture element on contacts page
Merge pull request #2040 from christianv/SAKIII-5548

SAKIII-5548 - Fix display issue in content permissions
Merge pull request #2042 from christianv/SAKIII-5549

SAKIII-5549 - incorporate editors into content profile
SAKIII-5551 enable save content button for mylibrary when user cant share item
KERN-2881 - Use localhost:8080/ for the webstart
https://jira.sakaiproject.org/browse/KERN-2881
Merge pull request #812 from christianv/KERN-2881

KERN-2881 - Use localhost:8080/ for the webstart
[WIP] Loads videos based on what you dragged into the textarea.
Remove unused files.
test don't set
v3: LED tracking plus sound
add screen keymapping
remove remote repo(srcexpl), add java debug snippets, rename local repo name, edit srcexpl/trinity for tagbar
cleanup db dumbs
theming
added version display, added plasmagun and plasma
Add logic for corridors and rooms.
Remove TaskWarrior support
test deleting bin folders
remove unused resources
background highlighting on menubar buttons
Merge branch 'enhancements'
[t1357] fixed up media target test
[t1794] WIP ripped apart headers
beautification and updation of todo list
updated the todo list
merging changes from torch
added the database query
add example.html
Merge pull request #2 from debashissaha/master

Refactored into js, css, images with local images and standalone example.html
moved init stuff to clay
Test to avoid repetition and try to fix the number of lines
sci-astronomy/poloka: Version bump

(Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit)
not checking for empty when open.
should also not trigger empty AFTER the door has been closed
aaaand one more switch_user bug.
deleted:    Assignment10_CS11B047.c
	deleted:    Assignment5_CS11B047.c
	deleted:    Assignment6_CS11B047.c
	deleted:    Assignment7_CS11B047.c
	deleted:    Assignment8_CS11B047.c
	deleted:    Assignment9_CS11B047.c
	deleted:    b_test.txt
	deleted:    lab10_test_cases/test_0.txt
	deleted:    lab10_test_cases/test_1.txt
	deleted:    lab10_test_cases/test_2.txt
	deleted:    lab10_test_cases/test_3.txt
	deleted:    lab10_test_cases/test_4.txt
	deleted:    lab10_test_cases/test_5.txt
	deleted:    test.txt
	10_lab/
	11_lab/
	5_lab/
	6_lab/
	7_lab/
	8_lab/
	9_lab/
	new file:   10_lab/Assignment10_CS11B047.c
	new file:   10_lab/b_test.txt
	new file:   10_lab/lab10_test_cases/test_0.txt
	new file:   10_lab/lab10_test_cases/test_1.txt
	new file:   10_lab/lab10_test_cases/test_2.txt
	new file:   10_lab/lab10_test_cases/test_3.txt
	new file:   10_lab/lab10_test_cases/test_4.txt
	new file:   10_lab/lab10_test_cases/test_5.txt
	new file:   10_lab/test.txt
	new file:   11_lab/Assignment11_CS11B047.c
	new file:   5_lab/Assignment5_CS11B047.c
	new file:   6_lab/Assignment6_CS11B047.c
	new file:   7_lab/Assignment7_CS11B047.c
	new file:   8_lab/Assignment8_CS11B047.c
	new file:   9_lab/Assignment9_CS11B047.c
	modified:   Assignment11_CS11B047.c
	11
	test.txt
Added messages in multicustom.properties for content lang filter
minor fixes
combine strings for more flexible translation
time travelling works
location fix
db loader for es
search interface
Added constant_csrf_token option.
Update input/programs/tsn/77/index.md
Fixed mkl applying in static
Fixed formatting of code example in README
fixed cucumber features
Merge branch 'master' of github.com:sicophrenic/CS169-ICA

Conflicts:
	coverage/index.html
Merge branch 'master' of github.com:sicophrenic/CS169-ICA
Separated out a home page and the search pages. Cleaned up error reporting. I still thinking validation returns are failing and I'll need to look into that. Also will probably do another level of abstraction so the search will be under /contacts and will search both people and companies. Will probably need to redirect certain search routes though
added some features
Added companies. Rerouted the search function to contacts instead of people. Search works with companies. Still haven't made viewes for the adding and editing of companies and they don't have phone numbers. However, representatives properly link as tested via the rails console
new features for companies, also added test for delete
Merge branch 'terri' of github.com:sicophrenic/CS169-ICA into terri

Conflicts:
	db/schema.rb
Merge branch 'tom' into terri
Merge branch 'ben' into terri

Conflicts:
	coverage/.resultset.json
	coverage/index.html
Created company views. Searching for companies and editing companies is working. Have no tried deleting or creating a new company yet. They currently do not have phone numbers.
DRYed out code a little more. Added phone numbers to companies.
Fixed updating and creating new companies and people and also DRYed out the code somewhat. update_with method moved to a module which is mixed in. Updated the seed so it populates the companies as well.
Merge branch 'ben'
Merge branch 'terri'
First major merge of all branches into master. Everyone should regenerate their branches from master
Merge pull request #1 from sicophrenic/test

Test
fixed bugs in the analyzer
Ignore object files
Fix size, origin, color, transparency of smoke.

Need better function for smoke size with a quicker increase.
Change ppm to 8 (powers of 2 are nice)
Change color, growth rate of smoke
Sort tank components into folders
Add Motor componenet to tank. Load YAML froms dirs
Make update, draw_on virtual methods of Entity
Draw/update tank components using vector Entities
ENHANCEMENT EmailField now uses type="email", which has the benefit of
allowing email validation when using the required="required" attribute.
If using an old browser, the "email" type will fallback to "text"
BUGFIX Ensure merging correctly
Merge pull request #349 from halkyon/emailfield_type

ENHANCEMENT use type="email" for EmailField
delcared Email::is_valid_address($email) as public static to avoid strict notice ("Non-static method Email::is_valid_address() should not be called statically, assuming $this from incompatible context")
Merge pull request #774 from icecaster/master

fixing strict notice by declaring static method Email::is_valid_address() as static
Send channel state update on terminate
Se establecen los archivos de la libreria
Se establecen los archivos de la libreria
Improved - Use $modx->webAlert() method
Merge branch '1.1.dev.japanese' of github.com:sjstoelting/evolution into 1.1.dev.japanese
Add type values to config props and better default examples
Added option to turn off caching of markup.
hei olen pihalla taas
updated skye_controller.h
Upstream changes

Change-Id: I1237e4bddef9fb1fc7edb1d67ec2021450696100
Updated the system so that it can handle multiple users on the same client

Now that you can log in and log out, it needs to be able to handle
multiple users
added SHOW INDEX <indexname> STATUS

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3585 8b96e2b9-35c5-2c16-bc47-5122d61876d4
Updates to api curl generator, better substitution
Добавил поворот стрелки при раскрытии подменю
Site updated at 2012-12-13 07:42:55 UTC
BK-285 Uncomment ODT options for editing default CSS in Control Center
WOBS-1841: Create Olympia Ticker for Sports section

Fix topic indexing.
CS-4198: Deck wysiwyg editor size should be 250px in default install

Added proper size to deck and full_text fields.
CS-4185: Remove feature NewsDesk from menu bar and dashboard widgets

Done.
Update info files for 4.0 RC4 release.
Validates if library/Zend exists before running exec
CS-4412 : Edit subscription doesn't work

alias for subscription.section doesn't work, add new service subscription.section
CS-4412 : Edit subscription doesn't work

fix class
Merge commit 'b4d8178' into next
Merge commit 'ee2b516' into next
WOBS-1215 - create weather page with external content snippets

Added werbung code for sidebar
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:newscoop into wobs-reloaded
Ensure that ssl_invalid_cert returns PEM formatted certifcate data.
Bump version to 1.1.5
Working with gevent

Conflicts:

	conn_tests/test_pubsubjobs.py
	conn_tests/test_pubsubserver.py
	sleekxmpp/test/sleektest.py
	sleekxmpp/version.py
	sleekxmpp/xmlstream/handler/waiter.py
	sleekxmpp/xmlstream/xmlstream.py
Merge branch 'gevent_branch_1.1.5' into hotfix/1.1.5
Merged hotfix '1.1.5' onto master_spartanbits. 
Merged hotfix '1.1.5' onto develop_spartanbits.
Show current working dir changes panel by default (ShowGitStatusInBrowseToolbar)
Ignore dotCover configuration file
Merge pull request #876 from vcpp/Show.Git.Status.By.Default

Show current working dir changes panel by default
Declare macros before any includes. Prevents MIN/MAX from being overridden.
Optimize arrange(). Misc cleanup.
More work on the reader. I imagine I am overflowing tons of one-byte displacements...
Merge pending instantiations instead of overwriting existing ones.
Check whether a pending instantiation needs to be instantiated (or whether an instantiation already exists).
Verify the size of the PendingInstantiations record (was only checking size of existing PendingInstantiations).

Migrate Obj-C++ part of redecl-merge into separate test, now that this is growing.
templates.mm: test that CodeGen has seen exactly one definition of template instantiations.
redecl-merge.m: use "@" specifier for expected-diagnostics.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164993 91177308-0d34-0410-b5e6-96231b3b80d8
Force triple in test to unbreak it on non-darwin platforms.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164994 91177308-0d34-0410-b5e6-96231b3b80d8
-arch is a darwin-specific driver feature, use a triple instead in rewriter test.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164995 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Check that the argument to CFMakeCollectable is non-NULL.

Patch by Sean McBride!

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167537 91177308-0d34-0410-b5e6-96231b3b80d8
Test for source location range of new expressions fixed in r167507.

Patch by Philip Craig.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167538 91177308-0d34-0410-b5e6-96231b3b80d8
When loading a module fails because it is out of date, rebuild that
module in place. <rdar://problem/10138913>


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167539 91177308-0d34-0410-b5e6-96231b3b80d8
Test case Clang::Driver/debug-options-as.c depends on the integrated assembler. Turn it on explicitly on all platforms by the "-integrated-as" option.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@156063 91177308-0d34-0410-b5e6-96231b3b80d8
Another fix for the configure build: correct order of dependencies.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159809 91177308-0d34-0410-b5e6-96231b3b80d8
[cindex.py] Fix erroneous comment for CompileCommands

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159810 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Remove duplicate work on deriving method behavior. No functionality change.

The cocoa::deriveNamingConventions helper is just using method families anyway now, and the way RetainSummaryTemplate works means we're allocating an extra summary for every method with a relevant family.

Also, fix RetainSummaryTemplate to do the right thing w/r/t annotating an /existing/ summary. This was probably the real cause of <rdar://problem/10824732> and the fix in r152448.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152998 91177308-0d34-0410-b5e6-96231b3b80d8
Teach the PCH validator to check the preprocessor options, especially
the macros that are #define'd or #undef'd on the command line. This
checking happens much earlier than the current macro-definition
checking and is far cleaner, because it does a direct comparison
rather than a diff of the predefines buffers. Moreover, it allows us
to use the result of this check to skip over PCH files within a
directory that have non-matching -D's or -U's on the command
line. Finally, it improves the diagnostics a bit for mismatches,
fixing <rdar://problem/8612222>.

The old predefines-buffer diff'ing will go away in a subsequent commit.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@166641 91177308-0d34-0410-b5e6-96231b3b80d8
PR14171: Don't crash if we hit one of the paths where GetFullTypeForDeclarator
rebuilds a function type, and that function type has parens around its name.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@166644 91177308-0d34-0410-b5e6-96231b3b80d8
Update clang attribute document.

Remove the instructions on manually adding boilerplate code of AttributeList::Kind and AttributeList::getKind().
Both are now generated by tblgen.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158386 91177308-0d34-0410-b5e6-96231b3b80d8
Initial commit
Improved version of README
Merge branch 'master' of github.com:ssavignano/sample_app
Adding GCID filter
[master] Allow return from social auth to skip the supplemental form.
Separated out more view code.
MapEditor: Mineral layer
Remove quantity force on inventory. Convert quantity to integer.
Regenerate gemspec for version 0.4.9
GTNPORTAL-2657 Gatein master Unit tests fails in GateIn Portal Component Portal Data on oracle7

This failure happens if testClosureCompressing is executed before testPriority. testClosureCompressing registers a plugin with the ResourceCompressorService, but doesn't unregister it after the test has completed.
As the ResourceCompressorService doesn't have an unregister method I've added a unregister method to the test that uses reflection to remove it from ResourceCompressorService.plugins. An alternative fix would be to add a unregister method to the ResourceCompressorService and use that instead.
counters fix
Breadcrumbs in /control fix
Refresh renamed device in device-select in Control->Settings
trackerid digits
startet work on dbus and some cleanup
Add a few more tests for recursion and memory
Removed tabs as an indentation marker. Started tracking indentation levels as groundwork for processing nested types
plant_tropical.mesh
cars upd (NS,TC power,aero)
Merge branch 'master' of github.com:stuntrally/stuntrally
Extend stylight-sem-feed package installation
Mix versionable concern into Dor::Item
Merge branch '3_11_1' into develop
Add params to Dor::Processable#initialize_workflow for repo and workflows datastream creation
initial commit
updated abc.txt in testing branch
modified 123.txt in title branch
added xyz.txt in master branch
Merge branch 'title'
testing conflict in master
fix serialization of open port in case there is just one port
Implemented home page, logout function
handling of collections
remove fixssh(), automated now
Default emailvoorkeuren nieuwe beheerder
T ++
Gerelateerde apps feature toevoegen.
Apps-class toevoegen.
Bug oplossen waardoor bij elke request een app erbij kwam.
Onnodige import weghalen.
ruby_bamboo isnt a default buildpack
Merge pull request #1 from ddollar/fix-default

ruby_bamboo isnt a default buildpack
add p100 code. refs #34
[Space Activity] Fix bug to make application run on juzu 0.6.0 SNAPSHOT and PLF-4.0
Change run mode from 'dev' to 'prod'.
Merge pull request #2 from hanhvq/master

Backport changes to source
Waypoint:
 * Starting in on namespaced events
 * Client library
Cleaning up the event parser
Confirmacion.jsp agregado
Adjust menu & sidebar
Ran the .go files through gofmt: maybe should add a pre-commit
view and remap methods added to pages controller
preorder table finished
Commented out defaults write for Gatesleeper to use spctl instead
moved elevator (-1) multipliction, ultimately this has to go into the mixer
fw control: added Dougs horizontal navigation controller
Optionally specify files on the command line
Chunk sends to avoid sucking too much RAM
Chunk stdin reads by the catch daemon
Extract remote catch path
Merge pull request #307 from tianlili/dev

[Testcase]提交coverage相关文件
Merge pull request #308 from tianlili/dev

[Testcase]添加覆盖率相关逻辑
Merge pull request #309 from tianlili/dev

[Testcase]修改baidu.event.stop的用例，提高覆盖率
Merge pull request #310 from tianlili/dev

[Testcase]修改page.lazyLoadImage的用例，提高覆盖率
Merge pull request #311 from tianlili/dev

[Testcase]修改baidu.page.lazyLoadImage的用例，提高覆盖率
Update release/build_run.xml
Merge pull request #314 from jiangshu/dev

Update release/build_run.xml
[BugFix] 修改opacity接口对数值设置的不一致性
Merge pull request #316 from linlingyu/dev

[BugFix] 修改opacity接口对数值设置的不一致性
Update release/build_run.xml

添加cov=true
Update release/build_run.xml

cov修改
Update release/build_run.xml

cov修改
Update release/build_run.xml

修改cov参数
Update release/build_run.xml

修改cov
Update release/build_run.xml

删除cov
Update release/build_run.xml

修改cov
[Testcase]同步修改opacity的用例
better exception reporting in XMLRPC
Useless comment-change
Implemented autocompletion for project
Star rating finished

It's finished!
Star

whut? Twice?
Added new models. Renamed Resident to Guest.
implemented galloping, minRun computation
Re-add MB_ENABLED constant
Replace function_exists() checks with MB_ENABLED constant
Revert "Re-add MB_ENABLED constant"

This reverts commit 6da86c89f8b0ecb8bee11e6fa777dac7f6052236.
Revert "Re-add UTF8_ENABLED constant"

This reverts commit 25cb81297c4458f80bee353fd645861a8a90ee33.
Revert "Remove unused defines from CI_Utf8"

This reverts commit a6fd531e348bd345bbbd06b7c5504090d9bd7ca4.
Merge pull request #1095 from colonelchlorine/develop

Added support for Wincache when running CI on Windows boxes
Merge pull request #1174 from tiyowan/remove-defines

Use the MB_ENABLED constant for mb checks instead of multiple function_exists()
Fix some spaces and alignments in the new Wincache driver
Extra
Merge branch 'develop' into feature/db_toString_support
Merge pull request #1177 from Eclarian/feature/db_toString_support

Adding Support to Properly Escape Objects that have __toString() magic method
Merge pull request #1176 from IT-Can/attributes-form-hidden

User guide update form_helper
Clean up the cookie helper
Clean up the array helper
Clean up the directory helper
New line and changelog correction
Active Record documentation cleanup
Merge pull request #1180 from timw4mail/develop

Active Record documentation cleanup
Merge pull request #1175 from toopay/path_helper

Path helper improvement
Further improve the path helper
Added DistributedHashJoinOperator::addIntialFactTablePos
Minor code cleanup
Changed permissions for git. Removed unnecessary libraries.
Created CIDA branch from v4.3.11 tag
removed calls to HTTPMethodBase.abort()
Add in flymake-coffee, to catch my boneheaded errors.
Added mem_cache
Some refactoring + enabled usage of mem_cache
style
removed bemhtml/
credit for http://www.paulund.co.uk/creating-different-css3-box-shadows-effects
Merge pull request #1 from tyv/master

style for your demo site
Site updated 2012-07-08
Vim: Add EOL script as a plugin

This will avoid writing a trailing newline to the file if one does not
already exist.
rewrite after adding iceland to the travel page.
Form.as_p
Added stylesheet link
styled submission page
Added default text
submission style changes
added autosizing to text areas
fiddled with autosizing
fiddled with autosizing
not recognizing autosize
trying to make my js be found
fixed masonry (again
fixed masonry (again)
Fixed brand link
added about page
added about page
Merge branch 'master' of https://github.com/tomshen/penn-projects
Regenerate with Go 1 style and add a SConstruct file so we can build it.
Remove stray makefile.
increased size of footer so that two lines of help/error can fit.
pass clopenbadger token to frontend JS.
Get songs by the correct artist
Updated grooveshark lib
NERDtree setting
make jquery happy for stats tests
managed queue impl
Merge branch 'master' of https://github.com/travuun/durable-queue.git

Conflicts:
	durable-queue/src/test/java/com/pipeline/collections/queue/SpilloverQueuesTest.java
Added a few dictionary handling functions.
initial version with closure property
Completed closure and scope of variables
Added another sample
Merge branch 'master' of github.com:tsathishkumar/Lisp.rb
我的项目基本跑通
Always generates original untranslated route.

Before:

     car_en GET /cars/:id(.:format)     cars#show {:locale=>"en"}
     car_es GET /es/autos/:id(.:format) cars#show {:locale=>"es"}

After:

     car_en GET /en/cars/:id(.:format)  cars#show {:locale=>"en"}
     car_es GET /es/autos/:id(.:format) cars#show {:locale=>"es"}
     car    GET /cars/:id(.:format)
Translate the routes automatically.

This change makes the call to "MyApp::Application.routes.translate_from_file"
unnecessary. It's still possible to call this function for backwards
compatibility.

It also adds a new config option, "translation_file", which can be used instead
of the call to "translate_from_file" to change the default translation file.
Merge pull request #10 from tute/originals

Always generates original untranslated route.
Merge remote-tracking branch 'Tretti/auto_initialize' into master

Conflicts:
	lib/route_translator.rb
	lib/route_translator/railtie.rb
	test/route_translator_test.rb
Fix botched merge, wrongly removed translate call
Modules with hooks needs them to be set in the window where fonts are loading

This was a misunderstanding of how hooks work on my part. Whoops! @ryanwolf
was right the first time.
Added alternative ways to construct a generic pattern group. #182
Added short messages to basic RETE exceptions, fixing #213 
Small NPE fix
Updated UI contributions to a more user-friendly name
Updated plugin.xml to use new extensions generated by Xtext 2.3
Tweaking and localization
use namespaced event
the `peekaboo()` method can take appear or disappear callbacks
following new interface
Release 0.1.0
Rename filter class to match module autoloader namespace
- Bumped version to 1.0.3.
- Made Banshee.Renamer usable as a Monodevelop project within the banshee solution.
- Upgraded the autotools files a bit (with properly configurable Mono compiler and markdown tool).
updated ios skills and some formating
Fix alerts i18n strings in admin/members ui Closes #675
Merge branch 'v2.5b' of https://github.com/ushahidi/Ushahidi_Web into v2.5b
Closes #658 . File referencing error fixed.
Update README.md
Update README.md
Can I change README.md
Make the Colosseum and XD icons somewhat less bright.
Revert "Added heroku environment settings to local setting"

This reverts commit dc764f59ee4d40e886274ca7c415e0e00deccdb2.
Revert "Added working query to Unsubscribe poller"

This reverts commit a7500afcde373754035b1940701d7b298c3054d1.
extracted login form into a partial
simplifies og data generation
simplifies logic to get member by hash
restart sign button brightness and add new options
creating data needed for UI tests; using env vars for settings
some debug logging
more logging to figure out wtf the railsonfire settings are
added test.yml for railsonfire; fixed email hashes in specs
yet more logging...
using env vars from default settings.yml - railsonfire is not picking up test.yml
are the env vars even being set?  hello?
fixed email hash regex(well, it's better, feel free to improve); removed hardcoded email hashes in tests
removed debug logging
Revert "using env vars from default settings.yml - railsonfire is not picking up test.yml"

This reverts commit 9091a3008f589a6b9b16eb194221d786680fd769.
added script to pull env vars from heroku
avoid crash in weird contexts
invoice & resource tpls upd
project catalog tpl upd
project catalog tpl upd
project catalog tpl upd
project search tpl upd
Merge branch 'master' of github.com:viewfuhrer/pro-atatat
some
add .md file for test
html.canvas
html.canvas
html.canvas
ctype
-> Com o menu funcionando
desafios sin puntos (criterio al azar), manage site funcionando basicamente, bug-fix de error con url o internal_name del repositorio
Merge branch 'master' of git://github.com/vitorohe/repositorium
Merge branch 'master' of https://github.com/vlafrazak/db-aviation
allages xana
Match the beanbag listing JSON to what it was before.
Added a basic test that a host database can be retrieved.
Added a basic test that the GET for the beanbags view works.
Make the connection status more sensible.
Refactored the host configuration so it can be used in other tests.
Removed a dead file.
Renamed a collector so that the name makes sense in the context of the
agent names.
Tidied up an old issue in the header.
Added test file skeleton.
Moved the collector routine so it can be tested.
Make sure a failed connect results in an error status.
Create a default structure for the Acanthurus database.
Added a test that directly checks the replication.
Make sure that the modified time we get on the replicated database is the one sent into the replication function.
Make sure that the content of the database is what we expect.
Merge branch 'develop' into feature/mlz-2
Merge branch 'feature/mlz-2' of github.com:KayEss/varanus into feature/mlz-2
Merge pull request #2 from vsirisanthana/develop

Upgrade bootstrap to version 2.1.1
Merge branch 'develop' of github.com:KayEss/varanus into feature/mlz-2
Fixed up the README format so Github will show it properly.
declarative
Ignore parsing errors in cache details download

 * Prevent loss of data when error in parsing is encountered.
Refactor cache types; fixes

 * Move cache types to constants, add missing common cache types.
 * Refactor imports in several modules - use explicit agtl namespace to avoid conflicts.
 * Clean cache type parsing - reduce duplicity.
 * Fix download of overview over multiple pages.
update myPtrList
multiple galleries
modified vimrc, insert mode move alias
Merge branch 'master' of github.com:watanabe0621/dotfiles
fixed the backup routine of the kernel on RPi
Merge pull request #4 from xsteadfastx/master

fix problem with the kernel image name on RPi /flash when backing up current images.
add a test for: rvm alias list names
update Travis build status for the asynchronous branch
Remote Links: opis modal show (część)
Removing blank lines from commands - causes issues during execution
/ ‘OSI/OSI-Affiliates-Slide-v1.2.png’
more functional obj refactoring
Finishing the implementation. Converting toString to not always do glicko1 output.
Fixed stuff for phones
More fixes, Auto Sync still runs infinitely...
+添加C#服务器库.(字节操作、线程池、server socket)
'source' doesn't support https, so the README lied!  Fixed.
change the package for the views feature
Gauranteed 64-bit
Least expensive deploy
It's now possible to create Contact Forms and render them to a Template.
modified eruby.snippets to jump to the end
Merge branch 'master' of github.com:williamherry/snippets
wrote a version of the projects file that might be readable.
Add tag formatting to article page
../../../examples/c/ex_all.c:460: warning: unused variable 'cursor1'
Apply operations to column group and index data sources.

Change index cursors to be a generic wrapper around the data source cursor, rather than always extending a file cursor.
Update classes/class-wc-order.php
Merge pull request #1328 from AaronHolbrook/patch-1

Update classes/class-wc-order.php
checkout loading tweak
moved common to shift
* Removed not needed files.
* Fixed terrain editing.
update to error reporting
GH-21 Set vagrant dep to >= 1.0.3
Fini d'ajouter les commentaires.
Besoin de détails sur le fonctionnement de la GUI et de clarification
sur les protocoles pour avancer plus loin.
Enfin enlevé le fichier communication/SessionThread qui ne servait plus
à rien depuis le passage à Select au lieu de TCPMutliples.
Update composter.
Set up css and html
fixed hover on logo
renaming a few folders and files to PSR-0

there were missed before
renamed model in cl4admin model list
Merge branch 'refs/heads/kohana_v3.3/fix/20121214-renaming_files' into kohana_v3.3/master