labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed meme question: http://memegenerator.net/instance/9856466
added executable flag to cr_git_tag script
Missed a recovery setting to print on create's recap
convert: Print unknown device codes (in hex, 0 padded).
>_<"
Added some aliases
Merge branch 'master' of github.com:NickCody/dotfiles
corrected display of the default list dictionaries
Split component binding into `init` and `update`.

This allows dynamically changing component observables.
Process components after they are inserted by Knockout.

Never forget to process dynamically inserted components!! Argh.
Fixed missing sampname.
Added valid score columns.
Some typos, still not right
atualizar o figura na visualização continua
Better configuration for the ExtJs view helper
updated docs for 2.2.1 release
Changed the footer text color for all texts
Added query debug
-Codechange: SCREEN_0 === SCREEN_1, etc, so name them identical.
A few bug fixes.  Refactored in the pursuit of extracting some common functionality.
more light black
Dealing with non-logged-in users

Doesn’t allow play, voting, or rule creation if not logged in.

Does allow non-moderator users to add rules.
Networking on server side completed (not tested yet).
Created new projct for the Dominion client.
Configured projects.
Created skeleton of Dominion client.
Oodles of changes...
testing adding clap
removed vendored files
added poxy bin, and conf
static chart 1 - todo:  pull data dynamically
Fixed broken widgets and updated logout.
Exposing json functions from jQuery
jsDuck documentation added + generated files (will remove these later and add using build process)
More docs
Accordion, slick grid, button, modal docs
Merge branch 'master' into feature/docs

Conflicts:
	test/static/testpad.html
Merge pull request #33 from PrimeRevenue/feature/docs

Feature/docs
removed transitions in favor of performance
playing with html
Merge pull request #241 from ProCynic/master

Simplified friends model, added friends api.
friend requests ui works
implemented post delete via api
working on adding POST post
Merge branch 'master' into api
created proper routes for users.  created a distinct about page for users
Adding support for pushtape_audio
Merge branch '7.x-1.x' of github.com:Pushtape/pushtape into 7.x-1.x
garden
add a generation counter to the actions queue; cope with the undo of queue opterations effectively by preventing it until such time as i grow a brain
Make markers vanish when their time is up.
Added new loading animation + removed unused icons.
debug alignements
some bugs fixed, but some bug remains
Only one jukebox object is used.
Jukebox toggles function as true toggles.
Jukebox class moved to Utilities from data folder
All collision classes will take in jukebox as an optional paramter
new file:   encryption.c
	deleted:    ../README.md
Fixes xscreensaver non existent --no-splash option

Fixes commit d636f87b02efaec81042388ec8bb8c41eb74bdac (fixed #271 XDG
autostart Xscreensaver must added missing "--no-splash")
XScreenSaver Manual: http://www.jwz.org/xscreensaver/man1.html

Signed-off-by: Luís Pereira <luis.artur.pereira@gmail.com>
Merge pull request #273 from luis-pereira/fix-xscreensaver-nosplash

Fixes xscreensaver non existent --no-splash option
Added README.md for main folder.
Add debug mode config parameter
Add REUSEADDR to fix 'address already in use' problem
Swap socket and game Threads

This helps setup debug mode
Add debug mode
Remove exception handling in parse_msg, should be handled by caller
Shutdown when network error occurs
Implement manual sending of commands for selected hosts

A server administrator can start the server with --debug_names <arg> where arg
is a comma separated list of names of future bots. These bots will be handled
specially, the server will pause before sending any commands to them and give
the user full control over which commands to send.
Merge pull request #14 from Sakartu/debug_mode

Add debug mode (--debug command line argument)
Set daemon as attribute, not from constructor

Yes, I'm looking at you, @Sakartu :P
always set server state on listeners
Merge upstream
test commit
hello
Merge branch 'develop'
Update to 33.1.0
custom FindXZUtils; FindLibLZMA was not working correctly
fixes comiler errors for Clang
replaces old liblzma link directive with XZ Utils directive
fixes compiler and linker errors for Clang, but breaks the program
added different colors for each category
remove picasa and drive from client scope
remove google plus scope
rebuild follower relationship
some changes to about page
don't modify process.execPath in register mode
Fix a little bit of everything
Removed the stillmaintained.com reference. The application is down. It looks like crap the missing image.
src/application/visual_servoing_demo/config/irp6p/ib_eih_wrist_ball.ini
fix
fix
fix
two imus config implementation
reeader fix
fix
Merge branch 'master' of https://github.com/Sapphire1/mrrocpp
Merge branch 'master' of https://github.com/wut-rcprg/mrrocpp
Prawie działąjący nowy serwomechanizm po mojemu.
Merge pull request #3 from SaveTheRbtz/master

Misc and portability fixes
Use autogenerated major/minor eblob versions. Whole version is being read from debian/changelog file
Merge branch 'master' of github.com:reverbrain/eblob
Merge pull request #4 from SaveTheRbtz/master

Life is a journey. Time is a river. The door is ajar.
Added google groups link
Merge branch 'master' of github.com:reverbrain/eblob

Conflicts:
	README
doc: added comments to all eblob subsystems

Comments to functions are kernel-doc compatible. Info about kernel doc
can be found in Documentation/kernel-doc-nano-HOWTO.txt

No functional changes.
Merge branch 'upstream'
Merge branch 'master' into devel
Merge branch 'devel' into data-sort

Conflicts:
	library/blob.c
tests: explicitly include signal.h
readme: use everbrain.com as main source
Backport branch-6-0: Fixed getFeature request with custom output format fails on filter encoding (#4190)
Fixed mapscript is unusable in a web application due to memory leaks (#4262)
[#2566] Wow, lint catches trailing whitespace in comments.
[#2189] Media changes can now be undone and redone.
[t1251] Keep tray outside body contents

1. Fixed up minor CSS annoyances with previous padding attempts
2. Added padding for tray specifically
3. Transitions for tray padding
[t472] playhead -> viewport snapping
[t472] lint fix
[t1251] added cross-browser transition props
[t472] added same functionality for `mediapause`
Merge pull request #327 from secretrobotron/t1251

[t1251] Keep tray outside body contents
[t472] removed whitespace
Merge pull request #331 from secretrobotron/t472

T472
[#434] Initial drag track events together.
[#434] multi drag and drop actually working now... Promise.
[#434] whitespace fixes and hasownproperty check.
[#434] Whitespace fixes.
[#434] caching of variables used in loops.
[#434] removed function param that was not needed, and variable name change.
[#434] removed dead function.
[#434] added newline to eof.
[#434] added some comments.
[#434] Review fixes so far.
[#434] More review fixes, so far.
[34] Fixed a bug regarding revert, and drop not needing to return true/false anymore.
GigaSpaces client
Probando whenever roles
Always skin some ui elements.
Improved SumAucBuyouts, now show bids and buyout.
Add Mass Spell Reflection to Filger.
Formatting
Performance
Finished Automated Performance Fixes
Fixed Player Detection IC
ChangeLog Updates.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Merge branch 'master' of git://github.com/sk89q/craftbook

Conflicts:
	circuits/src/main/java/com/sk89q/craftbook/ic/ICManager.java
	circuits/src/main/java/com/sk89q/craftbook/ic/ICMechanicFactory.java
poprawiona pozycja znacznika current position
Resolved merge conflict
Merge branch 'timber_dev' of github.com:Simversity/timber into timber_dev
remove uneeded stylesheets and add some default styling like font-family and bgcolor
Ignore dynamically created table
Readme
Fix blank bash session
Fix text for second screenshot
Correct discount calculation.
Don't show discount items on the confirmation page.
Merge difference between my state and current HEAD
Merge branch 'master' of github.com:Siyavula/emas.app

Conflicts:
	emas/app/browser/templates/confirm.pt
Add command line arguments and the filters mirror and invert.
Remove calendar.css from dev mode
Added flat interator
PhysicsComponent can be detached.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed inter-plugin ClassNotFoundExceptions
Fixes SPOUT-73
Fixed transform setting

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>
Rename game to engine
virheilmoitukset vaihdettu  ja sql-injektiot pyritty estämään
lancement de tomcat durant les test d'integration
datasource proprement configurée
spring-dbunit ajouté
Support for different tile set texture sizes
add max with for demo page
add support for webkits translate3d
Merge branch 'master' into gh-pages
to decrease the scope of the influence of the mocking mock object instead of class
Added Site(Update)
Added Login
Added login
Merge branch 'master' of github.com:Swadq/olympic-rts
Moved login
Updated Login
Moved logged in
Moved login
Linked login to current page (made white)
Merge branch 'master' of github.com:Swadq/olympic-rts
Changed col of logged in
Added logo to banner (experimenta)
Auto complete for binding parser
removed calendar_helper dir
update jff folder again
Adding dice submodule again.

Signed-off-by: Kevin Kragenbrink <kevin@writh.net>
finished adding all empty directories to git
Updated url -- oops
changeActivity zou normaal moeten werken
The basis of the Pluggable Coptic Chronology implementation.
Merge branch 'radicalstrategy' of https://github.com/ThreeTen/threeten into radicalstrategy
Change MIME type for PNG images to image/png

This is the official MIME type assigned by the IANA (see http://www.iana.org/assignments/media-types/image/png).
trying to add more fields
implemented interface, counter and compare unit for FanOMat
Did 3 entities obj.
Human was done but strangly, i did it again.
I did the zombie/pigzombie the same as human, but with horizontal arms.
Don't know if it's usefull or if you prefer to use human model for all
of them.
Creeper is done.
Added fallback link for ipad users
Added fallback link for ipad users
Minor refactoring
Added new maps
Merge branch 'master' of https://github.com/UlfS/LambdaLifter
Revert "use unordered_map instead of TypeUnorderedMapContainer template collection for in-map object storing v0.5. DANGEROWS! NEED TEST and measurements CPU load and resource leaks! related to #1165, #1083, #852"

This reverts commit b60272b0eb5e9daf5229a801ef54cb8c90f4f3c9.
[mr2175] rework HostileRefManager creating/deleting v0.2. related to #1068 also some corrects to unit deleting from map.
[mr2176] WorldStateMgr: fix most problems after last OPVP changes.
[mr2177] WorldStateMgr implement (cleanups) related to #1129 - some cleanups and fixes to fit current mainstreem - remove temp methods for dig/collect worldstates - make creating worldstates at bg/opvp creating permanent. Some parts of BG/OPvP seems not good functioning, required remove hack on Capture point work (BG EY), WS locking (OPvP GH) and some other things. Still need bugreports.
[mr2178] WorldStateMgr: implement delayed deleting of states.
[mr2179] add Target Limitation for 53457
[mr2180] use damageInfo on next two methods. cleanup and small improve structure.
[mr2181] use DamageInfo in Unit::SpellDamageBonusDone/Unit::SpellDamageBonusTaken
[mr2182] use DamageInfo in Unit::MeleeDamageBonusDone/Unit::MeleeDamageBonusTaken
[mr2183] implement GetTotalAuraScriptedMultiplierForDamageTaken/GetTotalAuraScriptedMultiplierForDamageDone (NU now). also fix damage reduce for 63944 (close #1127).
[mr2184] WorldStateMgr implement - some rework for fit to new OutdoorPvP system (unfinished). more correct work with expire states, add some flags fo future use.
SD2 update
WorldStateMgr: fix forget return value
Merge remote-tracking branch 'remotes/mangosR2.mangos/master'
[TESTING] Fix most GH OPvP problems. need improve script for correct spawn/despawn guards
PayPal Updates, Session Fixes and Security Updates.
Console has all permissions, and is perma-op


Signed-off-by: Ollie <dzineit@live.co.uk>
Merge pull request #27 from DziNeIT/master

Console has all perms and is always op
* Added gridfs file to medium model rather than storing binary content.
Added index mentor styling
Added mentor css3 transitions
Added JODA time.
Added shading for Joda time.
Changed primary key system to stop using autogenerated IDs, switching to unique attributes.
Bundle update
bundle update
Bundle update
Bundle update
Bundle update
modified:   ev.lua
begin to published posts display
made rails_best_practices a bit happier 2
* ADD writeLog Data(request.headers, remote_ip)
* modify setView function at viewHelper
Updated Database/Model/View/Controller. Finally fixed #87
high: --check-datafiles is now complete.
Fixing some aliases, added codeschool vim coloscheme
In the middle of fixing the similar shows show nothing
Merge branch 'master' of https://github.com/ackermanir/tixbay into fix_similar_shows
Similar_shows is more clear and summary shows 3 lines
Changed the color of the title of the shows
Fixed bug of showing extra character on more/less
Merge branch 'fix_similar_shows'
Changed to up to date listings
Fixed default locations to include Palo Alto and San Jose
Fixed price disparity on show page
Work in progress for back_top
Merge branch 'master' of https://github.com/ackermanir/tixbay into scroll_up
Scroll_top works but does not hide
Missing ;
Merge branch 'master' of https://github.com/ackermanir/tixbay
Move css from show.css to category.css
Back_to_top works but test cases not set up correctly yet
cucumber test works for back_to_top feature
Merge branch 'scroll_up'
Integrated keyword search into reccomendation form
Forgot to remove debugging return
Added crap ton of coin and collision detection works for all coins
merged changes
[character crud] update secrets
MONGO USER AVAILABLE IN REQUEST!!!
Remove map test code.
Remove map test code.
Add views/jobs.jade.
Merge remote-tracking branch 'origin/dev-advait' into dev-advait
MONGO USER AVAILABLE IN REQUEST!!!
Documentation Error, see /laravel/html.php line 225 for reference
Wheel fixed to provide the right wedges.
Merge branch 'master' of https://github.com/aebsubis/spinspun
Added blink() in Wheel
Updated to run in release configuration
Added request to TEMPLATE_CONTEXT_PROCESSORS (to template tag current_option)
Added to improve navigation usability (to mark current option menu)
Added current_option usage

Added template tag url from future (Django 1.5 compatibility)
Added new rule to a.current (to improve navigation usability)
Added template tag url from future (Django 1.5 compatibility)
b2 commit
Merge branch 'test-branch'
TestUtils.assertSucceedsEventually defaults to exponentially increasing period
Remove a byte invalid in UTF-8 from a markdown doc

One of the markdown documentation files contains the byte 0xCA which is
an invalid byte in UTF-8, and it was breaking the doc build on my
environment. It seems to be a typo so this commit removes it.
Merge pull request #102 from richardcloudsoft/documentation

Remove a byte invalid in UTF-8 from a markdown doc
Merge pull request #100 from aledsage/Tests-UseExponentiallyIncreasingPeriod

TestUtils.assertSucceedsEventually defaults to exponentially increasing period
Merge branch 'master' of github.com:brooklyncentral/brooklyn
builder syntax for better java construction of fixed-list locations
minor conveniences
Bumping to version 3.1.1
Add internal definitions processing. No unittests.
Se posicionan los diferentes iconos de las iniciativas sobre los indicadores. -lg
ReturnCommand, ReturnValue with tests
things
select in client
Update pre to be 26px
Need the installer controller to be named properly for installs to work correctly.
Search paths. Override module content
Modified the readme  and added a small python file
Small modification to the readme
Merge branch 'branch-2' Oops! Message is now corrected

Conflicts:
	README.md
Eliminate blur unnecessary blur from leaf edges -- save 4 characters. YEEEES!!!!!!

Signed-off-by: alexmwalker <alex@sitepoint.com>
Branch test
test
Merge pull request #1 from alexroe/testbranch

Testbranch
JavaScript Survey 2012, Gitgraph, ES6 Proxies
Avoid restricting with tautologies (optimizer bug somewhere)
Suffixed 'Copy' to names of files that were manually copied over from PhysicsBox2DExtension. This is to avoid naming conflicts when Dalvik tries to package together an APK that references both projects (AndEngine and PhysicsBox2DExtension). Yes, this is highly inefficient, but it works for now and is the only sane workaround I have found for getting around the circular dependency.
remote tan dosya silindi
Additional accessor functions added to MsgArg

The accessor functions added to MsgArg are to facilitate the unity binding that
can not directly call the get/set functions for MsgArgs because the functions
require using varargs and there is no straight forward way to p/Invoke varargs
using Mono we have to have accessor functions for each data type.
Remove attribute selector

Stops styles working for IE6 & not needed anyway no submit is button
default values for fog
new file:   Week3.rar
	modified:   Week3/index.html
	modified:   Week3/static/css/styles.less
	deleted:    Week3/static/img/architecture-1.jpg
	modified:   Week3/static/js/main.js
Update scripts/setup-bootstrap.sh

The final instructions did not sync up to the produce of the script when run as /scripts/setup-bootstrap.sh as it would install the bootstrap files to the folder above the Minty Wiki installation instead.
update the circle action
Added media folder to deploy process
Tests use negative mobility penalty. (#124)
Move Page and OptionsPage to ui.py

Page and options page are going to be used by other modules.  It makes sense to move them to ui.
Move all mode specific pages to {mode-name}.py

Like previous default.py commit, moves all remaining mode specific pages into their own file.  Each mode now has a container with GetFirstPage() and GetLastPage() to help with page navigation.

Options can now be requested from the containing class using the GetOptions() feature.  This will return a string that can be added to the other command line options

This will also update ccgui.py to make use of all these features.
Added more tests
Added rspech helper class
Changed rollback methods and added a rollback cancel command
nuevo estilo para el menu principal (menu, vision), y modificar content (fondo)
Glues mit Semaphoren und ein bisschen Log, FileRequest fixed
updated email info
added style to tag cloud
renamed agendas to sessions
dos2unix -> grunt build
v0.1.3 .js is allowed on deps (following node's semantics) - stripped in build, only if found in bundle, left as is otherwise
Nueva versión Crawler 20120605
Install Nerd tree (file nav) as a submodule
Install taglist (keywords navigation) as a submodule
Install supertab (completion) as a submodule
Install pydoc as a submodule
Add emacs lisp eredis client
Merge pull request #162 from justinhj/master

Added emacs lisp eredis client to clients.json
Added sinatra dependency to bundler Gemfile
Adding the Python Script
further MPI bug hunting, and multiple minor improvements
some corrections on sharding code
Add app function was adding all products
rc.lua .xinitrc .bashrc
fixed bug with runner
add web scripts to check properties of parent independent Markov processes that approximate more general reversible processes
Update the product display page

Update the product display page
update to ActionBarSherlock 4.1
Updated library: roboguice 2.0, roboguice-sherlock 1.5
Added libs files
CSPACE-4911,CSPACE-2841: Corrected displaynames of two new number patterns for Location and Inventory, in Location / Movement / Inventory records.
updated experiment texts
Removed python source
CT23
All Maple sources are stored in a separate branch.
Documentation has moved to the main Celery docs
My mistake
Docs have moved to Celery main
changes on .gitignore
Remove "green" from matches color sequence 
fix clickable_link problem with '
show only page numbers that are in range 
remove alfanous-json.py (it's a duplicated copy of alfanous_json.py)
feeds updating: move feed_to_update to plpgsql
hasher: move to_hash to plpgsql
model_enclosures: set_torrent/3 should use transaction Q()
sql: feed_to_update should always have a last_update
model_feeds: more robust to_update/1
Add buttons to all the other comment fields.
Try the php_self value.
Fix member name alert from Sonar
Fix accessors alert from Sonar
Fix utility methods alert from Sonar
Fix curly braces alert from Sonar
Fix minor alerts from Sonar
Fix overiding in constructor alert from Sonar
Fix exception alert from Sonar
Deletion redesigned plus related changes

[message deletion]

Message deletion implemented base on the new data model where
deletetion is handled as adding a new MessageVersion flagged as
deleted.

Other changes in this commit:
- admin form displays new flag in MessageVersion inline,
- new method Message.change() to add a new version to a message that
  is altered in specified ways (easy to add a new version that is
  changed in only a single field; deletion is a special case to this),
- a bugfix in Message.get_conversation(),
- data member MessageVersion.author modified to allow blank (for
  messages posted by anonymous users),
- code added to correctly handle deleting messages incl. all special
  cases.
added unicode code point to output of parser errors
updated dependencies
add browserify support and build target
switch back to using my custom build of pegjs until 0.7.1 is released
added some macros; see jashkenas/coffee-script#2460

__LINE__, __TIME__, __DATE__, __DATETIMEMS__
TODO: __FILENAME__
macro tests
Merge branch 'whitespace-before-closing-parens' of git://github.com/audreyt/CoffeeScriptRedux

Conflicts:
	lib/coffee-script/parser.js
add IINFE support (do fn = -> ...); fixes #43 and #73
Merge remote-tracking branch 'audreyt/master'

Conflicts:
	Makefile
	lib/coffee-script/command.js
	lib/coffee-script/compiler.js
	lib/coffee-script/module.js
	package.json
	src/command.coffee
	src/compiler.coffee
	src/module.coffee
preparing for s3 images
use s3 not filesystem
virt.kvm_vm: Add prefix/disable_kvm/disable_shutdown support

This patch adds the following new config keys for
the virt tests (kvm variant):

 1) Add prefix to the qemu cmd (ex: valgrind)
 2) Explicitly add -no-kvm to the qemu cmd
 3) Explicitly add -no-shutdown to the qemu cmd

Document the additions on base.cfg.

Signed-off-by: Yunping Zheng <yunzheng@redhat.com>
virt.kvm_vm: Adding bios_path to pass custom bios path

Sometimes people need to use customized bios, eg: for debugging.

Signed-off-by: Xiaoqing Wei <xwei@redhat.com>
create logic for getting axn execute in tab with active class on them
Delete the default file
Initial build system update
Merge branch 'vfw-removal' into vfw-removal

Conflicts:
	apps/avxframeserver/frameserverlib/src/avxSynthAppInterface.cpp
Merge ../avxsynth-staging into vfw-removal
FINALLY :)
1
Merge branch 'master' of https://github.com/b3log/b3log-latke.git

Conflicts:
	latke/src/test/java/org/b3log/latke/servlet/RequestProcessorsTest.java
	latke/src/test/java/org/b3log/latke/testhelper/MockService.java
.
抛出的内置异常改为  Jsonrender
nused import
Fixed the role switch log in button not being disabled but the main log in one is still broken
Included Javascript libraries to get the login button to be disabled
Merge pull request #708 from tobioboye/issue_641_ajax_complete

Issue 641 ajax complete
got rid of observe ajax:complete which was redundant..kept observe(ajax:success)
Merge branch 'master' into edit_groups
* Fixed bug where metadata list could be populated twice if callback was
  triggered twice
Merge branch 'master' of https://github.com/bananaboy/monbulk
Site updated at 2012-08-07 17:55:46 UTC
Swapped snipmate for ultisnips.
Fix mis-reporting of fl=ID + sort field on PBC.
Merge pull request #128 from basho/sdc-fix-flsort-error

Fix mis-reporting of fl=ID + sort field on PBC.
Alteração Layout

Diminuição para 740px, correção de bugs JS e início de criação do
repeater de imoveis
genereted model and migration
fixed associations
added validation and first tests for group
changed association to has_and_belongs_to_many + genereted docs
added sport and league model
added tests for sport model
updated GroupsUsers table
updated realations in models
added places model
added roles model
added roles and league models
added validation
Merge remote-tracking branch 'remotes/origin/i001-z003' into i001
reformatted the code a bit
Merge remote branch 'origin/master'
Clarify which parts of JCR we're interested in
improvements on continuegame.
remove the testUser after testing.
Fixed start of line to offset correctly based on box border width.
Making lowercase
update for Minecraft 1.4.6
Solucionado el error del costo.
Notes on research
added untested light sources
switched all uses of old get_direction to new keymap method
fix the dynamic lighting
renamed functions to match standard
moved to seperate lightmap generation to allow use by critters too, also faster
new style lightmaps now working
moved lightmap for player to game object rather than map, maybe should be part of player
let monsters see player if they are lit up by something
fixed the light of sight issues, smoke blockes light rays
can read next to fires now
support look around via u_sees function, remove debugging from draw system
fix seeing fire light while blind or in a pit, added hightlight for bright lights while short sighted
modified sparks to give light based on density
new light ray model, still broken
more debugging, fix defines
more sensible light ray generation, added natural light overlay
fix mistake made in merge
updated the endless todo's of things I need to tweak
reverting some light value tweaks, fix lighting model from weather
I really have no idea what I'm doing
More underscore-y-ness
Corrected gem version

Wasn't thinking and screwed up the version bump.
Preparing inventory/tools/etc for use
Removing tool use command and merging with player move to ensure proper
prediction and viewport replication
Actions targeting tools
Adding root entity, trying to get tool use working
BlockTool clicking on client and server
Set custom notification LED color and timing

- Change the notification LED light color to red, and the timing to
  300ms on, 3000ms off.
Removed duplicate background, moved to mdpi

- Removed duplicate file background.png.
- Moved the only copy to drawable-mdpi, as recommended by lint.
Use default values from constants in settings.xml

- Added new constants.xml resource file, with default values for
  pomodoro and break duration.
- Set the default value of these settings in settings.xml using these
  constants.
Set default values for notification settings

- Added three string constants for the default values of notification
  settings.
- Uses these constants to set the default values in settings.xml.
Load default values when creating main activity
Check valid numbers in pomodoro settings

- Added SettingsActivity.CheckNumberOnPreferenceChangeListener, which
  checks that the new preference value is a valid number and returns
  false otherwise.
- Set this listener for the two pomodoro number settings.
Use XML-defined constants in PreferencesHelper

- Remove hard-coded default values for settings in PreferencesHelpers.
- Use constants from constants.xml, parsing strings for boolean
  preferences.
Catch errors when parsing string pref into int

- Catch NumberFormatException in PreferencesHelper.getIntFromString,
  returning the default value in case of error.
- This should not happen naturally anymore as SettingsActivity makes a
  check before setting an invalid number, but just in case.
statusTextView now a field initialized only once

- Instead of having multiple findViewById(R.id.statusTextView), added a
  field to CherryBerryActivity and initialize it to this view in the
  onCreate method.
Added timerTextView field, initialized only once

- Added a new timerTextView field to CherryBerryActivity, initialized in
  the onCreate method.
Show pomodoro duration preference by default

- When creating CherryBerryActivity, load and set the timer text to the
  current pomodoro duration preference value.
When returning from settings, update timer view

- Start SettingsActivity using startActivityForResult.
- On returning, update the timerTextView to the new pomodoro duration
  preference, if currently idle.
Use constant TAG in CherryBerryActivity for logs
Version code = 4, version name = 1.2.1
#8 Descuento en documento de compras
Change neame
Merge branch 'master' of github.com:bettsmatt/CowsEye
Fixed up the RecordLocationActivity. The user cannot progress untill either the gps position is recorded or the address is entered. Upon pressing the next button the coordinates and address are saved to the submissionEventBuilder.
Adding via param
Some fixes per jsLint.
Better support the case where all samples are filtered
remove unused variables from Raycaster.
add Plane.flip() plus unit test.
add Frustum.containsPoint, containsSphere + first Frustum unit tests.
css
Merge branch 'master' of https://github.com/bieoe/Smithsonian
Update 'bundles/vim-colors' into 'develop branch'
Symlink bundles in bundle directory
explicitly added "report location" label
working ammonia radiolysis model
Updated gh-pages with various bug fixes
lib/lingo/language/word_form.rb (eql?): Stricter equality criteria; defer to #<=>.
lib/lingo/attendee/decomposer.rb (process): Only replace object if identified as compound.
Converted porter/stem.rb into proper attendee.
Updated config files.
v1.8.2
Adds README for stuff to install from brew, and some other stuff
Delete unused tmp file.
Fixing issue with oracle and dbutility and add configurable oracle tablespace setting.
Fixing issue with oracle and dbutility and add configurable oracle tablespace setting.
Fixing issue with persisting sourceID
Merge branch 'develop'
Fixing issue with locked icon at zoom top
[admin] more filters by user
less geoms per zoom
small fixes
change the way we detect if it's prod or dev:
Fixed two pvp reward bugs, moved command code to own package
Add Flask-Testing to requirements.
hopefully satisfied software dependencies such that our cron tasks work again
fixed bg name
Reconnections.
binary accepts same longoptions as PHPUnit
addLog
listeners
oh boy. make a new GenericDatabases (parent interface of IDatabases) and make that the arg to lots of methods. also, some generics black magic to get things to work out right.
make ModelWithId's model generic require extension with ModelWithId
primeiro commit da versão inicial do novo blog
Implementado custo dos pairings.
Initial
Merge branch 'master' of github.com:budnyjj/first_app
monkey glitchのワンライナー追加
change tools to a drop down. fixed modals abit
add the ability to send codebase to sendchange

Refs #2358.
expand buildbot_json.py to include the full Chromium license
profile to generate sources & javadocs
Replace Consumer default encoder with preferred and fallback decoder.
Version bump to v1.3.6
Closer, calculates a sum of the content, althoughts its not perfect.
Modified my config a it and changed? the solarized theme...
Put the progressbar in its own file
add my totvs utils, lsopenports
fix euiscript.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
Adicionando searchview no topo da lsitagem de pontos
mergin
changed Vdot
I don't want to track changes to Vdot
added Seebeck voltage Vs in leg.py
Merge branch 'master' of github.com:calbaker/TE_Model
Merge branch 'master' into develop
Merge branch 'master' into develop
CRUD básicos
Terminados los CRUD básicos
Paginación agregada
Agregados datos iniciales para llenar la base de datos
Merge branch 'develop'
inspire will not cause unpublishing
Ajout d'un nouvel ordres
Ajout de commentaire et de documentation.
Ajout de commentaires
Re-enable merge tool mvimdiff.
fix: don't check 'pyc'
Verder uitgewerkt met Service en Factory
Buttons aangepast - gedelete
Opbouw pagina basis uitgewerkt
Separating out some logic.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Fix some broken tests
Merge branch 'master' of github.com:carterpage/nevado
api: fix const addition compilation issues
api: use cross compiler typeof extension
index.rst indicates better what is under development
Update JSAV to 0.5.0-57. Add animation to Mergesort slideshow.
Fixed a bug where users were prompted to login more than once if their initial login failed
Fixed an error in the data-name.
Tune .jshintrc configuration file (and adjust Birthday.js to
match unknown globals)
4456456546
Added the columns parameter to the showcase APIs.

All of the APIs that are associated with the showcase now adhere to the column parameter. All of our APIs, campaigns and observers, already did.

The exception is Microsoft's HealthVault. We are using a library that uses annotations, however, we are having a problem using the columns list with Jackson. See: http://stackoverflow.com/questions/12865569/filtering-fields-and-sub-fields-in-jackson

Closes #437
Gem specification updated
Merge branch 'master' of github.com:cernops/landb-gem
update release builder to account for preview releases
Formatted the source files.
Formatted the source files.
zencoding 추가 tool 소개에
Rename
Fix locatin is null bug
Give variables the alignment that GCC says they should have rather than trying
to second guess GCC: remove some strange DECL_USER_ALIGN logic inherited from
llvm-gcc that I never understood the point of.


git-svn-id: https://llvm.org/svn/llvm-project/dragonegg/trunk@164936 91177308-0d34-0410-b5e6-96231b3b80d8
highlight ruby in benchmarks properly
Fixing matchparen and tmux on AIX
Doc fix for spacing
Implemented SMART style app manifests, and an app_loader to pull them in from the filesystem (like data-models/schemas)
Added tests for the app-manifest feature
Added docs for the manifest feature
sync update
Merge remote-tracking branch 'origin/master'
Changed method of spawning new Controllers
Edited readme to reflect new controller definition method
some minor refactorings, added documentation generation
Added error_wrongpassword_customtext config setting
bump ruby
add stuff to seeds
Expander Para ver cambios.

Actualizé todos mis diagramas, Casos de uso expandidos, contratos y el
diagrama de clases.
Porfavor integrar al documento de IC1
Move pyparsing import to specific methods to avoid dependency
Supporting birthday for contacts
Lint my dear lint
Add camera permission to system app
lock screen overlay should be hidden when transition ends
Remove one transitionend listener
Fix
Birthday now is localized to ES and EN
Supporting birthday for contacts
Lint my dear lint
Birthday now is localized to ES and EN
Fixing font size
Merging... locales
Transition the CSS visibility property instead of flipping hidden attribute
Same for Lock Screen camera panel
Don't wait for 0.3s when lock screen is being applied
home button and first page is landing page
bug 780340 is landed
Using new or old DeviceStorage API
Merge pull request #3107 from jmcanterafonseca/feature_contact_birthday

Feature contact birthday
Merge pull request #3142 from timdream/camera-permission

Add Camera permission to System app, and hide the overlay so ppl can interact with the camera
Merge pull request #70 from chromakode/wiki

Wiki JS cleanup
More cleanup
Allow img in markdown filter
Fixed images removing most of a rendered page
More cleanup
Merge down
Further cleanup
Added ynbutton callback to happen after the jquery request on success
Further cleanup
Restructure permission checks to be more generic
Corrected the very broken image extraction
Rearrange page not found
Whops
Rebase down
Wiki actions style tweaks.
Fixed Regular Expression matching for subscriptions, fixed order of events, tested hide and print on mgmtClient
fixed view button to redirect to groupon in new tab
Encryption Package is included

Signed-off-by: Yong Bao <baoyong162@163.com>
Add Sprout.hpp
Convert entities to pure integers
added env vars to zshrc
Add location and concert bundle
Update radio/Fidelio.html
piece attack update
Initial add of source from thing:28241. Preparing to modify for pressure sensing.
Reworked wingspan numbers.
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Fix route order to enable manual allocation.
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Merge pull request #1157 from galthaus/pull-req-release-rails3anddb-master-f69f358ed2

Fix routes for allocation [2/5]
Merge pull request #1158 from galthaus/pull-req-release-rails3anddb-cloudera-os-build-51756078ed

Fix routes for allocation [3/5]
db:migrate working.  requires layout=2
Merge remote-tracking branch 'origin/release/rails3anddb/cloudera-os-build' into release/rails3anddb/cloudera-os-build
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Update notes for submitted changes

* Uploaded aws stemcell
independent micro bosh stemcell versions

Change-Id: Iec42549266105ae0e5911f14c4eb2646662d329e
Merge "independent micro bosh stemcell versions"
domain might be nil

domain is an ohai attributed gotten from, i think, /etc/hosts
It is possible that this is nil. Don't error when it is.
Adjusted for Redhat/CentOS.
added font commands
Small docs cleanup
setuptools to simplicity
issue #1056: Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
#issue #1056: Updated SpriteTest.
Merge pull request #807 from dumganhar/gles20

issue #1056: Updated SpriteTest.
fix the reorder warning of class CCCallFunc

../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning:   'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning:   when initialized here [-Wreorder]
Merge pull request #1749 from guanqun/fix-reorder

fix the reorder warning of class CCCallFunc
Added: empty clip_url support refs #1242
moved navbar items around a bit
upload changes to config.yml
Make password secure
mere dokk
tokyo:put
Updated the lock file
Merge pull request #716 from stof/update_lock

Updated the lock file
Add --no-update flag to require
Allow dot in URL scheme

This makes it possible to support SSH2 urls, like ssh2.scp://
See: http://www.php.net/manual/en/wrappers.ssh2.php
Add repository stream context options

Add support for passing stream context options to the
StreamContextFactory. This allows support for SSH keyfiles, SSL
certificates and much more. Example:

{
    "repositories": [
        {
            "type": "composer",
            "url": "ssh2.sftp://host:22/path/to/packages.json",
            "options": {
                "ssh2": {
                    "username": "composer",
                    "pubkey_file": "/path/to/composer.key.pub",
                    "privkey_file": "/path/to/composer.key"
                }
            }
        }
    ]
}
Unittest for stream options
Improved argument order
Use array_replace_recursive() instead of array_merge_recursive()
Add stream context options documetation
Merge pull request #1177 from sandermarechal/stream-context

Allow setting stream context options
remove autofocus
remove not needed code
Add new_exception to auth, allows admins to view plugin index.

The new_exception allows you to view an index even if there is no objects ([].empty?) when you're allowed to create a new object.
Screen housekeeping.
Removed old manage partial and temporarily moved commented out code to non-JS form ERB
Removed fields and positions controllers - this will be done in templates - closes #190
Merge branch 'master' of https://github.com/concerto/concerto
Added my own ropevim fork to dependency libs so as to make autocomplete work.
some more docblocking
align naming between uris and views as much as possible
Rename totemcrypto

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Parse and use hash and crypto from config file

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
quorumtool: change default command from -h to -s

default run will show status instead of help text

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
quorumtool: add (local) next to the nodename when displaying node data

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
quorumtool: add local nodeid to global quorum info section

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
fixed typos in example message sequence charts
Added axomi's mongodb backend to the readme
MB-100 Delete compaction file if index compactor dies

So disk space is freed and useful for other operations until
the same index is compacted again.

Change-Id: Icc4b33caf7204970c7c27555f6b43e9f3ee39aa7
Reviewed-on: http://review.couchbase.org/20257
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Include support for intra/iter-group attraction/repulsive forces in sfdp_layout()
Fixed unchanged method name typo
Merge remote-tracking branch 'crafterm/master'

Conflicts:
	spec/sprinkle/installers/pear_spec.rb
Adds 'npm' installer
Updates the npm verifier to be a little more strict when searching for module names.
Removed extra whitespace which caused a Travis-CI broken build.
Merge pull request #75 from Punchkick-Interactive/master

Added support for a "npm" installer for use with nodejs servers
Added email invite and chart
[openvpn] redicung sleep time in the connect methods. Adding a method that reexecutes openvpn command in case the process wasn't started.
initial commit
fixed readme and gitignore files
added gvimrc and vimrc
tpope vim-pathogen installed - vim plugin package manager, sort of
Added molokai colorscheme
Added NERDTree + ^g as a mapping to open it
README update
Add vim-fugitive
updates README.md
update README.md
updates README.md
Adds tabular plugin & updates the README.md
Added mapping for Tabularize
improves alignement and titles
Adds NerdCommenter plugin
fixes typo
Adds a lipstick to the README.md
udpates README.md
updates README.md
adds basic search config parameters
implemented saving document history

- stored in namespaced sessionStorage parameter for now
- onSave callback can be provded in options to add additional save
  handling
Assign Logic change for check space and bondspace
Add OmniOS 151002
Merge pull request #13 from jtimberman/add_omnios_151002

Add OmniOS 151002
seconda iterazione parser
Fixed weird capybara errors
production compile on
removing old index.html and adding in paths to config with match
custom card button working
Incorrect sha1
Danish and Catalan language files, custom RSS function.
Added package.json and moved source code to src/
Refactored downloader and added unit tests to it
remove_statistics to remove_all_statistics
[Issue #81, #83] Use SendGrid as SMTP provider
[Issue #83] Modify show view for Parkings to display owner information
My initial thoughts and structure code for the elapids game editor
allow full widget customization
rename db steps command to db break steps
Update bootstrap to 2.0.2
Fix the "latest" page
Updates to add a bit more dynamic navigation to the app
rework controllers, routes for tags/pools that will come
Rework tag handling
Add new view-tag page
Дамп перед отправкой упаковывается в base64
Merge branch 'master' of github.com:dancingbytes/s41c
Fix for galleries ordering
Only update section numbers if they exist
integration
ddbp landed
New skeleton app not using require.js
change anime styles
wot
wot
renamed ihppObjectWithKey in ObjectWithKey
wot
tweaks to attempt to support bash and zsh at the same time
Added chart on SMRT delay tweets on About page
Initial 3 column CSS design
removed the backlogs plugin
fix bugs in registration confirmation

DBUtil.updateModelObject was using SQL that attempted to update
the model object's unique id, which is wrong.

Also, DBUtil.completeRegistration was returning normally in the
case of an SQLException, which is wrong because then the
transaction is committed.
First version with websocket support.
Initial working websockets support.

There is an example at examples/websocket with a simple echo server.

Support is incomplete, as there is ping/pong, all data is supposed to be UTF8, and there is no POLL support.
Fixed some compilation problems.
Added websocket.c/websocket.h with basic websocket support. Also a simple echo example.
Added support for changing websocket opcodes, defaults to OWS_TEXT. Also added support for client ping, but dont know how to test on real browsers.
onion_server has a backpointer to onion, needed to access the poller when available.
Merge branch 'websockets' into multiport. Websocket does not work, all the rest OK.

Conflicts:
	examples/CMakeLists.txt
	src/onion/CMakeLists.txt
	src/onion/onion.c
	src/onion/request.c
	src/onion/server.c
	src/onion/server.h
	src/onion/types.h
	src/onion/types_internal.h
documentation of tested default names, and test page against http://motes.tipjar.com/cgi-bin/motion/plain
smoothness comment
Merge pull request #479 from daylerees/docs-template

Offline Docs Template
working on offline docs.
style fixes.
adding doc routes.
fixing markdown
use url::to
fix routing.
fix handling of hash Urls.
fixed menu, added base styles, trying new header
Added RachelWeisz image
added Swipe navigation to webView
SSLR-206 Remove unused com.sonar.sslr.api.Rule#plug(Object)
Change the toolkit's package to org.sonar.*
* change udp and tcp options to be multiple
* implements use of udp/tcp options
* fix application to work with a war archive in argument
* add sample files to have a working simple app with sipatra
Merge branch 'barebone' of github.com:dbroeglin/kipatra into barebone
Zepto support added
Scroll left/top fail fixed
Removed .project
Merge pull request #28 from zvona/master

Zepto.js support
Update currentReferIdx and closedReferIdx out of doOpen/doClose, so it's thread independent and to avoid to be called more than once at any condition.
Added estds. Started design for iPad.
Adding extra sample file
fix merging when element is number or string
Changes to menu system

Signed-off-by: Derek Lawrie <derek.lawrie@gmail.com>
general update
frontpage designed, infinitescroll added, masonry configured
Feature update
Add "g pom" alias for "git pull origin master" which I do a lot
Fix some typos in README.
add kloaderp.bin rule, modify clean rule
modify clean rule
Tentativa de correccao
Add Scala support to VIM.
Page fully fixed
include const.php
Supporport for traversing actual data and heroku redis stuff
Merge branch 'master' of github.com:dfield/07.21.2012
Fix in prod
More linux compat changes.
adjusting the page titles
ACAD-175 altered dependency on 3akai-ux to match oipp-develop artifact; removed unwanted components from deployment
ACAD-177 assembling release
ACAD-175 changed deployment artifact name for oipp
Merge branch 'develop' into oipp-develop

Conflicts:
	app/src/main/bundles/list.xml
Merge branch 'master' into oipp-master
Merge branch 'develop' into oipp-develop
NOJIRA cut tag oipp-acad-1.0.2-M5-20111216
Merge branch 'release/oipp-acad-1.0.2-M5-20111216' into oipp-master

Conflicts:
	app/pom.xml
ACAD-489 commented acceptterms widget out of the deployment list
NOJIRA staged oipp-acad-1.0.2-M5.1-20111222 release
NOJIRA merged release/oipp-acad-1.0.2-M5.1-20111222 for staging of release
Merge branch 'release/oipp-acad-1.0.2-M5.1-20111222' into oipp-master

Conflicts:
	CHANGELOG.md
	app/pom.xml
NOJIRA revised version # of deployed artifact in order to mark it as an OIPP release
ACAD-545 corrected lists.xml and rev'd the binary to reflect this change
NOJIRA amended changelog
NOJIRA rev'd binary version number to a SNAPSHOT version
NOJIRA changed revision number and updated CHANGELOG for oipp-acad-1.0.2-M5.2-20120117 tag
NOJIRA corrected errorneous revision to pom
NOJIRA upgraded revision of uxloader dependecy, and rev'd version of app project artifact to reflect change for tag oipp-acad-M5.3-20120123
ACAD-1231 added repairmigration project; for not is just detect migration errors and logs them - must be manually deployed
Made changes to support mvim -v and tmux