labofsahil/github-event-dataset-2012 huggingface dataset:
[ux] removed sauce labs from sponsors
[ux] added lance to speakers
test
Merge branch 'master' of https://github.com/indiajuliet/ballongame
merge
Conflicts:
	js/FlyingObject.js
THumbs und desktop weg
some fixes ;)
Add sort
Rewrite intent
refactor common function
performSetVisible, performSetEnabled
correct event handler
Do not use intent on onCreate
Single thread and add loading message
rewrite exception handler
Reconfigure splash activity
Move to list when it is empty
add first date
Update administrator/templates/isis/css/template.css
Admin login language + various typos
- tweaks to template color overrides
Merge pull request #64 from infograf768/infograftemplate8

Adapting Admin login Module to languages + some typos
- adding invisible labels for accessibility and changing remind/reset links to icons
- adjusting login input widths, updating admin navbar font color, moving width-auto to core extended bootstrap
moving width-auto to core extended bootstrap
- compiling css
- adjusting module positions for sample data
Bunch of minor fixes.
Added missing new files/folders
- adding clear fix for extended editor buttons
- Bootstrapping weblinks form, partially fixes issue #62
Merge branch 'template8' of github.com:Joomla3-Admin-template/joomla-cms into template8
Merge pull request #65 from nonumber/installer

Added missing new files/folders
Merge branch 'template8' of github.com:Joomla3-Admin-template/joomla-cms into template8
- fixing Isis and Protostar install data
Minor code changes (changed depreciated/old code)
Merge pull request #66 from nonumber/installer

Minor code changes (changed depreciated/old code)
Optimize images.
Remove unneeded JS bit
Removed fork me on github when logged in as it goes over the user menu
changed maintainer
release 0.4.1
Merge branch 'master' of github.com:ipa320/cob_navigation
Merge branch 'merge320'
remove internal dependency
Stripe and project creation mechanics.
added control of verbosity of InputStream.
remove deps.lock
Fixed: BoundedLabelThingPeer would not always update text
funny saying
Merge branch 'development' of https://github.com/j-walker23/MyTruckLane
updated resume, new blog post
Added trianglePath.d (euler 18 and 67) and updated README.md
Removed any deleted files, post publish
add randkey
add more cache to speed up main page
Merged the chaos, and we are now getting the JSON in the appropriate View Controllers.
removed sass from deps
added rake tasts for prod deploy on heroku
Removed Unneccesary Python code
Updated index to use main css.
bit better organization, staging for if I decide to add more commands. Might possibly fix trying to check offline players.
Added option to not use the commit dialog to specify the commit message

To better support git workflows which use standard git commit templates or
prepare-commit-msg hooks, the "Write Commit Messages in Commit Dialog" option
has been added to the gitextensions tab of the settings window.

When it is unchecked, the commit dialog won't specify a commit message to the
git-commit, allowing git-commit to do it's behaviour of launching $EDITOR giving
the user the ability to edit the auto-generated commit message, just like on the
command line.

By default the original behaviour is used. (Require the message to be entered
in the commit dialog)
Plugins/AutoCompileSubmodules: did not compile because of previous changes
Code style: convert tabs to spaces
FormRemotes: Rearrange buttons to more intuitive positions. Add a close button (no function yet).
FormRemotes: code style
FormRemotes: Close button closes dialog
FormRemotes: Icons for New, Delete, Save
Uncover reason why file is not supported.
Reencoded file name is not needed here.
Fix broken dashboard layout.
Corrected patch processor, now whole header is displayed.
Compilation error
Start with empty module working dir
Merge branch 'FixUnitTests' into UnsupportedFile
Corrected TestLoadPatch
Ignore nunit test files
Include nunit dlls
Translate some German text messages
Translate some German text messages
Translate some German text messages
Reencoded file name is not needed here.
Let object decide which items are to being translated
friday's push
SWITCHYARD-873 add support for creating SwitchYard Service tasks in bpmn
editor
Updating carbon-0.9.9 SRPM.

- Adding carbon-relay and carbon-aggregator support.
- Standardized naming to make things more specific.
Added Ctools and Views not enabled
didn't need this… i think
login almost works now
Added code comments
Produce XML files from XML code comments.
Removing the database after the tests run.
Added option to get all partitions, using Topaz for dealing with continuation tokens explicitly, as the query could take a lot of time to be answered.
Starting the EventSourcing/EventStoreBusPublisher will look for all the unpublished events in the event store, and publish them.
Running the conference app without LOCAL, uses the Azure tables implementation for Event Sourcing.
Subband number start at 0
Sort subbands by number
Script to insert data locations pulled from CEP
Format subband data locations on observation view
Clean up "archived" and "on_cep" states.

Each of a Beam, a Field or an Observation can be marked as archived and/or on
CEP.
Show various field states on survey map.
added sumlabels.py
updated setup.py to include sumlabels
More EOF_WHERE() changes
Fixed decl_copy() not linking up correctly
Warning on testing an address-expression
Updated deps
Warning on nuls in certain string contexts
Tweaked nul-termination warning - was picking up the implicit nul
Merge branch 'master' into decl_init

Conflicts:
	src/cc1/Makefile.dep
Fixed Gendeps - regex wasn't matching __builtin
Merge branch 'master' into decl_init

Conflicts:
	src/cc1/Gendeps.sh
	src/cc1/Makefile.dep
Initial commit
Merge branch 'master' of https://github.com/jellyproject/jellytype.git
Moved browsing location
Previously renamed pos_inode_list_entry to pos_list_entry
Make page size configurable (although not well supported)
一种解决创建点问题的可能方式
开始完成打标号模块

现在已经可以在tree上面展示所有PMI了
完成了打标号的代码逻辑，

基本上可以上移下移，可以选择打标号，或者不打标号
完善tree，准备开始打标号
加入3DPPM
打标号即将完成，不过当尺寸竖直时总是有点bug
开始加上行位公差模块
增加了editballonnote模块。并且如果一个PMI已经有ballon，增加了删除
完成了一些bug的修复，除过点击查询尺寸标注后直接显示尺寸的ballonnote标注信息在tree上外，其他没问题了。
subtle update
加入multimap.....还未完成。
基本上搞定，但是删除ballonnote还是有点错误
如果对一个node点击右键，出现打标，则会把其置顶，以前是把他放到第二个。。。
123
เพิ่ม Autosave script และ Notice สวยๆ by p'mick
Use Django 1.4
WIP
docs fully integrated
First draft of Debugger.Source specification.
Refine Debugger.Source docs.
Borrow changes from old 'origin-tracking' branch.
Driver for NTCIR submission.
Made CCLParser client more resilient.
Added .gitignore file.
Minor improvements based on conditions eval.
Made output more compact.
Debugged driver
add pattens as chunks; extract chunk features
Merge branch 'master' of https://github.com/DrDub/hunter-gatherer

pablo's submission driver
change to maruku
Improved authentication mechanism.
Fix Movie browsing.
Better centering of availability button
Changed the README from markdown to just plain text. This will
allow it to work better as the long description on PyPi.

Fixes #4.
Moved SLColorArt up to the top level of the project dir
Fix for wrong image size in MPMediaItemArtwork
Added timing log to the SLColorArt creation
Only sample every other pixel
Only show albums that have artwork

Isn't working quite right now
add login credentials to private data file to more easily allow for local and LDAP authentication
updating version, doc and cov
Generaattori, javadoc ja lisää dokumentaatiota :)
upgraded to core plot 0.4
correcting the mogenerator scripts
euh - submodule commit deleted
ejemplo de resultados  repetidos corregido en lectura 8

Signed-off-by: Joao Fuentes <joao@localhost.localdomain>
Move class method to instance method
just some comments
Fixed with ReportMail
några kommentarer
fixade knapppositioner i create
fixat
Merge branch 'master' of https://github.com/johul223/politicimpact
Added stuff to reportmail
fixed conflicts
Merge branch 'master' of https://github.com/johul223/politicimpact
fixed positions
Merge branch 'master' of https://github.com/johul223/politicimpact
Fixed some in desktop caseitem details
Merge branch 'master' of https://github.com/johul223/politicimpact
fixat två fel till svenska
Minor changes in style-sheet
Finished comments in caseitem details
mer oversattning
Merge branch 'johannes'
Logout fixat
Added search to desktop
Each delivery will now indicate the channel group (by name) from which it originated.
glue and unglue are event.js related things, moving to event file
Added filtered public projects to show user
Added changes to user view
Got a preliminary version of all events working
Add another way to craft axes
Substantial rework of TileSource and Viewer.openTileSource to allow simpler introspect of the intended TileSource implementation based on the configuration object details.  Also major www updates to simplify and unify the informational site by building it via simple templates.  Improved examples and documentation.  Added support for xml, json, jsonp, and inline configuration of supported tile sources.
Merge branch 'master' into working

Conflicts:
	openseadragon.js
	src/dzitilesource.js
	src/viewer.js
fix win build. zip up mac build
checking parsed options...
Added foundry.json
Added connections index action and specs for viewing all of a contact's connections
projects table complete, mysql initialized
rigs table import, dropdown on proj page, css in app layer
f.select and db relationships setup for time entries
added technician and time entry associations
tasks created; links to project_show created
working on forms for tasks
user login system
user login set to public landing page
initial push
Merge branch 'master' of https://github.com/jpellizzari/whiteboard
Update my-lib/pom.xml
added admin as seller user in sample data
properly working 'require' line for using ActionView sanitize_helper
Added a note that submitting code changes is done by way of GitHub pull requests.
Merge pull request #7 from daniel-pittman/patch-1

Added a note that submitting code changes is done with GitHub pull requests.
added settings for PAgodaBox hosting
boost version number. fix portrait codes
release version 3.0
stable
eliminate tests
dotgitconfig file added
Adding young-pirates.org
You can use adc,i2c,timer, and uart Library.
Check Library
ADC WORKING!!
Change Structures Name

Init structure's name were changed.
SPI Added

Did NOT TEST for this SPI Librarys....
Merge branch 'master' of github.com:junpei0824/AVR-Library
don't create an intersection filter if the alpha map of an object instance contains less than 5% of fully transparent texels.
renamed the file format revision attribute from 'revision' to 'format_revision'.
renamings.
updated the reference output of the devkit sample.
added date to PS1, extra vimrc settings
adding .zsh_aliases
title to splitter, added touch-icons route
put hspec into the primary dep list until i can figure out why things are breaking.
created binbuftest, restaged template
database config
Capistrano colors
fixes #81, but it can be done cleaner
Add order_number for stock_record in restocking and normal forms
Add order_number to restocked_items view
Edited stock form : added supplier selectbox
[spec/controllers/api] WIP : shipment_controller_spec
[api] Added a pick request for inventory unit
[spec/controllers/api] Create inventory_units_controller_spec
[spec/controllers/api] WIP : Added spec for checking if shipment is marked as picked if all IU are marked as picked
q fix
Klar
Merge branch 't1'
Moved to postgres and working
Commenter name fix. Added sign_out to user page
initial commit - server
adjusted ClutterMat to average 20 values instead of 10 or 100, seems to work better --KW
Complaints and Debate pages
Improved config and its parsing
Updated README
Selector feature added to JQuery KO plugin..
SessionToken in UserControllers

SessionToken appear in JSON returned just by singIn and singUp to adjust
in REST API model.
Changes in UsersController.singIn

UsersController.singIn converted to a GET method (instead a POST). Now
it receives username and password as arguments.
inizio refactoring campi DB e aggiunta salvataggio friends relations alla friend req
Cominciato a strutturare il codice ed iniziato a scrivere il primo metodo
Added bunsen theme logic
NSDate+TKCategory: perform all calculations in the same time zone

This fixes the "monthDate" method being broken on non-UTC devices: it would return a date in the local time zone, then format it in the UTC time zone.
NSDate+TKAdditions: avoid potential category conflicts by prefixing methods with very common names
TKCalendarMonthView: add a -rectForSelectedDate method
Restore the standard color for unselected day numbers
UPDATE THE STYLING OF THE FEDORA RPMS LIST
Update luvit/arrayspeed/README.md
luvit-websocket worked on osx and chrome client
yeah
OK
add resources :organizations to :admin namespace
GUI + images
Mesg
commit on monday 27th february
second commit monday 27th february
last commit
end of april
Site updated at 2012-09-27 10:46:01 UTC
Added HTML,CSS,JS for the sharing buttons, now working
Disable nagle algorithm
added some links and tweeks to the West Coast IPA story
support for 3NF check
h264.so script, revert README for android port notes
Loste mitt fail
- added version display from maven properties
Changed config assets
Add min.js file
Stupid aliasing behavior
small bug fixes and enhancements
fixed query limit bug in _QueryHelper
Initial upload of MobileNetworkTool
Work of today. I don't have any floooooow.
Moving coins and stationary ones are on different layers, so stationary ones appear behind dropships but moving ones appear in front.
Changed logic so coins and dropships spawn more frequently and at the same time.
Flying enemy has 0 gravity.
Increased possible # of bullets to accommodate gun supercharge.
Very basic pause menu. Graphic not in yet because of conflicts with zwoptex file.
Merge branch 'master' of https://github.com/kristianbauer/BitBlast
added google signin functionality not quite done with callback method
added calendar view plugin with working events
OpenGL work

Clear
Present
Set clear color
Added more documentation to the code for the simple Nurikabe puzzle.
ポジションも直接指定出来るようにした
ポジションも直接指定出来るようにした
Springer.
finished intro to tags and added example src file
Site updated at 2012-08-28 02:15:29 UTC
Determine critical hit with coinflip, not randint
Use coinflip(), not rand(), in a few abilities
Merge pull request #75 from encukou/random

Minor RNG fix
Fixed minMax generator.
Fixed Beat Up bug in doubles / triples.
Now CrushCrip has at least 1 BP even if HP is low.
Added V-Create as an event move for Rayquaza

http://bulbapedia.bulbagarden.net/wiki/List_of_Japanese_Nintendo_event_Pok%C3%A9mon_in_2012#15th_anniversary_Rayquaza
Only available at level 100
Rhydon/Aggron Whirpool TM/HM in Gen 3
Partially done temp ban.
Added Event Pikachu in Teambuilder

http://bulbapedia.bulbagarden.net/wiki/List_of_Japanese_Nintendo_event_Pok%C3%A9mon_in_2012#ExtremeSpeed_Pikachu
Can only have the ability Static.
Fixed event combinations file.
Fixed LifeOrb not activating when damage=0 due to Focus Sash, etc.
Merge branch 'master' of ssh://github.com/lamperi/pokemon-online

Conflicts:
	src/Utilities/Utilities.pro
Merge branch 'master' of https://github.com/coyotte508/pokemon-online
Allow up to 99999 server listing to be sorted.
Renamed the test files and added default test files; BETA VERSION OF SYNTAX SCRIPT ADDED
Updated fr translations to 2.3.4
Update Views/Account/Register/Register.css
Improve README 4
add basic profile
use melpa's auto-complete

TODO: delete vendor/auto-complete later
Fix up some page
Added new .gitignore to prevent accidental commits
Source formatting
LPS-28929 fix upgrade
LPS-28574 not using "deleteFileEntryIds" anymore
LPS-28253 MessageBus default response destination should use SynchronousDestination to prevent creating new MessageBus Thread under MessageBus Thread which could cause AccessContext leak when SecurityManager present
29138 Fix bad translated Dutch country names
Added search tests, fixed database cleaner issues
Actions (scalable)
LPS-27906 Fixing timezone issues
LPS-27906 Move to own method
SOS-1185 Added so-ce.css for visual styling and so-framework.css for structure.
SOS-1185 Rename files
SOS-1185 Rename files
LPS-29542
LPS-29542 Source formatting
LPS-28501 Show link to other portlet only when the portlet is on the page
LPS-28501 Source formatting
Source formatting
On ARM: Don't be spooked by Puts to the translation-invalidation spec
when doing origin tracking, even though they are completely irrelevant.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13177 a5019735-40e9-0310-863c-91ae7b9d1cf9
Update somewhat.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13178 a5019735-40e9-0310-863c-91ae7b9d1cf9
Valgrind-side changes for new primop Iop_GetMSBs8x16, introduced in
vex r2590.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13179 a5019735-40e9-0310-863c-91ae7b9d1cf9
updated xen statistics
Rewrite WIP: Extract BaseTableUIElement
Rewrite WIP: Implement a table view control; excluded paths can now be displayed
Rewrite WIP: Monitoring Options: hook up “add/remove excluded path” buttons
update css for a deleted div element in workspace-items
added posters on about page
logfile nobuffer
started the web interface
few TODOs and fixes
* fixed h1 printing
* no rotation option added
* preparation for multi lists
parsing of albumshaper metadata done
album shaper transformer for one album "works", but needs sorting
transformation working (not nice, but working:)
Drupal frontend profile.

Make file name more explicit.

Declassify.

Add Drupal deps.
Better development workstation profile.

Declassify.

Clarify filename.

No more user.

Add virtualbox (mostly for testing these profiles).
updated device names for use in METAL
pop ranges working in columnts. Needs tests on zset and timeseries
several fixes to columnts with increased test coverage
add depth of field
minor revisions to README, added touch test_dump to scripts
i pushed it in enthusiasm before cleaning up some needed things
switch logic implemented
Fixed : There is now a default HashAction in order to manage an "on pop state" event on an empty historyStack
Primeira versao da pagina ADM. Ajustes ainda tem que ser feitos.
voltando senha do professor Leonardo
Fix link got github profile
$ character removed
Merge pull request #65 from lurajon/ZlatanM

$ character removed
Merge branch 'master' into BugFixes
fixed a merge problem
restructure handler to match opscode more
delete no used fiels
Deleted 20121030140800.md
added rb type, balance and insert function (from the book)
Created but hidden personal tab on homepage. Added content to work experience.
誤ってenに反映したものを原文戻し
Removing tmp files
ignoring unnecessary files
Removing log files
Ignorgin log files
Removing sqlite3 database from repo
Ignoring database files
commit
Merge branch 'master' of https://hwechori@github.com/maninsoft/smartworksV3.git
removendo readme do rails
Deleted unused
Added OK button to dialog description
added missing version properties for errai, mvel, gwt
generate atom and rss feeds of the changes
add generated atom and rss feeds
add links to atom and rss feeds
make ssh key uploads only a suggestion
Add sample testing strategy, test case list, and test case description to test lecture
Validator resetCurrentReservations

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
method sendmail now in ReservationBean. Extraservices displayed in Overview :-D
openscad: add small support
Add missing 'void' word to C#
Move C# type list to a local var via include magic
c# - object is a type, not keyword
C# - highlight system.collections.generic types

These are very common types so they should definitely be
recognised.
new haxelib build
Merge branch 'master' of github.com:marticorni/On-the-road.git
Working on UnitOfWork wrapper around ISession

Signed-off-by: Md. Latifur Rahman Maruf <marufbd@gmail.com>
Merge branch 'dev' of https://github.com/marufbd/DefaultDDDArch into dev

Conflicts:
	src/Zephyr/Data/NHib/UoW/NhUnitOfWork.cs
	src/Zephyr/Data/NHib/UoW/NhUnitOfWorkfactory.cs
	src/Zephyr/Data/UnitOfWork/IUnitOfWorkFactory.cs
added updated at in users stats
attempt at creating a dispatcher worker design using spring integration
Add content types back to dump.
GUI casi completa
GUI casi terminado
2012-03-21_11:04:56+0400
2012-09-22_23:41:00+0400
Merge branch 'master' of https://github.com/matimatik/translations
2012-04-27_14:04:57+0400
Initializer in engine was deleted in favour of prepare
Bump to 0.2.7
agrego carpeta con poster
random string generation changed to include zero padding and initial '#' for hex string
added preventDefault when tag is removed

added preventDefault when tag is removed to prevent unrequested page
refresh
commit all
Merge pull request #8 from intuxicated/master

custom element for list , remove tag duplicating , use custom element instead base element
update purpose of repo
Patterns vereinfacht

Signed-off-by: Maximilian Hoffmann <me@maximilianhoffmann.com>
Site updated at 2012-05-06 14:54:23 UTC
Use isotime instead of strftime, because it handles years < 1980
Fixed type checking being useless, because of shared super classes
Create events with all new attributes
Use uid instead of summary^dtsart if it exists
never say final
Initial McCall Solutions check in.
objects selecting
Updated Local saving
Updated Test's
Update profile page to show course options
Update dashboard to only show default_course details
Two KatushaDbContexts for Glimpse.Ef and Glimpse.Mvc to work fine.

Also this affects Runtime too. Dunno why!
Clean up header
About page
Added theme.
Merge branch 'master' of github.com:meyersh/emacs-dotfiles
Add formatting and theme CSS to asset pipeline.
add virtual/mgiken
lol forgot the libs ;)
Renamed db tables to be Rails compliant
cleanup test module. fixed addwatcher -command
UI upgrade for instructor import area.
Added whatyousee wysiwyg feature
show qr on quote
change div tag on li in basket item string
DBObjectXStreamSerializer now supports collections

However, the serialized format is nowhere near what it should be. Still work
in progres...
Restructuring of the BSON Serializer

The new format has better support for the structure of objects that XStream
creates.
XStream based serializers store the serial version ID as revision number

When no explicit @Revision is added to an Event, the serializer using the
serialVersionUID (either explicitly given or generated by the JVM) as revision
number, instead of defaulting to "".
Future versions will have a configurable "RevisionNumberResolver" to allow for
customization of this process.
Added some more documentation

Briefly described the SpringAMQPTerminal. More documentation will follow in a
later stage.
Updates versions in master pom

There seemed to be a problem in the generation in the checksums in one of the
plugins. This caused proxies to ignore the files, as they were invalid.
Initial draft for the Event Upcasting documentation update for Axon 2.0.
Whoops, fixed issue with formatting.
Fixed some more formatting that was accidentally ruined.
Minor modifications to the 'Event Upcasting' documentation.
Finished the first draft of the Upcaster documentation for Axon 2.
Minor documentation changes
Fixed assembly configuration

There is now a full assembly (14 MB) as well as one that doesn't have all the
dependencies (5 MB)
[maven-release-plugin] prepare release axon-2.0-m1
[maven-release-plugin] prepare for next development iteration
Added authentication support to MongoTemplate implementations (#55)

The MongoTemplate implementations now support the configuration of a username
and password, that cause the authentication command to be sent to Mongo.
Allow configuration of policy of unresolved routing keys

When a routing key is not present for a CommandMessage, the policy defines the
behavior of the RoutingKeyResolver. It can raise an error (default), a static
or dynamic routing key.
Allow configuration of policy of unresolved routing keys

Added documentation
Merge branch 'master' of https://github.com/AxonFramework/AxonFramework
Fix error in the license & about window
Add pcap 0.3.1
Fix bug showing wrong next/previous blogpost
Use Paperclip (with ImageMagick) to create smaller-sized images on upload
Update classes/theme/methods.html

Corrected the name of the partial array
Docv for Image::flip()
Added correct paremeter to get_query()
Fixed wrong boolean value
explained array dot-notation in more detail. Closes #462
Merge pull request #461 from stevewest/1.5/develop

Added correct paremeter to get_query()
Merge pull request #459 from Art4/patch-3

Update classes/theme/methods.html
Add query string pagination functionality

Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
Merge pull request #463 from kenjis/add_query_string_pagination

Add query string pagination functionality
Added a full list of core classes that can not be extended from a package. Closes #fuel/core/1224
Fixed syntax highlighting and link
Merge pull request #464 from indigofeather/1.5/develop

Fixed syntax highlighting and link
Typo on created_at in database table SQL
Merge pull request #466 from tevfik6/1.5/develop

Typo on created_at in database table SQL
fix deprecated usage
deprecated usage fix 
deprecated usage fix
Merge pull request #467 from tevfik6/1.5/develop

deprecated usage fix in ORM Observers
Added docs for join::and_on and join::or_on
Fixed notice in Upload class
Create initial dir layout, init.pp, params.pp, and Modulefile which
defines dependencies for puppets 'module tool'.
Merge pull request #7 from deadpoint/master

puppet-rt module layout
Modify bash settings

o Move some bash files to scripts repo
o Update upbash to move bash_logout
lab4 begun
文章の順番ちょっと入れ替え
Declare stripSpace with var
Strict escaping of ampersands
Updated index.md to include the start of a schedule
Added nxisnprintf to the .def file
Adelantos en el texto y mejora en el actividad de game over
merge con lo que hizo Ruben
Errors will be numbered now!
Some keys are working!
Raises ajiya's price
Geetha/Dhivhya : #165 Completed alert caregivers when new/update referral form is uploaded on service unavailable date.
Merge remote-tracking branch 'origin/master'

Conflicts:
	stepsovc-core/src/test/unit/org/wv/stepsovc/core/services/ReferralServiceTest.java
prep 0.2
Bug 790741 - Store gecko ICS b2g builds. r=armenzg
Bug 734221. deploy updateSUT.py and upgrade the boards to SUT Agent version 1.07. r=bear,jmaher
Changing the service-API call to "3", per mkelly

per IRC:

<stephend_> mkelly: http://snippets.allizom.org//1/Firefox/default/default/default/en-US/aurora/default/default/default/ isn't returning anything, but not sure if it should
* stephend_ fixes the double slash
<mkelly> stephend_: Change the 1 to a 3
<stephend> should we update our tests?
<mkelly> 1 means the old about:home that isn't grey, we don't use that anymore
dirty fix for invalid header name support

some adserver may return infalid headers like ";:" which break whole icap request on low level, this fix simply skip those headers
Added Librarian support
Added Librarian support
Added Librarian support
Move to SQLite3
Added socket bind.
Adding telemetry to config. Changing db_timeout to app_root where needed in service manifest.
show loan details on sidebar
Update Lesson_0/Basic/basic_programming_challenges.txt
Added notes about performance tests
Additions related to async pieces
finished item , added changing mods capability in state module
Less boring windows
Added banana image and animation
Fixed broken exit codes in ejabberd plugin.
Fixed order of arguments for 'ejabberdctl status-num-host' in ejabberd plugin.
Merge pull request #41 from wallunit/devel

Fixed ejabberd plugin
Handle namespaced class names in class declarations.
Handle assignment to global variables.
Handle the ||= operator.
Make use of SimpleCov conditional on an environment variable.

This way I don't have to comment it out when I want to look at warnings.
Refactoring: Unify assignment cases.
Refactoring: Replace case statement with hash lookup.
Create a blank comment node for modules, classes and defs without comments.
Add some end-to-end tests for examples taken from Reek.
Handle float literals.
Handle explicit block arguments.
Handle and and or.
Handle 'not' and '!'.
Handle unary plus.
Handle assignment inside a binary operator expression.
Handle assignment inside unary operator expressions.
Move unwrapping of s(s(:foo)) constructs into #process_paren.
Handle passing block parameters.
Handle the =~ operator.
Add passing test for if in block form.
Handle return statements with splat.
removed duplicate def
browse
add bootstrap to html table
<Y> and <Z> combinators fixed

<K> combinator won't work until function currying is implemented.
<Y> and <Z> combinators from last night
Merge branch 'master' of https://github.com/mwatts15/CS345-Project into carlo
display human nade for the tree nodes
change cozy notes icons
A new device deployment state has been created: Invalid Timestamp.
For the mySoc deployment system
Modified transmission
Minor changes
時間を画像で表示することに成功
Change README to reflect more extensible usage

Also add ruby syntax highlighting to examples
done with demo_app2
added an entry for broderick to connect to udb
Initial Text support and sample
moved state-machine into showoff
Update for latest alpha release
Deploy site '3db6d24' on Fr  8 Jun 2012 21:34:22 CEST
[NGRINDER-29] add user login plugin module 
- add config to plugin host component
[NGRINDER-332] Fix max agent value when using user specific agents.
[NGRINDER-332] Add release note
[NGRINDER-332] Delete out trial code
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git

Conflicts:
	ngrinder-controller/src/main/webapp/WEB-INF/ftl/common/navigator.ftl
	ngrinder-controller/src/main/webapp/WEB-INF/ftl/user/userInfo.ftl
Merge remote-tracking branch 'origin/master'
merge
[NGRINDER-68] Add unit test for controller

Fix some error in unit test.
[NOBTS] Delete out unnecessary code.
[NGRINDER-26] Migrate and develop user management module 
- Fix the user input form. Now it works even when user creating and
modifying.
Fix #31920: switching from cycles to blender internal with 3d view in rendered
draw mode did not draw the 3d view properly.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48270 954f8c5b-7b00-dc11-b283-0030488c597c
Compositor: Disabled debug assert checks for connected input sockets after convertToOperations. This breaks quite a lot and is not really necessary, since connected Node inputs are ignored later on. Connected outputs however are still forbidden, this indicates a real bug.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52510 954f8c5b-7b00-dc11-b283-0030488c597c
fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48519 954f8c5b-7b00-dc11-b283-0030488c597c
minor code cleanup


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50200 954f8c5b-7b00-dc11-b283-0030488c597c
code cleanup: correct misleading use of LABEL button type.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50582 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51844 954f8c5b-7b00-dc11-b283-0030488c597c
rename blur `Reference` to `Variable Size`, improve tooltip


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49892 954f8c5b-7b00-dc11-b283-0030488c597c
more draw code cleanup: was making wrong guess about wire color for empty-image draw types. also pass wire color to the metaball.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49945 954f8c5b-7b00-dc11-b283-0030488c597c
initial commit  for supporting masks in the image view, currently active seq strip is used as the mask source.

also unify mask drawing code for clip/sequencer/image


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49182 954f8c5b-7b00-dc11-b283-0030488c597c
fix for nasty bug with frame dropping playback.

When playback was running fast the frame step could be 0, making playback jittery.
this commit just makes sure the frame step is at least 1, but there is still an issue with framedrop skipping too many frames (or too few) which Ill check on next.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51617 954f8c5b-7b00-dc11-b283-0030488c597c
Fixed CORS JSON bug by stopping being smart :p
Updated to version 2.3.5
Some css changes to index
triggerPoints v1 + Autres (pb box tailleMin, affichage TriggerMsgs...etc)
ParentBox : Réparation de l'édition de courbe
build css minification
Add port argument to agent
Add support for eucalyptus 3.1.
retocando el readme
answers for sean
tests for line dispatcher
updated friends controller
Merge pull request #3 from njtechnologies/richard

updated friends controller
new test framework, lots of vector & matrix rotation stuff (with tests)
Added gene_table_filter.pl to filter gene lists
Changed the way messages are delimited, information is now space separated and messages are newline separated
Added try catch to server thread in order for it to close better when playing continuously
Tried to work on continuous mode, but I don't think it is worth it in the end
Added more tuning options to setup
Spring Security integration fixes
Fixed crash for timeout.
Update bolum10.txt
Merge pull request #3 from margulan/patch-3

Update bolum10.txt
Add Bootswatch (subdirectories)
HW4: implemented an acutal queue... still have no idea if it's right
update to mesh builder to fix auto flip
Created todo.html
Add blogpost kultur-o-mat
incl ExtraPriceType
new user functions
made some functions private
added aliases for formatting functions
split robbit into namespaces
removed joda-time wrapper
items accepts params
redundant function, fix for link sorting
fixed superscripting
user url fns
rewrite
new logging fns
use new logging ns
removed old docs
removed clj-time dependancy
rewritten readme
more docstrings, removed with-replies
more docstrings
added docs
Fix for language string issue

Moodle language customization had issues. This was due to having $string['am'] and $string['AM']. Replaced $string['AM'] to $string['AM1'] same for $string['PM']
Start navigable pages larger so that content doesn't cover them before resizing.
Fixed opacity and extra bolding issue.
Merged fixes
Update actuators
Update config
-
-
-
Initial features
moving i18n files to resources directory to be included in final artifact
Update notes for submitted changes

* Ensure correct cinder dir is written to tgt config
noVNC master no longer stable/folsom compatible

Change-Id: I06ac432ffd6ec82fa1c6a994ebdadc375c0f8f1e
Fixes: bug #1083189
Hotfix sync:kinomir
Fix upstart script so that smartkey is started after ls-hubd_public

Previously smartkey was started after fontconfig_cache which isn't
present in the Open webOS.

Open-webOS-DCO-1.0-Signed-off-by: Kimmo Leppala <kimmo.leppala@palm.com>
Change-Id: I009c0e9002c60bf811244db9689415adf7b98294
Add canonical link to manufacturers listing (bug #481)
added command to install it
escape non-ascii stuff
Add routing documentation
Редактирование стало лучше. Начал делать проверки при отправке на сервант
Added fixed width section.
Site updated at 2012-09-23 16:08:03 UTC
Merge remote branch 'origin/release-1.1.3'
Merge remote branch 'origin/release-1.1.4'
Merge branch 'master' into qa
Merge branch 'qa' into release
Rename Actions taxonomy to Event taxonomy. Updates caps and meta caps.
goodies is dead. see readme
Added instructions for VirtualBox quick setup.
Merge remote branch 'upstream/master'
Update generator
Adapters
Xml builder
Updated elasticsearch to 0.19.2
added in percentage tracking, calc dist
Bringing back appx versions
Implemented NepomukQueryMaker::run() for artist and genre
Updated git repos
Make sure that we are selecting the correct screenshot.
Merge branch 'feature/styles-demo'
Make sure that we are selecting the correct screenshot.
Merge branch 'master' into phpbb-com
[artf513787] -- list,add,delete and update for remaining objects.
ruby less2
Add brackets / braces matching
[songs] embracing the chaos - styling amendments
v 0.06
repaired - get actually location with NETWORK_PROVIDER
Multiline withing single cell working now.
changing the label for column types
Added and updated PDFs to match pre-made QR codes.
Updated some links in public html pages to updated PDFs
- rel 1; didn't notice 188528 anymore, so likely fixed
p.portlets needs fixes
LDAP version and RDN support

 * use jk:config set ldap_rdn_format '%s@jk.net' to set rdn
Merge pull request #58 from srogier/master

LDAP version and RDN support
responsive design and camera/network features
Modified sitecopyrc after removing svn's trunk folder fron the substructure
modified .gitignore to stop ignoring the output folder: I think I need it for the github-pages
-Added the dia v1 file.
-Added correct implementation of one session with user input. 
-Added more places where NotACharacterExceptions happen, and handled
them.
-Added printing of used letter list.

Signed-off-by: Prasang Chhetri <prasangbc@hotmail.com>
Added more documentation.
refactored a lot of code.
-Added the Player class with the main method.
-Added documentation.

Signed-off-by: Prasang Chhetri <prasangbc@hotmail.com>
hahahaha i already did it
fix html
responsive and stuff
update about and contact
fix ? instead of '
reindent
merged
added itertools to the notebook
fixing some styling issues in the patient population saving
removed unnecessary JS from cypress.js
* code still needs to be refactored and tidied*
Scaffolding for backend API routes.
Refactoring functionality to include/exclude group members when searching for users.

This way the query may be used to search with group members or within all users excluding members.
correct the output
Merge pull request #136 from tacman/tac_fix1

correct the output
recursively merge fixtures
Merge pull request #165 from havvg/1.1

recursively merge YAML fixtures
Versucht ein Menu zuerstellen. Schaffe es nicht, dass das 1. Jframe das
2. Jframe startet. Habe einmal einen Button und einmain ein Dropdown
Menu
del unnuetzes
removed files(?)
Merge branch 'notfall'

Sorry, kommt nicht wieder vor!
zwar schäbig, aber wir haben ein spielfeld ;) grafiken kommen später, immo retro design. btw repo sollte jetzt sauber sein.
Bomben jetzt in LinkedList organisiert, es können beliebig viele gesetzt werden
Spawning new tabs is now (kind of) working as it should.
Committing so I can merge.
Merge remote-tracking branch 'origin/jsan_master' into Joe_master
Added different messeges for the user to help guide their anonymization.
Merge remote-tracking branch 'origin/Joe_master' into jsan_master

Conflicts:
	edited_documents/anonymous_unmodified.txt
sending updates…
readme verbosity fix
extract only the framework related code to a new project
setup to be a framework generating project
Update res/values/messages.xml

Add PT-BR Translation for messages ROMUpdater
added prev and next buttons to slideshow
Habillage RepRap

Modification des plans pour ajouter un coffre sur la RepRap, un peu
comme la FoldaRap permettant de loger l'alimentation et la carte
Sanguinololu.
Habillage du fond et des côtés de MDF pour fermer la boite et peut être
rajouter un peu de rigidité à l'ensemble.
no-reply bug
Merge remote-tracking branch 'upstream/master'
Tweaked the rules for when [] is returned over None.
This makes std::vector<>[]. completions return None, which is
what we want to make it fall back to libclangs normal completion.
adds commas to the "online" section of the index
Military patrol timer stuff
job_item_category is exactly the same as stockpile_group_set
Readme now works..?
fixed #3, sometimes if the line was too fine the result of smoothing produced a NaN
add form is ok now
Merge branch 'master' of php53:/home/roy/public_html/pgday2012-task
Update charset according to HTML5 specification.

The previous charset declaration relates to HTML4 / XHTML 1.0 specs.
Merge pull request #27 from josemota/fix-charset

Update charset according to HTML5 specification.
Ajustes para a apresentação no JustJava 2012 em 19/05/2012.
<Rahul>: Timeline page completed.
<Rahul>: adding missing sections for timeline.
<Rahul>: Updated timeline page right user area content. (WIP): Products.html. Left Nav created.
[CPS_gvn.ml] clean-slate
[CPS_gvn] landing lambda

- dispatch term generation
- general case loop instrumentation
[gvn_on_cps] slight improvement on ranks
Merge branch 'master' of github.com:raphael-proust/cps-ssa
Fix pinout table formatting
Flesh out basic tutorial
my way to new coding style, now MVC
Added fasta_head script. V1.0
Removed PackageResourceBase. No need to register 2 resources with same resource name
Fixes #152
Changing the location of the travis note and adding Randall as a contributor
merge
Merge remote-tracking branch 'upstream/master' into local-test-settings

* upstream/master:
  Changing the location of the travis note and adding Randall as a contributor
  Fixes #152
  Removed PackageResourceBase. No need to register 2 resources with same resource name
Remving myself from contributors =p
Login Funcional 100%
Added About Page Copy
taskImplementation: Removed intent-filter for MathActivity

Removed the intent-filter in AndroidMainifest for MathActivity since
its not our main activity.
taskImplementation: Implemented MathController

Implemented MathController and added tests for its methods
Allow dynamic file resolution in Roxie

Add dynamic flag to query factory, which activity
factories will use to define if dynamic file
resolution is to be turned on by default or just
specific to certain activities (TDXdynamicfilename).

Implementing runOnce() on WorkUnit worker, so to
concentrate dynamic resolution to workunit execution
only, working for both dispatched and standalone
query types.

Seting the standalone/workunit payloads to have dynamic
file resolution, but still keeps deployed
queries as Roxie's standard resolve-on-startup.
HPCC-8083 Ecl packagemap no longer needs to support copyFiles

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
Merge pull request #3566 from stuartort/pkg_removecopyfiles

HPCC-8083 Ecl packagemap no longer needs to support copyFiles

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
complete management of mta
notes on linode setup
initial attempt at user account manangement
reference issue number
use a different version finding line, add trove classifiers
coverage
Added qualfiedName for aadl package such taht it gets included when only
containing error model libraries.
Refactoring the layout of the project into a more reasonable manner.  Also adding functions that will lend themselves to a DSL like query language.
revert arch/arm/mach-omap2/omap4-sar.c arch/arm/mach-omap2/usb-host.c to omap-3.0
update sound/soc/soc-core.c
merge some sound/soc/ drivers from stock-2 kernel
BZ 867322: Test if a cart was the only cart on a gear was failing.
new forklift plugin
Merge pull request #1278 from bitboxer/forklift

new forklift plugin
Better docs.
Fixed homepage in gemspec.
moved files up so it's easier to transfer to the proto rails server
Tolto attributo selezionabile da barra titolo
renamed to dweller; release alpha version
Final Assignment Ready
no autoload class in Pix_Table::newEmptyTable()
updated readme
Merge branch 'master' of github.com:rpedigoni/python-cielo
Adding igor_is_a_noob.txt
Make sure basic.cancel decoding function is generated

basic.cancel is originally a method that servers accept and our AMQP 0.9.1 extensions
metadata was making codegen not generate it for the client. This is needed by the consumer
cancellation notifications extension.
0.9.2
Updated templates/pages/index.rhtml
16/03/12
19/03/12
sequence_generator class
consolidated images in svg to reduce loading size and prepare for clear and undo support
Adds created method to README
Add newer BSDs, including entries from upstream
Gem usage added to readme
Delecao dos metodos e atributos e classes nao utilizados
Delecao da classe Repository
Criacao final de terca feira varios metodos e implementacao de teste unitarios
2 dias de treinamento
removed strict dependencies on gems
seperate proj-index
Merge branch 'master' of robinson.informatik.uni-bremen.de:awe17
validate hand_ins
Admins controller
Merged
please work on heroku too
update to scalatra 2.1.0.RC1
Added file Accorgimenti.
Cria classes BeatBox e MusicTest1 - correto
Coloca bloco try/catch no sequencer
Constroi uma sequencia
Conserta noteOn noteOff
Agora play leva dois argumentos
added two more my.cnf options
replaced print command by self.debug()
Fixed typos in admin views.
First pass at tuning. LOT of work to do still, but that's something :P
more synchronie + close file stream
Example

Add example.
Add logo

Add white logo menubar
Add icons

Add glyphicons black and white.
Edit CSS

Change buttons, menu, header color
Add css files

To keep the white space from appearing in the responsive layout.
Edit CSS
Edit Example
Embed fonts
Dropdown fix and other changes
zobrazovani jednotlivejch aktivit a uprava user panelu plus zmena hesla
ticket:5 fixed base template and added test for nonauthorized user
ticket:6 merged changes from branch "t5_edit_data"
ticket:6 fixed max-width for columns and configured datepicker
ticket:6 fixed block size
ticket:6 merging changes from branch 't6_forms_ajax'
ticket:8 fixed contacts edit template
ticket:9 merging changes from branch 't8_template_tag'
ticket:8 used ContentType in template tag
ticket:9 merging changes from branch 't8_template_tag'
ticket:9 added ContentType to management command and fixed tests
ticket:9 fixed bash script
ticket:9 fixed script
ticket:9 removed venv activation from bash script
ticket:10 merged changes from "t9_command"
ticket:10 added test for actions and changed admin
ticket:13 merging changes from branch 't10_signals'
Changes to be committed:
	new file:   http-client-ssh/agents.cfg
	new file:   http-client-ssh/hosts.cfg
	new file:   http-client-ssh/http-client-ssh.py
	new file:   http-client-ssh/urls.cfg
	new file:   http-server-ssh/http-server-ssh.py
	new file:   sip-generator/hosts.cfg
	new file:   sip-generator/sip-generator.py
Add Silver as a submodule.
board done
Fix a few bugs, make basic rollback work
tabs to spaces for tests.py
Fixed smaller test issue
Fixed minor regression in todo_store
Moved logic out of TodoListView into a separate filter
Improved StatusChanges interactor by avoiding collisions with older tasks
Increased version to 0.1pre
luna-sysmgr: use 4 spaces instead of tabs in python tasks

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
[SHRINKDESC-17] Create a Descriptor for Faces
started implementing a semcor example extractor
Tidy the base class
Settings implmentation

js file added, html popup + ideas.
Initial commit of fabfile.py
redirection role/index évite des bugs
debut de la page "a propos"
Fix Monster#xp to not raise an error when the level is bad
Fix a bug in the monster_list_spec for xp
Add better layout in monster edit page
Switch from BFQ-v2 to BFQ-v2-r1 by Paolo Valente
Resource#patch(attributes)
Post#hide method, for hidden_by_site and hidden_by_user.
deleted old db script
Added a variable type to the operation's struct and a main operation to the expression's struct.
General tidying after latest android upgrade
Fixed the Twitter @ shortcut.
Finished refactoring add/remove chunk code.
Added /cbsilence to toggle suppression of chunk border messages.
add more sample code. fix sub-modules's version control.
Added formatting to PWD in ls. added pull, push and update.
Preview qwik wiki format
removed home
Fixed debug conflict
shopping cart not sending info to controller yet
added packages.config
new shopping cart class
now able to send data from js to controller
now cannot add item to cart if it is already in it
adding products to cart working correctly
confirm order page showing products
csproj conflict
orders working
a few lines of css for extra whitespace in tables
make user email also primary key
changed anonymousId and removed category tables
removed categoryid from table definition
Merge pull request #19 from katfa/css

Css
Fix for duplicated building. Sorry but you can build only 1level per constructions.
do a check for if the data exists
NR-322 : It seems that the collaborators list is not complete

fixed some issue with collaborators list rerendering
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel
Test cloubees
Update test file [fixed #13]
Change drop down amount for navigation
Organize .gitignore. Tweak coverage section of README.