labofsahil/github-event-dataset-2012 huggingface dataset:
Added Error Number and little fix about the errors trigger
Changed method of determining absolute urls for helper functions.
Reran build.
Resolved build conflicts.
Merge pull request #199 from wet-boew/feature-multimedia-player

Feature multimedia player - progress bar polyfill fix and UI improvements
Added WAI-ARIA properties to the progress bar polyfill
Merge branch 'master' of github.com:wet-boew/wet-boew
Merge pull request #203 from LaurentGoderre/master

Progress polyfill WAI-ARIA properties
Fixed url helper functions method of determining absolute url.
initial work on the HTML Table Validator
Merged in pull request #202
Fixed merge conflicts
Added htmlEncode and htmlDecode functions.
Added cross-browser way of determining absolute version of a URL.
fixed a issue when no colgroup element where defined
Added example of the impact of just using any combination of the colgroup element in the same HTML table
Rebuild with the last table parser fix
Streamlined polyfill loading. Changed Mathematical/scientific formula display into polyfill. Added width to the progress bar examples. Commented out event handler for progress bar since caused forever loop in IE7/8.
Added ability to update certain polyfills to add support for dynamically added elements.
Fixed color issue in mobile view site footer.
Merged in #241. Fixed datepicker button in mobile view.
Changed mobile view footer links to grey to better align with the desktop view and to make them less prominent (so aren't more prominent than the language links on the splash pages). Removed red link hover colour. Fixed supression of rounded corners in mobile view menu.
* Consolidated the ant tasks to a central location
* Extracted the build jruby out of individual build files to the central ant task file
* Fixed problem in windows with spaces in path
Removed unused build library for SVN
Rough cut at a base theme. Still needs a lot of work.
Use existing sprite for mailto icon
Remove unused mail icon
Revert change to icon Sass
Merge pull request #642 from nschonni/reuse-mail-sprite

Reuse mail sprite
Merge branch 'v3.0'
Resolved merge conflicts.
Fixed broken site title link in French working examples index page.
Fixed typo in English Prettify working example page.
Merge pull request #512 from EricDunsworth/v3.0

Broken link/typo fixes
Added two methods for migrating content to ROSR 6
add template tags support
move FontAwesome fonts to public folder
enlarge geolocation icons
Add my README

Signed-off-by: WhiteTrefoil <whitetrefoil@gmail.com>
Merge branch 'dev'
Disable mouse support in Nano. It didn't work anyhow.
coursemgt:
- changed some table-names due to adding 2 tables to db (kurstutor, kursbetreuer)
- tutor- and laboringenieur- tables still exist but are deprecated
>> new dump on the way

- bugfixing in tutor-view
Studienplan | color and icon improvements
Added surrounde submodule.
Implemented a voting ajax call on the server side
Merge branch 'master' of https://github.com/wlindley/hotornot
can show activity list
console log on request
Deleted unused formulas

We'll just keep the basic formulas for building GTK+
add package.json and update packaging and build scripts
hbase cookbook
Merge branch 'master' of https://github.com/xchenum/chef-repo
Update smi config
untangle procedural code
done register and login function
create new comcrete command and delete the switch structure in marsrover class execute function,but there is a problem for turn direction
import da svn cdli
Fix for https://github.com/xml4r/libxml-ruby/issues/38.
Version 2.3.2 changes.
Versoin 2.3.3.
增加观察者监听队列中任务的完成情况

完成后调用本地通知
OS MBR

rt
second commit
Merge branch 'master' of github.com:xuyirio/CareerCup
don't try and escape nulls, which leads to dangling x values. fixes Sourceforge Bug ID: 3579602.
[maven-release-plugin] prepare release httptunnel-0.23
update class diagram.
Change-Id: I97d8b23be4abb98bebef13e6f5a4dd55d9417169
add yaversion to hdf
Merge branch 'master' of github.com:yavdr/yavdr-utils
create a README.md in markdown format
fixup create_db to run and have a bit of error checking
Improve the check_path script to limit how many it deletes

code cleanup and connection guards
update create_db script

added index on md5sum
added table to keep track of detected duplicate files
basic angular:crud
Merge pull request #99 from jacobmumm/angular-crud

Angular:crud
Added int-output.
replaced file manager with ES Explorer
Replaced browser with chrome
v0.3 changes
Fix wiping

Signed-off-by: Yassine Guedidi <yassine.guedidi@gmail.com>
Remove unnecessary set_perm

Signed-off-by: Yassine Guedidi <yassine.guedidi@gmail.com>
Merge pull request #1 from yguedidi/patch-1

Fix wiping + remove unnecessary set_perm
サービス停止時のログ追加
サービスが特定できない場合に"unknown"と表示しない
インテントの詳細ログを採取する
Reorganize XML-parameters for Joomla! 2.5
bug fix for a stray character
settings.js is always included
make sure blondin stops
drag and drop fixes, canvas size fixes, on the way to syncing
Updated basic information / author
test updated
Merge pull request #8 from ysokolovsky/context-proc

test updated
Component's availability loading has been moved from the ComponentInitialiser to the separate extension - ComponentDescriptionExtension.
+ ‘jshint/config.json’
double wrap response in answerTask

stupid fking rails
more merge artifacts removed
changed to ruby-1.9.2-p290 for compatiblity reasons
posting for march 7 2012
new images and posting about zsh prompt
postings for 3-13 and 3-14
Switched back to RVM from rbenv.

Larger community and a more featured tool.
postings for 3-15-2012
postings for march 16, 17, and 18
posting for 3-19-2012
Transient file removal.
Sublime cleanup.
Merge branch 'cldr-cache-language' of https://github.com/umpirsky/zf2 into hotfix/cldr-display-territory
Update library/Zend/Feed/Writer/AbstractFeed.php

Change docblock:
@var $_extensions to @var $extensions

I didn't found the property in the code, maybe it's not needed anymore?
Merge branch 'release'
check if $messageSet is empty before adding to array
added unit test for getMessages
Merge branch 'patch-1' of https://github.com/vseager/zf2
minor fix. remove en
Added Italian translation for Zend_Mvc-QuickStart.xml
Fix a lot of translations
Zend_Captcha resource ita
Merge branch 'master' of git://github.com/zendframework/zf2
Added missing translation
Merge branch 'master' of git://github.com/zendframework/zf2
@ezimuel suggestions
Merge pull request #1444 from wdalmut/master

Zend\Mvc Quick Start Italian Translation
Added debug config for development puruposes and updated development url patterns
Merge pull request #3 from politeauthority/master

Added debug config
new pt-br locale
missing ,
Merge pull request #54 from ricardocabral/ptbr

new pt-br locale
clean after merged from Xiaowen
Merge branch 'master' of github.com:zhenyi2697/ABDemo
Merge branch 'master' of github.com:zhenyi2697/ABDemo
add .gitignore file
Merge branch 'master' of github.com:zhenyi2697/ABDemo
Merge branch 'master' of github.com:zhenyi2697/ABDemo
commit local changes before merge
add final code
把zero中的代码按功能分到不同的新文件中，新加$global实现
what's SID
Use debug dlls when debugging in vs2010

Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.

There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
Merge remote-tracking branch 'mmd/vsdebugfixes'
credits.txt: fix name
Merge remote-tracking branch 'edmondo/master'
removed 2 unneeded lines
Merge remote branch 'scrawl/graphics'
moved selected spell from NpcStats to Spells
added addspell and removespell script instructions
Merge branch 'spells'

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwmechanics/npcstats.hpp
Added a .gitignore file
Added methods for verbose level logging.
Better name for private .github_config file and git ignore it globally
Fix a bug in ban.py
ZString.h goes away (again).
Done All Questions
remove one of the levels of indirection from import-fn, and add defprotocol-once
bump to 0.1.3
Add new cli options to add user css and js files

- Add user css file: `-C`, `--css`

- Add user js file: `-J`, `--js`

Both options can be used multiple times.
Change the semantics of setting destination file slightly

If a cfg file exists, any destination file specified in command line was
ignored, even no destination file specified in cfg file, and destination file
was set as 'presenetation.html'.  Fix this situation.
Cleanup for integration of new native features and demos
sync recent modification of the test cases
upload proright
Исправлен глюк с неправильным определением дефолтной иконки новых классов.
add more stopwords
Added Windows 8 Pinned Sites support
Update README - Listing 3.9
Implementing mkFrame
Updated binary.
Added reliability tests
New sytles and jquery
added faling test to see if Travis CI correctly picks up the failure
Fix redirect

Redirect would only work if the src of the application was in the
base directory. This commit checks to see if the users return url
hasn't changed and then redirects it to the location as defined
in config/main.php.
This was suppsoed to be a txt...

Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixing Distribution Name
Add a ###
Implement dependency status
More work on status.
Refactor Connection/Client/QueryJob slightly
Move functions around a little in indexer. Also, fix a memory leak.
Make convenience emitters.
More status.
Pass along raw rc command line with messages. This is a little borked
for cases where one passes more than one command but noone really ever
does that and it's only for debugging.
Allow extraCompilerFlags to be used for smart project
reorganized config files
bgds
doc: document the finish event

Since the stream implementer is not expected to overwrite
.end() the finish event is nessarry in order to know when
no more data can be written
First change README
GS-803 Build version advanced to 2493-239
Merge git://github.com/CloudifySource/cloudify
Nil values should not be coerced to types (Fixes #50)
Check for structure correctness during mapping (Fixes #49)
Update plugins/box/users/languages/uk.lang.php
Sandbox Plugin: updates
Update plugins/box/plugins/plugins.admin.php
Sitemap Plugin: _blank removed
Added server password support
Added channel password support
Fixed whitespace warnings
Merge branch 'master' of https://github.com/Azelphur/SourceIRC
Generate the waveforms in a queue using resque
Added the mix id to the name of the waveform to avoid name clashes
Display the waveform when it's done generating
Fix a language.
fixed bug with output; removed dead code
added check for MODX
removed closing div tag
added some sanity checks to lexiconhelper
Partially revert 39450ecea4615d084af38e5dfca5d4694930cbbf
Partially revert ^ (Part II)
Tweak getEncodedRequestsBySearch
shorten license heading
fixed spec
fixed bound and saving in maps
fixed leaflet zoom
changed setbase layer method
fixed layer creation (<3 @demimismo)
first commit
merging changes from upstream
Party over. Bye bye party barn.
Fixed server crashing bug with packets pre-auth (I hope)
Fixed fix
Diverse chat colouration
Clarifications of some console function messages
Spaced chatlog better
Set a maximum length on nickname box
Private messaging
Bold name for own messages
Use an actual table for chat log
Fix update required bug (hopefully)
More readable console text
Flair in chat, too
Full chat log improvements
Click to private message
Don't tab complete own username.
Easier setup.
Cannot message own nick via clicking.
Highlight own user.
Basic command completion.
controller: destroy() destroys the view
view, controller : use null instead of [] / {}
Update-Methode (+Überladung) für die Statuswerte
Make storing window position separately from tasks
Removed constructor for debugger. Added some more documentation
restyled entire website + styled commenting
Added options for volume control (-v, --volume)
Correct mistyped gem
WIP: configuration validate()
pyc and pyo compiled files are ignored now
Add log_level to ini-file
Adding Tuna links to read me.

Added a link to Tuna's history and one to Nyan Tuna in action.
CM: Sync only the active branch
allow https in pics
block element styling + layout
Add more debug data on question creation.
Working on C++ User lib and code dev
compiler accepts script library root configuration from MSBuild task and from .config file

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C3284
typo fix
Merge pull request #87 from msapunov/qqfix

typo fix
web2012061701 typo in lib.js
Moved buttons

Buttoms moved to bottom of form
Update examples/blog/contents/articles/red-herring/index.md
Changed to message as per issue #1
Added build file for chess benchmark
Making some small progress on tidying up the build files.
tidied up the build.xml files.
Minor tweaks.
back to debug key
base localization support
Deleted 'pong' folder (will reimplement later)
Upper part of the head roughly shaped. With eyebrows.
Hands roughly finished.
Cleanup
Fix player position misalignment
Trivial AI (tries not to die)
Fix trail graphics
Better walls
Refactor cell code
Undo
Migrationscript for issue #58
fixed structure of feed burner metric test, more tests in the config, table styles, added command line options (--group=[name])
sass cache ignore
some more stylin’
added group name to detail page
selection in menu works
Fix #159: Readback of non-modulo-4 images
Merge branch '1.4'

Conflicts:
	libs/eq/client/compressor/compressorReadDrawPixels.cpp
Added Reconnect Support to IP Connection class
Altered to include a setup script.
Removed luaposix tree.
Updated license and readme.
updated Sales class
In een begin aan het programma dat het schaakbord representeerd en een volgende zet zal genereren

Signed-off-by: GSamuel <gideon_hoog@hotmail.com>
fix generateur des lignes hor/ver
Reverted some logging settings, removed demonstration pages and all unaccessed files, updated index.html
Tweaks
Changing line endings in git config
Fixed pokemon not reloading when capture fails.
Envio de arquivo funcionando parcialmente
Löschen von User-File
Added Github support.
=The code
Added STM to notifications test (not compiling)
change some default settings in questormanager
Add setting to disable the AvoidBumpingThings routine... generally as bad idea to disable this but may help in debugging the traveler lag when jumping gates and docking.
Updated CMake again and added windows declarations to common.h
Arduino changes, correct pin numbers.
Int Hepasort added
* Added implementation of SessionServiceImpl class
Initial micromodels ebuild.

Closes #595.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key C0174749)
update astyle.ini
batch files cosmetics
Revert "Version.sh: silence the "no such file or directory" warning if Version_rev.h doesn't exist"

This reverts commit ba3c9ac5cf3c57488749262ea1db4bd145694c06.

Conflicts:
	version.sh

This above commit beat the point of the workaround for not overwriting version_rev.h if the version information has not changed
Fix ticket 2508.

Revert unwanted changes from c54d53014c9d5930bef9fa1a9ed46e55c3e3f7f0.
update ffmpeg (e4f3a96)
Merge branch 'master' of https://github.com/mpc-hc/mpc-hc
Added HDM sentence
Added support for Gadgetpool.de Seatalk USB Link and its $STALK  sentences.

Implemented 84 and 9C SEATALK datagrams
keymaps reset added
fix reopen of buried buffer
fixed lambda.toString(); fixed exception view
Début GridResource
Added some styling to app. refactored View.Note#make
dasherize now working on a single capitalized string
fix for bad handling of month traversal. much cleaner now!
adding guidelines
additions to contributions
creating a release script for edge
Adding Array#findIndex and more ruby updates.
one more Ruby method
removed unnecessary arguments
Merge pull request #68 from disfated/patch-1

removed unnecessary arguments
updating python lib
more ruby updates
adding a "compare" method on String, Number, and Date. Also modifying
Function#after to fire immediately when 0 is passed.
updating readme
updating docs for isBetween
more methods for ruby
more ruby and docs fix
mucho mas docs and added Array#sample
ruby updates
more ruby
Reduce fails when given a 0 initial value
fix build failure due to gcc44 inline bug (see julia issue #1480)
Fix build on amd64 linux
Dodal barve za napake.
Popravki na formatiranju.
Fix incorrect web interface styling when using parent diffs and new files

Add a check for parent_diff before adding the 'newfile' table style class in
diff_file_fragment.html

Manual testing: following the steps described in the issue will no longer
produce the issue. Unit tests passed.

Fixes bug 2389.
Reviewed at http://reviews.reviewboard.org/r/3372/
Minor change in getting-started documentation

source ~/envs/reviewboard now reads source ~/envs/reviewboard/bin/activate
Fix a bug with linkify js globbing parentheses

This further fixes the bug with regards to linkifying text. Now, URLs with
anchors (open and close parens, with or without text in between them) work
properly. This fix doesn't affect the behaviour observed with url wrapped in
parens.

Testing done:
Self tested on own environment with different types of urls
- blah blah (http://www.foo.com/)
- http://download.oracle.com/javase/1.4.2/docs/api/java/lang/Object.html#clone()
- http://download.oracle.com/javase/1.4.2/docs/api/java/lang/Object.html#equals(java.lang.Object)
- gwegdss http://www.foo.com/

Fixes bug 2002
Reviewed at http://reviews.reviewboard.org/r/3374/
Fix for javascript errors publishing reviews with screenshot comments.

Somewhere in here, we ended up trying to check the issue status for screenshot
comments. This works fine on 1.7 where screenshot comments with issues are a
thing, but broke on 1.6. This workaround was suggested in the bug.

Fixes issue 2707
Merge branch 'release-1.6.x'
Implement new style skeleton.
removed postimages
changed pypsy to fixcat in entwicklerdoku
Merge branch 'master' of github.com:KopierKatze/FixCat
Testeo para el IR.
Merge pull request #7 from nventuro/master

Testeo para el IR.
Facebook style updates
Slight scraper refactor
Multiple bug fixes:
UrlPathParts now uses Tools.UrlPathPartEncode() which encodes '/' as %252f since %2f gets treated like an '/' by the server and so affects how the url is parsed.
Get and GetAll method of the BodyParameter class now encode the parameter name check if the original unencoded name is missing.
Bug fix in the GetCss method of HTML class.
Double encode problem resolved in QueryParameters
Updated the CheckUpdate function to handle update for non .py or .rb files inside the plugins dir.
Improved status-bar to support many filetypes
update lewacode
Fix the GUI to the screen.
Use IronGrip icon for main window. Reorg shared data. Removed unused code.
* Fixed problems with Syllabus
* Changed design of gollum in admin
* Implemented Issue #16
Fixed a form validate bug in Google Chrome
Merge branch 'master' of github.com:LitusProject/Litus
Added some bundles for the website
Merge branch 'master' of github.com:LitusProject/Litus
Added slashes to routes
Implemented sale app (without discounts)
Some bugs in Shibboleth registration
add : core
image posting
稍许改动
Normalize line endings with .gitattributes
Optimize fog shader code

Calculate fog density once per vertex, not for every fragment.

The changes are backwards compatible with custom shaders that use
M_FOG_* constants, but some of the constants have been marked as
deprecated.
Adding in the development version of the new data store system.
completed ISO
New function: Save config data whereever you want.
Add meute.ffhl record for krtek, add AAAA records for all meute.ffhl domains
Core/Spells: revert previous commit to find a better solution.
Core/Protocol: Fix struct and make use of CMSG_UPDATE_PROJECTILE_POSITION.
toevoegen van download link in schema\n tbv.
opslaan
Merge remote-tracking branch 'origin/master' into jasmine-testing
Merge remote-tracking branch 'origin/master' into jasmine-testing
pre-merge commit
Merge remote-tracking branch 'origin/master'

Conflicts resolved:
	OL-build.cfg
	pom.xml
	src/main/js/KeyboardClick.js
	src/main/js/Viewer.js
	src/main/webapp/css/style.css
	src/main/webapp/js/config.js
A Jasmine testrunner for headless testing with PhantomJS. Based on work by Ivan De Marino. https://github.com/detro/phantomjs-jasminexml-example
working PhantomJS / Jasmine headelss testrunner (on windows)
Verbeterde versie van proxy servlet en bijbehorende unit tests.
Merge remote-tracking branch 'remotes/origin/jasmine-testing'

Conflicts resolved:
	src/main/js/Viewer.js
Uitpakken van platform specifieke runtimes naar de aparte profielen overgebracht
Use minestarlibrary snapshot for dev
Add deploy launch file
Go back to roots

Signed-off-by: Meldanor <Bhaals@gmx.de>
Merged unnecessary duplicate code between the two supported platforms
short-coding
Update readme.md

fixed wrong npm install code.
it's 
npm install nodeerrors
Merge pull request #1 from piffie/patch-1

Update readme.md typo
fix library export
removed patch for optional networkmanager from cinnamon
css that causes IE9 grief
Fix module grid height
[BUGFIX] Ensure that record row is passed to ConfigurationProviders even if row was empty

Fixes: #2
[TASK] Throw dependency exception if using Grid Widget on 6.0 without VHS installed
create openBafici readme
Ajout : Site
Ajout : Script site
Added error handling in forward and placeDown()
优化代码布局
Fix when try cancel with all possibilities
Move all data files to /data/ folder
Remove title from Window
Get all data in Data directory
Remove unessessary files and update .gitignore
Support different bundles
Create a bundle to BrazilJS
Fix barColor config of iOS
Remove files of Bundle
back to good 'ol default scrollbar
|#0|  renamed rnr-template.js to rnr-template-module.js
Data labels for charts
Refactored the main program into services
Corrections de bug du parseur (par les tests)
Mise en place du test de Rop
[Fixes bug #987643] Show image previews for all supported file types.

Added a method to IImageImporter for loading a thumbnail of an image.
Before, previews were only shown for files that could be read
by the Pixbuf importer.
Fix issue caused by broken async update
USERINFO_UPDATE: construct a new message for broadcast

The server was reusing the client's message when broadcasting userinfo
updates. This would allow a malicious client to insert arbitrary fields
into a message that the other clients would trust as coming from the
server. For example, adding "disconnect" or renaming other authors.

This commit fixes it by having the server construct a new message with
known fields before broadcasting.
Merge pull request #1035 from amtep/develop

Guard against malicious clients in USERINFO_UPDATE handling
Revert "Gridify the header. Allows global padding and sweet out of the box responsive design"

This reverts commit 14c8dfbe354c287ef0909ba164ec8256562d32e1.
remove default values from header logo left and right options
Fixed a bug with the TinyMCEditor CSS on the front-end.
Use a class to target TinyMCEditor. Because BBPress uses their own IDs
error at pdf upload solved
Added the main script
Merge branch 'master' of https://github.com/Qasaur/qrocketcalc
fixed voting with scrolling in Chromium
Changed format of testdict to UTF-8
Draw the features correctly when syncing - did a quick hack to fix a scoping issue with insertFeaturesIntoTable when syncing - will come back and clean up when higher priority items have been knocked off
Updated UI.
Finished Localization for en.
Finished cleanup of login form and tests
[#32100593] fixed
setting 값 변경
returnt
osiris2-client-ui:
- updated GroovyTemplateProvider to support the new TemplateProvider methods

osiris2-report:
- updated ServerReportUtil

rameses-client-ui:
- updated SubListModel
  - fixed bug on setting the selected item object
updated:
- osiris2-report
- ruleserver
- rameses-common
updated:
- db-dialect:
  - support on MsSqlDialect

- rameses-common
added sqljdbc driver from microsoft
Polynomial program
Finished cfg_connect_block. Refined block_list manipulation functions
Fixed bugs. Added github link.
Minor tweaks.

Improved the audio device list.
Changed default res to 1280x720.
Fix tests for PHP 5.4 support.
Add Travis (http://travis-ci.org) support.
Added test for #64
Added test for #64
Fix #64
Revert "Fixed normal gmod entites using overlay"

This reverts commit 9d98a5f320375ca2b3337e210adcef726d710c62.
Merge branch 'garrysmod13' of https://github.com/RevoluPowered/wire into garrysmod13
MAC300:
-Updated new MIDI saving method - it is more close now...
Новый вид "зомби"
Новый вид "зомби"
pierwiastek kwadratowy
Pykaboo can now be run with Cygwin. Also solved argparse dependency issue for users with python2.6 or lower.
Find extreme point in data added to redgefinding
user registrations test
downloader
merge
moar radar tweaks
some blip action. and bugs.
Add basic startup routine in grove.go
Remove unneeded public function
budget portal minus deadline setting

submit option given to finance core, appropriate views for open/close portal, permissions granted properly to finance coords, minor front-end changes
To BE added: deadline time setting for finance core
debug OCDP time logics, switch -D OBSERVER on for ml605
Vi tester :-D Følg godt med Liisberg :-)
Reshuffle of code

Moved feature defines into common for easier changing
Added ability to build without Arduino libraries - saves ~300 bytes
Added door placement
Processo 1151/2012 implementado..,Testando merging...
Processo 1151/2012 implementado..,Testando merging...
Merge branch 'proc.1151/2012' into producao
Gerando release 1.2.71.0
Terminado rodape.
test__examples.py: better timeouts and error reporting
test__socket_dns.py: simplify internal function
greentest.py: longer pauses in GenericWaitTestCase
test__socket_dns.py
test__socket_dns.py: better logging
Revert "Fix bad merge in 08446fba4927cf767d9e753ca9bc845aa936ee15."

This reverts commit aa0ba0cfe91dc27b936a4463528002cdbcf7458a.
Show software button on front page for everybody.

Also force authorisation to see software list.
Simplify.

Use special section to support more software in the future.
Force authorisation before requesting kvm.
Simplify.

form_id was dirty hack. Improve the message.
Drop not used garbage.
Import zocial.css

Comes from http://zocial.smcllns.com/
Activate zocial.css.
Simplify login page.

Focus on social authentication, propose BrowserID as fallback.
Find the newest packing list only with proper simulation states.
Switch unicode for ascii for \u{2013} and \u{f7}
Merge pull request #2 from boztek/boztek

Switch unicode for ascii for \u{2013} and \u{f7}
implemented simple core working with watchers, builders and loggers
First commit to repo
Adding configuration for am-test environment
Adding tests for messenger admin
Adding tests models and code for US5483
Updated configuration to use the new generic accounts on Production and Staging
Do basic auth on am-test and staging
Add ruby-debug19 and chromedriver-helper gems
Add page model for Account Management
Run cucumber.yml through ERB before parsing it in the rakefile
Add account_management profile to cucumber.yml
Add a helper method to Capybara for accepting javascript alerts
Added feature for Your Properties (incomplete)
Added feature for Locations (incomplete)
Added feature for Basic Info (incomplete)
Merge pull request #1 from wildfireapp/basic-auth

Do basic auth on am-test and staging
Merge pull request #2 from wildfireapp/account-management

Adding additional features for account management
Added tests for updating and publishing an app in page manager
Merge branch 'master' of github.com:wildfireapp/pact

Conflicts:
	config.yml
	features/step_definitions/navigation_steps.rb
	lib/model/wildfire.rb
Mark incomplete Facebook scenario as pending
Open up version specs so that the Gemfile.lock can do it's job, and `bundle
update` is useful. Add a platforms spec to ruby-debug19 so that the project can
be built on non-MRI and 1.8.
fixed table issue by putting them at the end
change webapp directory to /var/lib/stratuslab to avoid having template files deleted (fix #15)
Merge branch 'master' of github.com:StratusLab/storage
Startet på menyen
added microloader
adds simple test case
fixes global variable bug
0.0.3
Initial commit
Implemented "About"
Switched from MediaInfo CLI to MediaInfo DLL
Added MPlayer toolbar images (not implemented)
Partially implemented FFprobe
Working on mplayer window
Get info from individual clip xml files
Created portable launcher for eventual portable version of program.
Compiled some binaries. USE AT YOUR OWN RISK
WOO CONSTANTS
Channel status indicator
Added icon
Revamped handling of "About" contents
Implemented clip downloading.
Fixed 64-bit MPlayer URL
Implemented installer (still incomplete)
Started work on automated installation of MSXML if needed.
This is where I stop for tonight, folks. Swooshy needs his sleep.
Removed some debug code
Implemented basic MSXML checking and installation.
Currently it's set to always detect no MSXML.
Added functions for basic logging.
Not yet implemented.
Implemented loggging in installer
Fixed a typo
Made wall avoidance scale weight with distance from wall.
the function exporting works right now, at least on linux. had to add a second sbol_internal target to keep the tests and swig wrapper working through, because they access internal functions.
fixed the README so section ids don't appear on github. looks like it will take more work to get it working with github and doxygen at the same time
Fix missing revision.
wlcore: use different dwell times in normal scan
fixxed overview nilclass error
Adjusted formatting
Merge branch 'master' of github.com:Talon876/mavenrepo
fixing stuff
Conflicts:
	README.md
Added output file minification option
Removed l_precomp.cpp, l_precomp.h, l_script.cpp and l_script.h from botlibs, linked idLib with botlib
[Mapeditor] Added help button
[Mapeditor] Added docu page, that will contain information about a single topic
[Mapeditor] Added a reader that should read docu pages from a file
[Mapeditor] Suppressed unchecked warning
[Mapeditor] Begun with the help dialog.
[Mapeditor] The ide will now copy *.txt files to the out folder too.
[Mapeditor] Rewrote the documentation loader
[Mapeditor] Added documentation entries
Merge branch 'docu'

Conflicts:
	illamapedit/src/illarion/mapedit/MapEditor.java
	illamapedit/src/illarion/mapedit/resource/loaders/ImageLoader.java
Fixed formatting of the README.MD file
vim7.3 and vimgdb-for-vim7.3
No Longer ASks Arduino for whoami
iostream instead of printf
pet message only once
NPCs are back.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Finally, Vanilla compiles.

Signed-off-by: Chris Sanders <zidane@outlook.com>
Initial recipe implementation

Signed-off-by: Windwaker <wjcrouse913@aim.com>
fix unfortunate bug that PG driver does not like
added server service authorization via Vkontakte code
added Vkontakte get user info
service server side authorization fix in Vkontakte sharer
NSURLConnection replaced to SHKRequest
Merge pull request #575 from mikk22/master

added Vkontakte server side authorization and user info request
BUGFIX: NSAssert was firing unexpectedly on iOS4
added method update_table_pg_stats to table.rb
and not &&
Merge branch 'feature/analyze-table-on-import-for-proper-row-count' into develop
数据库更新了，增加了收费部分的数据
Update pics format
Add pics viewer in wouaf details
Minor reformating of todo
typo in readme
typo in readme
robert uniquement sur map 1
Indents to 4 spaces, double quotes, etc: app/modules/player/player.js

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #16 from rwldrn/player-style-nits-3

Indents to 4 spaces, double quotes, etc: app/modules/player/player.js
Indents to 4 spaces, double quotes, etc: app/modules/player/frame.js

Additional cleanup and refactoring for minor perf optimizations and code maintainability

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Indents to 4 spaces, double quotes, etc: app/modules/player/helper.js

Includes minor refactors

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Indents to 4 spaces, double quotes, etc: app/modules/player/layer.js

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #13 from rwldrn/player-style-nits

Indents to 4 spaces, double quotes, etc: app/modules/player/frame.js
:)
add call to boxxy on adding bonus laps
WebSockets instead of PubNub messaging service

- WebSockets instead of PubNub messaging service
- Java WebSocket from TooTallNate incorporated for WS client
map to map transport is added
added enclosure files

production grade
51.1%
Prevent creating duplicate servers...
Styling of grid system
ddump v0.1
Removed mwTrace.txt
Fixed some pylint warnings and conventions.

Ran pylint over my code and cleaned some things up.

- run_astrodrizzle.py:
  Removed some scraps from when this needed to return a list of files for use as input for other modules. (9.22 to 9.33)
- run_cosmics.py:
  Filled in an empty docstring, fixed the command line execution to use the get_file_list function. (6.98 to 8.44)
- mtpipeline.py
  Just cleaned up some lint. Got rid of an unused sys import.(8.03 to 7.9)
- run_trim.py:
  Cleaned some lint. Probably a little too early for that. (6.58 to 8.03)
ahkMessenger v0.22.2

Changes:
^ Updated Autocomplete. Stable and cycles all first letter matches
! Fixed bug that added blank user name at bottom of user list
ahkMessenger 22.2.1

Changes:

-- Temp commit.
ahkMessenger v0.22.2.2

Changes:

+ Added server commands using /

Code tidy
Merge branch 'devel' into temp

Conflicts:
	ahkMessenger_client.ahk
	ahkMessenger_server.ahk
	lib/chatGUI.ahk

Changes:

^ Update devel to RaptorX new scintilla lib
ahkMessenger v0.25

Changes:

+ Add server commands.
* Merged with v0.24 from RaptorX (scintilla fix)

Code tidy
ahkMessenger v0.26

Changes:

+ Added chatrooms
+ Added server commands
+ Added status bar
- Removed Lots of code from client, server and gui
! Fixed double posts from server
! Fixed blank last listview item
* Changed send message and nick change to 1 label on enter
! Fixed nick change notify to all channels
! Fixed nick change update channels the client is not in
ahkMessenger v0.26.3

Changes:

+ Added leave command.
- Removed some unnecessary code.

To do:

! Finish fixing leave command.
Add jwhois from homebrew-core.

Upstream project is mostly unmaintained:
https://github.com/mxcl/homebrew/pull/8902
added files nesecary for rack
Added dependency on M3d (closes #9)
fixed notification namespacing and notification + archival
version bump
fixed specs; fixed problem with sending notifications for archived items
version bump
added link to the event_notification email
readme travis link takes you to project
Merge pull request #8 from alexrothenberg/travis

readme travis link takes you to project
Merge pull request #9 from alexrothenberg/link_in_notification

added link to the event_notification email
minor style tweak
basic renaming from notification rule to notification subscription
making progress on filter UI. grouping services, introducing 'all' filter
more progress on ui; no filter selected makes 'all' selected by default
'all' option is working
added dot star filter to handle future as well
prevent all from being unchecked
putting together notification subscription model
got specs passing
notification subscription creation and update working
Merge branch 'notification-subscriptions'
bump version
3-5 and 3-6 added
Anka 31/03
Merge branch 'master' of github.com:aevdokiomov/pararu
rename to match expected filename.
Replace irssi start with irc-start script.
Updating shortcode to match README
Move non-theme customizations from ak theme to templates/zshrc.zsh-ak
zshrc: Do not correct aptitude
zshrc: instead of a bunch of nocorrect aliases, only correct commands
zshrc: tree alias: paged with color
added a test to compare creation via init and not call default
enhance doc
Set nofoldenable and latex specific no folding to vimrc.
refine plugin. change navigation point and some typos
Better plugin names.
Initial design files.
Added another light

Yeej\
makefile for cuda
taking emails out
Merge branch 'master' of github.com:alexmilano/pollbag
fixed #39.
also modified style.css so the modal is larger only for the question. will have to rethink the API.
Complete form, pre-styling
oop: properties - fix invalid argument for foreach
Add support for time zones
Add helper to get time zone aware current date and time in UTC
Add tests for 'now' helper
ivykis: Point the submodule to upstream

Point the lib/ivykis submodule to upstream, to the commit fixing the
io handler abort. With this, syslog-ng compiles against and works with
unmodified upstream ivykis.

This patch should be merged into a previous one before merging onto
master or similar, though.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
added forked url
[#421] fix_url fix (also in Evolvis, so I know it’s correct)
problem12 rough
The display now sorts the students alphabetically.
User can select both ways now. I FIXED IT.
New menue item: "Open Folder". Allows the user to open an entire
directory.
聊天室查詢
added more commands and fixed a few bugs
Noted that: panopticon_api_credentials.rb gets overwritten on deploy
display lead organisations on the topics page

Ensure that they appear before the other org.

Also remove associations and use methods so that we can reorder the
list - there is a default_scope on organisations
Extract duplication in ordering forms.
Improve the usability of the role sorting.
Make the role/person clearer when sorting.
Downgrade rails as the different rack version breaks preview
adding static jobs link to bottom of org pages simple html no styling
Use the correct variable for static
Save of Armadillo_Movement Function
Allowed for access for cached files.
'findlike' cmd to make finding files by name easy
add delStr
Forgot to load slim tables on startup
put table names in lowercase
Removing traces of ToroHandler from the README.
Dock in base.css
Road testing basic social entity model
Ensure part collections never null
Update db/semillas/usos_de_la_tierra.yml

Se agregaron dos categorías Id:3 y 4.
chore(scripts): add init-repo script
fix($route): support inline annotation on .resolve
ISPN-2102 Disable randomly failing test
ISPN-2106 Disable randomly failing tests
ISPN-2058 Tree node move concurrency test broken

Some cleanup:
* Remove some unused imports in tree module
* Remove unused class TreeContext
* Fix some generics related warnings
* Fix a few usages of deprecated cache configuration
* Add NodeAPITest.testGetParent()
ISPN-2058 Tree node move concurrency test broken

* Cache in NodeMoveAPITest uses optimistic locking + write skew check otherwise NodeMoveAPITest.testConcurrency() cannot work
* Add NodeMoveAPITest.testConcurrencySimple(), a simpler easier to debug variant of NodeMoveAPITest.testConcurrency()
* Add rollback support via AutoBatchSupport.failAtomic() and use it accordingly in TreeCacheImpl.move(..) to ensure a partial move is never committed and we do not get duplicates
* TreeCacheImpl.move(..) reads the parent node to ensure the write skew check can detect concurrent removals of the child
Marker is added by long click
S2, T15 - using Messages to display Hour vs. Hours based on number.
S2, T18 - disabled save button in MarkDoneDialog until actual hours has
been entered.
S2, T23 - waited until server call returns before closing dialogs.
S2, T24 - fixed the width of Story and TaskCard
Bug : add class SQLToolKit.
Bug : Direct Mapping refs blank nodes ID.
Fix 'No previous prototype for function' warnings for parameterless functions.
Merge pull request #2 from maikg/prototype-warnings

Fix 'No previous prototype for function' warnings for parameterless functions
removed armv6 from build settings
fix Xcode 4.5 build errors
only show use searchbar on android and ios
0.3.3
don't generate Android menus on non-Android platforms, show warning (ALOY-376)
Update docs/Alloy-bootstrap/index.html

Fixed docs URLs and added link to main docs.
Add callbacks for various animation methods.

Update fadeAndRemove, fadeIn, fadeOut, popIn, shake, flash to allow for
a finishCallback.
Fix syntax error in test app for builtins, add callback example to
shake, and a non-callback example, flash.
Fix trimmable string issue (looks like preprocessor for XML and TSS was
stripping out leading/trailing spaces).
ALOY-396 Ensure that fadeIn and fadeOut don't crash if no callback is supplied.
Document all callback arguments as optional.
Merge pull request #85 from arthurevans/patch-1

Update docs/Alloy-bootstrap/index.html
Merge pull request #87 from arthurevans/aloy-396

ALOY-396 Ensure that fadeIn and fadeOut don't crash if no callback is su...
enable optimizer.js for more runtime enhancements
Merge branch 'master' into binding
debugging
changes
drag drop
Merge branch 'new_branch_name'

Conflicts:
	public/css/one.css
	templates/form.html
personal rating list logic moved to tasks
Merge branch 'develop'
2012-04-23
Merge branch 'develop'

Conflicts:
	appengine/app.yaml
Tornado started
Bootstrap 2.0.3
Bootstrap conf
Nginx config; Error 404 page;
Supervisor conf
Tornado controller logic; Supervisor and nginx onfig changes;
Main application scripts; Authentication;
Public search
Updated 'name' -> 'title'
Version update: '2012-05-16'
Merge branch 'develop'
Public view finetuning
Redirect public view to tornado
Merge branch 'tornado'
2012-05-24
Database changes
Correção no import da biblioteca geraldo
Adicionados doctypes de NFSe na assinatura do XML
Merge pull request #4 from daniel-hartmann/master

Ajuste referente a NFSe e correção de import de biblioteca
make move sequence diagram
Updated some of the string length tests.
Merge branch 'master' of https://github.com/armet/django-armet
Utilizes a temporary text file for ease-of-use

Used to use the pastebin paste that was inevitably made to access old product info.
Now stores all info in a temporary text file to pull from.
(Note: If one does not use '1' to quit the program, the file "pyegg_temp.txt" will NOT be removed.
Preparing for 0.5 b2 release
Initial commit for LKLocationManager - updating project file as well
ALM-145 accept queries with pmcid in format PMC…
ALM-154 added retrieval_history errors to admin dashboard overview
PDEV-1028 make all rspec and cucumber tests pass
Keep list of excluded moves in Engine Output header

As long as there is still space, excluded or included moves are added
to a new header line in the Engine Output window (prefixed with + or -
depending on whether they are currently excluded or included). Future
in/exclusions of that same move then alter the prefix.
Let clicking on header line exclude moves

The exclude header in the Engine-Output window can now be clicked, to
toggle the exlusion of the listed move. Clicking on 'none' resets all
exclusions, clicking on 'best' excludes the first move of the latest PV.
The pseudo-move 'tail' represents all non-listed moves.
title isn't bolded
Codejam - Store Credit - solution.
- Uses a hand-implementation of coarse Mergesort.
Updated to new architecture in support library.
Migrate to new support lib, reimplemented functions and callbacks.
Calling message send method again.
Updated to new ADT17
Sending messages now works fine with callbacks and so on.
Reading Location with location helper
Reading location.
FIxed Editing all items regarding to new model.
Merge branch 'master' into use-fragments

Conflicts:
	THWdroid/src/de/atomfrede/android/thwdroid/mission/activity/DisplayMissionDetailsActivity.java
	THWdroid/src/de/atomfrede/android/thwdroid/mission/activity/EditMissionActivity.java
added some validation for user
added home page
zoom für workshop detail page
Storyboard Corrections + Masterfile animation
Changed GUI again, but the measurements are exact and I think the logo now reflects the playfulness of the game
SAT-98 minimize and maximize window feature
Add Comparison
Merge remote-tracking branch 'origin/master'
Add userlist on comparison
updated reference to Systemsbiology maven repository
add another way for calling sevice by ServletContext that will no create session, and no cookie. good for CDN.
Checkpoint; fixing stuff
Didn't put coffee-script in dependencies, only devDepencencies. Now in both
3.7: rebase/cleanup beagle expansion patchset

New: LSR COM6L adapter support, note the TiWi modules plugged into the Adapter have no
eeprom, the TiWi5 needs a 26Mhz reference clock (TiWiR2 uses a 38.4Mhz), so i added
yet another boot console variable (buddy) [wl12xx_clk=wl12xx_26mhz] for the TiWi5.
the kernel will print hints about this situation with [dmesg | grep wl12]...

Status: WiFi works with both COM6L adapters, bluetooth relies on the evil ti-uim script.

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard-3.2: add Alexander Holler zeroMAP patch for serial

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard-3.2: update to 3.2.23

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Can now change user password.
sharing on twitter now works
adding google's multi touch detector
adding multi touch helper class
Merge branch 'master' of github.com:benetech/FBReaderJ
fixed compilation error
Merge branch 'master' of github.com:benetech/FBReaderJ
Update documentation

reference #7
(m) Add Code Climate badge
(m) Add note about use as a file renamer
Merge branch 'master' into simple-tools
comment linking to wrong link fix
[Vim] Mise à jour du submodule fugitive.
[Init] Rendre les dotfiles disponibles plus tôt.
added php docs
=added php docs
Fixed a warning on narrowing in array assignment


git-svn-id: https://alisoft.cern.ch/AliRoot/trunk@57789 f7af4fe6-9843-0410-8265-dc069ae4e863
update main.cpp and README
colors: Add power-law normalization
colors: Replace docstring single quotes with double quotes
Trabajando en la rotacion
Issue #454: Use KeyIterator to iterate the rows and ColumnSliceIterator to iterate columns in a row
added OfabArmorModule; added Professions object for resolve short profession names to full profession names;
Merge branch 'master' of https://github.com/bigwheels16/Tyrbot
Draw names above players
Previo a la muestra a Benavides
Actualización juntas
Solucionado choice Gravedad y copia correo al usuario
Cambios Juanma
Agregado campo path a Junta
Junta ya va dirigida a todos los usuarios
Añadido editor de textos
Read-only functionality using the respond_to_event method in EventMethods module
Update to 1.7.0.RC2, add the forgotten patch9
fixes for issue #180
renamed to v0.9.3 for issue #155
Add support for use_types_for_optimization
rewrote everything to hack VM spec. hopefully its bug free
worked out all the bugs (I hope) in translator
wrote multiple vm file handler
worked out some more bugs in translator
wow, it fucking works (slowly, with a strange bug)

for some reason, String output only happens for
every other character. It's really hard to tell where
the bug actually is, since everything else seems to work.

Must be some stupid arithmetic handling bug.
Mask potentially harmful keybindings.
Efficient window movement.
Updates.
extracted CherryPicker from PageStore to reduce complexity
replace one-for-one arrays with regular objects
ignore errors when closing a TokenStream on a StringReader
interfaz linda y colores
Removed childbrower and cordova non platform-specific js files.
Merge branch 'master' into develop.

Conflicts:
	childbrowser.android.js
Fixed android splash screens.
Android alpha release.
Modified index.html to have standard phonegap and childbrowswer includes.
Optimization in the works.
Merge branch 'android' into develop

Conflicts:
	index.html
iOS appearing to work. At least on v6
Working on Android too.
Fixed some graphics. Attempting to fix soundcloud player.
HTML5 music player working.
Added caching routines.
Caching everything but maps.
Added versin tag.
iOS updates with caching.
Android alpha.
Android alpha release.
Trying to regain control of android.
First official Android release.
Fixed events update and scroller initialization.
use app config transformations for local development
Update src/main/scala/uk/co/agiledev/lrn2scala/SimpleMicroBenchmarker.scala
bug fixes to z3 solver integration
Rsync is dumb.