labofsahil/github-event-dataset-2012 huggingface dataset:
fixed: numerated header annotations were not removed when converting a header to a paragraph. ticket 50702. Also: added numerated-header plugin to the boilerplate
fixed: numerated-header plugin adds spaces to the headings, this will cause 'convert to paragraph' to not work
added proper indentation of numerated header annotations via a margin in the css
added changelog entry for numerated header fixes
fixed numerated headers plugin block format change event handling
Add caption as first child of the table
Remove generated table id's on cleanup
Merge branch 'numerated_headers_50702' of https://github.com/csupnig/Aloha-Editor into hotfix

Conflicts:
	build/hotfix-changelog.md
Merge branch 'hotfix' of https://github.com/alohaeditor/Aloha-Editor into hotfix
Built documentation
Merge branch 'hotfix' of https://github.com/peponesound/Aloha-Editor into hotfix
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix

Conflicts:
	src/demo/boilerplate/index.html
[maven-release-plugin] prepare release hw1-pgadde-0.0.2
version change
* Updated unit test
Translated using Weblate (Turkish)

Currently translated at 100.0% (2610 of 2610)
Add Armenian language
Fixed dwc:Taxon to tc:'Taxon Concept' for object of tc:toTaxon property restriction on tnrs:Match. (DSW actually asserts them to be equivalent classes, but we aren't importing DSW anymore, and so don't have that assertion.)
Create the Project class and the Tests
uploads van een half uur toestaan
password reset redirecten naar pwm
zimbra herinstalleren
nieuwe lijst: posterplakkers
fotos renamen naar gallery
iedere 10 min updaten
as found (minus des_key)
sieve configgen
nog een keer sieve proberen
as found
perskit en logo ieder uur zippen
cronjob nicen
oude files opruimen
hoofdletters gebruiken in de gallerij
sieverules plugin voor roundcube proberen
niet compatible met roundcube 0.3
nop
debugging weer uitschakelen
makefile
juiste sudo-regels voor zimbra
Explicitly requiring xpath to try to fix the build.
university/show -> famous graduate id

Signed-off-by: Balázs Antal <balazs.antal@pixelephant.hu>
Cleanup classifiers.
added resolve command
Merge remote-tracking branch 'origin/feature_resolve'
Refactor the remaining 4 activities.
Upgrading packages for gondor virtualenvs.
Pass props/metadata in direct get/put pipe
GUI: Corretto bug in ros communication
Pistetallennin (ei testattu vielä)
Картинка заполнения пустот для отчетов html
Переделка по документации, пока работает зва отчет
https://localhost:8443/busterminal/mvc/report/pdf
Добавлено XLS, HTML
add remote ssh expect script
get rid of internal_name and replace with slug for project spec model
bump 1.0.1 - how did rake manage to create a 15mb 1.0 release? crazy!
update history for 1.0.1
Getting it there
cgvaktest
Finished up the viewing
Added adding pictures
Merge branch 'dev'
use android colors for process color
Don't load or set up trigger at runtime. We'll do that during installation.
rediska include
Add a full_title helper
All Changes
Finish layout and routes
Updated cmake : added i_add_lua_library macros
tools pkg fix

Signed-off-by: pussbb <pussbb@gmail.com>
fix

Signed-off-by: pussbb <pussbb@gmail.com>
overriding recent heroku commit
gca removing unneeded file
split common testing functionality into base class to prep for the ParallelPickOtusBlastTests
added test of ParallelPickOtusBlast
Target platform correction.

Signed-off-by: Christian Trutz <christian.trutz@belaso.de>
MANIFEST.MF must end with new line and build.properties correction.

Signed-off-by: Christian Trutz <christian.trutz@belaso.de>
Merge branch 'master' into nebula

Signed-off-by: Christian Trutz <christian.trutz@belaso.de>
Edit forms
Requiring the right user
Paginating has been added
JS glue for admintools/bootstrap moved to django-coop via an ugly {% include %}
helf
Merge branch 'master' of github.com:r-mikkelsaar/cppFiles
image pdf: don't use abbreviation name
Merge pull request #67 from rackspace/sethbrayman

Some minimal testing for MongodbFeedPublisher
Fix config file closing comment
Merge pull request #68 from rackspace/chadlung-mongodb

Fix config file closing comment
Add back code to create DB
Merge pull request #69 from rackspace/chadlung-mongodb

Add back code to create DB
Add back code to create DB to AtomHopper WAR project
Merge pull request #70 from rackspace/chadlung-mongodb

Add back code to create DB to AtomHopper WAR project
Removal of two unused variables
Merge pull request #71 from rackspace/chadlung-mongodb

Removal of two unused variables
Fix spring config formatting issue
Merge pull request #72 from rackspace/chadlung-mongodb

Fix spring config formatting issue
Update README.md
Update README.md
- added test code for MongodbFeedPublisher
Remove unused variable
Tests for MongodbFeedSource.
Bugfix: don't overwrite a slug if the user has manually edited it from within WordPress. Props Chris Fritz.
fix for bug#826002
enter bootstrap.php
Major refactoring to make the Robot use the a chain of responsibility in its thought process.
Changed icon file names and app title
Added Proxima Nova and removed Gentium
Condensed Skelton into a single minified stylesheet, removed style.min.css
Changed the date and title separator
Merge branch 'refs/heads/develop'

Conflicts:
	css/rbright.css
	css/skeleton-1.1.min.css
removed test steps related to tableview + added possibility to pass own accessibility element selector block
Added filter to snippets and finally re-added ~rm back to quotes
Listo
Render images (nasty hack)
Trying to setup caches
Add the first test
Alterações de identação e href após revisão
Modified test to reflect changes in design for simple rdf

Needs modification to accommodate wider variations in triples types,
and still have ability to best guess correct output for unknown entries.
- ‘ideas.md’
cosmetic change to Expection class
Fixes #24 typo.
Removing useless " in invitation email
This is infuriatingly retarded of Clojure 1.3
Give me a REPL in case I want one
Fixed for Clojure 1.3
Wow, this is pretty dumb
Need to add deps
More Clojure 1.3 hackery
Initial commit - no Web.config upload
fix: compatibility with Ruby 1.8.7 (rel. 0.2.12)
Move event sourcing behavior into Entity
better readme
Initial scaffold of main controller, backbone integration and chicks
added backbone scaffolding, also changed the 'mood' into a virtual variable
small clean on chick.rb and fixed the old inflector activation in application.rb
now it's possible to add more chicks
delete function added
further details added to the chicks list
small refactor over smiles
Readme for info
Emeralds added to RPG system
added some controller sugar
Restore the timezone lookup ability.

The way it's currently implemented is that the camera stores the
timezone directly into GSettings every time a photo is placed onto
the map (whether it be automatically or manually), and then if the
timezone method is changed to lookup, it consults the GSettings key
to determine where the camera was last used.

There are some subtleties here... if you open photos first, then GPX,
the GPX simply looks at the loaded cameras and tells them 'hey, this
is the timezone here' and then the photos are placed correctly. If
you open the GPX before photos, the photos don't have any way of
communicating with the GPX to ask what the timezone is, so they
default to use the system timezone. I put in a check for this at
the end of GottenGeography.open_files so that the timezones will
be recalculated correctly, but it's not the sexiest code ever.

Thankfully the discovered timezone is persisted in GSettings so this
is only an issue the very first time that a camera is loaded (and again
every time you start using the camera in a new timezone and change
the camera's clock to match).

This works I guess, but the results are undefined in the event that
your GPX track crosses a timezone boundary. Because of this, I *highly*
recommend *always* keeping your camera clock synchronised to your
computer's clock and then just use 'system' instead of 'lookup'.
Three new screencasts.
should this file be gitignored? is it generated?
Added a Generation label during sim
experimenting with readme
hmm
Merge branch 'master' of github.com:rodhilton/Geneticrypt

Conflicts:
	README.txt
start working on myanmar language
finish myanmar translate
add myanmar link in all language
fixed minor text
Merge pull request #36 from saturngod/gh-pages

Support Myanmar Language Translation
Readme and mit license
Enable experimental WebKit features. Fix #105.
more fun with configuration
orientation
treure el sencha designer i fer que els listeners de orientation estiguin tots en el appmaincontroller
treure el sencha designer i fer que els listeners de orientation estiguin tots en el appmaincontroller
revisat pel roman. queda ficar bonic el dialeg
Updated Post list & detail views.
Removed Azure Table Storage setting
Adding validation rules
Fixing slot redirect
Updated SmallNorb to use new pipeline functions
adding missing migration
fixing frozen model in migration 0005 to add field added in 0004
adding conditional migration
merge branch master
Merge branch 'master' of github.com:Lacrymology/django-helpdesk
fix conflicts with master
Merge branch 'conditional-tags'
Merge pull request #139 from Lacrymology/master

Conditional tag field has problems with migrations. Fixes #126.
Last sprockets changes
Traverse entities and notify
2012-12-08-a
added 1 missing string to Russian localization
Updated readme, deleted demo directory, it's hosted on my site.
might have fixed the regex matching problem
listen at LOWEST, use setUseItemInHand
Begin work for standalone api server
Base64 encode the blobs
Update timecop dependency to version 0.4.6
Update airbrake dependency to version 3.1.3
Update builder dependency to version 3.0.1
Update jquery-rails dependency to version 2.1.2
Update newrelic_rpm dependency to version 3.4.2
add highline to the main gem group
+query->fields for db_select_fields()
Added single quotes around tags and values, included tag value in validate_bag_info() exception.
Added text clarifying that Profiles are agnostic to the payload in 'data'.
fix DelThread bug
set v1.1 & export .apk
Merge branch 'release/v1.1' into development
Boyle IDE'nin ben ta
Fixed blocked contacts bugs and undefined contacts
added screenshot
added weekday to date
added screenshot and credits to readme
Whenever a task migrates to another cpu, the taskset is updated and a new schedulability test is performed
removed unneeded variables (s(sem_records)
removed loaders agian
SAKIII-5439 - implement the :merge parameter
https://jira.sakaiproject.org/browse/SAKIII-5439
Merge pull request #1957 from christianv/SAKIII-5439

SAKIII-5439 - implement the :merge parameter
"Search all" page should have a better HTML heading structure
SAKIII-5932 - Recaptcha is not defined
https://jira.sakaiproject.org/browse/SAKIII-5932
Merge pull request #2297 from christianv/SAKIII-5932

SAKIII-5932 - Recaptcha is not defined
Checking resourceType = 'user' in user search documents
Merge pull request #2553 from mrvisser/profilepictures

Checking resourceType = 'user' in user search documents
Combined with tessdata
fixed points backend. added NFLPlayer.seasonPoints and queries listing NFLPlayers are ordered by seasonPoints. removed NFLMatch entity
added seasonPoints for NFLPlayers representing defense.
last touches for going live
fixed setup local server for windows
Fix Compile
Fix Some Warnings
[Core/spell] Seal of Righteousness
Close #95
Fix Regeneration Focus (Try)
Add internal helper service.

Turns out I needed an internal helper service because my BroadcastReceiver can't
make async calls, which are required to call into the MyTracks recording service.

Also now laying out the CONFIG activity using RelativeLayout.
In CompositeCell, consumed events are determined as an union of all sub cells' consumed events. However, during event handling, an event may be fired to a sub-cell that doesn't actually consume this event. This is problematic if the cell doesn't check consumed events itself (which in most cases they don't).

Review at http://gwt-code-reviews.appspot.com/1632804

Review by: jlabanca@google.com

git-svn-id: http://google-web-toolkit.googlecode.com/svn/trunk@10860 8db76d5a-ed1c-0410-87a9-c151d255dfc7
Fix off by 1 error in StackTraceDeobfuscator and fix line number issue when no sourcemap is present.


git-svn-id: http://google-web-toolkit.googlecode.com/svn/trunk@10861 8db76d5a-ed1c-0410-87a9-c151d255dfc7
In cases where sourcemaps were turned off, or Safari is used, the StackTraceDeobfuscator would report the raw JS line number as the Java line number. This change does two things:
1) Enable CollectorChromeNoSourceMap which reports -1 for JS line number when sourcemaps are off (thus forcing symbolMap to be used)
2) If sourcemaps are on, but no column information is present, or column is -1 (Safari), fall back to symbolMap


git-svn-id: http://google-web-toolkit.googlecode.com/svn/trunk@10862 8db76d5a-ed1c-0410-87a9-c151d255dfc7
Merge remote-tracking branch 'mirror/master' into scalagwt

Conflicts:
	dev/build.xml
	dev/core/src/com/google/gwt/dev/javac/CompiledClass.java
	dev/core/src/com/google/gwt/dev/javac/Dependencies.java
Fix checkstyle issue.
Fix tests compilation.

After CompilationUnit refactorings tests were not updated
causing compilation errors.
Merge pull request #30 from gkossakowski/merge

Merge changes from upstream and fix some issues
Use nil? instead of blank?.
removing demo
removed river-demo module
updating gh-pages
updated river
updated demo to match new river stuff
allow every hubproxy param to be overrided by spider, setting or mw attribute
refactor page
fix some pages helper specs
refactor asset specs
refactor backend routing
add translated attributes
changed secret key and moved it out of version control
detect if signals can be used and set ENV variable
Re-added jQuery sources.
gcc detects SSE 4.2 automatically.

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
changed readme stuff...
build as expressjs app

reduce the lines of code from 150 to 75. better structured and better
code in general.
add link to dvd download
[t504] My Events functionality

1. Added "defaults" section to plugin config
2. Only add plugins to myevents tray if they're listed in defaults section
3. myevents list is droppable, accepting new plugins
[t504] Fixed potential bug if config doesn't exist
[t710] Media loader disappears

1. Added constructing event to popcorn-wrapper and media
2. View is updated as several places to reflect different states of media loading
3. PositionTracker can be destroyed properly now, and is.
Merge pull request #247 from secretrobotron/t504

T504
Merge remote-tracking branch 'origin/t710'

Conflicts:
	src/core/media.js
initial commit
DisplayView probably not working
Vectoroid exploder example project
move dv>Vec
SpurCards Exploder intitial commit
Vectoroid Example Changes
Changes for initial release with examples:
- load drawing from asset, alter DisplayView
- animations array in render object.
v0.8
Added Skip Install do project
ticket:4 added context processor, test that checks context for "settings" varible
ticket:4 moved context processor
ticket:4 fixed makefile
Up to date live example of fetching place json.
Conversations API started
Moved statevector typedef to particleSystem.h. Got rid of integrator files.
job.db path change with murakumo_node.conf
initializ m_features with NULL / fixes hang
show case / exception in tester
more BO cleanup
gallery block and partial-to-medium relation
Started adding new blog functionalities (articles, categories, comments)
v0.9 BIG UPDATE! Weblog system now available :)
fixed errors in log
fixed getters and insert call
added box lid test files
Continued play is now supported close #17

Need to start working on #18 so the player becomes its own entity
instead of belonging to a simple "test script" environment
Need to delete something remotely.
Added phpDocumentator tags, cleaned the code, moved to the original position on DocumentParser->parseDocumentSource
Added phpDocumentator tags, cleaned the code DocumentParser->executeParser
Added PHP5 constructor DocumentParser->executeParser
API change: Renaming get() to getState() and getConfig() to get()
Adding basic tests for set() and reload()
API change: Combining getState() with isAt() and deprecating getState()
Sanitize IDs before sending them to the database.
Oops, set default values for entries.
Changes to improve database joins
Update localdev
Switch plainTextEdit for richText in servoboard_main
Added sequence highlighting while playing
Added pause and stop to sequence playback
Cleanup
Merge branch 'system-font'
completed javadocs
removed useless debug logs
removed support for xpath expressions on JSON response bodies - now an exception is thorwn if an xpath is used
picking a graph clustering algo
Extend foregrond/backgrounf protocol.
Restore position.  Partially working.
New command: choose A B C: pick one randomly
2.5.4
2.5.4
2.5.4
Improve odds and round the ave time
saving latest
Merge branch 'master' of github.com:socialigniter/youtube
made install require oauth
imp autologin: modif del landing para comprobar si el server tiene
sesion activa del surfer
CS-4183: XSS vulnerability in password check token

Escape params.
WOBS-1482 - active state for aboshop is wrong

fixed
WOBS-1347: Agenda mobile version
* navigation selectors
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:campsite into wobs-reloaded
WOBS-1312: Omnibox update

Fixed password input.
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:newscoop into wobs-reloaded
Blue box is not showing
Revert to original stacking behavior.
Merge branch 'master' of github.com:spencerkrause/Mo_Ro_2
boobs
Inherited updates
added multiple notes and auto-updating
Makefile: support any name for Python2
Updated documentation to make mention of default record format as ISO8601 as suggested in a code review.
Simplify diagnostic emission. No functionality change intended.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@169351 91177308-0d34-0410-b5e6-96231b3b80d8
Minor cleanup.

DS parameter  has a default (null) value anyway, so there's no need for an
if/else here.
Patch by Nikola Smiljanić.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@171210 91177308-0d34-0410-b5e6-96231b3b80d8
Update to reflect the change of macro name in r168993.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@168994 91177308-0d34-0410-b5e6-96231b3b80d8
Preprocessor: add __BYTE_ORDER__ predefined macro

The __BYTE_ORDER__ predefined macro was added in GCC 4.6:
http://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html

It's used like the following:

 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 ...
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 ...
 #else
 #error insane architecture like the pdp-11
 #endif

There's a similar macro, __FLOAT_WORD_ORDER__, but it looks like it
mainly exist to accommodate fairly obscure architectures and ARM's
old FPA instructions, so it doesn't seem nearly as useful.

The tests are updated to check for the correct(at least, based on
clang's current output) value of the macro on each target. So now the
suite will catch bugs like the one fixed in r157626.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160879 91177308-0d34-0410-b5e6-96231b3b80d8
Mark Doxygen warnings DefaultIgnore.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159026 91177308-0d34-0410-b5e6-96231b3b80d8
Claim --param ssp-buffer-size, even if the stack protector is not
active.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@163705 91177308-0d34-0410-b5e6-96231b3b80d8
No need to put the SourceManager in with the ASTContext, as the ASTContext
already contains the SourceManager.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155198 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Better test cases for explaining where tracking types of
symbolic regions would help.

Thanks to Richard Smith.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@154541 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] dynamic_cast Simplify null value generation.

As per Jordy's review. Creating a symbol here is more flexible; however
I could not come up with an example where it was needed. (What
constrains can be added on of the symbol constrained to 0?)

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@154542 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Another dynamic_cast false positive/negative.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@154543 91177308-0d34-0410-b5e6-96231b3b80d8
Make sure we treat variables captured by reference in lambda as modifiable lvalues.  Regression from r152491.  Fixes PR12248.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152573 91177308-0d34-0410-b5e6-96231b3b80d8
C++11 [temp.deduct.call]p6 tweak: when given a set of overlaoded
functions that includes an explicit template argument list, perform
an inner deduction against each of the function templates in that list
and, if successful, use the result of that deduction for the outer
template argument deduction. Fixes PR11713.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152575 91177308-0d34-0410-b5e6-96231b3b80d8
Have clang pay attention to the LIBRARY_PATH environment variable.

The LIBRARY_PATH environment variable should be honored by clang. Have the
driver pass the directories to the linker.
<rdar://problem/9743567> and PR10296.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152578 91177308-0d34-0410-b5e6-96231b3b80d8
Update FIXME.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152579 91177308-0d34-0410-b5e6-96231b3b80d8
wip++
route system; for quick definition when dealing with www
shorthand class for centralizing general public directory tasks
more flexible base controller
gemlock
maybe?
display at most 1 ISBN per item

we now:
* identify corresponding ISBN-10 and ISBN-13s and keep the ISBN-13
* use the first of those
* strip additional strings which are potentially appended after a blank
Prime counter table

Document the list of counters which are currently implemented.
Specify meter type, volume and resource in the table

Addresses bug #1030120

Change-Id: Id2e454144194a1a33534e6e74f60b4f8a5fd3e6f
Merge "Prime counter table"
D_{Coh}(O_X) for spaces
Fix MySQL Driver test for bug in table creation no longer tolerated by MySQL
Update SQLite driver for alternate patterns for finding PK
Add no PK test to SQLite driver test and drop tables before creating
Fix columns function in SQLite driver and add caching of data dictionary items for speed improvements
Composerify
Add missing changes
Merge remote-tracking branch 'adam/master'

Merging adams changes which
  * fix the mysql test to not use unsupported method of setting auto_increment
  * Fix sqlite driver finding of PK for new versions of sqlite
  * Cache columns for sqlite and make it work
  * Composer support
Upgraded to Ruby 193
Removed header, navigation and footer from default template
Added onload and minified version
Added scss files
Forgot to remove old .dat file rubbish, gone now
This should recognize unzip errors correctly
filter likes by ... filter
Handling for blank reference type
Redoing the span tag thing
crate2
own visibility flags for objects (now no grass or trees in them)
windowmanager/i3: update to 4.2, add i3.gpg
fix map.js for auto scale
Use mustache helper in research page
Merge between mba and imac
we use puppet::repo, which in turn use apt::source
Reverting: [maven-release-plugin] prepare release mp3-Browser-0.2.0
head0
git-svn-id: http://javascool.googlecode.com/svn@1244 17e3714e-118d-3e7a-01ef-bee73ecf6174
rename builtin factories

git-svn-id: http://protostuff.googlecode.com/svn/trunk@1583 3b38d51a-9144-11de-8ad7-8b2c2f1e2016
issue 124

git-svn-id: http://protostuff.googlecode.com/svn/trunk@1545 3b38d51a-9144-11de-8ad7-8b2c2f1e2016
post-raceday homepage updates
Some testing code.
handle-message protocol.
Moving scheduler to a kwarg of SPAWN.
WetKit Admin Update
WetKit Web Usability Update
WetKit Adaptive Theme Update
added git batch files
fix NullPointerException
vertion 1.2
static_castに変更
Text entry is there now!
You click on the gold box, start typing, backspace works too. Hit escape to stop typing
help instructions and about added
Fix bug in which user_id was not properly logged
Consistent use of leiningen-version function.
Suppress stack trace from exit exception in with-profile.
Move task chaining to do task. Fixes #632.
Document do task.
Handle global exclusions in all dependency cases. Fixes #498

Also remove global exclusion handling in pom generation, otherwise
it would generate 2 exclusion tags.
Add leiningen-core's pom.xml to fix #745.

[ci skip]
Fix help task to call tasks function.
Fix example in tutorial. Fixes #449.
Set :jvm-opts during eval-in :leiningen.
Updated README with Cucumber info instead of JBehave.
finish user edit,update,index
removed /public/index.html
Remove problematic annotation (for now) and fix typos
Tools, start of new terrain structure.
Completed second draft of structured pop BEAST interface.
byte to bit fix
Fixed GenericEvent method names
sorting by roles test
Merge branch 'MH-164'
Test on gender sorting
Merge branch 'master' of https://github.com/thelabtech/missionhub
Add Send Text/Email Guide Popup
email sort tests
Change 'Cancel' to 'Close'
Merge branch 'master' of github.com:thelabtech/missionhub
add cache columns for org stuff
Merge branch 'master' of github.com:thelabtech/missionhub
Merge branch 'master' into dev

Conflicts:
	db/schema.rb
Adjust batch process for notification and also adjust the test
add organization id to followup comment serializer
added sales by coupon report

initial version of sales by coupon report. Since multiple coupon codes
for a single order are stored comma separated, this report considers
them as 1 coupon. Handling multiple coupons within an order as
individual coupons with the report would be quite a bit more complex --
I think most stores force individual use on coupons anyway.
Update Product Image Title w/ Variation Image for Lightbox
Cleaned up States in WC_Countries

Brazil and New Zealand were not in alphabetical order. Also was a duplicate in Brazil for 'RS' => __('Rio Grande do Sul', 'woocommerce').
Dutch translation refresh
Added Norwegian Nynorsk (nn_NO) translation
Merge pull request #1541 from frilyd/master

Added Norwegian Nynorsk translation to WooCommerce
Merge pull request #1535 from WooCommerceEU/master

Dutch translation refresh
readme
Fix updating when typing. Closes #1540.
Grammer. Closes #1538.
Merge pull request #1527 from thenbrent/master

Add filter to needs_payment() and display formatted taxes if set
Merge pull request #1530 from scottbasgaard/master

Update Product Image Title w/ Variation Image for Lightbox
Update Italian Translation
Variation stock should respect main inventory settings. Closes #1537.
Merge pull request #1544 from Giuseppe-Mazzapica/master

Update Italian Translation
readme and min
Fixes for italian translation

fixed errors and all 1.7.0 strings now translated
Merge pull request #1546 from Giuseppe-Mazzapica/master

fixes for italian translation
Fix price trim function. Closes #1485.
Move loop_end hook so its called when the function exists. Closes #1529.
initial command parser and sanity checker
Passing camera buffer's metadata on as NSDictionary.
We can declare that as a constant.
Updated the version number
Updated the changelog of the app
Added a new change for the next version
Fixed a bug which caused that the wrong title was extracted
Another small update to the changelog
Fixed a bug which caused that the notification icon was not stoped moving as soon as the download was finished
Fixed an untranslated resource
Added a notice about the players the user should use
Added the German translations
Updated the German translations
Fixed a bug which caused an crash of the BackgroundDownloadingService
Prepared the code for changing the size of the text in the license agreement
Changed the way the download buffer is selected and added error handling
Added some more error handling
Renamed the currently used search loader
Updated the ProGuard mapping for the next release
Removing dirs before creating them
Merge pull request #290 from tianlili/dev

根据drag的修改（不再设置margin为0）更新用例
Merge pull request #285 from linlingyu/dev

修改wrapReturnValue的逻辑顺序
[BugFix]修复了getStyle当高宽是auto是能够取得数值
[Change] size.js移到fixer中
#77 : Widget séance, vue ELV problème fermeture de balise
Correct title and add a link
Merge pull request #3 from timotiirikka/master

Here are the modified Project and Stock modules
moved load_rest_test_data.pl to correct place, set up lib paths, and put the correct two experiments in it.  fixed the test data which was still using the 'Characteristics [Organism (unsupported)]' column - should be [Organism].  Stock loader was emitting warnings if organism column missing.
started getting the REST tests in order
added some documentation to the project test
Merge pull request #6 from bobular/master

load_rest_test_data.pl fixes
frag ref tweaks
add error handling also handle zero rows case
test
Merge branch 'master' of ssh://github.com/tiopramayudi/rup-lkpp
Ajout d'un logger pour gérer nos logs
Merge branch 'master' of https://github.com/tlechauve/fourmiliere
cabin default font
Added an operator= that ensures the header copied to is closed.
vim bundles to git submodule
Add icons from Open Icon Library
Add new Resources.Custom.cs to simplify using the Resources designer with non-generated code. Rename two icons to make the names CLS compliant
Make the rest of the icon names CLS compliant (removes the compiler warnings)
Add new icons to Resources
Main menu: Icon for Archive revision and Cleanup repository
Add icons for Merge, Rebase, Copy to clipboard, Rename branch and Cherry Pick
Icon for manage remote repos in main menu and Pull dialog
New Icons for Create branch and tag. Icons for Checkout branch and revision. Make these icons consistent main menu and context menu.
Icons: Copy merge and rebase icon (should be color filtered to green to match the branch color)
Added setting CheckForUncommittedChangesInCheckoutBranch to increase performance on large repositories
Optimized performance in FormCheckoutBranch
Merge branch 'pr/n1257_feinstaub'
Use font from settings in revision grid
Updated changelog
Clear branch list before adding remote/local branches in checkout branch dialog
Fix dashboard for mono/linux
Icons: Transparent background for Rename and Copy icon. Copy original / unmodified icons into subfolder "originals".
Icons: make merge / rebase green to match branch color.
Icons: separate icons for Delete branch, delete tag and cherry pick
Icons for Cleanup respository dialog.
Added support for ensime
Site updated 2012-05-17
minor name change for tests
Extracted renderer class instantiation into protected method for reuse
in subclasses.
Merge remote-tracking branch 'upstream/master' into improve-renderers
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
Replaced spinlock by passive waiting using FutureTask
Merge branch 'master' of https://github.com/tomsontom/e-fx-clipse
Merge branch 'master' of https://github.com/winterer/e-fx-clipse
Merge branch 'master' of https://github.com/tomsontom/e-fx-clipse
Added at.bestsolution.efxclipse.runtime.workbench.renderers.* to
Export-Package to be able to subclass custom renderers.
Added support for nested stacks.
Made label, localizedLabel and closeable optional.
Merge pull request #22 from winterer/improve_generic_renderers

Improve generic renderers
Enable colorized, detailed RSpec output via Rake
Gio: refactoring css style to remove unused params
Gio - #13: added success percentage to the spec summary
Gio/Thiago - #6: added parser to set feature sourceCode
once again correct something i got wrong due to my inability to comprehend basic boolean algebra
Testing new AppHarbor integration
issue #6: allow spaces around jsl control comments
issue #8: hard wire jsl to use python2.6 to avoid problems with it not being the first python on the PATH
issue #8: ensure we link against the specific Python 2.6 framework lib, even if that isn't the 'Current' version
Merge pull request #9 from trentm/python27build

issue #8: hard wire jsl to use python2.6
Merge pull request #7 from trentm/issue6

issue #6: allow spaces around jsl control comments
Stop hardcoding python2.6 and having a silly include path
Merge pull request #11 from mcavage/master

Stop hardcoding python2.6 on SmartOS
reverted small change in ref to `paths`
Merge pull request #3 from rkaron/master

apply patches for typos
Modified gitignore once again..
startdialog.cpp and startdialog.h modified a bit
Move the tabindex to the top-level container
Ignoring .swp files and our old friend .DS_Store
Hitting things with the ugly stick
Text-shadow nazi
Consistently spell Console with a 'big' C.
- Deleted obsolute changelog.
- Improved refresh behavior.
- Fixed neocomplcache#complete_common_string().
Fix : add "a:" >>neocomplcache#head_match()
Merge pull request #230 from LeafCage/master

関数の引数にa:を付けていなかった問題
- Improved initialization.
Merge branch 'master' of github.com:Shougo/neocomplcache
Fix s:is_enabled default value
Merge pull request #233 from daisuzu/Fix/Initialization

Fix s:is_enabled default value
- Supported scss.
- Supported scss.
- Version 7.2 development is started.
* no neocomplcache 4 -> 5 migration info needed
* vimproc url was wrong
* trivial english fixes
better english
Abrakadabra init
Merge branch 'master' of github.com:unixander/Abrakadabra
player can send message
date header template finalized
Init basic requirements
Squashed 'sun-java6/' content from commit abd6e47

git-subtree-dir: sun-java6
git-subtree-split: abd6e471bee9494bf490e3c32f668b16d1145001
Merge commit '866b9cc1dda2b733f2863543c4d788013af73924' as 'sun-java6'
Squashed 'sun-java7/' content from commit e992bac

git-subtree-dir: sun-java7
git-subtree-split: e992bac5d6c4d9178a94f75484a341e26c24437b
Merge commit '5c2ca021b3f40ef32e0b593a96f527e1aa41c552' as 'sun-java7'
Add README
replace case with logically equivalent statement, give new_ab_test an options param for readability
Tela inicial de configuracao do tabuleiro
Merge branch 'master' of github.com:victormaehira/navywar

Conflicts:
	src/main/webapp/WEB-INF/jsp/navywar/configura.jsp
Merge branch 'master' of github.com:victormaehira/navywar
desenho do tabuleiro
fix bug where we weren't tracking unknown's
see http://stackoverflow.com/questions/10643918/auth-statuschange-doesnt-fire-during-fb-init-if-the-user-isnt-logged-in-to-fac
add email test for button color (red vs. green)
Added to Pypi. Changed install instructions to use pip.
sphinx.conf.sphinx.conf.prepared
adding image
bump up version
Content and Buttons
Initial work on switching to new Passenger
Use method format instead of hash
Explicitly join to string
node.nginx.passenger
Don't fetch from github because we want to control the revision, store on s3 and track checksum
fix names in watch function, comments and delete unuseful code
Add BODY selector
Add jQuery
Add init jQuery function
Merge branch 'css' into development
Merge branch 'html' into development
Windows x64 solution label tweaks
Added 'task comment' feature (A. Radimov asked).
Selected Planet Integration (Fixed P2/ Optimized)
add FileStorage.root
added insertion sorting and stubs for other simple sorting algorithms
Adding bash_profile settings
Updates to make creating apps easier
change file_upload.php
构建项目框架hibernate
bugfix for left list while init and load data
Modified file: G:\test_geakitd\abc.txt
CHANGE: Repetitive javascript explanation comment
Added .idea to gitignore
Fixes ' superclass mismatch for class Mark ' error
Added Mongoid support
Fixes Mongoid generator
Refactor generator
Remove attributes line from the model generated by protocolist

Protocolist generator invokes default active record generator, which
adds this line to the model:
```
    #attr_accessible :title, :body
```
Which is kind of ugly, because we already add our attr_accessible
line. This commit is a quick solution to this problem.
Add instructions sections
Implemented the switching of players' turns
Updated SSI demos.
Added WET 3.0 initial SSI version
Merge pull request #2 from MaddyDaigle/master

SSI template added
Fixed reference to domain_master function.
indexes for mongo added
some refactoring and additional TS inclusions
some refactoring and additional TS inclusions (setup)
some dependencies added
some dependencies added
some dependencies added
rsm.css for custom styles added
some refactoring of Home Layout
some flux options removed from home layout
refactored bootstrap inclusion in home layout
removed FED tutorial artifacts
refactored man navigation -> bootstrap responsive navbar
moved breadcrumb to partial
some layout fixtures (bootstrap file inclusions)
removed the rest of old breadcrumb
some additional FED tutorial artifacts removed
additional fixtures on home layout
moved submenu to partial
moved mainmenu to partial
Init version of User TSConfig for BE usergroups added
disabled maxW setting due to responsive images
[Makefile,scripts] revision of wiki types

Makefile now uses wiki-names.sh to get the list for nls-install
no  that the wiki name lists only exists in two places:
 shell script: wiki-names.sh
 Lisp program: GenerateIndex

Signed-off-by: Christopher Hall <hsw@openmoko.com>
[offline-renderer] fix undefined variable

Signed-off-by: Christopher Hall <hsw@openmoko.com>
[scripts] add message to show which items are scanned for symlink

Signed-off-by: Christopher Hall <hsw@openmoko.com>
[fixes] for appropedia and wikihow

FileScanner must ignore other attributes e.g. bytes=""
on the <text> opening tag

Signed-off-by: Christopher Hall <hsw@openmoko.com>
added g3dopt.py help message
update schedule about setback.
Add a verbose type for lsm. Convert debug print statements to verbose
messages.
Fix some gcc warnings:
../src/session/session_root.c:503: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'int64_t'
most up-to-date highest grade possible
more elegant api
[3.2.3] Templates XSS #1575
hide cart note if taxes are disabled
Mangler USERLIST
mangler USERLIST
færdig med at merge
Fint
fint
/all implementeret
Added html slot view and tests.
Removed reference to oerui
Merge preview changes from oerpub-master. Manual merge since paths have diverged.
Merge df84c89d7e13d027245e94f148525a05e2f72b70 from oerpub-master. Manual merge cause code paths diverged.
whitespace gardening, better default onUploadSuccess
whitespace gardening
added copy method, some tweaks
fast
imple insert_on_duplicate method (taken SQL::Maker)
using Module::Build
reduced the JVM heap size
Merge branch 'master' of http://github.com/xi-project/xi-filelib into publisher-refactor

Conflicts:
	README.md
Merge pull request #29 from xi-project/publisher-refactor

Publisher refactor
multimodule init commit
fixing the passing the session data to airbrake and fixing adding nested arrays to the XML object
Indenté algunos archivos, ahora acepta 1 solo toque por jugador y las areas de toque son proporcionales al tamaño de la pantalla (20%, 100%)
Emm, parece que comitié mal, ahora sí :P
Ignorar los .DS_Store y algunas otras cosas de Xcode
Ahh, que atroz, quedó la cagá con los ds_store y no puedo hacer pull xD
ignorar otro ds_store, por la crestaaa
Removed debug code. Auto load tooltip using the data attribute
Finished coding module. Debug and testing required.
WIP: still buttons to be connected

add a color picker
add push buttons, selectors and sliders
volume/mesh/fibers rotated labels are centered thanks to "float: left"
ADD: color picker library
void-installer: revbump for latest fix.
dracut: add 2 useful patches from upstream git master.
kernel-snapshot: update to 3.6-rc1.
shadow: remove utils provided by util-linux>=2.22.
util-linux: update to 2.22rc1.
shadow: also remove sg.
util-linux: provide sg(1), fix systemd service, provides eject vpkg.
systemd: sulogin(1) is now provided by util-linux>=2.22.
shadow: newgrp(1) is provided by util-linux>=2.22.
util-linux: fix replaces for shadow.
xbps-triggers: [virtualpkg] handle all vpkg files.
kernel: update to 3.3.2.
buildbot-slave: update to 0.8.7p1.
xbps-git: new day new rev.
Fixed margin error
Added touch and drag support
Fibonacci implemeted in iteration and recursion.
引数のキャプションを変更

内容と違っていた
affichage des devis déjà achetés dans un but marketing
filtrage selon les notifications
Add general password machism for supervisor login

Signed-off-by: Ying-Chau Huang <yingchauhuang@gmail.com>
Added bailout step to prevent explosion
Automated commit on Mon Mar 19 21:42:11     2012
Fix a bug putting array value to local variable
Actualización Sintaxis Básica
Added a dropdown.
fixed markdown notation
Fixed Entity so it prints right
Cleaned up fromString to use String.split

Also added 2 tests for just empty Attribute or Relationship
Fixing ngs scripts
diff実行時に改行が無視されるバグ修正
Updating timeout to mirror max response time
- Better host and language management
cvb
cxv
Ignore the data from text input in POST request.

Fix the problem when the option in dropdown list is not always working.
Updated libraries...
model is bad and i should feel bad
fixed path issues between root and other users
removed controller recipe
use dhcpd for lxc container network configuration so we do not have to hack up the lxc templates anymore
cocokinect
增加初始化数据的方法
Github ticker #1 :
 - Alpha-version FTP transfer
20.0 完成 变量名、函数名
Fix update method error
Updated package version, querystring module is now required
fixed the following format inputs:
-meeting with ramon on monday
-date on mountain at 3pm on 15th may
-meeting at soc at 3pm 15th may
-meeting at 3pm 13/2

Signed-off-by: shubham kaushal <1shubham@gmail.com>
WHISTLE-1111: remove the crash dump... duh!
Trig on op1 now actually works, but still has to be tested
Fixed Main window destroy event. trying to fix create user window destroy event.
Update notes for submitted changes

* tf201: remove aokp-specific overlay files from device tree
pad/blink.py example
Hello World Linux Driver example
Updated simplified Chinese translations

Change-Id: I2b22478aaa730e3a88e7caa4fb6d21b0a928743a
Merge "Updated simplified Chinese translations" into jb
Adjust Volume steps

Change-Id: Ie52a6c6b19bb261abedffe609be3c96c18f9225b
Add show pattern dots option (1/2)

Change-Id: I9cbacc8c89d040887832a0114164baf20aaa8edb
Menu UI Overflow Toggle (2/2)

Adds the ability to show the Menu UI Overflow (3-dots) within apps, regardless of navbar being present or not

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
Smdk4210RIL: block unsupported requests to avoid RIL wakelocks

Change-Id: I54fa04be9389b6a2a5843ffcd074c64d24dfc03a
ime switcher notification: remove reboot requirement (1/2)

patch set 2: fix uri, remove old comment, add handler

Change-Id: Ie21fed15c2cc865ae2d164fa485cc44d69ef5452

Conflicts:

	services/java/com/android/server/InputMethodManagerService.java
Merge "Menu UI Overflow Toggle (2/2)" into jb
Fixed 2GToggle longpress action

Long press on 2G Toggle now open right settings dialog.

Change-Id: I5b7040b1ca33d59365b4e8fe5e5a3fdda052a55e
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Merge "ime switcher notification: remove reboot requirement (1/2)" into jb
Merge "Fixed 2GToggle longpress action" into jb
Un-hard-code default toggles and remove vibrate from default.
Add a string-array with the default toggles and read the
array to populate default toggles.
Signed-off-by: gdanko <gdanko@gmail.com>

Change-Id: I65516acb22f6880dffb7f2d5d7d52a89381c2123
Merge remote-tracking branch 'aokp/jb' into jb
Removed over 1100 lines of legacy code
Added check for process error
Capture of stderr for inclusion in exception message
Added -m flag for ignoring minor errors
Method renames
Showing phone_id in Order Form + Numaricility
Merge pull request #1 from Aliya-cmuq/PhoneIDinOrderForm

Showing phone_id in Order Form + Numaricility
More dev + second notif to check
Corrected Stemming + LSI multiplication + added test dataset
BagOfWords working - needs to test LSI
add exemple.json.
100% test coverage of MatchingFeatureExtractor

Fixed a bug: when one region did not have both features that are being tested for equality, the extractor would throw an exception and stop running for all of the regions.

41% of featureextractor lines covered.
100% test coverage of NormalizationParameterFeatureExtractor

One of the tests is pretty clunky. SpeakerNormalizationParameters needs getter methods for easier inspection of the parameters

41% of featureextractor lines covered.
Better and new dia figures
Fixed bug in debug menu
fixed npcs waiting for air to clear
new level layout
Extends translation implementations to allow several files per translation domain
Extends config view helper to allow nested configurations
Merge pull request #19 from nsendetzky/master

Extends translation implementations to allow several files per translation domain and config view helper to allow nested configurations
forgot to uncomment the one testcase
added first implementations of the transformation engine prototype. At least forwarding works for now
concat of strings now also work in the transformers
Refactor gem task initialization

- remove the need to always run compile_gems before other methods

Change-Id: Idf5d85876a0617a8f1b606cfd410851aa0f337f4
Precompile assets in Rails 3

- run rake assets:precompile on stager

- assume that assets were compiled locally if assets manifest is present

Change-Id: I23a62e9a5d6ce45da6547d79e6ab6bf966b92b90
polishing pains
* v1.0 Stable Release
SignApk: perform the whole file signature in a single streaming pass.
mkvendor.sh: fixes for Android 4.2.

Change-Id: Id7ff9ef03700d595734811ccf868371ffb024384
roomservice.py: Verbose error when a branch is missing.
Also add ROOMSERVICE_BRANCHES environment variable to use fallback branches.

Change-Id: I3c2b1d79fc185c1f1e1d658e5ca4f78e688780e2
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD
rename bsdcore to netbsd.
remove c9 revision
linux-bede :: 3.6.9rc1-1

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

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

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

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
Chunk rotations are now correct
solucionado el error que tiraba en followers
[Bleeding] Add ExpBottleEvent; Addresses BUKKIT-888
[Bleeding] Added way to get/set if an Iron Golem was player created. Addresses BUKKIT-1229
[Bleeding] Add iterator() with starting index. Addresses BUKKIT-1246
[Bleeding] Add Chest.getBlockInventory() for convenience; this always returns a single chest inventory. Addresses BUKKIT-1247
HistoryToDBSync v2.2
Update feature1.php

Added driver/passenger/both filter
got basic petri net tokens working
put the correct indentation in the ftl
WIP
merge with roan, new layout of tree plugin
updated to 1.3, now shows leaderboard!
Tied in code to show posts, threads and last post.

Now home view shows the following:

Last Post
Threads
Posts

All linking is also done along with routing.
code cleanup
Moved rendering to vbos

...in a sloppy manner to see how I want to connect types
fixed punctuation - you happy, ben?
Facebook: Now calls footer where footer needs to be called
awedaw
Needed to expose the setDefault method in order to subclass it
Added the program summary to Git as we don't have dropbox and are done soon
Merge branch 'master' of github.com:Claus35-dk/TaskManager
Fixed response parsing for deleteSnapshot command
Adding user.py to user branch
board and splash screen
functionalish gui
added pgu requirement
adding images
Merge branch 'user' of https://github.com/CluelessNERDS/Clueless into user
lastest svg headers from w/n
answer key title bkgrnd color overwrite colophon
Merge branch 'remaining-bugs' into dev
Release v12.06
Replace input buttons by links
Better textearea style

closes #17
some missing edit components
improve link list
display stylesheets buttons with two columns
Merge branch 'feature/edit' into develop
Retirando NPCs duplicados
Restyle iOS buttons
QuizConstructor migrated to Neo4j
Merge branch 'devel'
Updated default date format to solve an error when navigating to the "orders" section in the admin panel.