labofsahil/github-event-dataset-2012 huggingface dataset:
Added 'Coming soon' to ea reflection subsection, broke into new branch, reflection-guide
Typo: "linearlizable" -> "linearizable"
Merge pull request #107 from mechanical-snail/patch-2

Typo: "linearlizable" -> "linearizable"
pending changes to .sln
Remove errant A in file.
git-svn-synchronizer: add the --reset and --force options

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
added url for team members
Initial Structure and Files
query killing cron
And now MS3 compiles cleanly
Added front end stuff.
removed App.xib from the framework target; it's only needed by the test app
added button in test app to reproduce issue #25
ctags fix
Better no bluetooth message
added analyitcs.js
Solved the problem with isolated events in given workbench. The problem
was: when we send message, event broker receive message to receivers in
all workbenches listening this event. Forexample, if we have 10
sessions and all 10 workbenches in this sessions listen the event X, so
sending the event XXX to event broker as result has that all 10
workbenches receive the event XXX. I apply Thomas Schindl patch to event
broker and create SeparateEventBroker that send messages only for
receivers in exactly same workbench. This broker is instantiated by
ContextFunction and replace original EventBroker.
Better handling of MeshMS with multiple identities
tankBodySprite
added signup form and made it hidden...
Cleaning root folder
try fix disconnection
Setup page handlers
Whitespace fixes and added quiz dialog
Registreren maakt gebruik van een backup methode

wanneer JPA niet werkt
sor added
mégegysor
Move routers to their own files.
Corrigiendo una metida de pata mia.
Organize stylesheets by page-specific section tags
New theme added

New theme added

Signed-off-by: Joshua Pekera <joshua@smagency.com>
update sht11 driver and example
changed add member and placed combo box
Merge branch 'master' of github.com:smophos/ClubManagement
add qiwi module
Added Enemies

Player can die, destructible asteroids generated
Add routes and model method to handle the ramify of an idea.
Remove useless spec.
Merge branch 'master' of github.com:softa/festivaldeideias
set andam flickr account in tyof.js
sync theme andam with online theme
Added man file. I hope it works.
NR-216 : UI MVC - Collection implementation

some more separation and some different 'garbage collection' handling
NR-216 : UI MVC - Collection implementation

differential collection update, authentication models and collection,
trying some implementeation on old code
Fix un-catchable IOException
Enumerate input kinds dynamically. (Partially done)
Continued this refactor.
input kinds worked out in refactor
Fixed a bug in a Windows input that Wim filed (DVPL-1119), and updated Changelog.
Resolve comments from David. Fix getType/setType on WindowsRegistryInput to reflect new design Wim and I agreed on for Java and C#.
Replaced String with StringBuilder in Util.join
Resolve round 2 of David's comments.
Resolve final comments.
Missing file...
Reformat to try to make diff happy.
Add methods here so merge will go through smoothly.
Revert "Add methods here so merge will go through smoothly."

This reverts commit ee64eeced322252a780b479029b50b83615270bb.
Remove methods that are moved in branch to merge and are causing merge conflicts.
Merge branch 'fross/enumerate_modular_inputs' into develop

Conflicts:
	tests/com/splunk/InputTest.java
Armor plating IndexTest.testSubmitOne(). Refactor long lines in SettingsTest. Extend timeout for splunkRestart().
Merge branch 'fross/new-test-suite' of github.com:splunk/splunk-sdk-java into fross/new-test-suite
add the ability to change the way methods and fields are checked for compliance
fix &amp; in text
Ported Police Tape Overhaul from BS12 (comma)

Original pull request from BS12:
https://github.com/comma/Baystation12/commit/9efafd39bdaa1fdfde332c726bd335b7fb50f66f

New superclass, barricade_tape and barricade_tape_roll
police_tape is now barricade_tape/police, same for _roll
Added second kind of tape, engineering tape ("Caution, constuction"
style)
Allows people with access to 'raise the tape' to allow others through.

TODO: code/obj/item/clothing/suit/detective.dm needs to be split/moved
TODO: Probably the same with heavy.dm; same directory.
Styled switch
small change
Merge branch 'master' of
git+ssh://git@github.com/steelfan555/Battleship.git

Conflicts:
	BattleshipProgram/src/packy/BattleshipGame.java
	BattleshipProgram/src/packy/SavedGames.txt
Implemented some basic stuff

Signed-off-by: steffen <steffenb198@aol.com>
Insertion dans MongoDb
Updated composer.json for current Symfony2 master branch.
Updated RedisCache for current doctrine/common master branch.
Updated RedisSessionStorage for current Symfony2 master branch.
Updated RedisCache and RedisSetCache for current doctrine/common master branch.
Removed RedisSetCache class and test.
Updated README.
Merge branch '2.0'
Added some notes to UPDATE.md.
Merge branch '2.0'
Updated RedisSessionStorage for latest changes in Symfony2 master.
Fixed index in the session storage options array (fixes #32).
Forcing composer to stick with stable releases of Predis in the v0.7 branch.
Merge pull request #35 from sliver/patch-1

Forcing composer to stick with stable releases of Predis in the v0.7 bra...
Fixed cookie_lifetime issue in RedisSessionStorage (#36).
Merge branch '2.0'

Conflicts:
	UPDATE.md
	composer.json
Updated README.md
Merge branch 'phpredis'

Conflicts:
	README.md
Added phpredis support for RedisCache.
Merge branch 'issue-37'
Updating Redis session support

Moved RedisSessionStorage to a RedisSessionHandler which only implements
the `\SessionHandlerInterface`.
Fix readme and tests
Added availability to skip the adaption process

L32-L36: If a GET-Parameter ('skipAdaptive') is transmitted in the HTTP-Request with value==1, then the rest of the script is ignored and the original image is sent to the browser without any adaption. (Resize, compression, etc.)

Example URL: www.yourserver.org/hqimage.jpg?skipAdaptive=1

---
I need this feature for press downloads: Regardless of the screen resolution, the visitors should be able to view/download some certain images in full quality (eg. print versions, etc.)

....ay be useful to someone else too...
experimental first catkin release.
remove precompiled assets
retain assets folder with gitkeep
prevent connecting to db on assets:precompile
add .gitignore to public/assets folder
-Hung modify Support_Activity
code complete, JSLint passed with no errors, no warnings
Add commons-lang to libraryDependencies
Add initial version of UnicodeBlock
Add more improvements to CodePoint and UnicodeBlock
Add val codePoint and intern to UnicodeBlock
Update sumito-base version to 0.0.3
Add .jvmopts for sbt-extras and set -Xss512m
Update library sumito-base to 0.0.8
Add UnicodeBlock#{equals, hashCode}
Add spec for UnicodeBlock.apply
Merge branch 'startup'
finish the functionality of moving
TextViewにした
セクションを逆アセンブル
ability to import songs by pasting a URL
エフェクト完成4
Database creation function
PHP Fatal error: Call to a member function getDBkey() on a non-object in OpenGraphMeta.php on line 50 (BugId:42104)

git-svn-id: https://svn.wikia-code.com/wikia/trunk@59487 e846bd91-c042-42a7-a218-4b65e2c1904d
Removed unnecessary regression test
Added regression tests for bug report 35
topic develop.simulatePlaying: in progress (doesn't compile)
topic develop.simulatePlaying: in progress, not finished, but now compiles.
topic develop.simulatePlaying and in general for testing code
mapper persistency for timeFirstChosenConstitution
Merge branch 'develop' into develop.simulatePlaying

Conflicts:
	webApp/swift/src/main/scala/org/ocbkc/swift/OCBKC/OCBKC.scala
refactored handling player chose first constitution event
this allows it to be called also directly for testing purposes
+ better separation of concerns
topic develop.simulatePlaying in progress...
topic develop.simulatePlaying almost finished (compiles, but still runtime bugs)
develop.simulatePlaying in progress (does not compile)
develop.simulatePlaying in progress, now compiles and tested partly!
include create random number of players + tested all: it works
fixed ship typo in user template
Dev build update
Install clang and make sure dpkg is not updated (since we use a patched version)
Check Front-End-Https header for __SECURE__ env

Check the Front-End-Https header when determining whether or not the
connection is secure to allow Symphony to exist behind an HTTPS
downstream proxy.
Change to X header

Change the downstream-HTTPS switch to X-Forwarded-Proto
Change value of X header that indicated https

It should be 'https', not 'on'... Swift.
USe $_SERVER instead of apache function

^^
Check for X-Forwarded-Proto header in a more succinct fashion

This change is the result of feedback from pull request 1498 to
symphonycms/symphony-2:
    https://github.com/symphonycms/symphony-2/pull/1498
Merge pull request #1505 from Sidevices/master

Use X-Forwarded-Proto header to detect secure connections
Fix how to set force the locale, based in my remote Ubuntu machine
show tags from the system in the home page
You can create Organisations now.
Updated Langue.
Updated link for creating organisations over map.
Add preliminary compatibility with ctags command line flags.
Only show 'kind:' key if the kind field is shown.
Hold the result returned by PHPParser as a property.
Merge branch 'feature/ctags-compat' into develop
Refactor how scope information pass through iteration.
Add composer.json
Use composer for dependancies
Merge pull request #1 from sanpii/master

Use composer for management.
Update credits in README.
Update installation instruction in README.
Merge branch 'master' into develop
Update README
Sort by occurrences by default
Remove the `$mStructs` property
Rename method getAccess to getNodeAccess
Change`$mFields` to a more proper name `$mKinds`
Pass options array to export method instead of the whole class
Pass target file to the export method instead of the whole class
Introduce a new easy extendable test framwork
Introduce debug flag to enable error reporting
Добавил вмплывающее окно при введении неправильных параметров продукта
fix animal_request_decidision_tool array size
Merge branch 'master' of github.com:tedmanahan/Animal-GRIN
fix DoesNotExist exception.
Merge pull request #15 from gkmngrgn/feature/profile-exception

fix DoesNotExist exception.
directed and undirected pageranks
Updates to default conf/settings.py with more options

Added example db connection configurations besides heroku but left that the default. Added comments to emphasize we are merchant provider and newsletter provider agnostic.

Signed-off-by: Ed Schipul <eschipul@schipul.com>
Added videos module as default to tendenci-site

Added the videos module as a default in tendenci-site. Still need to add credits, license, etc, but will add those as mods under issues on github

Signed-off-by: Ed Schipul <eschipul@schipul.com>
add mawarbook
Un-commenting a line for git bootstrap
Threads for pound
Fixing getElementById use for non-existent ID
Changed name of screenshots/ folder to img/
More progress on doc
Merge branch 'master' of https://github.com/thenoviceoof/romeo-set
Admin views
Resolved merge conflict
reverted mac-style aliases
Improve site/sector data in Info View
Clarify data label for CI
Support for Cellrefs (part 2)

- introduced a SiteList to the app
- fill list of sites objects, parsing site properties using hardcoded
column order (for now)
- lots of JSDoc work
Rename pomo tests to conform to the standard introduced in [904]. see [1106].

git-svn-id: https://unit-tests.svn.wordpress.org/trunk@1171 4a5a2adb-35eb-4268-9a1b-fe04a4134342
Update htdocs/Themes/default/index.template.php
updated iframe busters
removed redundant dartiframe.html
Merge pull request #30 from darshanbib/topics/ad-iframe-busters

updated iframe busters
Primitive multiplayer works.
oops, didn't needed that migration
Engine kinda working for very stupid robots
Header fixed and bootstrap removed
Merge branch 'master' of github.com:timehome/game-off-2012

Conflicts:
	fightcode/static/coffee/animation.coffee
	fightcode/static/js/animation.js
	fightcode/static/output/fightcode.animation.min.js
	fightcode/static/output/fightcode.engine.min.js
	fightcode/static/output/fightcode.min.css
	fightcode/static/output/fightcode.webApp.min.js
	fightcode/static/output/fightcode.worker.min.js
OpenTTD 1.2.1
Migation : include load bar in panel
- new structure for architecture
Make emails be from League
added a fix to batchgetitem
Evelyn's Data
deleted procfile
created first static page
Added a Pages controller

rails generate controller Pages home contact
unbind only $.prettyLoader.scrollHandler .
Finding shortest path in progress
TMPSTGSQL-115 - Merging a fix in from another code branch. Needed to add additional tables to the filters.
add seeds gitignore config/travis.yml
add pusher, fix some events
replace getPath/setPath with get/set now that ember supports it
debian: add some module build dependencies

Thanks to Steven Ayre for an initial list.  I've made some
modifications and corrections.

FS-4202 --resolve
debian: enable mod_snmp
debian: mod_java depends on gcj-jdk for a symlink to jni.h

See:
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=371060
debian: enable mod_java
debian: enable mod_managed except on squeeze

mod_managed needs mono 2.8 or greater, and squeeze has only mono 2.6.
debian: use libjpeg62-dev rather than libjpeg8-dev

Some modules such as mod_h323 pull in libjpeg62-dev which creates a
dependency conflict if we try to use libjpeg8-dev for the core.
debian: add build-depends and suggests for mod_ladspa
debian: enable mod_ladspa
debian: add build-depends for mod_yaml
debian: enable mod_yaml
debian: enable mod_portaudio and mod_portaudio_stream
debian: add build-depends for mod_h323
debian: add build-depends and section for mod_mp4

This needs a package from debian-multimedia.org, so it needs to go in
contrib/ and we can't build it as part of this source package.
debian: add build-depends for mod_osp
Use a new (more efficient) graph variant from hbgl

This makes the affected analyses much faster and drops memory usage by
as much as 25%.  Very worthwhile.
Fix an import in a test case
Removed "This is derived from the status code X"

It's an implementation detail. Doesn't belong in the doc.
Declard examples as examples, some minor changes.
make formatter spec more reliable
Merge remote branch 'bdurand/master'
perform ILI9340 initialisation
Section 6 Exercise 1
Section 6 Exercise 2
Section 6 Exercise 3
fixed force close on pass generation
Add new javascript jobs
Adding the Check All box to the list page per group.

Making the too many projects bounce error not happen any more.
Workaround: when the URL is too large, it uses a session-local
key to cache the project list.  Bad side, it's no linkable to
other people without your session.
Initial commit.
Switched to fixed layout for iOS
Added readme
More design tweaks (pay no attention to the stinky inline CSS)
Swapped out Bootstrap for H5BP in prep for tomorrow's design buildout
Added basic styling.
Image uploads deferred to v2 of app. Too complicated for initial release.
Adding jqmobile to project
Add demo link to readme
Ch-ch-ch-anges.
Fix merge conflicts.
Replace NamingException with AuthenticationException
Add configuration files to package
Finalized data for plotting
added build automation
Reimplemented KArray
fixed week link
Added activity loader indicators and map zooming upon vehicle selection
QuickGridView javadoc improved
Added generate report flurry events
Added Flurry New,Edit Entry and Voice Entry type
Correction added to the activity to match the C server
Mgmt Queue
Renamed and fixed example config file
said import to include change
Some minor fixes & changes
Renamed temporarily named WappalyzerRb::Some to WappalyzerRb::Detector
Version bump to v0.0.3
Wed Jul 18 07:58:06 EDT 2012
usf.logic堆栈退出资源没有清理的错误解决
tuils.string_utils增加辅助函数
去除调试代码
cpe.dr增加判断是不是key属性的代码
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/support/game' into t/support/game
Merge branch 't/support/game' into refs/top-bases/t/support/usf
Merge commit 'refs/top-bases/t/support/usf' into t/support/usf
merge
gd新增了pom_mgr模块
cpe.pom_grp把二进制持久化的接口对外开放
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/support/game' into t/support/game
gd and gdpp update vcproj
cpe and cpepp update vcproj
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/support/game' into t/support/game
new android-sdk
Initial Commit
Added files
Merge branch 'master' of github.com:wannabegeek/TFTouchMap
Version 2.1.22

1. Requires EMP Server 2.1/13625 or later
2. Change export transaction queue format like csv at Configuration > Import And Export
3. Put in a remarks indicating that if the date is not checked, it will export all transactions that have not been exported before at Configuration -> Import And Export
4. Add 'Upload By Limit' check box and text field at at Configuration > Import And Export
5. Merge transactions in txn queue into 1 row, instead of the current multiple rows.
6. Support user permission > View Report, Cancel Cashsale, Cash In Out, Can Config, Delete Item, Edit Price.
7. Get all active salesman, instead of all salesman
8. Fixed - Show error when select Customer Account
9. Add wait cursor when click Import or Export button at Configuration > Import And Export
10. Show Export transaction records and update status transaction records message at Configuration > Import And Export
11. Add new field 'serial_numbers' at cust_invoice_item
- ALTER TABLE cust_invoice_item ADD COLUMN serial_numbers TEXT;
12. Display show Item EAN Code
13. add ["] at export txn queue
Version 2.1.22

1. Requires EMP Server 2.1/13625 or later
2. Change export transaction queue format like csv at Configuration > Import And Export
3. Put in a remarks indicating that if the date is not checked, it will export all transactions that have not been exported before at Configuration -> Import And Export
4. Add 'Upload By Limit' check box and text field at at Configuration > Import And Export
5. Merge transactions in txn queue into 1 row, instead of the current multiple rows.
6. Support user permission > View Report, Cancel Cashsale, Cash In Out, Can Config, Delete Item, Edit Price.
7. Get all active salesman, instead of all salesman
8. Fixed - Show error when select Customer Account
9. Add wait cursor when click Import or Export button at Configuration > Import And Export
10. Show Export transaction records and update status transaction records message at Configuration > Import And Export
11. Add new field 'serial_numbers' at cust_invoice_item -> ALTER TABLE cust_invoice_item ADD COLUMN serial_numbers TEXT;
12. Display show Item EAN Code
13. add ["] at export txn queue
add combining events routine
2 particle final states
version 0.1
make it work with conduit
action has zipSink3
Added draft 1 of the charter
Test by adding exclamation mark

This is just a test
Test—revert prior changes

Just to see what's up with GH
qt4-webos: set PACKAGE_ARCH to ${MACHINE_ARCH}

qt4-webos is really machine-specific as of right so we have to specifiy it to keep package
feeds sane. This is necessary unless qt4-webos moves out of the machine-specific corner and
becomes as universal component available to use for all machines.

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
qt4-webos: use in statement instead of multiple conditions

This makes it easier to add other machines as well. Otherwise the used if statement will
be very complex and long when adding more and more machine names.

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
webkit-supplemental: update path to qt4-webos WORKDIR

Open-webOS-DCO-1.0-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
fix dones't clear tab bar after close tab window
Make default variants modifiable

We want to be able to upgrade from the default
variants so it doesn't make sense to always
have them be in the array.
Add configurable flag to packages
initial CV
Octopress init
Site updated at 2012-05-18 16:58:23 UTC
put link to popup
Imported Upstream version 0.5.16
Add a test for log message in rounded case (#203)
Linked titles
try copying to /root, given that /home is already bindmounted
bug fixed: visual feeback needs to be removed and not added when the
rendering is finished
Add new module for, remove approval from default module
Add ACL
Activate add user for super user
merge master and review01nov
changed the maps and small bug in gamemodel causing you to respawn on the wrong place
php example: student/course database example

File stucou.sql is the sql scripts to create the database.
see list
Merge branch 'master' of https://github.com/wollowizard/id2212-hw2.git
Improve the style for overflowing data
mensie upravy - parser, course dialog
Merge branch 'master' of github.com:xbacinsk/MZJ_Timetable
marge 2
len zmeneny nazov dialogu
Merge branch 'master' of github.com:xbacinsk/MZJ_Timetable
lebo som si nespravil predtym pull..sorry :D
Added quickstart for BiQuad Filter app.
Site updated at 2012-12-13 08:30:56 UTC
Merge branch 'master' of git://github.com/courgette/big-brother-bot.git

Conflicts:
	b3.egg-info/PKG-INFO
	b3/PKG-INFO
	py2exe_builder/b3-installer-project.iss
	py2exe_builder/b3_lite_for_bf3-installer-project.iss
	setup.py
made changes to screenchangemenuitem
XWIKI-7864: Allow the Hibernate connection URL configuration to use the Environment Permanent Directory property
Pre-packaged hsql database files were not being placed in the permanent directory.
add the endless loop test
fix the decode aray error
add landspace for kindle dx
fixed bugs on thread
Finished Round class
WIP > building up framework
WIP
Fixed path encoding
renaming log4net config
adding log4net config
Fixed encoding issues
Say bye-bye
Fixes #2331 -- bound 'super' regression
CoffeeScript 1.3.3
more changes to REPL autocompletion as suggested in 8dcbe54e55cda4f3f157187020ec79a6fdfdf417
corrected some SIGINT/EOT logic in REPL
Styled create account page, firefox bug on select.

Firefox -moz-appearance: none does not remove select arrow.
Bug on scrolling container div, solution not found yet, will likely
involve hack (footer div?).
Finished slots page styling.

Small discrepancy between design mockup using a dropdown select and
mockup html using checkboxes.
dev branch changed
master branch changed
conflict fixed
reset main.c
add dev function
add master function
fix confilect
reset main.c
add dev declare
add dev function
fix conflict
changed function dev()
Merge branch 'dev'
add dev2()
Merge branch 'dev'
remove dev()
Merge branch 'dev'
remove dev() decl
add new file
Merge branch 'dev'
Added REST api guide
css adjustments + footnote idea
refactored footnote code
Merge pull request #17 from sarabander/master

Style adjustments and footnote idea
Improvements
Merge branch 'master' of github.com:zquintana/ActiveRecord
Added Travis support to the project.
Error handling in Database constructor
oops, missed a bit.
Simplify code
Simplify code
Fix test diagnostic
Add some tests; note on incorrect handling of time wrapping over midnight
Simplify code
fixed columns names for ACE format
switch to error_log
final s/s4w/dezi4w/ fixes, plugin config and registration works
Added the runnable version.
README.
Finally getting links, its not pretty though
starting project 4
done
+++ Modified tests adding id number
+++ Modified RegressionTest to notify if the command diff caused some problem
Alternative main program code cleaned
Tweaking the maze mode to look better for the wit laptops.
Merge branch 'master' of https://github.com/LynxStar/MultiSaver

Conflicts:
	MultiSaver/MultiSaver.suo
Added original note back
Fixed headings' hierarchy
Fixed style and some typos
Added people report intial pass.
Merge branch 'master' of github.com:AngelCabo/walk_of_faith
/ ‘src/game/client/c_club_dj.cpp’
/ ‘src/game/server/club_dj.cpp’
Fixed collect(node) test
поедает мишени, нащитывает очки
fix controller method name
Updating headers in the HTML webhelp to reflect updates in website.
Minor update to HTML header template.
update config of memcached; make memcached pass unit test

Change-Id: I981ed1429e34d5d2a34842ffd2a096628ff716bd
Merge "update config of memcached; make memcached pass unit test"
change on questions interface and index for the path link
added .gitignore to suppress ZS project files
working on redirects
working on redirects
working on redirects
working on redirects
Set up the origin so that it is always at whole numbers. This stops the 'seams' from appearing between blocks.
Do not print background color if Options.fvBackground is false.
Remove warning about 0 converted to nul.
Merge branch 'HtmlViewer11' of https://github.com/BerndGabriel/HtmlViewer.git into HtmlViewer11
Merge pull request #29 from JPeterMugaas/HtmlViewer11

Do not print background color if Options.fvBackground is false.
Update for test project; refactoring tests to suit new model and architecture and pluralised naming conventions for controllers
Added Synonyms to Species
Fixed bug in image uploader; added api pull for vimeo
playing with docs
base website is done.
renaming a file for better importing
Update elite/inc/database_config.php
added valid move checker
controler code refactored and some buisness logic moved from product controller to user model
SRM 538 Div 2, 300 Pointer
SRM 538 Div 2, 300 Pointer
Third floor sequences.
Someday I will remember to add files before pushing, but today is not that day
Handling Exception
Handling Exceptions v.1
ninject on client done
exceptions updated
Fixed tests in ListCommand class
Merge branch 'master' of https://github.com/ClTraining/Task-Manager
inserite le firme con dimensioni adatte
aggiunto riferimento nel capitolo5, scritto il ciclo di vita
Merge branch 'master' of github.com:ClockWorkTeam/ClockWork
CLOUDIFY-1224 REST Security roles
CLOUDIFY-1124 REST Security roles Added spring beans profiles.
Merge branch 'master' of https://github.com/CloudifySource/cloudify

Conflicts:
	esc/src/main/java/org/cloudifysource/esc/installer/AgentlessInstaller.java
803 Build version advanced to 1193-153

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@112305 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1194-228

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@114175 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@114176 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1193-142

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@112233 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1196-100

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@116829 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@116831 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1194-3

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@112983 eb64e737-3616-4df0-8941-5ee2ae88103d
Build version advanced to 3481-30
803 Build version advanced to 1194-243

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@114259 eb64e737-3616-4df0-8941-5ee2ae88103d
Build version advanced to 3481-11
Added padding at top.
Released v1.0 (2)
demand grid view and viewmodel
Updated to latest Joomla 1.5.x version.
Working on a fix for bug regarding being logged out during a server shutdown.
Also added a new configuration options which allows a maximum amount of players that are allowed to be registered from an IP.
clean up azathogh cpp
Merge branch 'master' of https://github.com/CurtisMcKinney/Azathoth
Updated to use new Cinder and made custom signals2 version
remove label from reservation button
Add entity_type to button theming function
cambbiando el nombre user en ordenador BT
Fixed stupid backslashes bug in idFileSystemLocal::CreateOSPath()
Fixed bug in Sys_CPUCount()
Fixed some bugs in idSysSignal.
Merge remote-tracking branch 'DanielGibson/linux' into linux
Merged 64 bit fixes.
eliminate more longs

for 64bit compatibility.
Added default template files for project generation.
initial public version (but bug in the database engine)
bug fix database
bug fix database2
Connection process done up until after WorldData.
md fix. quote block
added support for abstract models
updates to css and new images
All the libs and packages used in the graphing so far
catch install log into file
images pres
Add before commit!
Imports removidos do Main
fix wire/reg conflicts name
Auftrag
Merge branch 'master' of https://github.com/Frameset91/untitled0815.git
Merge pull request #692 from FranciscoBorges/smallFixes

Small fixes
fixed RA managed connection to return correct connection and session type
revert part of commit e8175c07d5f9dec08846c778825edf0578e6ada5 back and add test
upgrade version to 2.3.0.beta2
Revert "upgrade version to 2.3.0.beta2"

This reverts commit 0a0a0533240e68b7835277a6e565b28d55822d0e.
Merge pull request #695 from andytaylor/master

version stuff for release
Sorry adam
dependency to acceleo added
Hey Commit
menu.js file
Fixed deadlock in statistics home page
Merge pull request #132 from natalvc/master

Fix deadlock in statistics home page
add 4Way Reboot
Stylus files in separated folders, gitignore fixed to ignore stylus compiled CSS
doc directory for documentation, run for sourcecode.
Included a markdown-flavoured template in /doc so it's readable on GH.
settings.yml contains a list of the used directories and their
descriptions.
README.md updated to reflect these changes.
Starting to add blocks
Package renamed to ikrs.httpd; documentRoot renamed (non-alpha); system uses user.dir property for file locations
Add codecompeletion in ExpressionEvaluatorDialog.
Add code completion in ExpressionEvaluatorDialog.
Merge branch 'master' of https://github.com/Indomitable/monodevelop
admin_blog: Fix event selection, save form contents on save in edit form.
admin_base: Move tablesorter lib stuff to admin base template
admin_events: Start using tablesorter
admin_slides: Start using tablesorter
admin_upload: Start using tablesorter
libs: Some tablesorter css tweaks.
admin_kompomaatti: Move all admin features from kompomaatti-admin. Use tablesorter everywhere.
Touchscreen fix for atmel toushcreens on ICS.
UP-3456 Create SASS Compilation Mojo
First commit from file-system
Merge branch 'master' of https://github.com/JasonCrease/RaspiGuitar
Custom fields handling improved.
second commit, trying to add two files at once
I don't want the log file in daemon mode
Fixed Emils bugs and more stuf.
Update source/academy/sessions/20120529.markdown
Fix bug with @include box-shadow(none);
Fixed update notifications to ignore if the CsvEditor changed the csv via saving.  Also abstrcted out RCR code into custom interface
Style Unit_Reports
Merge branch 'master' of https://github.com/Kheos/Telephony-Reports

Conflicts:
	web/WEB-INF/unit_reports/add_unit_reports.jsp
fix sceletons
changes in creditVC
nodeJS-Port auf 843 gestellt, weil dort die meisten Flash-Anwendungen ein Loch in der Firewall spendiert bekommen haben, HTML und CSS aufgebohrt
Port auf 8080 zurückgesetzt, da sonst node als root laufen müsste, Verbindungsstatus nun
funktionstüchtig in der rechten unteren Ecke, Client-Heartbeat auf sechs Sekunden, damit
relativ schnell wiederverbunden wird, bissel CSS Kram
Pinsel in drei stärken, jsColor ohne cursor
Schriften korrekt eingebunden
Schriften ins Repo und Status auf Chromium funktionstüchtig
First test adding a namespace Qoha to make scripts more modular
WIP: refactoring git commands
QohA: End of refactoring into a QohA namespace
Add a TODO file
QohA: Don't create a tmp file, use a perl oneliner
QohA: Don't exit if we have no template file to process
QohA: If a file is removed, check_compil raise a warning
Merge pull request #1 from joubu/qoha

Qoha
first version of the downloader
Disable TravisYML plugin

It's not necessary to regen the file every time dzil builds.
Check if service hook towards ReadTheDocs is enabled
Signed-off-by: Balthazar Rouberol <rouberol.b@gmail.com>
organisation de l'arborescence de  base du projet
ecriture des dernieres modifs
ajout du document du rapport, à remplir au fur et à mesure
Merge branch 'develop'
+getAllSkillsNames()
Gemfile.lock for bundle install
Merge pull request #30 from LaurentGoderre/master

Added a missing image for the web feed widget and fix the mobile view not working when ajax call fails
Disabled auto-height for tabs-style-4 and tabs-style-5 since not meant to support equal heights.
Make hover/focus colour for links less specific to avoid conflicts with widgets. Fixed keyboard focus for tabs. Up and down arrows now work on tabs. Up, down, and spacebar no longer cause the base to scroll or jitter when focus is on a tab.
Initial port of Share widget
Fixed positioning and keyboard support.
Fixed handling of click outside of popup.
Improved display of widget. Fixed open/close functionality. Enabled overrides through settings.js and the data attribute. Improved mobile support.
Implemented default overrides in the Share widget and Tabbed interface. Defaults are overwritten by settings.js which is overrided by classes which is overrided by the data attribute. Also updated pluginTemplate.js with this new overriding approach.
Corrected a couple of JSLint issues
Added arrow key support to share widget. Enabled navigating by the first letter of the links. Changed title and link text. Removed second hide link. Removed share links from tabbing order (only button is part of the order). Changed into a WAI-ARIA menu, changing WAI-ARIA attributes accordingly.
Corrected up/down arrow handling in share widget.
Removed some redundant and unused Share widget code.
Added filtered sites examples for share widget. Changed data attribute overrides to data-wet-boew attribute overrides.
Corrected contrast issues in mobile view. Made jQuery Mobile CSS theme-specific. Now dynamically merge jQuery Mobile structure CSS and theme CSS. Now Base64 encode jQuery Mobile images.
Putting event delegation so that not-here-on-page-load links get the goods too
Added a starter mapserver file, which is required in order for the print functionality to work.
Fixed some broken file paths.
Bug #67 Fix:  Media Upload Error
Added retraction and prime settings to each extruder data.
Updated version log.
Add Enemy character
submodule MCForge update
ordered files into package order, (submodule MCForge update)
Update contribution guidelines.
Remove old contribution guidelines.
Refer people to the correct projects in the README.
Bumped to latest dependencies
Use a version of bundler compatible with Travis CI.
[IMPROVEMENT] Allow and and or operators between filters
type-o correction
remove test Files
Merge branch 'master' of https://github.com/Madhuka/MadhukaBlogRepo

Conflicts:
	New Text Document.txt
remove test files
Commited everything
Oups too much commited.
nuevos telefonos en directorio interno
css de cas
app/bootstrap.php.cache removed from the gitignore.

New task phpcb added to the build

Change-Id: I90a0e851d764b6c79cc7919befbfd449dd87b193
String to time for timeslot tweeking padding
Fixing link to cli
Adding randomize action to ordinals for group members
Users is now picked as next from a random list
Merge remote branch 'tomGithub/master'
Cleaing up solution - organizing js files
Reverting recommended version of voxelmodpack
Fixed Minecraft.class for 1.2.4
Merge branch 'master' of git://github.com/TechnicPack/Technic

Conflicts:
	CHECKSUM.md5
Zrobienie nawigacji między stronami, menu, wypisywanie wyników
lots o specs written
Group cloning started
Image resize fails when Froce flag is set
Merge pull request #80 from biszkoptwielki/master

Image resize fails when force flag is set. Fix & unittest
Fix index build_spec #177
* 1.0 release build fix
IUserManager and IArticleManager created
 IUserManager and IArticleManager created
Added System defined events example
Merge pull request #387 from billmn/1.3/develop

Added System defined events example
Fixed typo and added when system events was triggered in the example
documented new Debug::$js_toggle_open variable to control dump() behaviour
Merge pull request #388 from billmn/1.3/develop

Fixed typo and added when system events was triggered in the example
Merge branch '1.3/develop' of git://github.com/fuel/docs into 1.3/develop_japanese
Navigation umgestellt + Telerik eingebunden
Telerik navigation eingebunden.
SessionParseMapper hashtag twitter
Add ExpectNotSend and other nots to testing, closes #339
added widgets, moved helpers to utils
trillian2adium
Added end of day processing for Human
Address and port are not required and can be empty.
Merge pull request #1 from mnaser/patch-1

Address and port are not required and can be empty.
organize_recordings manage.py command
Added specs for the conference and side chat action bars.
Dashboard: action bar flipped: fixed
ConferenceScheduling: reviewed for UI and layout
more security skeleton code
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group
Small tweaks network screens
before i redo all the tree catchers
Readme for the JSON data directory.
Remove dead code
Fix/adapt unit tests for try/catch

We no longer pass an error continuation to 'eval'. Instead we just use try/catch for
all error handling.
A factory detail is in a space property 'detail'
- Bounce!
set context after handle; defaults for inline action
make the recommendation module and copy the code of UserController.php as it is to the module

Signed-off-by: yanzhou <yanzhou@mail.ustc.edu.cn>
Added an explosion sound
Made the prison be on fire
Added the ControlActivity and made sure the URL was passed to it
Initial glide_size increase.
Some changes. Untested.
Merge branch 'animation'
Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt
Fixes
Merge fixes part2
Making it work
Split speed from actual delay time
Adapting glide size formula
Now gliding_size for pulled objects and mobs is also changed.
Updated cycling airlocks

New controller can check secondary sensor (tag 'sensor_tag_int') for current pressure inside of station.
Adds high_volume vents

Can be used in place of airtank in station airlocks - vents don't depend on tank storage, and do pressure equalisation faster a bit
Added merge driver for .dmm files.
More work on the mapmerge tool.
Adds more airlocks to the main halls and maintenance and fixes a conveyor bug in cargo.
Merge pull request #1911 from zartco/master

More airlocks and conveyor fix.
Merge pull request #1910 from RawrTaicho/master

Custom items and stuff
Adjusts AI code to bring back custom cores and makes it easier to add in more.
Adds in Ravensdale's custom AI core sprites, as well as brings back Serithi's and Searif's.
Merge pull request #1912 from Ravensdale/master

AI custom sprites: Re-introducing three and adding in my own.
Adds atmos pressure suits I forgot to add last time.
Scripts/RubiSanctum Update all Instance creatures and implemented Halion Script
Core/Security Added Developer Security Level
Bug fix

Risolto un bug nella funzione int controlla(int giocatore) che poteva
modificare il risultato in base ai valori delle celle di memoria
adiacenti alla matrice.
Rimosso un file
import bone stable patchset

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Fixed a missing param

Was breaking FF (at least) in some circumstances.
Hoisted some vars

Tidied up some redeclared vars jslint was complaining about.
Merge pull request #28 from nathanadams/minor-fixes

Added nathanadams Minor fixes
even more service installation bugfix
copied libs
Modified station file
Merge branch 'master' of https://github.com/SanabriaRusso/CSMA-E2CA
Update TsReader.ax (NSM 51)
moved framerate from gameworld to rollbackableworld. reduces dependencies
moved if statement for checkCollide to beginning of function
tabs replaced w/ spaces for indents
use newer ScalaTest jar
use "implicit class" instead of old-style implicit conversions
tighten the code for adding zipWith as an extension method
remove commented-out stuff
update comment
new update of exported data from OSM
Generalizing the Problem and adding a slightly better readme
sqlserver
Merge branch 'master' of https://github.com/SiteView/Realtime-Panel.git
fastupdayte
Weiter Nutzloses entfernen
#8 code formatting
VariablePlaceHolderConfigurer example
Add VariableSource configuration sections to documentation
Fix some typo's, minor cosmetic changes
Add missing image
Consistent usage of variable for `${variablename}`
Fix typos
Move note on `PropertyFileVariableSource` to detail section

Also some formatting and typos/
Move `VariableSourceConfiguration` up
Add note on user changes to user settings during container lifetime
Spell-check
Merge branch 'master' of git://github.com/SpringSource/spring-net.git into ivariablesourcedocs
Add note on precedence rules for `PropertyFileVariableSource`
Add note on non-existing registry keys
Merge pull request #10 from serra/ivariablesourcedocs

SPRNET-1477 (well, not really, since that isn't an actual issue but this pull req. is certainly related to it <g>)

Adds documentation on IVariableSource implementations provided by Spring.NET
#476 - make 'with' binding more lightweight (also 'if' and 'ifnot')

Key features:
If the value is initially true, will save copy of nodes and bind to the originals;
if the value is initially false, will save the originals.
Will only update UI if the value has changed (for if/ifnot, if the value's truthiness has changed).
Uses cloneNode to copy nodes.
Optimize template binding to only re-render template if 'data' or 'if/ifnot' values have changed.
Add specs for if, ifnot, with, and template bindings to test for re-rendering only when necessary--when the bound value changes to a distinctly different value.
Add specs to demonstrate breaking changes (these pass on master)
Modify if/ifnot/with and template bindings to restore backward compatibility
Rename "if.js" to "ifIfnotWith.js"
Define if/ifnot/with in single file, since they are all constructed by a shared utility function
Optimize ifIfnotWith slightly; make sure saved nodes are cleaned. Add spec for new 'with' functionality.
Merge pull request #476 from SteveSanderson/476-lightweight-with-if

make lightweight version of 'with'
minor style changes
baibai~
small tweaks to naming - filled in C15 and fixed PROGX
i don't understand this commit...
refine
premium fcfs elevator
Updated README again because I am an idiot, that's why
More code clean-ups
List View implemented for StaticPages
Added Note for auto build system.
Signed-off-by: Matt H <mathwhiz19@gmail.com>

 Changes to be committed:

	modified:   README.md
initial load of index and css file
Added some menus, reimplementing Element system, Adding Chunk/tile support

Signed-off-by: Tricon2_Elf <tricon2elf@hotmail.com>
DB/Spells: Add missing Invisibility (spell id 35009) to spell_dbc
New authentication using username&password instead of authentication key
not working commit, just for backup
New authentication scheme works now
Git status evalueate maked with one grep call
cs130 Got points working
Add idl command

To be extended once GCLI has plugable Types
.idl.cpp generator.
Added examples of WPF TreeView, TabControl and DataGrid
Made generic system classes. Hopefully this makes sense (amidoinitrite?)

Signed-off-by: Ollie <dzineit@live.co.uk>
replaced true / false w/ :ok/:fail
Update application/views/auth/forgot_password_form.php
wall color fix
leftpane selectted  added
Merge branch 'master' of https://github.com/Wallitapp/wallitapp.com
Truly fix the bishop's threatened cells. Blame me and my dead brain.
New results : git commit 542dc07c8a80922e1710bed062cefd8d4f4538e8
Writing human interface.
Effing design shit, whatnot >:(
Update applet/applet.c
Make sure time1 is unique before committing to db
Merge branch 'master' of github.com:XanderStrike/PolySurvey
Updated server logic.

implemented GetVersionLogs() in AbstractVersionControlSystem
Merge branch 'master' of github.com:Yndal/BDSA-Project-2012
check env before using in bugzilla script
[tell] fix - use string instead ref when robot speak
typo
add eval, ping, uptime, tell testing scripts
Use the logo repository
order and orderDetails
Shell v1.1
this
next
new schem
Merge branch 'master' of https://github.com/abocskocsky/alu-verilog
Added yii debug toolbar extension

- Added yii debug toolbar extension from
http://www.yiiframework.com/extension/yii-debug-toolbar/
- configured log configuration variable to enable yii debug toolbar
- Added enableParamLogging, enableProfiling parameter to db config
variable
NOTE: should add enableParamLogging before enableProfiling.
Debug toolbar feature updated
styling and template for hours chooser in filter search
implements updated visual design for view details desktop
Guang Liu : fixed bug in roi class
Guangliu: refine code
change in methods hash
Created gh-pages branch via GitHub
add
adding
first
add readme
add new read
sdfs
Created gh-pages branch via GitHub
remove all
add png
add new site
add newdsdf
add new sms
removsad
removasd
Don't white balance the solid white test
create view: flag icon for sections, closes #123
minor tutorial tweak
table for bound plays
Data file was pointing to the wrong place.
Reorganization of webserver.js and startweb.js
Move to a more descriptive and easier to use directory structure.
Improve encapsulation by reorganizing ivars and code. Add ARC guard macro.
Add ARC guard macro.
Add ARC guard macro.
Improve encapsulation by reorganizing ivars and code. Add ARC guard macro.
Reorganize image files to copy them into Silent Text.
Commit the project files.
Revert "BZ835131 configure errors after upgrade"

This reverts commit 0dc9e897432062550970f65a068441d28be8f34e.

Incorrect BZ# was referenced in commit message.
fixed creating the html for the SSI, but it's not finding the script on the server. probably just pointing to the wrong place...
modified:   gtk_opencv.py (removed button)
Fixed Bad host name message.
removed tz
Add support for sparse sp_exog.
Add tests for restricted and iterated SUR
2SLS first draft + Kmenta example
Added overloads in CLogPolarCam.h for columns first order arrays (e.g. matlab)
removed mex
Fixed type in xgrid_types
Added xgrid_types to xgrid-manager
Change send_packet in XGInterface to pass by referece for logging
Implemented internal processing for ping request and reset packets
Added node info tab; added firmware info query and reset support
Another bug fixed and some cosmetics applied.
[JENKINS-7376] Clean submodules whenever cleaning superproject (after checkout), unless submodules are disabled
Merge pull request #105 from rzwierz/master

Fix for JENKINS-7376
Create testcase for starting builds with RevisionParameterAction

Covering existing behaviour where later builds with different revisions are ignored.
[FIXED JENKINS-15160] Earliest git hash passed by parameter trigger.

Correction is to create a seperate build for each git hash rather than
allowing them to be combined into a single build.
[JENKINS-13368] Merging in change as suggested. Also added a little null
checking for the buildData being passed around now.
[JENKINS-13368] Changing SHA1 of last build to
buildData.lastBuild.revision.getSha1String().  
[FIXED JENKINS-13368] Fixed GitAPI so it does both the older style of
checking for changed
files, and used the recommended change.  Added test case for commits to
included files that were changed further back than the last commit.
[FIXED JENKINS-13368] Added one more level of null pointer checking for
new code.
Merge pull request #106 from darthtanner/master

[JENKINS-13368] Fix for missing changes if multiple commits back.
[JENKINS-15160] add support for combining git hashs when passed downstream

Don't combine with manually started builds
Merge pull request #107 from cjo9900/JENKINS-15160

Jenkins 15160
Add ability to update tag. #JENKINS-15758
Merge pull request #109 from vkravets/master

Possible fix fo JENKINS-15758. Add ability to update tag.
JENKINS-15083 Avoid rebuilds upon intermittent network failures and similar
Merge pull request #110 from krosenvold/master

fix for [JENKINS-15803]
java.awt.headless=true for unit test, too much coffe on osx :-)
use a more recent version of release plugin
[maven-release-plugin] prepare release git-1.1.26
[maven-release-plugin] prepare for next development iteration
Fix reset and init for new repository

Fixes JENKINS-15432
added while loop, casting, or statement
added rz-admin in uploader
Bugfix: When all items were added with alt="checked", if the all button was turned on it would not highlight until the user clicked on an item.