labofsahil/github-event-dataset-2012 huggingface dataset:
[2623] Cleanup and improve script for Priestess Delrissa - Magister's Terrace

Notes:
* implemented heroic spells
* allow the companions to be handled by instance script, in order to avoid any issues
* improve combat behavior of the AI, allowing it to use the Medallion of Immunity in order to remove all movement impairing effects and also allow the AI to better select healing and dispell targets
[2624] Improve companions handling for Malacrass - Zul'Aman

Also add a few minor updates to Priestess Delrissa

Note: Malacrass companion scripts can be moved to eventAI
[2629] Improve timers for Shadow Labyrinth bosses

Thanks to X-Savior for providing the data
ulduar SQL fix - thx to mns && Reamer.
Merge branch 'master' of https://github.com/mangosR2/scriptdev2
Grammar/Spelling Errors. Commented out code not yet required

Signed-off-by: Matt Hollier <haeltera@gmail.com>
경로 수
수염 수정
the good old 5sec typo fix after commiting
added paycalc about screen to vault
footer fix
Merge branch 'master' of github.com:RobDoan/spree_sold_theme

Conflicts:
	app/views/spree/shared/_footer.html.erb
footer seo
bug fix: make sure we actually get wheezy

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Update plugin.video.icefilms/default.py
Made name prefix config option
Add EventDispatcher pattern and convert line delimiters to Unix

- Using the MVC project as a guide, converted from calling EmployeesDBRemote static-aly to a singleton pattern.
- Change the line delimiters from Windows to Unix. It was messing up the files in GitHub.
skbtrace: fix aligned flow_keys
Only include the apache2 recipe when really needed (bnc#775269)
Fixed clan roster command; Fixed disbanding
Updated Version
Sauvegarde des données JSON dans un fichier.
Parsing des données depuis le fichier.
Processus de login et logout (requête vers le web pas encore implémentée).
Compatibilité iPad.
text is editable
Enforce single move per tick
Clearer button labels
Hopefully fixed Manifest generation stuff for SophistSolutions.ActiveLedIt.dll - chanigng name of output and directly embedding hopefully proper manifest - right now seems it maybe working with HF/side-by-side and COM-Isolation stuff but needs much more testing
Minor tweaks to doxygen output
started tweeking headers for doxygen descriptions
lots more Iterator<> cleanup for Doxygen (partly docs for this file - partly learning how to neatly do doxygen)
Lots more updates to container docs - semantics - docs - and doxygen prettying
minor change - perhaps working around gcc bug? - but simle/sensibleenuf not to track down (memory::SharedPtrBase*)
Fixed memory leak introduced in https://github.com/hibernate/hibernate-orm/commit/3e2be6a009e6783c30ad6483ff378770d5105f4b (Fix of HHH-7557). loadingEntries are not removed after read what leads to big useless ArrayLists present in memory.
sped up animations, reducing frequency of the bug where reviews and filters show up at the wrong times.
fixed a bug where admin menu was highlighting the wrong item
couple of tooltips and friendlier form label for youtube ID
Put video child item links on video display page

* (closes #1460)
* content_group_list.html template created to show the children of a
  video in a zebra striped list view
* course_materials.get_children uses File.get_ext to determine extension
Merge branch 'master' into jrbl-1460-child-items-on-video-playback

Conflicts:
	main/courses/videos/views.py
Merge pull request #1477 from Stanford-Online/jrbl-1460-child-items-on-video-playback

Put video child item links on video display page
forgot to check in changes to settings.py for middleware
final missing file in commit
Merge branch 'perCourseAuth' of https://github.com/Stanford-Online/class2go
überflüssigen Import entfernt

Signed-off-by: Nikolaj Gerads <nikolaj.gerads@generali.de>
added backbone and require.js, added some geolocation stuff
rearranged messages, added ajax to explore artists
rearranging pages, updated sidebar, updated admin templates
updated more admin secions
refactored groups
better saving and also honour user level
i607
add count minused function reform the listmodel
Fix MMC brick bug
Turn off link highlighting.
Changed bootstrap theme to cerulean from bootswatch

http://bootswatch.com/cerulean/
Moved chat log to right, like in phc
mediaserver: instantiate SecTVOutService for samsung tvout

Change-Id: I0e7767f8cf3ffd0bc376d14cf4fffffed225e701
exynos4: libstragefright: add support for samsung colorformat/omx/mfc

Source:
http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/av/commit/?h=exynos-jb&id=1614612f7ca2a00473d202dbedcb135fadc608ad

Change-Id: Ib40b3cfa1480ecbb69831e7967a81f63719e2ff7
d2vzw: update nfc props from VRBLI5
Merge branch 'jb' of github.com:TeamBAKED/vendor_samsung into jb
Weather averages and now rounded
Mobile mode compatibility updates.
Navigation graph is automatically constructed via floodfill, graph is viewable using a GraphViewer.
Finished testLoadingPeople. Not sure we're doing it right though...
Problems with tests
Merge branch 'master' of github.com:TheNaterz/NateKevyn-Clue
Adding all pythonbrasil classes in inheritance as pythonbrasil
Update .gitignore

repaired bad paths to tmp
Add clean to pom build goals
Restore provider authority.
Fix add dialog padding and scrolling.
Fix dialog minimum and maximum widths.
Lagt till projektfil för er med Sublime Text och flera placeholders för ikoner
Optimerade funktioner från Fullback, uppdaterade TODOs och fixade issue #5

Optimerade de flesta funktioner med $this = $(this) men mycket saknas
fortfarande för att skriptet ska bli mera responsivt. Har lagt till
bättre TODOs för att förklara vad som behövs göras. Även småfel har
blivit fixade.
translation work
Merge branch 'master' of https://github.com/ViniciusMiana/scala-dist
And then some...
Funky Demo
Worked on Ui, removed some unused parameters for new HttpRequest
binary saving hack/test
fixed overblown keybuffer test
Setup Main Page
Reload systemd after updating config files.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
finishing phone number function
Fork me on GitHub ribbon added
Commit conflit
Add section about ZPermissionsService.
Initial commit
Komentarz
Merge github.com:Zieluowaty/Flamberg_2012
Proba dodania do repozytorium plikow .java
Dorzucam biblioteki, z ktorych korzytsalem. Chociaz nie jestem pewien czy w Javie mozna mowic o bibliotekach :P
Dorzucam biblioteki, z ktorych korzytsalem. Chociaz nie jestem pewien czy w Javie mozna mowic o bibliotekach :P
Komentarze tego co mi się rzuciło w oczy na szybko.

Dodatkowo: klasy w pakiecie XML dobrze by było jakoś przerobić żeby NIE miały tych seterów, albo dorzucić takie których można by bezpiecznie używać.
Merge branch 'master' of github.com:Zieluowaty/Flamberg_2012
small refactoring
Merge remote-tracking branch 'origin/master'
fix concurent modification exception
Uploaded the last syllabus
add todo (Some ideas to clean the code up a bit)
Merge remote branch 'logic/master'

Conflicts:
	index.html
No border for #embedded-video
Used the endpoint convention model
remove ipython dependency
Merge branch 'job-queue' into test
pretty good-looking fire and the fire outlines fixed
ground quad is in, to be done is putting a grass texture on it
Revert to working commit.
spatial hash for stat area, counter
Empty project.
Added body class
Merge branch 'prototype', remote-tracking branch 'origin'
set up a single subsurface layer in teh map generation
set up sample tileset and tiling rules for the subsurface
Sample tileset and map code for subsurface

Also cleaned up worldgen a bit by putting it in its own script
Fixed holding a key down not repeating

that was dumb!
Cleaned out global vars

Cleaned up all of those ugly global vars...
Cleaned Comments & tweaked mouseover

I don't know why it needs to be 0.74, but it works better, so stuff it,
also removed my commented out vars now that I know it works properly...
More var cleaning...
Cleanup

General clenaup for readability and stuff...
work in progress

shouldn't really commit this, but hey, I'm hungry and trust the internet
more than my hard drive
Preparing multi-level maps
Multi level map tiling preparation...
Multi-level maps now work more or less...
subsurface tweaks
Subsurface now tiles correctly
Cleaned out some useless comments
fixed syntax & tweaked radar

I had misproperly used "type" as the name for a property, so I've
replaced that with "kind", also made the radar change colour based on
the level
Turns work on all levels...
Cleaned up some ifs...
Tweaks to radar
JobViteBox on homepage, and blog post about it
initial implementation for pascal method
fix pascal method
Deleting this outdated stuff
desert256 default theme
Changed example cv
layout tutorial added
Merge commit '31e4eaf18829bb0290218c923dbd5e4d5733d710' into dev
Given it a doctype. Now validates without errors.
Moved buttons to ABS toolbar. Code tidy.
Add jinja2 to vim config.
Merge remote-tracking branch 'origin/master'
adding subscription groups in inquiry notification to admin
Alpha build
iron mq+ajax
almost done
under construction
Author crawler
Merge branch 'master' of github.com:anantzoid/Author-Crawler
Readme update

Readme update.
Base GWT Test
enabled async domain event notifications
Added a base DomainEvent

Added a VersionedAggregateId to identify an Aggregate in time
Добавлены перечисления CType и CompositeType, функции преобразования в/из строк
Add debug config option
Fix bug with DateTime for Date::localized_date
Change author email
Add URI config file to modify to auth controller behaviour
Done
Adding db dump
Removing "field" property from VirtualProperty annotation
commiting filtering functionality for movies based on rating
added functionality to let the system remember the user choices
Update TPCodeaTabExample.codea/tpBatch.lua
Switch to a more sophisticated Makefile.

This is to make it easier to grow the library without copy-pasting the
Makefile, and to make it easier to build the library for e.g. AVR instead
of local architecture.

So far I've been unable to get the conditional MCU argument to work right
so that part doesn't work yet.
upgrade leveldb
print db path
Merge branch 'master' into develop
erase warnings on linux
Fix loading of admin media with our custom templates.
Prompt user when leaving the page with unsaved changes.
fix Undefined subroutine &WWW::Contact::Yahoo::decode called at lib/WWW/Contact/Yahoo.pm
Added event list
Added add comment act
Added files for CareerEventFacade lab
Updated CareerEventFacade Lab
Merge branch 'master' into packaging
issues with iOS folder because of nested git repos... ugly
Added .gitignore to map_cache directory
Change the cover photo sizing.
Updated to AS 3.0.90 SP5, AR E3.09, and VC 3.95.7.
Added vendors
Added composer
add

about me link
Extended main
Prelim Router Configuration
Renamed query to path
Prelim Router
Extended Application a bit
Allow for other PSR-0 compliant classes
Finished up Router
Prelim callback in Application
Callback debugging
Refactored checking the Callback, add Action to method name
Set request for Controller Callbacks
Use new Interfaces
Check for stream_resolve_include_path first
Return the response, dont output
Added Formatter functionality
Added basic error handling, more documentation, core exception
Made formats glob system independant
Removed Old files, added Readme, renamed autoload
Cleanup and Tweak
Started refactoring application tests
Dodat manager
Check for copyrights and fail gracefully.
Add some simple testing to verify the results.
lots of polish, tiny fixes, added Apache.v2 Open Source copyright notices where appropriate.

Signed-off-by: baracudda <ryan.fischbach@ist-research.com>
Add roles table migration
Poprawione literówki, interpunkcja w plikach: casnet.tex, seth.tex, introduction.tex, gideon.tex.
Merge branch 'master' of github.com:barthez/sodm_prezentacja
RuttEtra
added a few more exception related rules
timte based sorting done in backend, just needs view. bob dylan pandora is pretty awesome. also setup campfire room
moar changesgit add .! d
hieman javadocsei
Remove compiled assets from git
Remove redundant font declarations
Legger til forklaring av hvordan man installerer WKHTMLTOPDF og legger til config for WKHTMLTOPDF som er nødvendig på windows (eller om man ikke har installert WKHTMLTOPDF på default sted)
GUI Updates mostly
Removed parameters from GraphDescriptionBean/JSONObject response.
Add create method for the secrets controller
Make associations lazier and try less hard in the face of missing data.
rm old tests.
debug
to sync
to sync
Preserving ordering (and duplication) of srcs
Implementing concat_files rule
added new javadocs
Added specificity to xpath query to filter out parents that have title tags which contain the text.
day 2 lab 1
Fix broken links in Bioclipse users manual in help
Create Troubleshooting entry in the help Contents and 

add the problem with Internal Web Browser in Ubuntu 
Include the BC-R troubleshooting help page in the general

troubleshooting help contents entry
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x
Site updated at 2012-12-02 12:02:51 UTC
added fancy perspective stuff. not sure how long i'll like it for.
Landscape mode forced and no title
Volume control MUSIC stream
Changed navigation to include Log and have single Graph link. Select plant to graph with dropdown.
- in firstboot, do not show list with secondary languages (F302520)
- 2.13.53


svn path=/branches/SuSE-SLE-10-SP1-Branch/country/; revision=41334
- disable DPMS while adapting time (#348348)
- 2.13.54 


svn path=/branches/SuSE-SLE-10-SP1-Branch/country/; revision=43051
fixed path to xset (#348348)


svn path=/branches/SuSE-SLE-10-SP1-Branch/country/; revision=45435
Setup gem dependencies and got spec working.
Transferred Controllers, Models and Helpers form Main Site. Setup bootstrap.
2012/07/25
Add change to .gitignore file
Re-added the extension filter to the file picker
Correctly handle nested options in the chosen drop-down
Updated the SimplePie library to version 1.3
Updated the TCPDF library to version 5.9.176
First parse the footer scripts when handling the dynamic script replacements, because they might add CSS files
Fixed a spelling mistake in the SimplePie library path
New dependency type for module class loaders which doesn't cache paths
[MODULES-86] Handle . and .. properly
Prep 1.0.0.CR3
Next is Beta4
A couple of convenience methods
Add redirect for XPath
MODULES-89: properly process manifest attributes
MODULES-89: make sure ModuleClassLoader lives in complete isolation and use package name to load package spec
MODULES-89: fixed imports
Correct root URL on windows (?)
Next is 1.0.0.CR4
Next is CR5
[MODULES-90] do not exclude META-INF anymore
Prep 1.0.0.GA
Next is 1.1.x
Add redirection support for SchemaFactory and XMLReader
Fix imports
Fix resource loading with system.pkgs
Delete JAXP redirect facility
Suppress warning due to IDEA-72097
added venue and agenda info
Not sure if I like this or not, but it gives Breakpoint something of a logo.
made label detection everywhere
fixed the templates to include the missing information
updated the fronted
1) Updated the xml method mapping
1) Added the service reference to the method mapping
1) Added the extra mapping methods
1) Added the extra mapping methods
1) Added the extra mapping methods
1) Groovy data mapping
1) Data mapper broker
1) Implemented the basic rpc call
1) Updated for RPC calls
1) Fixed the scopes
1) Fixed updated RPC calls
1) Updated the XML method mappings to include service support
1) Fixed the persistency result
continued development of the workflow rpc
Add some unit tests

- Unit tests for Actor, Movie, Director
Example normalization script - we will want to re-assess this once we have de-identified clinical information uploaded and matched to celfiles.
Documented animation feature in README
Merge branch 'animate'
Added exception throw to HAML interpreter check.
Add tz
Removed some ide files and added a .gitignore list with some common
things to ignore in the list

Signed-off-by: Jason Greenwood <2datop@gmail.com>
Merge branch 'master' of git@github.com:bridgetb/MultitouchBingo.git

Conflicts:
	MultitouchBingo/ECE_700_BoardGame.suo
	MultitouchBingo/ECE_700_BoardGame/ECE_700_BoardGame/ECE_700_BoardGame.csproj
	MultitouchBingo/ECE_700_BoardGame/ECE_700_BoardGameContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
let more little boxes through
tweaks, extra padding for last column
reference popups
Finished a working (but buggy) ability to add verses and convert them to unicode text.
continguts de prova
Added Android project
version
.
HSP's changes
Refactored devise views. Fixed custom devise views to be rendered. Devise views have to be stored in the devise folder
set include root in json = true to get a root node
Conditional Action Links on _Layout.cshtml
Log all requests and response codes.
Add the models I believe I need.
Add reading time to Rails Rumble post
taj can't wear gloves or shoes comfortably, have a chance to break them/hurt themself when they try to put them on

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
[Caique] README.rdoc updated! Rules section added!
Add readme content
Ignore gh-pages 'static' directory

The 'static' directory is an artifact of running `showoff gh-pages` to
publish the presentation to http://cbeams.github.com/spring-3.1-review
Add slides for c: namespace
Add javadoc links
Add github static pages
Update link to @MVC async example
upgraded packages, added admin dropdown menu for main navigation
added some twitter bootstrap chrome
Cleaned up files that should not be on GIT + added ignore
Correcting typo
Merge branch 'load-count'

Conflicts:
	jquery.infinitescroll.min.js
Removing bad copy/paste
Merge branch 'load-count'

Conflicts:
	jquery.infinitescroll.min.js
Initial hospitals list.
multiple inputs and outputs
Handle default SIFT and Polyphen scores, display on log scale
Add article explaining odl-tiles2.1
IConverterに型引数を取るようにした
pom.xmlをgithubに対応
fix sub3

Signed-off-by: Keisuke Nakao <chome@argv.org>
Fix tabs to spaces misultin_req_bridge
remove circular dependency
restart php5-fpm after everything is installed
Upgraded  bootstrap
Upgraded  bootstrap
Removed compiled assets
Removed empty vendor dir
MOved bootstrap gem outside assets
Don't use activerecord when compiling assets
COmmented out duplicated device migration
order payments by item then date
Added google analytics code
Added GA tracking to welcome layout
Fixed print styles for invitation inserts
Added page break for inviation inserts
Removed prawn; added link to guest list in guest show
Fixed csv export of guests
fixed password reset and added admin proxy
Added reset scene funcionality
Add gunicorn support. Let restart simply start if not running
Add options for specifying kind of unicorn
Add note about gunicorn in readme
Bump version and note changes
Quick and Dirty historic newspaper advert in newspaper search results
keyup, readme
Made originalEvent.data comparison less strict to catch null and undefined
leaflet base
Fixes in tilestache setup

Signed-off-by: Giorgos <giorgos.lamprianidis@gmail.com>
Adding maximum threads

There is a nasty bug, sometimes the headers are sent before the actual
result, I have no ideea what triggers it, and that will crash the app.
Disable Ruby 1.9.2
Added upload support.
Bugfix de /wsempresas y comienzo de mejora de busqueda de varias palabras
Update notes for submitted changes

* fix "mongolab https gateway" issue
第十一章结束
Pages for website
Add new templates, convert from PJAX.
Deprecate jQuery event bindings for route states.
Update handlebars compiler to add newlines.
Update template to use router actions.
Add compiled templates.
Fix a typo in travis.yml
The original version, by Dusan

Included here so you can easily diff with Git and such.
Corrected attribute name for ShopData
add sles update
Merge branch 'master' of https://github.com/coldbloodx/leo-test-code
add xproject32 deploy config
Removed unused files.
Removed almond js.
Removed unused dependencies.
Merge branch 'organize' into staging
#69 日本語サニタイズ対応
port the tests to coffeescript and amplify the test suite
add more coverage tests
more tests
more tests
reorg the files
add coffeescript files
Merge pull request #3 from tenaciousflea/master

Add extensive test coverage and some coffeescript magic.
added stub README.md.  updated .travis.yml to get assert pkg
Fix the citation and details formatting on the papers page.
Base app with Router and Home View (no CSS yet)
Build: No need to store ncurses explicitly.
Build: Retrieve present libraries from Config.h

The defines written to the Config.h file are parsed to make a list of
libraries that exist on the system, and used to determine which set of
files should be built.
commited the latest changes according to the last feedback we get.
first test release for building physical server in vcl openstack cloud
oops
Merge branch 'master' of github.com:cybera/ansible_playbooks
directs cyclus-users to the users list rather than the dev list.
added another contact us link at the bottom of the get and build page.
Cyclus formatting
 built site, adding more references to cyclus-users list
auto-generated config files now have comments
Adding a 'play again' to UserPrompter
One small step for WhichBus, one giant leap for Mass Transit
Add local print feature
Update submodule go_braille

braille/svg has new functions:

- DrawLabel()
- DrawPage30()
Use DrawPage30() to draw braille to svg
Merge pull request #10 from suapapa/master

여러줄 점자 그리기 구현 완료
go_braille submodule update
Fixed html element jquery printer library
README.md: Add clients
trivial: reformat these files.
crop_to_fit in partition(), don't resize
gitignore
logger typo
Merge branch 'master' of https://github.com/danielballan/photomosaic
fb comments test 4
NO Comment after value
got person working
Remove start.sh

Replaced with oacd start
Version Start
Merge remote branch 'rt/master'
Allow specifying endpoint override using `url` or `endPoint`.
Added the known connection issue to the readme.
add heart monitor component
goto kevoree 1.7.8
Fix checkboxes to return value in form
Add check for reading cert and key file
add new vim plugins
turn on neocomplcache
email_reminder
Merge branch 'develop' of github.com:dblaichinger/jacob_joins into develop
deleted html5.js
debug oauth to stderr
Merge branch 'master' into develop
DRY up initialization
- Move initialization from restaurant and user into base class
Merge pull request #1 from yrgoldteeth/feature/dry

Feature/dry
significantly styled the app
Add table servicegraph missing in install + update
Finished the Photos section
WS1 completed: Runge-Kuttas method is still broken
Re-set timeout value on every iteration as select() modifies the value.

This changes the time-out from an overall connection time to a
per-node connection time.
implemented optional output of aligned subfeatures
EX4A3
Merge pull request #579 from dingpinglv/iss1509_UpdateMenuTest

fixed #1509 add init caller to cc.LayerColor.initWithColor
fixed #1509 extra a protected method for initialize
Small description of what all this i tried
Forgot to add a models.py in the svntogit app.
Fixed #17385 -- Searched the browsed docs version.
Stuff from 1.28 that didn't get pulled into the repo.
initial issue
deleted not used
Fixes extconf
Removed Readme and added redirect file and index
started hacking content saving into HAREntry
Added gladius as a subdirectory so that the examples are part of the hosted page.
Additional requirements:
adding minified version of jquery
updated simulation to 0.0.4-SNAPSHOT
ajax bugfix for safari 5.0.5 (missing xhr.response)
X#draggable support plus some bug-fixes
adding drafts
updating imperative v. functional draft
more draft work
finished off imperative world post.
update cocos2d-x
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
[Win32] fix Menubar typo error, disable glPointSize()
Pressing N in terrain demo builds part of the navmesh around the cursor.
Terrains can now contain extra geometry in the form of entities, and navmesh can be built from them.
Fixed adding/removing obstacles (mainly their ray queries) correctly.
Updated resources license file to include tudorhouse.
いい感じにいろいろ変更。
Change description.
Merge pull request #10 from niaeashes/master

Modify filenames and plugin description.
Included the RubyMine config Directory
Finish modifying Users Model
Changed the basic title of the application to show the new name.
Modified lend.jsp to allow for addition of new category.  This does not function yet, but the code builds and runs.  Need to work the connection with the categories table to check for existing category and create new one if it doesn't exist.  CreateItem.java modified to facilitate this.
Lots of changes in getting hibernate 3 to (finally) work with a basic setup
appended CodeJam 2012 R1B
solved a.rb(after the round was finished)
Follow unimplemnted specs
adicionando webkit-playsinline
AUI-657 Fixing issues with Widget ids in Diagram Builder
Now inserting the patient demographic information into the QRDA document header
* fixed fonts
#14 Optimized and tested querries
Merge branch 'master' of github.com:eggnet/callgraphanalyzer
Update with new export, with fixed UTF-8 character encoding.

Hopefully, this fixes the character encoding for the whole
Open Context data dump.
added JavaScriptCore to project
Fix races in tests
AOP spring
Deleted folder UBjme
Version bump to 1.0.0
changed documentation
page view events to mongo
Added .java files or authorization filter
Added dependencies for logback
Created the StormWendavFilter that incapsulates SpringMiltonFilter and,
before calling SpringMiltonFilter, check if the user is authorized to
perform the request.

The authorization mechanism, before this commit, was in a second
separated filter.
Modified mapping between methods and operations.
Now StormHttpsAuthorization is a little bit custom , it will be better
with an handler for each method.
Remodified the authorization mechanism: now is implemented as a second
filter. Deleted the StormWebdavFilter.
Merge remote-tracking branch 'origin/webapp' into server

Conflicts:
	webapp/src/main/resources/applicationContext.xml
Server upgraded > see you next commit, this is only a backup commit

Sorry next release is coming soon!!
new WebDAVServer with HTTP + HTTPS jetty servers embedded and
Storage Area v.1.1 with protocols enabled
not wroking -- filetransferfilter not called!
HDMI rotation
vendor: add Xperia T maintainers

Change-Id: Ie899a466f9588f4f4f084f1ed2332d3b74e9a17c
Merge "vendor: add Xperia T maintainers" into jellybean
Merge remote-tracking branch 'CyanogenMod/jellybean' into jellybean

* CyanogenMod/jellybean:
  vendor: add Xperia T maintainers

Change-Id: I24e1e437a211f63dd743e729ec8e5b599c0c4b19
moving reStructuredText documentation to index.rst
More work on strip. Preliminary routing of the power stage.
Working notifications, multiple region detection, region names
finially we have all rspec passed - the auth page issue
update more env info
Merge branch 'master' into vmc
Merge branch 'master' of github.com:ethz-asl/libpointmatcher
use y-or-n instead of yes-or-no-plus-ENTER
raise the default absolute timeout to 12 hours
fixes EUCA-3762, regression caused by another commit last week
Merge branch 'master' of github.com:eucalyptus/eucalyptus-ui
added Korean translation; fixed i18n bugs; undo use of .html() for user inputs; don't display 'Loading...' for tables
merge conflicts
adding .vim as vim.zip
se agragan mis cotizaciones a la cuenta
Adds an eCommerce setup checklist to the site configuration tab, also adds/cleans up some management icons on the edit product views (so you can easily get to the screens to edit list items).
Adds parsing of listbuildercontrol 'lists' in expConfig for params ending in '_list', implements reminder emails in new events controller [#139 state:resolved]
04.07.2012
polishing finished
Updated save JS injection
Fixed Cookie Issue
Updated to reflect new functionality (SQS Delay)
Set autoincement property to boolean.
Namespaces for content elements an the module

Added namespaces for the conent elements and the module.
Some changes in the readme
multiple mycontainers and read/write servlet
added doxygen and new functions to CAN driver
suppression du spell dans la config de vim
Tests pass in admin
Remove chrome work around for a moment.
Emprolijando
xoxo
initial add for problem 114

Signed-off-by: Jun Mei <cadnium@gmail.com>
加入Ajax

为避免跨域访问，和掌上查车服务端放在一个端口不用应用下。
Some more stuff. Like info on scalaz7
Merge pull request #28 from timburks/master

minor: use int instead of bson_bool
Merge pull request #30 from bspaeth/master

Return empty string if none of the "string-string" types applies in bson_iterator_string.
minor: test fix
minor: build fixes
CDRIVER-96 var declarations should go before definitions
CDRIVER-119 move platform.h into bson.h
minor: test fix
minor: typo fix
minor: doc fixes
Added example program for docs.
CDRIVER-106 minor doc fixes
minor: docs
CDRIVER-121 store errno string on conn->errstr
Fix OSX compile.
RELEASE v0.5
fix soname on libbson using Makefile
Merge pull request #34 from halkeye/master

minor: fix libbson versioning in Makefile
merge from mongodb
Ensure no minHeight and margin in shadow text area.
remove "vector" class and use arrays
add sample_output to diff with sample_input
fix realloc bug
use heap-sort algorithm for sorting array
Partially fixed downloading in kiyomi.
ajout du local_settings
database sqlite !!!
Moved network code out of the Janeway project into the NetworkLib project.
Setup NetworkLib to automatically build a jar file into Janeway and DefectTracker.
Removed JAR building of the Network project. The Janeway and DefecTracker projects now have a depenency on the Network project.
Renamed NetworkLib project to Network.
Merge branch 'dev-exemplar-feature-refactor-network' into dev-exemplar
update life sprite to use RK face
Merge branch 'master' of github.com:fragcastle/game-off-2012
commit holamundo sergiowebo
fixes decryption of messages that were too long and were truncated by the server

Thanks to mumixam <mumixam@gmail.com>
fixed DH1080 exchange with clients using fish_10 trying to use CBC

Thanks to mumixam <mumixam@gmail.com>
small change to em highlighting
revert to c48cc13d41
Fixed asset precompilation error
Notes on site process/rules
view styling; remove CDATA
params for profile needed to be an array.
A lot of bugfix
Site updated at 2012-08-21 04:03:32 UTC
20121014
Se añade etiqueta revision a los .ini
Ext. 0005.-Informe de vencimientos de recibos de clientes y proveedores.
Añadida ext450-envio_mail
Merge remote-tracking branches 'aulla/master' and 'rmenor/master'

* aulla/master:
  Ext. 0005.-Informe de vencimientos de recibos de clientes y proveedores.
  Se añade etiqueta revision a los .ini

* rmenor/master:
  Añadida ext450-envio_mail
Wyczyscilem BootStrap.groovy by nie ladowal na starcie danych do baz
danych.
刺身くいたい

リファクタリング
Changed <h1> tag color
Site updated at 2012-10-07 12:32:23 UTC
modified:   _includes/themes/the-minimum/default.html
	modified:   _plugins/.DS_Store
	modified:   _site/about.html
	modified:   _site/archive.html
	modified:   _site/atom.xml
	modified:   _site/categories.html
	modified:   _site/en/archive.html
	modified:   _site/en/categories.html
modified:   _site/en/index.html
	modified:   _site/en/me.html
	modified:   _site/en/pages.html
	modified:   _site/en/tags.html
	modified:   _site/pages.html
	modified:   _site/tags.html
	modified:   _site/zh/archive.html
	modified:   _site/zh/categories.html
	modified:   _site/zh/index.html
	modified:   _site/zh/me.html
	modified:   _site/zh/pages.html
modified:   _site/zh/tags.html
Change time to ctime
Downloading song assynchronously
added support of other working directory
bbg update: zram, swap, s2w, fastcharge, stats, config...
Thermal and mpdecision inclusion
More emotive README
add TODO note about making Jackson handle the downloading directly
Weitere Zeilenumbruchseinstellungen
Updated bounding box of field
minor directory refactor
use unicode icon for `#links`
follow markup changes
Middle Dot <- Black Diamond Minus White X
separate non-layout styles
update `#news`

- Follow markup changes
- Use column layout
- Hang date string on large screen
update `#iine`
redesign "links on Delicious"
fix disappearing list's bullet on small screen
limit `a` styles under a `li`
version 6.27.1
Site updated at 2012-12-23 06:01:23 UTC
added eassist.el
el-get: install cedet
form2json 1.1
Commting the Readme file of sinatra
add nservicebus note
fixes missing extra params in form submit
Anjuke All Other City Rent, Generic Rent. all other city: except Beijing Shanghai, but including Guangzhou, Shenzhen and the rest
Merge branch 'master' of github.com:havelife/Address_Crawler
Add T-Mobile theme engine support-CM10 (2/5)
Update indexer.cpp
Merge pull request #26 from duytran92/patch-31

Update indexer.cpp
Merge branch 'master' into gui
LPS-27741 Update dependencies on test-pacl-portlet
Merge branch 'master' of git://github.com/liferay/liferay-plugins
use << and >> for pag..
removed unnecessary file... again
Merge branch 'master' into color
cheat with breaks instead
何もいじっていない。
reformated code, added jquery 1.7.2, updated cache_inclusion_tag
pep8, fixed sphsearchboard migration
Merge pull request #1 from pigletto/master

Some updates
Site updated at 2012-10-22 20:16:45 UTC
add msgTimeout in hOptions
fix bug timeroutcallback transportOptions null point
Merge pull request #6 from sunchenliang/master

fix bug timeroutcallback and null point
UPDATE ccna

fixed error
fix quirks in XML completion
Continuied attempt to port the UnitTesting.Tests.
[WIP] Major refactoring of the unit testing addin:

A lot of functionality gets moved from the main portion of the AddIn into the framework-specific providers.

We no longer deal with test classes and members, but instead use the new ITest interface.
A test can be a whole project, namespace, class, or just a single method.
This can be used to support features like the NUnit [TestCase] attribute, where a single method might result in multiple tests.
Change design Thomas
Design of the main view done
Merge remote-tracking branch 'origin/master'
update main view
revert regression that causes GET with argument to be treated as a POST
fix it
gene-rate
no waiting for parameters
Merge remote branch 'origin-ipa320/master' into automerge
non blocking service calls working
switched to list for clarity
the 14th commit
New IntelliJ project files
edit for OSC.cloud
Add *.exe to .gitignore.
Commented the test
Update to twitter boostrap 2.0.4 files. YMMV.
Added more docs.
need adds
TinyMCE editor added on user end
Liam added tilt offsets and sensors for the ball
Unlink and untrack tag()
Added toString to Account class.
Added migration
Added article related coffeescript file
Added tag selector extension and templaye
Added composer.phar
Fixed dependencies
Added required bundles for tag related features
added changes related to enabling tags
added delete-white.gif
s
ls
Last comma is removed in tag listing. Tags are listed in article listing
Added code highlighter. Adjusted css
added paramaters.dis.yml
removed parameters.yml
updated gitignore
removed prod.log
Merge pull request #2 from janimattiellonen/article

Article
Ds store 2
another layout idea and added svpply
Added POSt as an allowed method to smsrecv
Starting overlay functionality
adding a small background image to get rid of the baby-blue color
Added login jUnit test.
note and transaction models
force pages update
Added IDG's best swedish developer award.
Update User Front End guide to match the new project structure
[maven-release-plugin] prepare release jboss-javaee-5.0-1.0.0.GA
Separate error retrieval and processing from display.  Change frequency calculations.
Added more flexible transpose and capitalization bindings.
fix tab/space issue in loadStyle function
remove hardcoded url for less file
Merge pull request #1 from joelrbrandt/relative-url

Remove dependence on hardcoded URL (thanks to joelrbrandt!)
properly sorting the TeeTimes.  Moved the logic into the model
New japanese translation by a3novyy
module sharpen: fix bug in normalization of gaussian kernel
Merge branch 'master' of ssh://github.com/darktable-org/darktable
make email subject translatable
This should fix the bold font some had in bauhaus
opencl: fix bug in module sharpen that would produce slightly different results than cpu
opencl: like previous patch, here for modules highpass and soften
Small tweaks to lensfun and OpenEXR configuration discovery
opencl: some fixes to avoid differences between cpu and gpu codepath
Merge branch 'master' of ssh://github.com/darktable-org/darktable
opencl: fixed bug in demosaic concerning green equilibration
Add splitline to overlay in tethering's live view
Update to RawSpeed revision 438
Fix brace in RawSpeed, now builds again.
shadows&highlights: make it a tad faster with SSE
lowpass: make it a tad faster with SSE
fix for bug #8821
lens correction: first of a number of needed fixes
module basecurve: properly transfer alpha channel
module lens correction: fix opencl bug
removed other branches from this.
update of dutch translations
Add mirror button to live view

... and do the rotation using cairo instead of creating a temp pixbuf.
overexposed: same colors in opencl and cpu path
Call it "horizontally" instead of "vertically"

I still prefer it the other way round ...
Merge branch 'master' of ssh://github.com/darktable-org/darktable
Add center lines to icons
overexposed: make color scheme user selectable
overexposed: make sure opencl path shows same results as cpu
exposure: bauhaus widgets + clean unused code
Merge remote-tracking branch 'upstream/master'
Add image overlay in live view

The GUI might change, but it's kind of usable already ...
vim style key accels: introduce hashtable with path to bauhaus controls.
vimkeys: buggy :set implementation.
vimkeys: first shot at autocomplete.
vimkeys: autocomplete module and element separately
vimkeys: autocomplete works, so does exec.
vimkeys: prepared for more features.
gradientsliders: better adaptation to bauhaus style
vendordropped LibRaw 0.14.7
The Grey Period post
Rake task for create class and spec
cleaning up demo project
Catch all exceptions with jirafe client
Nested Resources: Users are only able to view and edit their own results
master now processes messages at startup, added a post-init startup hook to slave
remove Windows.pm again
Successfully tested gameMode variable.
Successfully implemented game mode shifting.
Room transitions are conditional on game mode.

Also a few other tweaks such as removing the winning platform messages
if it's a different game mode.
Implemented "rocketing." It's awesome!

May need to tune the mechanic and restrict when it can be used. I am
considering including a bonus mode where you can use it on the mode
with instructions.
Smoothed rocketing mechanic.

Turned off inside-platform glitch control when rocketing. Also reduced
speed slightly.
Implemented a platform counter with a boolean to count down.

Platform counter tallies dynamically for each level and is set in the
setup rather than draw so that the boolean can be used to subtract from
the counter when rocketing platforms.
platColor boolean working. Color change not.

Dynamic boolean array to detect landing on specific platforms working!
However, I can't get the individual platform's color to change
accordingly.
Plat-flipping working. Still no color change.

Landing on a platform for the first time now subtracts one from the
tally. I will need to change it later to only apply when rocketing, but
for debugging this is great and fully functional. Unfortunately I'm
still not sure how to make the color change correctly.
Color change success!

Used an alternate strategy to make the platforms appear to change color
when landed on.
Rocketing now required to flip a platform.

Also fixed a "press v"-based glitch and removed some unnecessary debug
code.
Preparing to build the remaining levels.
Half the levels built!
Plats draw a 5 complete.
All levels built!
Minor presentational tweaks for showing in class tomorrow.
Must rocket platforms to advance in mode 2.

Also made a few debug tweaks such as fixing a glitch where notKirby
can't move to the previous level in mode 2 (was set to move him to the
previous screen into a position which would immediately move him into
the next screen), and making notKirby draw in front of the flipped
rectangles.
Last screen displays WASD.
Use WASD to rocket the last platform to switch to mode 2.
Added a delay when transitioning between modes.
Fixed invisible platform glitch and massively reformatted the comments.
created api class
removed spiffy + grey styles. We can do this without them
tweaks to companies layout + markup for smaller viewports
~ modified .css margins, lookin' good
fix for unscriptable error in method _format_args_spec
trivial change to represent commit 5169ce62f4edc614a9a9b0da61f68c2c187d9bf2
minimized normalize css
fix the cancel button for editing cards

The javascript was checking for the parameters assuming the backend
provided version information.  The community edition backend does not
supply any versioning information so the javascript checks both
locations
Fix the Clipperz Compact link

The clipperz compact link should be relative to the current path
Remove reference to missing images

This removes references to image files that are missing that don't
affect the display.
Merge pull request #40 from jokajak/issue37

fix the cancel button for editing cards
Merge pull request #42 from jokajak/issue38

Remove reference to missing images
Merge pull request #41 from jokajak/compactFix

Fix the Clipperz Compact link
adding support for rooms.
adding and using button images
wrap long pre
warning detail in model
Update spec to match new duration format
Always show notifications on the page. Closes #4

Squashed commit of the following:

commit b1c795d142c915f0d2b3124f73f85393a1811d2f
Author: Josh McArthur <joshua.mcarthur@gmail.com>
Date:   Sat Aug 18 21:49:32 2012 +1200

    Add functions to Queue script to load and display currently
    playing tracks when the page loads

commit 0990b24dfffd2a93cf22fc6b896451f334f3c742
Author: Josh McArthur <joshua.mcarthur@gmail.com>
Date:   Sat Aug 18 21:48:16 2012 +1200

    Add 'current' action to return the currently-playing track
Fix bad 4.1 to 4.2 upgrade.

The SQL upgrade script from OMERO4.1 to OMERO4.2 tried
to remove a non-extant constraint. The same issue was
copied over to the 4.1 to 4.4 upgrade.
Synchronize the specification component with schema-2012-06.
Re-add UNSIGNED to spec. package target
Refactored station search.
modified README to include text
there is such a thing as too much whitespace.  who knew?
cambios pequenios
Merge branch 'master' of github.com:jstejada/acmuniandes_hor
Balance change - increased costs for tank, air, antiair
some data bug fixes and comments
Added editing of tray items
Some fixes in Orum script.

Set variable right after giving the reward.
Check for weight and inventory before giving the reward.
Add a tmx-to-wlk converter that handles CSV (in Python), and run it.

Some of the _mobs files changed due to bugs in the maps, which I fixed.

Remove the old Java version.
Add a script to run all three servers, from anywhere.
Running 'make maps' for the changes done on 013-3, 017-1, 017-3 and 017-4.
Running 'make maps' for the changes on tutorial map and surroundings.
Fixed the NPC locations and barriers for 041-1 and 042-1

-Fixed all the NPC locations to match the new coordinates
-Fixed the barriers to warp you to the correct locations
-Fixed the warps on 041-1 aswell
Store thumbnails of episode images too.
Add tag <param>
fixed Spring SSO second section indent
finalparticle
bumb version and updated readme
fixed aitoff projection (closes #14)
bignum.h : Add Definition of class Bignum
update AddApplication method as well
More changes to cap:deploy
redirect to root path if not logged in
only show calendar if such exists
Backend support for password reset
frontend support for password reset
Putting a index.html placeholder.
nav bar problems
remove deleted files
created authentication method to active user
test for authentication user created
test for active user doesn't work
adding active_for_authenticate method
activate for authentication created
activate for authentication created
activate for authentication created
test created and it works
finished
deted exlamation in user.save from admin_controller
deleted quotes from false in user model
deleted user.rb~
correcting some mistakes in test
testing
added default value approved to column users as false
before_create method was not necessary here
Merge branch 'master' into 20-activate-accounts

Conflicts:
	app/models/user.rb
Merge pull request #20 from kishiamy/20-activate-accounts

20 activate accounts
storageId added
Refaktoring struktury projektów
Update quiet option documentation and config
Merge branch 'project-master' of git://github.com/sheesh87/smart_clips into project-master
Merge branch 'project-master'
Added the Integer Stack
Dedeleted the files in test
Merge branch 'test'
layout creation
change default theme
update again

Change-Id: Ic0d5a12b83019d34151b5da20e6305a28a9de90f
note 2

Change-Id: I7fc8407bccb5719aa93c9880523d0074d93b7b0f
Update devices.js

corrected email. ;)
Merge pull request #410 from playfulgod/gh-pages

edited email
redis cookbook init
redis templates
updated readme, license, versionfile
modifications for Spree 1.0.0
fixed problem with include logic
updated readme, version
updated readme
Added attr_accessible for :name to work with rails 3.2
Add Fork me on Github ribbon
Installer has been updated, note will now be removed.
progress saving and loading Scoredata
Use only hincrby for now to support older redis
Fix figures' bug and minor corrections
Require S3TC lib
source-*-pro to source-pro
more change to PTE controller
Revert "Bugfix include jackson core dependency"

This reverts commit ea8c439688567404692f3791d118c5a88c73e1da.
Revert "486 Automatic citation generation"

This reverts commit 887af66fa1f9bafb3f6f98c521f98501be7a0801.
[maven-release-plugin] prepare release lconz-curation-tasks-2.4
fuzzy search modal dialog updated
resolving conflit with merge of branch 1_posts
solving conflit with merge of branch 1_posts
resolving conflit with branch 2_posts_comentarios
Merge branches '3_autenticacao' and '4_ajax' into 4_ajax
Merge branches '4_ajax' and 'master'
p500: Build SIM toolkit
[YM2612] fixed LFO AM modulation waveform (California Games)
[Game Gear] added support for CJ Elephant Fugitive mapper (recently released by SMS Power)
Merge git://github.com/ekeeke/Genesis-Plus-GX
Now uses RGB565
[Tokenizer] Example
Adding 'Tokenizer' example to main documentation
page.
Update install now that we're in cocoapods master
Wrote the README file.
Added set -e; set -x; in example.sh
The ACL paper.
a lightweight wrapper around PostgreSQL for tornado
multiple reports may now be appended in the same report file
add a full report (all results at once)
filter system was missed in extension report
Add some partners actions
admin button path for inline editor changed
the API for the page resources returns the position + fixed a bug about the position when creating the index and 404 pages
the pages API returns the locales for the translations
include the translations available for a content entry when fetched by the API
Merge pull request #491 from ka8725/master

Fix path for button admin inline editor's
Generator : Carrierwave => put S3 bucket region in an environment variable instead of hardcoded. See the documentation pull request referring to this : https://github.com/gabrielnau/documentation/commit/ff14201825ffde0dd3afae56fca8395720bbb610
Merge pull request #497 from gabrielnau/master

Generator > Carrierwave : put S3 bucket region in environment var instead of hardcoded
Fix new password fr locale

Change from e-mail to Nouveau mot de passe
fix issue #503
Merge pull request #499 from pimpin/patch-2

Fix new password fr locale
fix issue #488
fix issue #489
fix issue #494
Merge branch 'master' of github.com:locomotivecms/engine
, <a href="http://shopdrugcheap.com/">buy Strattera</a>,  %]], <a href="http://price-drugs.com/order-ampicillin-online-en.html">Ampicillin</a>,  >:-[, <a href="http://ordergenericdrugs.com/products/cialis.htm">buy cialis</a>,  3441, <a href="http://price-drugs.com/order-lasix-online-en.html">buy cheap  Lasix</a>,  =], <a href="http://price-drugs.com/order-prednisone-online-en.html">buy Prednisone</a>,  ydg,