labofsahil/github-event-dataset-2012 huggingface dataset:
add missing commas in Puppetfile examples
Reducers now key-values in DHT
Merge branch 'master' into put-reducers-in-dht
Merge branch 'master' into put-reducers-in-dht
Reducing stage now persists to DHT. Cleanups to reduce redundancy in Mapper/Reducer stage
added two files
merge
fix concurrency issue in character decoder
After scaffold micropost

Users database reverted to original format, deleted the test db:migrate
ruby file
after creating foreign key relationship
完善数据库删除任务
changes to planning scene interface before it moves to planning_interface package
gitignore
code cleanup && pep8
Merge pull request #1 from clockfort/master

code cleanup
UICukes updates

Submodule UICukes f018b6b..683b36c:
  > OCCukes and UIExpectations updates
  > UISteps renamed to UIAutomationSteps; they are UIAutomation framework dependent
  > OCCukes v0.4, build 141.0
Arregle diseño de borde, en la parte de grupos
Add more debug output.
Refactor new item creation logic and UI.
Remove obsolete code.
Fix errors.
Fix errors.
Fix errors.
Fix display of events in DayView.
Cambiando la estructura de la configuracion
Agregado main handler
First commit with all files
Merge branch 'master' of github.com:rwagner00/uclick-custom
More option documentation
Enhanced for homework2 part 3
Merge remote-tracking branch 'github/master'

Conflicts:
	app/controllers/movies_controller.rb
Merge branch 'master' of github.com:saga-project/radical.wp
more verbosity
show and hide 実装
とりあえず画面側はcss以外完成か？
First version, enough stuff for 2hrs
Merge branch 'master' of https://github.com/salvadorbfm/taller-ieee
updates to C code to include mac addy and port
third level subheaders, and complete media functionality
redis: adding attribute for setting appendfsync
adding functional requirement format
adding auth failed support

Auth failed was still returning 1 even in failure case, so changed it to return 0 now on fail.

Signed-off-by: Scott Gustafson <scott@garlicsoftware.com>
changing image for taxes
adding images for sabor
deleted:    fcitx-table-editor.pro.user
bootstrap, backbone, html5bp, other
merging
Participants, participants, participants
configure production, development and test
merge /protected/add_friend
renamed:    local/soft/CONKY/.Conky/cpu -> local/dotfiles/.Conky/cpu
	renamed:    local/soft/CONKY/.Conky/forum -> local/dotfiles/.Conky/forum
	renamed:    local/soft/CONKY/.Conky/mail -> local/dotfiles/.Conky/mail
	renamed:    local/soft/CONKY/.Conky/mem -> local/dotfiles/.Conky/mem
	renamed:    local/soft/CONKY/.Conky/net -> local/dotfiles/.Conky/net
	renamed:    local/soft/CONKY/.Conky/paconky -> local/dotfiles/.Conky/paconky
	renamed:    local/soft/CONKY/.Conky/rings -> local/dotfiles/.Conky/rings
	renamed:    local/soft/CONKY/.Conky/rss -> local/dotfiles/.Conky/rss
	renamed:    local/soft/CONKY/.Conky/weather -> local/dotfiles/.Conky/weather
	renamed:    local/soft/CONKY/.Conky/weather2 -> local/dotfiles/.Conky/weather2
	renamed:    local/soft/CONKY/.bin/conky/clock_rings.lua -> local/dotfiles/.bin/conky/clock_rings.lua
	renamed:    local/soft/CONKY/.bin/conky/conkyForecast -> local/dotfiles/.bin/conky/conkyForecast
	renamed:    local/soft/CONKY/.bin/conky/conkyForecast.py -> local/dotfiles/.bin/conky/conkyForecast.py
	renamed:    local/soft/CONKY/.bin/conky/conkyForecast.template -> local/dotfiles/.bin/conky/conkyForecast.template
	renamed:    local/soft/CONKY/.bin/conky/gmail.py -> local/dotfiles/.bin/conky/gmail.py
	renamed:    local/soft/CONKY/.bin/conky/imap.pl -> local/dotfiles/.bin/conky/imap.pl
	renamed:    local/soft/CONKY/.bin/conky/netstat.sh -> local/dotfiles/.bin/conky/netstat.sh
	renamed:    local/soft/CONKY/.bin/conky/notify.py -> local/dotfiles/.bin/conky/notify.py
	renamed:    local/soft/CONKY/.bin/conky/paconky.py -> local/dotfiles/.bin/conky/paconky.py
	new file:   local/dotfiles/.bin/conky/procesor.sh
	renamed:    local/soft/CONKY/.bin/conky/startconky.sh -> local/dotfiles/.bin/conky/startconky.sh
	renamed:    local/soft/CONKY/.bin/conky/startconky_testing.sh -> local/dotfiles/.bin/conky/startconky_testing.sh
	renamed:    local/soft/CONKY/.bin/conky/sync_pacman.sh -> local/dotfiles/.bin/conky/sync_pacman.sh
	renamed:    local/soft/CONKY/.bin/conky/update.pl -> local/dotfiles/.bin/conky/update.pl
	renamed:    local/soft/CONKY/.bin/conky/update.sh -> local/dotfiles/.bin/conky/update.sh
	renamed:    local/soft/CONKY/.bin/conky/update2.pl -> local/dotfiles/.bin/conky/update2.pl
	renamed:    local/soft/CONKY/.bin/conky/update2.sh -> local/dotfiles/.bin/conky/update2.sh
	renamed:    local/soft/CONKY/.bin/conky/update3.pl -> local/dotfiles/.bin/conky/update3.pl
	new file:   local/dotfiles/.bin/html_script_v0.4
	new file:   local/dotfiles/.bin/my_script
	new file:   local/dotfiles/.bin/script.html
	new file:   local/etc/cron.hourly/desktop_slideshow
	renamed:    local/scripts/local_scripts/sync_pacman.sh -> local/etc/cron.hourly/sync_pacman.sh
	deleted:    local/scripts/local_scripts/curatenie.sh
	deleted:    local/scripts/local_scripts/curatenie_cache.sh
	deleted:    local/scripts/local_scripts/curatenie_deborphan.sh
	deleted:    local/scripts/local_scripts/curatenie_eng.sh
	deleted:    local/scripts/local_scripts/instalare.sh
	deleted:    local/soft/CONKY/.bin/conky/procesor.sh
anchored overlay element to top of window
The better pieces from my poetry.
queries tested for level 3
user settings : basic function done
Split specification to Sah distribution
Corrected XML errors in mutter theme
Cleanup
Renamed slots to players
Added server country determination
test touch events
Merge branch 'master' into gh-pages
Use XDG_CONFIG_DIR/singularity for preferences dir

Make E:S compliant to the XDG Base Directory Specification, helping
unclutter the user's $HOME of dotfiles/dirs. Also change default dir name
from "endgame" to "singularity", to be uniform with game's package name
in Arch, Debian, Ubuntu (and also with game's launcher, singularity.py)

This is backwards-compatible with previous releases: if ~/.endgame is found,
it is used. The new default is, for most scenarios, ~/.config/singularity
Use XDG_DATA_HOME/singularity/music as an additional source for music

It is only created if XDG_DATA_HOME exists. If so, /music in preferences
dir, if it does not already exists, is created as a symlink.

In most systems this defaults to ~/.local/share/singularity/music
load messages as soon as language is changed

Allow strings to be translated to chosen language very early in game:
in the preferences file parser error messages and in command-line
argument handling, including the --help page.

Previously the only languages available at that time were the game's
default (en_US) and the user's native locale. Settings in the preferences
file or in command line were not effective until main screen was loaded.

As a welcome side effect, messages are automatically loaded when setting
language, so load_messages() does not need to be manually invoked anymore.
set_language() will handle all locale and language changes.
update maketree so it works again

Also now it can be invoked from anywhere. It generate 4 files in current
directory: 2 .dot files and 2 png images, for techs and items, a tree
diagram of all technologies, pre-requisites and unlocked items.

It still has bugs and room for several improvements, but since it is
fully working there's no reason to hold it back, so I cherry-picked it
from my testing/classdiagram branch to master.

It is a very powerful tool, and its diagrams are invaluable for anyone
fiddling with game balance. A truly golden gem from the past just brought
back to life.  Thanks aes and FM!
Support for all the http methods in Net::HTTP / raise forgotten
fixed the gdr_yyt.py
another test file for github on windows
comment delete.
fixed ImapEmail
draw routines done
draw routines fix
Merge pull request #7 from danyjavierb/master

rutinas dibujo flechas
OK... think that it is good up to lr removal.
	modified:   res/input.txt
	modified:   src/Grammar.java
	new file:   src/GrammarToken.java
	modified:   src/Lexer.java
	modified:   src/ParseGen.java
	modified:   src/Rule.java
	modified:   src/Token.java
	modified:   src/TokenType.java
	modified:   src/source_lexer.java
	new file:   src/temp.tok
	new file:   temp.tok
	new file:   test.sh
renamed deploy to gotowork in usage
new jquery
new bootstrap
different color per tr depending on yslow value
typeo
Merge branch 'master' of github.com:soulgalore/sitespeed.io
Added image, css, js and css image total weight/size
updated the help section
new version
added spof average per page
added popovers and changed where the js is located
added popovers
# fixed title
Updated the Unity plug-in, but more work is emittent to detect the desktop environment in use.
Updating the UI of most of the wizards' pages and a few other parts.
Updated the Content class with a lot more verbosity.
Fixed an issue in Content::allContents() that prevented the detection of any Content object.
Added a bit more documentation.
Added more text to wizard's introduction and conclusion pages.
Used QWidget::setLayout() to fix sizing problems.
Added pixmaps for the plug-ins.
Added LibraryCommand to the MPRIS desktop control command.
Updated UI once more.
Fixed the flatness issue with the Quick Start wizard.
Added a bit of documentation of proposed regexp to use.
Allows Desktop Control to invoke an action (but only the first one matched).
Updated the Main window.
Ensured that the window updated after closing a dialog.
Added src folder and initial login.py file
Did problem 13.3 in 330 lab.

Signed-off-by: Spencer Lyon <spencerlyon2@gmail.com>
changed the service_name to service to be more consistent with the API
naming.
project nature 수정
Merge pull request #36 from dimdim2/master

BinaryTree & RedBlackTree 코드 추가
Handle Recurly.js success tokens
Add function to refresh all buffers
added
simplified and added test cases
first working version
intialInitial revision
fixed input name
intialInitial revision
Added cipeciop manager filter
boh
Added null check for User-Agent checking on published pages
Initial commit of the readme
Default button state is now LED_OFF, not false
Create Euler_48
Update GROUP_0/database.py

Comment on major issue
now can use non-mobile site in case ingredients are messed up
Fixes Several Bugs.
The parser is able to handle extra spaces and tabs now
Finished the Layout and routes
add jquery.calendar-widget.js
Merge remote-tracking branch 'origin/design-2012-11-13' into design-2012-11-13
public: try adding tempaltetags to openstates
getting basics setup
reworked database schema to facilitate stock data
adding stocks working, ajax to php communication working.
database handling of portfolio working, deleting stocks working, net gain/loss per share based on current price and inital price working
removed unnecessary files
remove executeRoute method in main pupcake app
Alternate string-matching option (mainly for CJK languages)
localisation
update javascript to use match anywhere option
passed Job validation spec
a comment added
Checkstyle: Line has trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs/trunk@1403157 13f79535-47bb-0310-9956-ffa450edef68
First sentence should end with a period.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs/trunk@1403158 13f79535-47bb-0310-9956-ffa450edef68
Checkstyle: Line has trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs/trunk@1403159 13f79535-47bb-0310-9956-ffa450edef68
Checkstyle: Line has trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs/trunk@1403160 13f79535-47bb-0310-9956-ffa450edef68
Validation for survey states
remove some gitlab install stuff since capistrano will be handling this part
Bug fix: Do not exclude tests with inherited RunWith annotations

sbt does not match an AnnotationFingerprint if the annotation is on
a superclass, so we must not check for those annotations either
when excluding RunWith-based test classes in JUnitFingerprint.

This also means that an inherited @RunWith alone (which would be enough
for JUnit to run a class properly) is not sufficient for getting the
class discovered by sbt.
CodeSigningをMac2台で同じように実機転送できるように。
moved 1993 from 1994.10/inc
moved 1993 stuff from 1994.10 and 1995.11
began merging 1994 directories
Atualizado o diagrama da classe Aluno.
Atualizado o diagrama da classe Curso.
Atualizado o diagrama da classe Disciplinas.
Addition of new API

Addition --

-(void)setSelectedIndex:(NSInteger) index andReloadView:(BOOL)doReload
initializing thread
Modified update_repositories to use a single repository instead of cloning out multiple copies.
Added commit comments describing the actions taken when updating the repository.
Removed making a copy of the ssh key script, just embeds the ssh key in the clone command.
Added pulling of the repository before update to capture external changes.
Removing the now unneeded require 'thread'
Merge branch 'master' of github.com:tdjones/redmine_gitosis
Fixed bug in referencing URLError without package name
Merge branch 'urlerrorfix'
remove make-source.sh
Update: 2012-11-16
Oops, I broke it earlier.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4799 2fea6a4d-a838-0410-917b-93a53c48e9d2
Array Complete
First release
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
don't redirect to sub-projects when in single-tracker mode (fixes #1735)
Added table into admin page
Merge branch 'develop'
#68 pass through userapikey to REST services (for both workbench and embeds)
extracted BioMixer api key
fixing undo action with height and width attrs
started world map gui
ITP-188: Rcade pulls info of connected cameras before initializing
ITP-188: Video chat will detect other machines connected to the same server
Merge branch 'master' of github.com:thevoiceless/wc-testing

Conflicts:
	wahcade/video_chat.py
Merge branch 'master' of github.com:thevoiceless/wc-testing

Conflicts:
	wahcade/video_chat.py
Almost have a working solution
Merge pull request #16 from thomasf/org-color

Set org-agenda-structure to solarized foreground color
Merge branch 'master' into mine
Merge branch 'org-color-2' into mine
Allow to_create defined for all factories

This allows users to define to_create for every factory run through
factory_girl.

    FactoryGirl.define do
      to_create {|instance| instance.persist! }
    end

If you want to override this default, set it per factory or in a trait
(and include the trait).

Closes #341
WIP: first pass
WIP round 2 - remove the invocation ignorer and the rest of the junk surrounding initialize_with and double attr assignment
Move requirement of deprecation
Cooperate with Appraisal gemfiles/ naming conventions
Improve gitignore, added missing libs on .classpath file and create main table structure on page.tag to allow 100% height modules.
Turned off send server offline for mixed with inactive symbol test.
Separated out SymbolSimulators from FIXSimulatorSupport.
Now separate QuoteSimulatorSupport and FIXSimulatorSupport with ProviderSimulatorSupport that connects them together.
Factored MBT specific stuff out of QuoteProviderSupport.
Moved some files around.
Refactored MBTQuotesSimulator so that it has only MBT specific items and common code moved to QuotesSimulatorSupport.
SimulateSymbolRealTime upgraded to new provider simulator design.
Fix for server offline reject test.
Corrected separate test and reduced alarm sounding on reject retry.
Build version 1.3.3.3406.
Merge remote-tracking branch 'jdservice/master'
Test Erik
Merge branch 'HEAD'; commit 'tags/1333356531' into dev
show error if key pressed while user is not in control
Added back FsContent methods of the form 'getXAsString()' where X is an
enum from TskData that were previously removed for changes in support of
AUT-669. Also removed methods FsContent.getMetaFlags() and
FsContent.getModes().
add images to README[-jp].md
Made the application all one page

The application was not working well, had issues when changing pages it would flash white, which was a pain in the neck. Made the whole application work on one page.
See travis-ci/travis-cookbooks#86 and travis-ci/travis-boxes#6
Bump travis-build
Use new username
Merge branch 'travis_user' of github.com:travis-ci/travis-worker into travis_user
Merge branch 'master' into travis_user

Conflicts:
	Gemfile.lock
Make CI env username configurable via an ENV var
Merge branch 'travis_user'
don't swallow the exception during vbox sandboxing
Requirements not neccessary as there is an install script
Merge pull request #5 from trustmaster/master

Late static binding and more
Update README.md
Various changes
Merge branch 'master' of github.com:GHengeveld/cot-factory
Added View layer prototype
not quite working, 'connection reset' directly after successfully saving player first time
011-1
* Layer Issues Plants, Stones around 30,50 going south and west from there
* Collision errors around 64,69
* Layer Issues at the Roof around 94,24
* Tileset Issues at the Roof around 94,24
* Shadow at 54,64
* Shadow at 83,30
--------
013-1
* Warppoint to 055-1
* Collision error at 34,65 and some other places
* Collision + tilesetuse at the magic house
* Layer issues between over and fringe fixed
* Cleaned up all layers, removed tiles which were overwritten by the layer above and moved tiles to the correct layers
* Overlapping to 012-1
--------
017-1
* Collision errors
* Shadow error at 47,24
* removed plant at 42 ,23
* renamed Road layer to Lower, because there is more than just road on it. Lower fits better
* numerous layer issues
* warp to 056-1
--------
018-1
* Overlapping to 055-1
--------
055-1
* Collision errors (Trees, Footbridge)
* Warppoint to 013-1
* Overlapping to 018-1
* Map now fits into the global continent concept
--------
056-1
* some Collisions
* overlapping to 017-1
* overlapping to 055-1
* warp to 017-1
init commit: --> add ePetGrabber.py
change README.md
Copying and pasting StepLocatorStepFactoryBean from spring-batch-admin and adding a-probably-overkill unit test for it.
* Added timedelta for adding date
Selectors for ModelObject were added.
Adding price and image elements
Merge branch 'master' of github.com:uketernity/com_elements

Conflicts:
	components/com_elements/templates/styles/block.php
sorting the playlist based on votes and added datetime
some functions returning no values annotated with void
used revision dart-sdk
Add BracketHighlighter.sublime-settings
Removed dependency to Cohttp.Base64, using Cryptokit instead
fail
Merge branch 'Pierre'
Disables landscape mode for the space filter screen - spot-69
Fixes equipment positioning on second+ draw, a bunch of storyboard changes to make things center properly.  spot-69
renamed machine module
Now using chicken scheme modules for better namespace control
Update samples/MVC3Sample/Views/Home/Index.cshtml

Namespace fix "@using CrackerJack.OAuth" => "@using OAuth2Provider"
Initial commit.

- proximo scraper script to fetch intersection names from sf muni
  transit stops, then order them by street (no dupes) and order
  by longitude/latitude in the direction of the street with a
  relatively accurate heuristic.
- google maps scraper script to fetch geocode and elevation info
  for a set of intersections on a set of streets in sf
- map.html - javascript to draw arrows on a google map of sf based
  on elevation changes
moved scripts into folder, hammered down the data schema
grade of hill calculations, gradiented colors on hills
interface around bad address cache. breaking out functions in main. checking in initial test data
starting to add a bunch of data into sf_test.py. regions instead of just buckets for data.
Reversed border inset and outset.
- few fixes in Player & Recorder
modified album choice and solved issue for registering new user as well as auto login
Added .gitignore file. Call function only in script mode.
added mime setting.
改写一个MapEditor作为地图编辑器完成;
使用SLGTEST范例作为SLG的基础
Implement gesture area support

Merged every commit of the shiftyaxel/gesture-area branch into this one.
keys: split out common key handling code from emulator module

It makes no sense to have the same code in more than one module so we're splitting out the
common input device handling code and just put the specific key handling into module
specific code section.

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
battery: split out common file handling methods into separate source file

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
battery: add a common linux battery module implement (using power_supply kernel interface)

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
keys: add tuna specific implementation

On the tuna device some keys are handled differently (e.g. no KEY_HOME but KEY_POWER) so we
have to adjust this in the keys module.

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
system: use a flat directory structure to have same code for all machines

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
led_controller: initial code for a common led controller module

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
touchpanel: rename emulator implementation to evdev

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
touchpanel: evdev: read screen size from framebuffer when possible

* read screen size when not defined by machine config from framebuffer
* define static screen size for qemuarm and qemux86 machines

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
machine: add support for the tuna machine

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
led
Adding a check for 3D transforms, and adding a 2D backup. General refactoring.
Added last title
Imported Upstream version 2.1.1
Merge tag 'upstream/2.1.1'

Upstream version 2.1.1
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 2.1.1
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 2.1.1
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 2.1.1
use -290 version of 1.9.2 because of DEPRECATION warning on Travis with FactoryGirl: https://github.com/thoughtbot/factory_girl/issues/167
use -290 version of 1.9.2 in Travis config because of DEPRECATION warning with FactoryGirl: https://github.com/thoughtbot/factory_girl/issues/167
trying ruby 1.9.3 on Travis w/o ruby-debug
change back travis config
alternate approach to travis config
another travis config
changed rvmrc to include 'use'
Added name to the user - changes done with Anne
moved some README content to the wiki -- notes on starting the app from scratch
changed user's spec
Merge pull request #17 from nrevko/work_with_anne

Add name attribute to User model
added role model and validations
moved volunteer method to event model & added event model specs for volunteer_rsvp creation and uniqueness by event and user ids

added volunteer_rsvp attribute to event

added unvolunteer method to event model and specs

added volunteering? method to event model and specs

Tests for volunteer method pass.  Removed bang from volunteer method.

Completed changes to event model and controller spec.
Merge pull request #1 from jenmei/further_refactoring

Further refactoring
Versão Beta 1.0.1 Oficial

1ª versão oficial
more reasonable line-height on quote line
Added a collection select widget
Date field added to restaurant object and ability for user to change
date added.
Add  as param to _ctools_automodal_get_form_confirm_page()
Merge pull request #2 from acouch/master

Add $form_state to _ctools_automodal_get_form_confirm_page() to allow great control for callback
Added a travis CI marker.
changes
changes
Improved MVC
Fixed cities which were not removed from the screen
Added cities to canvas and modified game parameters
added jar file
Documented some more classes
Modified tests
Added the baseTracker tests
Tests finished
Added javadoc
added uml diagram and improved code style
added diagrams
Added documentation
Bump version to 4.1.0.
[maven-release-plugin] prepare release 4.1.0
[maven-release-plugin] prepare for next development iteration
added known-bugs test case for #272
Merge pull request #485 from jgilfelt/272testcase

added known-bugs test case for #272
Fix Issue #495.
Intellij is so helpful with this kind of error, just run `Reformat Code` on the incorrect code.
Merge pull request #496 from zhen9ao/patch-zhen9ao

Fix issue #495
Do not allow the ShareActionProvider to take up the whole screen when split.

Closes #303.
Comment out unused method calls.
Rename the `_ActionBarSherlockTrojanHorse` class to avoid confusion.
Protect people from themselves. Refs #504.
IntelliJ IDEA fails at compiling ʞɔolɹǝɥsɹɐquoıʇɔɐ.java. Rename again.
Update changelog for ShareActionProvider fix.
Merge pull request #507 from JakeWharton/testing-buildhive

Testing buildhive
Add Foursquare to apps.
Merge branch 'dev' of github.com:JakeWharton/ActionBarSherlock into dev
Fix myself being an idiot.
Dodanie znacznikow do todo powiazanych z redmine
Add rest of config examples as testcases
Add hwmon feature (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Battery out screen added.
Update dialog messages
bugs found by seahawk fixed
Revert "[Bugfix] removed root without locale from routes"

This reverts commit 589ae632fa31459097bc757026bdcf7a2a9520b4.
Draw the item frame without any rescaling
add npm start command scripts
ignore temporary files.
Merge pull request #2 from yudoufu/add-npm-start

Add npm start
Section 11.6 Figure 11.13 syntax error? meh
Swapped PIL dependency for Pillow
changed README message
Merge branch 'scenario_1'
get messages as json every 2 seconds; changed scope.
added class Convertor
eleven and twelve in progress... considering utilizing numpy
Added a water texture
Merge remote-tracking branch 'none-da/public_alert' into ZE_master
should fix the logout link
新增加策略模式
criando controller e view de teste
Bump to version 0.2.1.dev.
Switch from Jeweler to Bundler.
Bump copyright year.
Adding comments to volunteer.php
add locale translations
Merge branch 'almajeas'
updated DXUIKit v.0.0.3 commit hash
Updated 2012-11-20-another-song-test.md
Cleanup (pep8, pyflakes)
Cleanup (pylint)
Cleanup response.pt (add missing dl-close-tag, reindent)
Cleanup: update translatable strings in templates.
Cleanup: fix bad translation default value.
Update German translations.
Move Plone translations from i18n to locales.
Remove unneded dependency BeautifulSoup.
Cleanup: reindent ZCMLs
Load ZCML of plone.principalsource dependency.
Declare dependencies to zope / plone.
Add ftw.tabbedview to generic setup dependencies.
Update German translation for tabbedview.
Merge pull request #5 from 4teamwork/jone-cleanup

Cleanup
add png functionality for arrow default and hover states
Remove music, add Apollo and track
found another mysql truncation
update bower packages on travis
update collaboration in README
Funcionan ciclos y condiciones al 100%
Añadido un test, pero no sé si es correcto. Hay 2 test que comprueban la misma cosa de forma diferente. Revisar eso.
refactor ant turning code
Merge pull request #1 from AlexGreulich/master

request
Merge branch 'master' of https://github.com/AlexGreulich/zombie-game
Merge pull request #2 from AlexGreulich/master

update
Merge branch 'master' of github.com:JenniferSpry/zombie-game
scans von skizzen hinzugefgt
Merge pull request #1 from JenniferSpry/master

Skizzen hinzugefügt
Swap color theme
NearestBART
cascade for all operations to Workout-Set dep
added news_model
added views, temlates to news_app
wrap it as a python package; make setup.py pep8 compliant
Staging commit
Merge branch 'HEAD' of git@github.com:Anvil0008/Javintelligent.git

Conflicts:
	bin/net/sajasabie/Javintelligent/JIApplication$1.class
	bin/net/sajasabie/Javintelligent/JIApplication.class
	bin/net/sajasabie/Javintelligent/JIObject$ERRORS.class
	bin/net/sajasabie/Javintelligent/JIObject.class
	bin/net/sajasabie/Javintelligent/JIRenderer.class
	bin/net/sajasabie/Javintelligent/JIWorld.class
Update common/navi.shtml

fix bug
ajustes nas entidades geradas a partir do db
taiwan.lua: Add Media section
Few fixes by Darth
Default case added
Convert skybox textures to JPEG

also remove deprecated library from release build
Avoid showing of music info when no music is playing
added GameObject.cs
Added Powerup base class and Fireball powerup
Added ships to the project
cleanup
Added projectiles
Added fireball powerup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ScrollingShooter/ScrollingShooterContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ScrollingShooter/ScrollingShooterContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Created Birdcrap Powerup file
Included proj files

I have included the bird crap powerups files and set powerup to be
birdcrap. Known issues inclued the color keys do not work.
LQR control successfully implemented with function use.
Added WordPress Canberras custom domain
Indent settled correctly and remove superfluous line

Signed-off-by: Buddhima Wijeweera <buddhimawijeweera@yahoo.com>
used single quotes and tabs instead of spaces

Signed-off-by: Buddhima Wijeweera <buddhimawijeweera@yahoo.com>
changed quotes and added tabs

Signed-off-by: Buddhima Wijeweera <buddhimawijeweera@yahoo.com>
Gateway-3100:Added Annotations to DocRetrieve_20 Service
Merge commit 'ba26dfc' into feature-EventLogging
Merge remote-tracking branch 'upstream/feature-EventLogging' into Gateway-3100
Gateway-3104:Add annotations to DocumentRetrieve-30
GATEWAY-3103: web wiring for Retrieve Document 2.0, 3.0 + DR core.
Merge branch 'Gateway-3100' of git://github.com/alameluchidambaram/CONNECT into feature-EventLogging
Gateway-3100:UnitTests for Documentretrieve_20 Service added
Merge branch 'Gateway-3100' of git://github.com/alameluchidambaram/CONNECT into feature-EventLogging
fix typo in app context
Gateway-3100:Unit Tests for DocumentRetrieveCore
Merge pull request #180 from CONNECT-Solution/feature-liteweightGateway

Feature liteweight gateway
Merge pull request #178 from tparnell/feature-EventLogging

Event logging for Document Retrieve
Merge commit 'ddf7e1024c8d1be0661dd180615370c38db540fa' into CONNECT_integration
Merge pull request #181 from tparnell/CONNECT_integration

Connect integration
Synced up liteweightGateway branch with the latest from CONNECT_integration.
Merge pull request #185 from akong/feature-liteweightGateway

Feature liteweight gateway
Add dates and date pickers
Add FlawList feature.
Added form element and php handler
Started deconnexion
added admin to delete workotus
updated assembly info, versioned at 1.0.1.0
Update openstack module
Update Cobbler submodule
Doesn't matter about the design when I'm a programmer :)
update read me with project purpose
Lägga till auth, kommentarer kan skapas, Man kan likea
Merge pull request #1 from ClaesTillborg/hansbranch

Lägga till auth, kommentarer kan skapas, Man kan likea
fixed #1380
WireBox doesn't observe inherited annotations
new app templates
oos
fixed #1340 cf10 compatibilities for validation support
fixed  #1341 base orm service saveAll() was flushing on the last entity only
fixed #1342  baseORMService not flushing correctly when dealing with array of entities on deleteAlL
fixed #1345 active entity not populating correctly from new events
fixed #1344
 Updated all void methods in the controller to concatenate and return itself
fixed #1343
reworked the validation manager constructions to support reloads
more fixes to validation stuff
Order of loading changes
fixed order of declaration
fixed #1347 All pre/post/around/onError/onMissingAction receive rc and prc as arguments now to make things standard
fixed #1347 All pre/post/around/onError/onMissingAction receive rc and prc as arguments now to make things standard
new dictionaries
Added parent() to Binder to allow abstract/parent mappings
Added parent() to Binder to allow abstract/parent mappings
Merge pull request #91 from pnacelli/development

Abstract parent mapping feature in Binder.cfc
fixed #1348 New method parent() to allow for copying of parent/abstract object declarations into any mapping thanks to Phill Nacelli!
fixed #1349
Mail settings bean mismatch default value on getValue() method when using a default value
updated rendering caching techniques to 3.5 standards
Two new methods in the queryHelper plugin (rotateQuery:"Rotates query swapping rows for cols and cols for rows, first col becomes new col names" and slugifyCol:"Create a query column name safe slug from a string"
made O go first and X go second so that it is compatitble with twitter assignment spec
added nose to deps
Little update to Readme
Update tweet_loader2

Added a few comments.
Got rid of a few superfluous functions.
Cassandra Queries Script

Added python script to query Cassandra
Updated tweet_to_cassandra2
Update Readme

To make it all a little more friendly for anyone who surfs in.
Image is empty close overlay
merge
Updated UKPostcodeToLatLon geocoder to throw errors if not 1 result found.

Added 2 new exception classes…
* NoResultsException
* TooManyResultsException

Changed from using toString() to getPostcode() to return postcode.
Changed authentication to devise and added phone number to users
add simple html5 form validation
removed the one character that brought down the entire matrix
Revert "-Optimisation de chargement Client"

This reverts commit 367294ec4290c3d2d9b318e44ae48f0e4db5f3a4.
Spelling error in docs.
Relax the dependencies on template-haskell

This allows lens-families-th to compile under GHC 7.0.4.
Further relaxation may be posssible.
Merge pull request #5 from roconnor/master

documentation and dependecies
Add a release task.
Ensure timed preserves function attributes.
Bumping version number.
Better handling of empty/nil group titles
seach by agency
Removed "!" from style.css
Updates to readme.
Added konami code easter egg. Dog gifs.
Completed metho to get, modify and create an object
Kartenelemente außerhalb BaWüs werden abgeschnitten
Erste Version zur Verschiebung von Pins

Pins können verschoben werden und die Logik wird automatisch aktualisiert.
Merge branch 'master' of https://github.com/DomiBosselmann/Kartenapp
Optimized images.
Optimized Images

Preview commit was for the .gitignore
Updated champion images ("Kha'Zix Patch")

Updated champion images to "Kha'Zix Patch" state (League Of Legends
v1.0.0.148, Sep 25th)
Updated ignore file
Should allow us to use Error() rather than ErrorException()
fixed editShowNameFunction

mostly working
apns-conf: Update Pepephone Internet APN

Switch to gprsmov.pepephone.com as explained by Pepephone.
See http://blog.pepephone.com/index.php/2011/10/27/internet-con-pepephone-explicacion-para-frikis-y-no-tanto/

Change-Id: Ia19ee175ffefc680e3740a34f6442c54212b470d
Merge "apns-conf: Update Pepephone Internet APN" into ics
apns: Cleanup Rogers

* Remove invalid and deprecated entries
* Define LTE provider first
* Sync with provider documentation

Change-Id: I65823691df922f35df713793f073af6f95dc5e91
Clean up Bulgarian APNs and fix MMS not working for M-Tel and VIVACOM

Change-Id: Idf6bf8bfda203b0c76f4df8fde1514f103a07f45
cm: Add D2s

Change-Id: I2ea77fc6b767cfa4380cc3af0ff94c92958996cf
cm: Add D2 maintainers

Change-Id: Ifcb899fca50c94ab954035141306d4088adcbeef
remove mount/unmount capabilities from backuptool

backuptool should not be messing with whether /system is mounted
or not as it screws up the expectations of other scripts run
in the install process. instead the mounting/unmounting
functionality has been moved to ota_from_target_files

Change-Id: I0711afd517638e7d0a0c39369d3a776748245dd2
Merge "Clean up Bulgarian APNs and fix MMS not working for M-Tel and VIVACOM" into ics
cm: Bump to 9.0.0-RC2

Change-Id: I7c55a1292d17b711cb87e88aa6f31a50934d804a
cm: added Samsung Galaxy Tab 2

https://github.com/teamhacksung/android_device_samsung_p3100
https://github.com/teamhacksung/android_device_samsung_p3110
https://github.com/teamhacksung/android_device_samsung_p3113

https://github.com/teamhacksung/android_device_samsung_p5100
https://github.com/teamhacksung/android_device_samsung_p5110
https://github.com/teamhacksung/android_device_samsung_p5113

https://github.com/teamhacksung/android_kernel_samsung_espresso10

Change-Id: I2af9e6c101c63fe31babe4dfd38f3477b1311b19
Official support for Samsung Fascinate SCH-I500

repo: https://github.com/teamhacksung/android_device_samsung_fascinatemtd

Change-Id: I7d5824511bd86bb5f59afce9b5858902fcf4438d
Merge remote-tracking branch 'cyanogenmod/ics' into ics
Doc Extension Change

README from TXT to RDOC
changes from Yakov's edition
updated the README
4242
Fix MEM_TEST option to work correctly with our static variables.  Also clean up formatting of mmgr.cpp
(#327)
Fix memory leak in CppShear
(#327)
Fix potential memory leaks in (currently unused) Laguerre class.
(#327)
Added script to illustrate memory leaks
(#327)
changed dir to point to subdirectory with realgalaxy catalog example
(#327)
fixed supremely stupid mem leaks in PSFCorr.cpp
(#327)
removed pointless test script
(#327)
Merge branch 'master' into #327
fixed placement of deallocations
(#327)
Merge branch 'master' into #327
Enable copying images of different types
(#327)
Add alternate PSFCorr.cpp file (called PSFCorr2.cpp) that uses Image and tmv rather than C memory allocations
(#327)
Fix errors in matrix sizes
(#327)
Make new PSFCorr2.cpp code the one used by GalSim.
(#327)
switched, for now, back to original PSFCorr source code
(#327)
Merge pull request #328 from GalSim-developers/#327

#327
Merge branch 'master' into #297
some edits to S1 after a re-read
(#236)
updates to S2 following draft reading
(#236)
Install galsim/*.py into python installation directory
Merge remote-tracking branch 'origin/master' into model-editor

Conflicts:
	SiGyl.Models/Areas/Configuration/Equipment/Unit.cs
	SiGyl.Models/Areas/Runtime/Equipment/RuntimeZone.cs
bumped versions to 0.9.7-preview.1
test cases for pull request #92:
Parse key=values even with whitespace around the equals sign. Prevent ArrayOutOfBounds exception.
fix test cases for pull request #92:
Parse key=values even with whitespace around the equals sign. Prevent ArrayOutOfBounds exception.

add TestAppender class to check for logged statements
part one of pull request #92:
Parse key=values even with whitespace around the equals sign.
Prevent ArrayOutOfBounds exception.
allow dots in hostnames
(cherry picked from commit c9229cf1757d608eceecebaa677786c5b143efe2)
removed no longer needed elasticsearch_url parameter
extract all Metrics.newXYZ calls to private final fields to avoid looking them up in the registry every time we use them.
minor optimizations around compiling pattern matchers ahead of time
always use ElasticSearch's version of the uuid generation to avoid having to generate a new ID later when writing the message out to the two indices.
We don't care about the actual value of the ID anyway, it just has to be unique.
make release script work on osx lol
set version back to 0.9.7-dev
make outputbuffer processor consumed multithreaded

with @kroepke and because @trishagee said so
make estimated tax nullable on order
GRASP commande à finir
removed google analytics dependency and permissions
TestChange
MatrixC++-Dateien
Matrix
Gauss-Verfahren
Namenfetischismus
MatrixPopup
MatrixPopup meh
nicht integrier
pro.user geloescht
1. versuch loeschfehler
Taborder auskommentiert, Fehler gefixt
Anfang Einbau in Client/Server, Rebase auf QtNetzwerk
.orig ignored
dialog.ui geloescht
Reporting

Reporting works. It's formatted wonky but it's there.
Add `abortUnlessCommitted` method for use in `finally` blocks.
Merge pull request #13 from JakeWharton/closeable

Support closeable editors.
Solve problem initialization PreferenceManager
Move Class refactoring is now association-based

Conflicts:

	src/org/jetbrains/plugins/scala/lang/psi/impl/ScalaFileImpl.scala
Move Class refactoring: proper object names
Move Class refactoring: clean orphan imports
Don't show empty Paste Imports dialog
ScalaFileImpl.setPackageName fixes
MoveScalaClassHandler: select a template basing on the entity kind
Verify dependency path on restoration
Since IDEA 117.912
Fixing that there is no way to reject an invalid move
Commit 2

Added hero and sapphire boot.img.
Can pause the gameplay screen with Enter key

https://groups.google.com/forum/?fromgroups=#!topic/limejs/FYQ0iucqdKo
Attaching and detaching from observable entities done vie constructors and destructors.
Moar tmux

* Add ssh users
* Add scripts to add and remove ssh users
* Add memory and cpu load script
Added soundex method
Added Nysiis method
Merge branch 'master' of github.com:KartikTalwar/LeGenderary
Update css/structure/jquery.mobile.structure.css

Demo of how a new listview-grid might work
Add data array to the error method
Added BaseOperation abstract class
2w2fwef
Psycho-eye
preProc_setup.sh: added new alias0 text file to rename MEG/EEG channel names for subjects acquired with the new MEG system since October12
makeAveFiles.py: included eeg rejection thresholds for ac2 and ac7 alone
Replicated new Cell design into iPad SB. - fixed 'Jammy' cells
Made functions script-local.

The functions ExtractLabels, ExtractInputs, GetLabelCache are now
local to this plugin.
My current DRU tuned for my etch process
实现在程序内部根据屏幕大小调整布局
Fix Make Package Command In Readme
Update AttackDetectComponent
Merge pull request #161 from aeronzhou/master

Update AttackDetectComponent
Update Monster, Prop
Add nullptr's detection
Change material's name to empty string
Merge pull request #162 from aeronzhou/master

Update Monster, Prop
Merge pull request #163 from LiuJack/master

武器粒子特效放到XML
commit
给【偶然理解了树的旋转】增加了两幅图
Ändrade switch till if else
This version cannot link to BinaryFile.obj, I don't know where to find the .lib file.
Hauteur max pour les paroles
- Themenliste
- Timeline
- AgKCG Zip-File
- loads now correctly material files
- materials not shown in the moment -> have to edit graphic properties?
Fixed directory_owner
CSS styles stuff
css styles stuff
Merge pull request #1 from MartiUK/experimental

Experimental
Fixing issue with status line not being replicate to result object in ResponseHeaders#combine(ResponseHeaders)
everything must sync!
Added Content Extension for Animation Set.

Signed-off-by: Minalien <minalien2gmail.com>
we can expand to all bases
adding js version to build script
added ticket 1337355178_new-index-html-md_686
adding image uploading
rm sqp
changed postEditor to use form post
erged
Merge branch 'postview'
changed port to 5001
remove untracked file
Merge branch 'master' into postview
removed temp files
Updated dateInput library path
.xmonad/xmonad.hs: swapped a bunch of spawns for safeSpawn
removed the debuggin abs() in the dot product of the lambert plugin
phong BRDF, and fixed the shade function to call all BRDF evaluators and
add the results together.
We're using 1.9.3 in real life.
Sort so this will pass on 1.8.7. #2131.

1.8.7 does not preserve insertion order in hashes.
Defer acquisition of adapter until used. Closes #2386.
Report on cached contact links, events, participants.  #2734.

The code taht looks like

    sync_key['event', '']

is needed to allow for sync_keys that join their components with a
non-empty string.
Finish up Field::PscSync#load_for_sync.  #2734.
Integrate new PscSync with Superposition.  #2734.
Fix up ncs_navigator_schema revision.
operation data extractor for telephones now has mandatory type parameter; #demote_primary_rank_to_secondary now only demotes rank if the type of existing telephone records is the same as the new telephone record being extracted, if there is one
Added the actual library.
Fixed a few issues with compiling on Linux.
Delete size_chart in Brand
Fixes #2234: update the error message when the report is not sent with content-disposion: file
(cherry picked from commit 58a63311a1e120b17d6bb77f5b3355a311ba61b6)

Signed-off-by: Jonathan Clarke <jonathan.clarke@normation.com>
Refs #2383 remove snapshot options about rudder-project repository in pom.xml
Fixes #2486: add root exception of node addition error when available
Fixes #2487: add a check to not be able to manage UnknownOsType OS Type
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

* branches/rudder/2.3:
  Refs #2383 remove snapshot options about rudder-project repository in pom.xml
  Fixes #2234: update the error message when the report is not sent with content-disposion: file (cherry picked from commit 58a63311a1e120b17d6bb77f5b3355a311ba61b6)
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Fixes #2487: add a check to not be able to manage UnknownOsType OS Type
  Fixes #2486: add root exception of node addition error when available
  Refs #2383 remove snapshot options about rudder-project repository in pom.xml
  Fixes #2234: update the error message when the report is not sent with content-disposion: file (cherry picked from commit 58a63311a1e120b17d6bb77f5b3355a311ba61b6)
add cohttp-0.9.4 update
Merge pull request #251 from mirage/master

cohttp update
Revert "Más arreglos de pets"
Update app/views/cliniques/lipolyse_ultrasons.html.erb
Fonts colors like moocng (orange and ~gray dark), all boxed have shadow
Blasr.cpp:
  .  Added affine gap alignment, use -affineAlign -insertion 20 -deletion 20
  -affineExtend 5 as parameters to do this.
  .  Made use of quality values to score alignments off by default.  Before
   this, alignments often used mismatches instead of indels since these
   are higher in probability assuming the reference is correct.  Now an edit
   matrix is used that has a lower mismatch score, and more SNPs will be
   visible.  A side effect is that there will be a higher false positive
   indel rate in homopolymer regions, since the quality values will give
   more accurate alignments in these regions whereas qv-unaware alignments
   push gaps to the 5' end of a homopolymer stretch.
PulseToFasta.cpp:
  .  Added the ability to print the number of passes in a ccs read to the
   read title.  If you are filtering on passes, this information may be
   easily parsed out.

Sam printing:
  .  Added md5 of reference contigs to sam reference groups.  This DOES NOT
   conform to the SAM spec because the md5 is of the sequence as it appears
   in the fasta file, and case is preserved (spec is upper case).
removed resharper files from git
Checks height
added building/room url hierarchy to views and urls
replace hierarchy with lily version
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
rooms: added queue models, ui tunings
Allow users not to enter a phone number, but only if texting is disabled
Rooms: Added missing files
Made to work with any barcode, and not just a specific string.
Merge branch 'master' of github.com:ProjectGado/Project-Gado

Conflicts:
	src/gado/gado_sys.py
small fix in AccessControlledQuery
New universal header, this one is actually 1 line smaller, but way nicer.
Fix a broken url.
Ajout de message d'erreures dans la fenetre d'identification.
Improve variable finding
gitignore추가
frame_remove and uninstall_page
Forgot to make the webhook route a POST route. Made the url's in the
index for usage dynamic.
use 1.0.0 of nexus_cli
move proxy repository setup to a data bag
add databag support for hosted repositories
read group repositories from a data bag
remove unused attributes files. many updates to readme.
add checksum back and use nexus 2.2-01
use before_extract proc
more templating for nginx conf file
Merge pull request #13 from RiotGames/namespaced_proxy_repos

Use a namespaced data bag for repositories
example glossary image / text for testing
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
some edits + glossary testing
nouvelles musiques
deplacement des avatars