labofsahil/github-event-dataset-2012 huggingface dataset:
Added license to Filter and removed duplicate functions
Merge branch 'master' of github.com:Ossianm/Grupp29Asciicam
fixed something stupid...
Autocomplete feature for admin page by Enish.
Выкинуто лишнее из заголовков
Fix last commit (missed a file)
more work integrating boss and marker server
Merge branch 'master' of github.com:RC4Group2/ResearchCamp4

Conflicts:
	raw_mbn_scenarios/raw_mbn_movebackforth/src/boss_states.py
update youtube
Merge branch 'master' of github.com:Rafe/playdiary.tw-theme
disable title again
TiaoXin. Many bug fixes
Fix some ui glitch.
Adjust Multichoice buttons. Increase framerate.
added pauseGame() and resumeGame()
Added syntastic module
Added ack submodule
Added vim-powerline
intellisence test
Reversed comparison of Timestamped against body.class for determination of adding Last-Modified header.
I added Tumblr controller
3.5-rc5-d0 release

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Update: modified Prolog Day 3
Updated Build script

Now supports /regex/ style expressions
Added 'parent' special containee

Allows an element to contain its parent (function definition may contain
a function definition for example).
Fixed end terminator generation to support /regex/ style expressions.
Added GitHub flavored style

Simulates the highlighter style used on GitHub's website
Updated GitHub Style

Fixing up the background, forgot to commit that
Created data parser class - fixed up posting of entries and comments
Adding an icon-set failure check. Automatically fixes if an error is encountered.
WiP - v56d - H.264 NALU parser efficiency improvements.
Merge remote-tracking branch 'remotes/upstream/EXP-TsReader_noStopMod' into EXP-TsReader_noStopMod_BD
parsing complete. now, formatting output for graphite.
HDFC gateway: Add support for passing ECI value
Fix and localize Unlink
unlink: translate UI
morebits: fix functions needed by unlink, localize namespace names
shared, config: UI translation
spilder panel
removed bin directory from build.properties
Created arrays.xml for sorting options
Created xml for preferences
Created EditPreferences activity class and updated manifest. Also
removed some unused libraries.
Added preferences to the menu and added an action in the MainActivity
when user selects "Settings" (see onOptionsItemSelected)
getAll method in RestaurantHelper now accepts a sort order. onCreate
method of MainActivity grabs sort preference from shared preferences and
uses that for the call to getAll.
Added a listener for preference although at this point it does nothing.
Now the list of restaurants updates as soon as the user hits a sort
option. initList() removes the old cursor and creates a new one.
Added onSaveInstanceState method into DetailForm to save the content of
the form.
App now restores the content of the form when rotating device. this is
done with the onRestoreInstancceState method in the DetailForm
Created new landscape layout for form
Explain in finish message that the pattern repeats forever.
Add UI option for viewing progress and publishing
Event to open 'move ships' menu now posted.
Customizable navbar - Zaphod-Beeblebrox, many other updates and changes - romanbb as well as some clean up and fixes
Add a test for Tangente_courbe_interpolation and Tangente_glisseur_interpolation.
Fixed their construction.
Pbm: Tangente_courbe_interpolation needs a float number to be built.
Added a Glisseur_coube_interpolation class.
This is a template..to be debugged.
Just write this file
A Lot

i added many feautures from the last commit. I forgot to commit.
features:
new database
post system
improved security
Modif Mineur avant Controle ALL
Add vcs info
Changed ta to soliantconsulting
Core/Protocol: Missing changes from ac81411db461184a9d20cb43b44eca414df5e81e
SQL: Auth db data type cleanup `account_access`, `account_banned`, `ip_banned`  / Storage engine switched to InnoDB
Core/Guilds: Implemented some guild packets, some basic guild functions is working, though most are still WIP/TODO
Core/DB: Quest 'Distortions in time'
Core/DB: Quest 'Distortions in time'
Core: Quest 'Distortion in time' - Codestyle

Replace enum name eCloseRift with CloseRift and add underscore to private
member counter.
DB: Update period timer for icecrown ship transports
Core/DB: Quest 'Gordunni Cobalt'

SpellScript and conditions for spells of this quest.
Core/DB: Quest 'Gordunni Cobalt' - Codestyle
Merge pull request #8134 from Gacko/q2987

Core/DB: Quest 'Gordunni Cobalt'
Core/SQL: Corrected a mistake from previous merge.
Author: @Gacko
Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script
Dungeon Finder: Fix teleport coords load
Core/DB: Children's Week
Merge pull request #8138 from durotar/master

Core/Script: Gnomeregan - Deleting duplicate texts and script adjusted
Core: Implement Gameobject::Use() for traps
Core/Conditions: Fixed a mistake in Conditions loading which didn't allow to use SAI conditions with negative source entry (guid)
Merge pull request #8146 from Gacko/usetraps

Core: Implement Gameobject::Use() for traps
Closes #8137
Closes #4811
Merge pull request #8088 from Gacko/q13038

Core/DB: Quest 'Distortions in time'
Closes #3011
Core/SQL: Renamed SQL from previous merge.
Core/Build: Build fix from previous merge
Core/Logging: Fix PlayerDump logging
Core/Dungeon Finder: Corrections to 8622d49 (Fix teleport coors loading)
Core/Battlefield: specify correct npc for vehicle teleportations.
DB/Conditions: Missing condition for gameobject Sha'ni Proudtusk's Remains

Closes #6863

Signed-off-by: Nay <dnpd.dd@gmail.com>
Core/Build: Fix compile using mysqllite included with core
Closes #8283
Core/Build: Remove some more unneeded code for OS X from cmake files
Core: Minor changes here and there
Core/Scripts: Added Worgen and Goblin races to .pinfo command.
Core/Achievement: Do not expose AchivementCriteriaData to ScriptMgr
Core: Added some attribute definitions
Core/Achievements: multiple changes
- Fix crash when updating criteria with no reference player
- Update progress counter to uint64
- Remove hack introduced for achievement 318 (conditions are already checked in additionalConditions)
- Add extra parameter miscValue3 (needed for type "LOOT_TYPE" with additionalConditions "ITEM_SUBCLASS")
- Correct definition for Additional conditions: 11 (HAS_AURA_TYPE), 17 (SOURCE_AREA_OR_ZONE), 18 (TARGET_AREA_OR_ZONE), 41 (TARGET_ZONE)
Core/Player: Define talent trees (tabs)
Rename global config variables
Added frmMakeOffer, and adjusted bits of others to make it work.
Added the stub of a Validator class, for validating form fields.
Added a stub of a Mailer class, for sending notifications, but no complete methods yet.
Added the new files to commit- forgot first time
Added form to accept an offer. Updates to controllers.
Added ability for liveness arrays to grow, by starting and stopping the world.
Made arrays only add 64 elements at a time to the process_array to limit memory presure
Use head for pivotal_workstation
Generator style formatting.
Ex function names.
Invalid modification error test.
parseCSSStyleRule goes to parseCSSRule.
Added the defualt audio message by Nicholas
Merge branch 'master' of https://github.com/Velascodelaguna/catchme

Merging latest changes
Set push=false
wall color&wall post with selection list
Fix droid parts not flying away from exploding droids, when above water.

This was due to unsigned comparison with the negative water height.

Fixes ticket:3681.
fixing spec helper file
fixing array to_s shennanigans for ruby 1.9.3
fixing array to_s shennanigans for ruby 1.9.3
Added Native Material Loaders. (Recipe.yml and Material.yml)

Signed-off-by: Wolftein <agustin.l.alvarez@hotmail.com>
Update Skins/StreamedMP/4x3/Window_TVSeries_Playing.xml
Factoring request
Adding header in layout or page
Flow Chart added
Added the GUI in swc file.
Added the UI codes.
XML 2.11.13
Create static pages Controller and actions
Modify static pages controller
Add about action to static pages and specs to static_pages controller
Add sidebar tests to static_pages_spec
Add contacts action to static_pages_controller and spec to it
Style, db fixes, footer, admin access and more crap
added UMA
Fixed syntax error in crowbar.yml

rubygem-psych (as in ruby 1.9) complains about illegal tab characters and
causes barclamp_install to exit.
Merge pull request #80 from rhafer/pull-req-master-94ec2e15c0d9cbde0867a2736bb6f0cde73f80b8

Merged by devtool for VictorLowther
Remove //AJS comment for resolved issue.
Port part of EM to the question objects and fix a smattering of bugs.
bird of prey with shields
adding icons
moved CSS changes from CSS to SASS
changed all pink icons to cobalt blue
changed featured project icon
changed Project Backing text
slight modification to institutional video
Added full ALU and test module plus helper equals module.
Merge branch 'master' of https://github.com/abocskocsky/alu-verilog
Feuerwerk für alle Bildschirmgrößen angepasst

Das Feuerwerk sollte nun bei jeder Auflösung sichtbar sein.
Regenwolke animiert

Der Sms-Effekt Regen ist nun animiert! Die Wolke wandert über den Screnn
bis du dem Feuer, welches sie löschen wird!
Merge branch 'master' of https://github.com/abraxasson/publicGaming
Screens werden nun disposed

Am Ende des Spiels werden nun alle Resourcen wieder freigegeben.
logging collection on remove
Fixing mailing list name
Redid about us, search page into Boilerplate and added CSS

Added CSS to the style.css folder in the css folder.
new model Games
Games resourse
HCI lecture 2.2 - another nightmare QA job from stanford-bot =P
QA done, some egregious mistakes corrected (e.g., the opposite of what's said was transcribed)
rename README to README.md
Merge branch 'master' of https://github.com/acmello/bukowsky-quotes
Delete files manually
test flight stuff
Add OnHomepage to Products
change to use new dao entity convention
added project_static_dir for token test
added static file packaging to georefine packager
Incluindo selectBox para escolher o módulo
Re-Engine: split main game loop and quit procedures, moved more stuff out of ac_main
HPCC-8158 Set maxCompileThreads >1 by default

Set the value to 2 in the default enviroment. This will mean that
regression suite runs go fast, users that don't tweak anything get a
decent default, and users that do tweak get a hint about where to
tweak it.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-7984 ECLWatch 4.0

More ECLWatch work.

Fixes HPCC-8270
Fixes HPCC-8271
Fixes HPCC-8272

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Merge pull request #3740 from GordonSmith/HPCC-7984

HPCC-7984 ECLWatch 4.0

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8383 Add using to access declaration

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
HPCC-8386 Fix extraneous or missing parenthesis

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
HPCC-8387 Fix NULL-to-bool conversion

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
Merge pull request #3746 from rengolin/warnings3

HPCC-8387 Fix NULL-to-bool conversion

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3745 from rengolin/warnings2

HPCC-8386 Fix extraneous or missing parenthesis

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-3.10.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-7984 ECLWatch 4.0

Sync install lists with actual files.
Remove files from being included in the generated project tree.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
HPCC-8392 Silence silly empty body warning

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
Merge pull request #3751 from rengolin/warnings3

HPCC-8392 Silence silly empty body warning

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3748 from GordonSmith/HPCC-7984

HPCC-7984 ECLWatch 4.0

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-3.10.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3744 from rengolin/warnings

HPCC-8383 Add using to access declaration

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-8390 Don't rely on offsetof

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
HPCC-8384 Silence most unused parameter warnings

Also fixes a function call in Dali, correctly passing the timeout
and adding a return statement to hqlexpr. The rest just works
around the warnings.

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
HPCC-8390 Change strategy to use inner struct

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
Merge pull request #3730 from richardkchapman/maxCompileThreads

HPCC-8158 Set maxCompileThreads >1 by default

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-8384 Changes due to comments

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
made a test case less possible to time out in slow testing modes.
thickening red lines
Added keep alive threading
conflicts
ex3 extract stuff
extract
Moved everything under legacy/
Changed example repo to ahn/vaadin-githubribbon
Added .gitignore
Added .classpath
Added webapp folder and contents.
Various changes. Added non-functional blog post
working on simple version for Lilia
i have no idea...
merged with master
incorporation of the mouth functionality
added the changes to allow for capacitative sensing, got rid of legs and added tail
subtle println changes
some changes to account for kissing code
commit before bug investigation
came up with a sort of a fix for the fabric problem, integration of new capacitive sensors
worked around the loop bug by creating seperate methods, memory inefficient
Significant documentation and cleaning of the code, only GestureHandler remains undocumented
trying new markdown things
trying new markdown things
testing readme file
more readme changes
more documentation
Continued documentation, finished software documentation, added hardware documentation, will add matlab scripts tomorrow
More documentation, especially hardware
documentation
stupid fucking bugs
updating the moving platform on its last version before the merge
trabajo en progreso
* Adapted lib-print to Java 5.
Merge pull request #1 from juanluisrp/master

Java 5 compatibility
Problema de rutas
mend
roles activos
mend
mend
mend
mend
con usuario
QtRadio: added MASTER button
QtRadio: tidy up opengl calls
Merge branch 'opengl-qt5' into adreno-test
Adds post about Helipad's PDF generator
IRUNNINGLOG-43 - Register page validations
IRUNNINGLOG-43 - Register page validations
ENT08 Pagging tests
preparation for v0.3
Tighten display of completed answers
Forgotten send
cleanup the spec

Change-Id: Ic3796d74719ef9ad2ad29dc9431c941b53d15637
Merge pull request #66 from amalvagomes/graphics

Adding database + Fragmentation Graph
Merge pull request #67 from amalvagomes/graphics

Fixed Inclusiveness
Update config/database.yml
Merge pull request #68 from amalvagomes/graphics

Started on mysql data pulls for main page.  Wrote in some, questions on ...
Merge pull request #69 from amalvagomes/graphics

Fixed leaf level linking to error messages (no linking now)
Fixed "assignable?" in network
Replaced include once by simple includes to optimize performances
Keep clock on, AES2810 errata

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
fix manual path
http://www.pathname.com/fhs/pub/fhs-2.3.html#USRSHAREMANMANUALPAGES
Merge pull request #4 from stefano-k/master

fix manual path to /usr/share/man, accordingly to FHS
servus
fucking fuck merge
tradis protocol
tradis tweaks
Merge pull request #107 from andrewjpage/pipeline

merged tests for rna seq spreadsheet
insert site plot
properly calculate insert size
standalone script to create insert site plots
make script executable
spreadsheet generation of insertion sites
create intergenic regions for insertions
cleanup temp files from tests
tradis standalone script
load modules in script and select pipeline activity based on protocol
need to add up number of insertion sites not the frequ
skip over unaligned reads
pos neg gene strands
fix insert site test
Merge pull request #108 from andrewjpage/tradis_pipeline

Tradis pipeline
declare modules for tradis
Merge pull request #109 from andrewjpage/tradis_pipeline

declare modules for tradis
typo in insert sites
PLFED-322:  PLFED-305:
sakets commit for all
updated gitignore and removed temp files
Preparing a polygon selection tool
Proof of concept: polygon selector
Selector refactoring
geom.getBounds for Rectangle and Polygon
Merge branch 'master' into polygon-selector
Drag selector: corrected black/white box behavior in 4 quadrants
OpenLayers: various edits
Modif index

test
uncg
Adding Occupants
Update jmx-collector/pom.xml

Version is corrected
Add javadoc URL for jackson.
Fix deprecations in new jackson library.

Refs #21
Fix lint warning by making base activity class abstract.
Drop execute bits.
Sort members in MindRpc.
updated THANKS.txt
adding core changes
updating code
Bumped version to 2.0.1 and updated changelog.
$this to self так как это assert и были статичными
Фикс дублирование вставки зависимых объектов из foreigns для тестов
Объект тестового примера вместо массива. CustomType должны иметь два метода prepareForDb и prepareForPhp, чтобы обрабатывать обе ситуации попадания данных  в объект
Объект тестового примера вместо массива. CustomType должны иметь два метода prepareForDb и prepareForPhp, чтобы обрабатывать обе ситуации попадания данных  в объект
[#37516441] Moving factory methods to own class.
languageOrphan
cache manager
Visual improvements & League Gothic
canvas drawings from the plane
Merge branch 'gh-pages' of github.com:atleastimtrying/stringy into gh-pages
Adding scanf error example
mplayer USE=-libass
fix bench tests
Finish provolone update post
this is actually done
Merge branch 'master' into gh-pages
Fix CoreParse URL in README
Merge pull request #36 from codefreax/master

Fix CoreParse URL in README
Officialize the use of GPL license ;)
replaced TreeMap with HashMap, renamed imported as parsedMachines 
added getter for Name->AST Map
Merge branch 'develop' of github.com:bendisposto/probparsers into develop
fixed bug in logic PARSERLIB-11
Merge branch 'hotfix/2.4.9-hf1'
Added overview html
Creating Entropy Libraries - Currently untested
Made config look better
Post to NLTApp server works
Typo und neue URL für Git
New players; more building!
minor fixes
replaced underscore with hyphen
Merge remote-tracking branch 'bio2rdf-master/master'
Merge pull request #73 from micheldumontier/master

updates
get k-means clustering working
resolve conflicts on merge with front-end work
More Models and textures
Remove getRoleId from ZfcUserAcl\Model\RoleInterface
Merge pull request #7 from adamlundrigan/hotfix/fix-interface-error

Remove getRoleId from ZfcUserAcl\Model\RoleInterface
modified service

better way of passing key/secret, some methods
removed debug output :)
Ensure swift hash is rebuilt for every puppet run

Previously, the swift caches were being built on the class
instances themselves.

This could result in stale values when puppet runs multiple times
using the same process (like in the case of puppet agent)

This commit uses prefetch to ensure that the retrieved swift ring
values are updated per puppet run.
Chore: Tidy up login.liquid nesting.
Bumped version. Readme.
bad quotes, bad!
Add contact form. Still needs more work.
try to remove extra space between paragraphs... (go back to previous
commit if shit gets crazy).
;ljlkj
Quick and dirty hack to make this work with Subversion 1.6+
Highlighted Additional Functions

Included additional text about updating and disposing functions in an
effort to hightlight them since they are at the bottom of the read me
Removed Extra _width Call
Space Added

No reason really
Update src/ng/directive/ngEventDirs.js

Added focus and focusout events.
オブジェクト志向っぽくリファクタリング
Did some more things
calibrators partial
Handle the situation where a SphinxModel is related to a non-sphinx model.
Merge branch 'master' of github.com:btimby/django-sphinx-db
Fill in some links, clarify some README parts
Merge branch 'master' into fixes
Merge branch 'fixes'
Add english part to README
Merge branch 'fixes'
Fixed typo in README
Merge branch 'fixes'
Multiple choice checked items in Shopping view.
Now interfaces with the recipes database to get ingredients.
Changed the list layout to checkboxes.
adding path compression & comments
Float the close link right. Refs #59
Merge pull request #60 from caktus/59-fix-close-position

Float the close link right. Fixes #59
Initial pass at weekly time detail; added comps templates
refs #397 - Removed deprecated allocations query in dashboard and improved readability
refs #397 - Added /static/CACHE to .gitignore to avoid checking in
collected static media
refs #397 - Removed others_active_entries query. No longer needed with the
active_entries context_processor.
Started the work on the daily time detail
Added boiler plate URL, view, and template for new dashboard
refs #401 - Added a query and utility function for returning todays entries
in the prescribed format
refs #399 - First pass of clock-in form
refs #399 - POST form redirects to clock-in for selected project
First iteration of the daily time detail
Added modified tooltip JS; enabled popovers
Removed Rectangle since it wasnt needed
refs #401 - Made tests for todays_entries
Update widths to prevent all clipping; correctly position text
Merge branch '397-new-dashboard' of github.com:caktus/django-timepiece into 397-new-dashboard

Conflicts:
	timepiece/views.py
Merge branch 'dashboard-visuals' into 397-new-dashboard
refs #401 #397 - Improved style in view and fixed weekQ to truncate
Merge branch '397-new-dashboard' of github.com:caktus/django-timepiece into 397-new-dashboard
Removed comp; added daily time detail to new dashboard
Color update to fit bootstrap
Added stripslashes() where text would potentially be escaped to avoid re-escaping text
Move social links, add analytics
Fix bizarre event binding error when switching between calendars in IE
Framework ARDrone added
addded move_
elements method
added reason_get_media_placard_image_info()
added set_placard_image_dimensions()
Added set_placard_image_dimensions() and added fallback content for flash video
added placard images to the preview
added placard images to the preview
Changed alternate link text
we add the recaptcha element if the user to submitting a comment and NOT logged in.
tweaked so that it handles things the same whether or not disco considers the element 'required'
fixed indentation and changed so that front end posted entities are not marked as 'new'
modified to include a note which shows when an item is both owned AND borrowed by a site
modified delete_borrowed_relationship so it no longer deletes associations when we are unborrowing an item that also happens to be owned by the site
modified so that 'new' entities being saved and finished from within the context of the reverseAssociator can no longer create backwards relationships
added publication_related_and_events_sidebar_show_children
added news_and_events_sidebar_show_children to publication_related_and_events_sidebar_show_children
added feature_before_content_sidebar_blurbs_first_under_subnav
change repositionUploadButton to use offset() instead of position() which should make the positioning more reliable since offset measures relative to the document instead of the parent element
added return link to the framework and added the description to the front page list
removed deprecated news page types
got rid of notice when upgrade_info or upgraders is empty
Agregado edición de blogsy blog nuevo
Edición de título y blogs
Added support to store authentication token
CCTrayDownload package
add audit history plugin
fix typo in description of CCTrayDownload/Manifest.xml
project latest build package
view all builds package (project)
Merge pull request #121 from RubenWillems/master

added packages for existing plugins
Add block for attached articles, fix #217
Update Tutorial-Part-1.md
Turn on re.UNICODE flag
JS - Added perliminary Service/Provider Structure
Fix bug with rpc response validation
Restore distcheck non-failure.
Add inter-intersection measurements to the measure tool.
Bad for-loop grouping in sfd.c

This should clear up failures in the Caliban.sfd Python tests
(tests/test1001.py.in in my autotools branch, or parts of
test/test1001.py in the master branch). They occurred if and only if you
did not have device tables enabled.
Ignore backup files, too.
make --without-python work
Merge pull request #8 from mskala/master

One line to make --without-python work
Add docs for measure tool intersections feature 
Use cairo drawing for all windows

Cairo is pretty fast these days and will give us smoother UI elements
(smooth arrows, circles that really are circle etc.) If this is not
accebtable, we have more than way to turn cairo off completely.
Remove the rectangle base of submenu arrows

They look nicer this way (more close to GTK ones as well).
Remove unused leftover from development.
Don't use SelectedFgColor for unselected glyphs

When cairo is enabled, unselected glyphs use the color of selected
glyph. As far as I can tell those lines make no sense at all, but their
effect was masked because we were not using cairo for fontview.
Merge pull request #5 from jhps/measure-tool-intersections

Add inter-intersection measurements to the measure tool.
Avance del día sábado. En facebook comenteré sobre mi avance
updated header with icons
Add user microposts
Update of class.rep.php - no need to utilize child class
Use thin in development.
Update gems.
fix issue #1398. Do not update last action when it is done in IntervalAction
fixes indentation issues with previous merge
Merge remote-tracking branch 'zeaster/develop-v2' into develop-v2
fixes issue #1398

possible double fire in sequence fixed
Shaders: improved errors at link time.

... and added test
Updates SpiderMonkey to FF 15.0
spidermonkey libraries without debug info
Merge branch 'develop-v2' of https://github.com/cocos2d/cocos2d-iphone into colorTint
added active mark threshold
colorize speed time circle; added numbers on clockface
add signin/signout capability
fix bugs on first creation of vblob tmp dir

Change-Id: Icb2d15c1538ad5c257b5c009b33696aaf2bb5699
Merge "fix bugs on first creation of vblob tmp dir"
remove db_size_overhead and add max_disk for postgresql service

bump src/services
git shortlog  182a0f296b..046bbda3ea
Frank Lu (1):
      remove db_size_overhead from postgresql ng service

Change-Id: I78881a5ee74e404cf1fa5a08e929eeb2f7010ded
Use full path of "start-stop-daemon" binary in service warden start script

Change-Id: Ic451cdc8938e919c5823b605271023bc2a99285f
Merge "remove db_size_overhead and add max_disk for postgresql service"
update rabbitmq to version 2.8

shortlog:
$ git shortlog 046bbda..44727c4
andyzh (1):
      support multiple version for rabbitmq

Change-Id: Icf50165b8054305c1c498a93c801785ac689a1ba
Merge branch 'built'
Merge "update rabbitmq to version 2.8"
Closer to home
finished comms
Fix ConcurrencyException bugs.
drop js plugin in favor of nodejs module
drop some useless shit
add .vimrc made by vundle

Signed-off-by: Alex Kyoungdon Jang <code4rain@gmail.com>
git: change default editor to vim

Signed-off-by: Alex Kyoungdon Jang <code4rain@gmail.com>
check for existing files and reuse them
Conguring jekyll- Changed BASE_PATH
Switch libraries database and sql from SNAPSHOT version to last stable version
Merge pull request #13 from colinnewell/master

Fix for issue 68 (http://code.google.com/p/html-formfu/issues/detail?id=68)
changelog/version update
Updated repeatable control to update id_field used by DBIC::Unique constraint
Changed poltergeist´s dependency type from development to runtime.

The poltergeist gem was missing when installing phantomjs´s dependencies via bundler.
Changed package urls from phantomjs-1.6.0 to phantomjs-1.6.1
Added some more output to the user while installation.
Added cURL support for downloading the phantomjs source.

wget is not preinstalled on OS X, but cURL is...
Bumped version to 1.6.1.0
Merge pull request #2 from robinboening/master

A few minor changes waiting...
updated build number..
Update configs after testing machine
Fix parameter namespaces
Fix message naming
Ignore generated files
update the message mechanism of admin module
Two new posts, and a few minor html changes
A few minor html changes
redirecting output to log files for supervisord
sundtek: support for Raspberry Pi
connman: wait longer time for wlan interface to appear
busybox: add seq applet (useful for long loops)
fontconfig: generate fontconfig cache on boot and move hack to support user installed fonts form xbmc init
xbmc: do not install .conf files and fix a typo
xbmc-frodo: update to xbmc-frodo-2876e72

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/*/linux: update kernel config

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge pull request #1230 from vpeter4/master

connman: wait longer time for wlan interface to appear
Merge pull request #1216 from vpeter4/sundtek

sundtek: support for Raspberry Pi
Merge pull request #1157 from Gujs/openelec-updates

Openelec create fontconfig cache on boot
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
projects/RPi/options: use speed optimization

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Update vboxguest to 4.2.0 for building on 3.5.x kernels
projects/RPi/linux: sync DVB drivers with generic project, this should fix #1240

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: update to xbmc-frodo-b9d289d

Signed-off-by: Stephan Raue <stephan@openelec.tv>
bcm2835-driver: update to bcm2835-driver-f20e9d7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
bcm2835-bootloader: update to bcm2835-bootloader-f20e9d7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
open-vm-tools: update to open-vm-tools-2012.05.21-724730

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge pull request #1237 from chewitt/patch-11

Update vboxguest to 4.2.0 for building on 3.5.x kernels
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
Merge remote-tracking branch 'upstream/master'

Conflicts:
	projects/RPi/linux/linux.arm.conf
Updating bundles
Tweak syntastic settings
Add tab completion
Switch to supertab
Set indentation on html, js, and coffee
Make all of js, css, and html use tabwidth 2
Switch to Scala 2.9.  Use 10 day forecast.  Add bash script.
Add in better directory/file redirection
adding docs to web root
take picture via webcam
eight queen solver
let's make a deal monte carlo simulation.
add Ukrainian, thanks to Богдан Дранчук
Update 2.8.29
Broke ThreadLocal out into its own file, since my ide does not seem to like it.
Git Build: rename repoPath to repoPaths

make git fetch shutup cause we use the output of that command to get
the branch sha.
GitBuild: allow custom commands per-build

Poses a potential security risk... ruh roh!

But it could be so useful!
CLI: add --command option

Using --command sets a custom buildCommand for this particular build.
The git-build plugin should then run that instead of the configured
command.
Merge custom-commands (#25) into master

CLI: add --command option

Using --command sets a custom buildCommand for this particular build.
The git-build plugin should then run that instead of the configured
command.
Some aesthetic work
Some template work
Add work on making table, progress bar and filtering out columns
Add json to Makefile in a comment
bauhaus: move half of lens correction module.
lens corrections: more bauhaus widgets. still looks terrible.
Updated polish translation, thanks Michal Predotka.
Numerous edits, including adding a botchive and a robotcomplete page. All new bots are placed under consideration. Still need to work through unicode issues with shelve, though that may be resolved with MongoDB.
Added botchive and robotcomplete templates
`
Fixing bug in XCFixin_FindFix where it leaves artifacts when closing the find bar.
Building Responder and Requester classes.
Closes isssue #1; Closes issue #2
fixed issue with change to navigation module config
validation, placeholder, defaults, etc
why was db/schema.rb ignored??
ruby 1.9.2
Use Maven, add pom.xml
Adds very simple and ugly version of DB exercise.
Update everything, use latest versions
Remove DeleteRestrictionError catch, it breaks rspec
不要なjarファイルを削除
Adding sorting features to ged interface
Upto Exercise17
Flowplayer commercial version added.
Can now link to external data stores using tags.
Arreglo de fondos
dev-lang/ghc-7.6.1: rebuild x86 binary with profiling libraries

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Bump symbol to 0.1.4
Bump warp to 1.3.3.3
Bump exception-transformers to 0.3.0.3
Bump exception-mtl to 0.3.0.3
Bump hashed-storage to 0.5.10
Bump hedist to 0.6.2
Bump hpdf to 1.4.3
Bump libxml-sax to 0.7.3
Bump hothasktags to 0.2.2
Bump mainland-pretty to 0.2.4
loosen srcloc dep in language-c-quote
Bump srcloc to 0.3.0
Bump hslogger to 1.2.1
Bump lio to 0.9.1.1
Bump stringbuilder to 0.3.0
Bump vacuum to 2.1.0.1
Bump bindings-bfd to 1.2.0.0, patch for ghc 7.6.1
Bump bindings-dsl to 1.0.16
Bump generic-deriving to 1.2.2
Implemented Get Byte Variable Array command and a new LineGraph widget test page
get rid of conj duplication in interceptor
no more beforeThisChange
using location field in icalendar
cur.getPosition()
bahh!
Revert "bahh!"

This reverts commit 81c864af596b55518a9ba68718961d04d8630314.
#DoYouHaoBaby-2.1 框架增加一个prowered图标
后台增加一个清理应用的配置缓存
添加一个设计应用提示，并且附带与之相关的东西
商城头部
Merge branch 'master' of https://github.com/doyouhaobaby/needforbug
重新修复一下图标
商城提交
提交帮助界面
提交代码
修复框架记住登录的错误bug
hbm2ddl
added integration with desktop actions
restructering as android library project
inputs crossbrowser
responsive completo del home 320 - 800
Only notify once on update. fix #515
Always do votecount as int. fix #513
Log plex error. closes #512
Give error when datadir in appdir
Encode html entities in log
Simple growl-like notifications
Styling cleanup
Message didn't animate in Firefox
Use settings datadir again. fix #518
Not restarting after update
Give feedback if no update
Merge branch 'master' of https://github.com/RuudBurger/CouchPotatoServer
Cache for detail page, more logging exception handling and cleaning the search string
setting up knockout with json payload
Removed the CDATA tags for Opera
Separated the style from the javascript
Comments should have consistent casing
Lipid species in CompartmentProcess
还是搭一些架子

一些接口，以及计算胜负关系
Work in progress: pty forward to network

Signed-off-by: Zhou Zheng Sheng <zhshzhou@linux.vnet.ibm.com>
Another baseurl.
`py-shell-switch-buffers-on-execute-p' renamed `py-switch-buffers-on-execute-p', lp:1066994
Added animationend
added image to console splash
typo
added section on editing user profile
added section on editing user profiles
updated link so it will work when merged
added reports section
Merge branch 'infra_update' into infras_update

Conflicts:
	saas/console/console_overview.rst
Process Feed
Process Feed
initial commit of Pathogen Portal base code.
Forgot to update method signature
Set default for timeindicator option
Made bots render as prisms, larger ones with more sides
handle setting of ftp usernum/groupnum dynamically just in case something weird is going on and there is a conflict
some fixes for new list uci save code
Revised end of question
Added fixed re slides.
Work in Progress: GENCLIENT-374
Rendu le background gris. Closes #1
Remove global usage of UIUpload
Task#4515 - Error in compilation with Messenger
Merge pull request #150 from mlalbuquerque/Task#4515

Task#4515 - Error in compilation with Messenger
Setting ID in Rosters TreeNode; Delete onbeforeunload handler for IM
Merge branch 'messenger' of https://github.com/explivre/ExpressoLivre3 into messenger
Adding default configuration file for zeNEX..
Change Handle to a normal pointer to avoid cycle.
Merge branch 'ver-1.2.0-alpha' of ssh://github.com/fabric-engine/PublicDev into ver-1.2.0-alpha
Fixed issue in screen output
Removed some temporary code
Renamed script for consistency
Some data file renaming
More sanity checks
README update
Updated makefile
Bash script to batch-run all preprocessing steps
Patch for errors in IMG metadata
New script to calculated 16S copy number
Fixed undef bug
Tiny changes
extract_ssu_script supports RNAmmer and rfam_scan
POD update
Merged extract_img_16S into extract_ssu_seqs
No reliance on specific IMG metadata column order
Need to provide IMG genome ID to function append_seqs()
A couple of bugfixes in extract_ssu_seqs

1/ Bio::SeqIO, not Bio::PrimarySeq to read a file of sequences
2/ No need to loop again over all sub-folders
3/ Also, give the temporary file a more informative name
Fixed bug

Need to run() rfam_scan command before parsing its output
Feed rfam_scan only the SSU that we are interested as database
Add noseopts and replace noseargs where needed to run_test.sh

Add of noseopts to the run_tests script so users can be
able to run tests adding extra options to be passed to
nosetests.
This option is currently in keystone but not in glance.
Fixes bug 1065758

Change-Id: I7c78749adb90b126da5bd9580da6bfd7c9e1bf54
Disallow updating deleted images.

1. Return a 403 Forbidden error when an admin user tries to update a deleted
image.
2. Also added unit test coverage.

Fixes LP: #1060930

Change-Id: I8290c8c9f1bcbbfbff7d54f141bdcfa1c40aab6f
Return HTTP 404 for deleted images in v2

For admin contexts, the db api will return deleted images. This patch
manually checks for deleted images in the v2 controller code to treat
these cases as if the images didn't exist.

Fixes bug 1071446

Change-Id: I33075f94e9d560a279085e2afd18c8052f57d60b
Pull in a versioning fix from openstack-common.

Fixes bug 1059634. Related to I6cff4ee7f6c1dc970397b66fd2d15fa22b0a63a3

(Cherry-picked from 68253587f0d5a5b5f0dde63dd6036c7977e4f3d6)

Change-Id: I4c8daa8bf4a57849bd8d1e512a388d982f79b7d5
Merge "Pull in a versioning fix from openstack-common." into stable/folsom
Merge "Add noseopts and replace noseargs where needed to run_test.sh" into stable/folsom
Merge "Return HTTP 404 for deleted images in v2" into stable/folsom
Merge "Disallow updating deleted images." into stable/folsom
Return 403 when admin deletes a deleted image

1. Returned a 403 Forbidden error when an admin user tries to delete a deleted
image.
2. Added unit test coverage.

Fixes LP: #1060944

Change-Id: I1a5c4ca18e2e70d8a614b3132bfcea1f56c5f59c
Make cooperative reader always support read()

glance.common.utils.CooperativeReader provides eventlet-friendly
cooperation on top of backends that support either read() or __iter__().
However, in the case of backends that only support __iter__(), such as
images returned by store.get(...), read() is not defined. This patch
adds read() in all cases.

Fixes bug 1057322.

Change-Id: I67d9b3e4d93fbefd7eeaf7cfc947ab635fe09534
Ensure strings passed to librbd are not unicode

librbd rejects unicode by throwing an exception. If the location uri
was unicode, this would result in deletes failing. Convert all rbd
StoreLocation properties to ascii strings to avoid this problem.

Fixes bug #1075580
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

Change-Id: I445902bb1b72b8c814585f1481e6bf9e758b4e07
(cherry picked from commit 3aea9320d20d0291c5b4b027a585370d8e658a95)
Merge "Ensure strings passed to librbd are not unicode" into stable/folsom
Don't access the net while building docs

(Note this hasn't been submitted upstream)

Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
(cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
drop support for 0.4 and 0.6
Simplified dev env for users of most users (those on Rally1 Server)
Merging the changes from Kanban
bugfix makeheader
add  minified to javascript
adding og metadata
Add more header comments/example.
remove html link due to rules escaping tags.
Initialize the app with the actor id
Bug fixes
Check for actor, which is present only when someone is logged in and redirect to dashboard on start
initial test of bodytrack dateAxis integration
Merge git://github.com/jeztek/fluxtream-app
fix missing variables
Merge git://github.com/jeztek/fluxtream-app
zeo timeline works, yay
Modify SpringScaffold to allow scaffolding of entities to different subdirectories of '/' via targetDir param.
Modify SpringPlugin to accomodate using Forge in existing Spring webapps.
Only add <mvc:default-servlet-handler> if the servlet being mapped has the mapping '/'
Item11708: Expect failure in 1.1 for 1.2 Store API fixes

git-svn-id: http://svn.foswiki.org/trunk/UnitTestContrib@15005 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11955: Force RcsWrap, address perlcriticisms

git-svn-id: http://svn.foswiki.org/branches/Release01x01/UnitTestContrib@15033 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
added new drupal database
- Avoiding "plataform dependent" warning when building.
Sin privilegios para tabla de estado de usuarios
add flashes
add bourbon-ui-base typography
clean up dropdown arrow
clean up modal buttons
Updated modal dialog
Try harder to find bugs. Add many many more PMD checks. Customise some PMD checks that are bad or too strong.
adding support for send email to contact
Edited container: switch from MALLOC/FREE to NEW/DELETE
yeah
Merge branch 'master' of github.com:frozenteradactyl/Phones
simplified header stripping
use a script template to render the detail view of a row which is cleaner than messing with JS code
Do at least a non blocking select when we notice that another thread requested the NIO manager wakeup.  This should allow us to pickup any new IO events that have occurred on the selector and therefore reduce the latency that it takes to process those IO events.
Remove special case for straight domino
LPS-31737 Workflow Kaleo - improve search by designating search target better
Updating Alloy to 4610c77; LPS-31413
Pootle data
ant build-lang
ant build-lang
LPS-29747 Fix LayoutExportImportTest
LPS-30916 Source formatting at ca4dc3e7f5460136725c74fa4908cccc82e5b76b changed to wrong order
LPS-27841 Source formatting
LPS-31913 Slight performance improvement in PortalImpl.escapeRedirect()
LPS-31913 Little more performance improvement - do the equals check only once
LPS-31823 XSS in Search portlet if results are displayed in document form
LPS-31223 Cannot open in MS Office when title is missing an extension
LPS-31223 Source formatting
LPS-31620 - Fix document type verbose label construction
LPS-31886 No confirmation message when deleting, expiring or moving articles in Web Content
LPS-31886 Format Source
LPS-28897 Fix, Document library export/import is also able to bind FileEntryTypes from Global scope.
LPS-28897 Format source
LPS-28897 Source formatting
LPS-30587: updated javadocs
no functional change, javadoc fix on bivariate normal
AMQP-254 Add MessageId Advice

The RetryInterceptor requires messages to have an Id. It does not
work in an environent where some messages have an Id and some don't.

This adds an advice to enhance incoming messages with an id if it is
missing. Such messages cannot participate in the normal retry logic
(backoff policy etc), but allows 1 retry (until the redelivered
header is set). For a redelivered message without an Id, that fails,
the advice throws an AmqpRejectAndDontRequeueException, signaling the
container to tell the broker to stop delivering the message.

The broker can be configured to forward such messages to the Dead
Letter Exchange.

Add tests to verify messages with and without Ids use the
appropriated retry mechanism.

Also adds a RejectAndDontRequeueRecoverer. The default
MessageRecoverer simply eats the failed message; this recoverer
throws the message back to the broker enabling DLE/DLQ processing.
AMQP-253 Add Id Generation Option to AMQP Appender

log4j.appender.amqp.generateId=true

Turns on id generation - useful when configuring a
retry interceptor on the consuming side.

AMQP-253 Polishing

Fix default value; move to Message Properties.
AMQP-190 Memory Leak With Tx and RabbitTemplate

When the RabbitTemplate is invoked with an existing transaction,
the channel is bound to the thread, and

  ConnectionFactoryUtils.releaseResources(resourceHolder);

is called after processing. There was a commented-out line
in ConnectionFactoryUtils.RabbitResourceSynchronization.afterCompletion()
that would have reset the synchronized state so that
releaseResouces() would "close" the chanel/connection (return
them to the caching factory).

Being commented out, the channel was never removed, and each
transactional template call grabbed a new channel.

However, uncommenting causes issues with the listener container
because it continues to use the channel, so it must not
be closed (made available for reuse).

Added code to reset synch, by default, but not for the listener.

The listener sets a boolean releaseAfterCompletion in the
ResourceHolder to false so that the channel remains and
is not closed (logically or otherwise).
AMQP-251 Update RabbitMQ Client to 2.8.4
AMQP-250 Template reply-queue Could Not be Anon.

If the reply queue was defined with an id (rather than name)
attribute, the template's reply container listened on
the wrong queue name.

The template parser set the container's queues attribute
to the reply-queue attribute value, instead of a
RuntimeBeanReference to a bean of that name.

When a <queue name="foo"/> was used, it worked because
the Queue that Spring created during property assignment
had the same name and all was fine (the container uses
the queue name).

Changed the parser to correctly use a bean reference instead.
resource packages rename, bug fixes
Alpha Release Commit for GitHup
Alpha Release Commit for GitHup
First version of the containers.html file
saving data and searchinh
Removed PDB files
added jquerydate prototype block
Implement crypt_root_options

This change fulfills a request from prometheanfire. The main benefit is
that --allow-discards is now optional, which provides stronger security.
It does not have any relationship to ZFS for now.
Implement crypt_swap_options to complement crypt_root_options
Renamed test variables for consistency.
Added test block for statechart 2.
Fixes for second block of tests.
Added statechart 3 test block. Made fixes in root state example code. Changed logging to error to logging to info, so now seeing errors had been missing.
Fix crashing bug that ws cannot deal with .close. Doh!
Merge branch 'master' of github.com:georgeciobanu/touchPals
adding idea and iml to gitignore
Publish Issue 34
Beast are now remove when they have no more life