labofsahil/github-event-dataset-2012 huggingface dataset:
windows setup: Fix some layout issues
windows: fix build installer
Remove duplicate file
windows: update README
linux statusicon: simplify icon caching
setup: add TODO
repo git: don't resolve conflicts on the .sparkleshare file. See #807
Merge remote branch 'upstream/master' into gitbin
Fix up some naming
fixed things showing up on foster's own profile when they shouldn't be
qianjun
Merge branch 'master' of github.com:lifang/rrapp_season2
qianjun
qianjun
Merge branch 'master' of github.com:lifang/rrapp_season2
Heading was at the wrong level.
cosmetic tweak
Nelmio Api doc example
Merge pull request #18 from lilleyt/master

Updated asset precompile command
Major rewrite of taxation guide
Finished up tax guide
Updated to include tax changes
Modified QST with new rate and URL accordingly
Merge pull request #19 from jipiboily/master

Modified QST with new rate and URL accordingly
Fixed typo
command line tool guide
Update source/command.textile
Update source/command.textile
Added notes on spree_cmd
Capitalize Bundler
Update source/promotions.textile
Merge pull request #21 from jay2u/master

Fixed 2 small typos in promotions.textile
Fix whitespace issues.
Edits to spree_cmd instructions
Add Spree namespace to code samples
Merge pull request #22 from lucapette/master

Add Spree namespace to code samples in customization logic guide
Make initialization note a little more clear, and put into an info block to stand out.
Updated Preferences guide to include site-wide preferences
quanton: fixed file header rebranding
Arduino program for control over serial
added homepage randomize, and disclaimer
restore code for querying tasks for jqgrid
adding draft saving
remove homepage photos except one
Methods reordered
borrar usuario rame
Merge branch 'master' of github.com:lmettini/what-to-eat
update readme
Agregando Facebook Sign in
Merge pull request #8 from lshimokawa/kandra-test

Agregando Facebook Sign in
Merge pull request #7 from cordoval/feature/updateReadme

update readme
clean specs
fix home button
move login button
add seed.rb data
edit event locations
edit event locations
move logout button
show only current events on home
remove gmaps for the moment
update about
fix button icons
fix buttons and icons
create slots for the agenda
fix create slot
delete
Ignore auto-generated vim history file
.htaccess add to ignore xml folder
added newline to fix compile of kernel
Got DynaJSON working
consider-venting
separate table cell from table view file into its own file
App executable
Fix OMakefile.
Add a PROJECT() where we can set include dirs to
fixed #3 . No longer an issue since we dont use name field in registration form
Updated redis-sentinel commit version
adding a ulimit cookbook
Fix master & cucumber
Re-fix the mustache syntax
initial source commited
Merge branch 'master' of github.com:maeyan-zero/SoundGWT
updated README
add flask startup description
updated build system to handle glibc behavior
fixed completition handler (now return on main thread)
Change drone port
changes to uni, bi, trigrams for pairs of authors
edfeng/qszhuan | #1708: Add view for deleted submission logs
Added deleted and not delete existing facility..
HDI Table added to databses
Re #6151 Add lightweight API v2 reducer code
Re #6159. Missed an include
Change the time to "2 weeks" before extra warning. re #4945
Refs #4954 Elim cppChecks, oxygen checks, start dup code

Reusabel code segments moved to static methods that are more amenable for
reuse
Re #5767. Remove erroneous line.
Re #5767. Suppress warnings out of Qt code.
Prevent crashing when setting wrong scale for the color map plot.

It checks inside AxesDialog.cpp if the start entry for the scale is lower
than the end entry. It does abort the operation if the check fails,
warning the user why through a Warning MessageBox. re #5994
Refs #5757 -- added ingestNexus & ingestReduced scripts
Refs #5757 -- Modified to use new icat4.1 python client
Retrieve a single value from a log entry. Refs #5629

The value is cached for furture lookups.
Refs #5211: helper text for StartLiveData dialog
Refs #5187 handle line plot from a Workspace2D

in SliceViewer, but only for perpendicular lines. Uses Rebin2D
added version output with warranty details
fix blockquote and pre
fix del
add documentation
temp fix mobile look
added mapping status to torrents for current status display
More changes to guardfile.rb, addint two TODOs.
The wrong variable is checked and appended in this example code block.
maintain this in my oh-my-zsh repo
use zsh for scripts
use osx keychain to keep track of github creds

doesn't work on linux, obviously, but anything I'm doing that needs
these credentials, I am almost certainly doing on osx
get display of memory used in to debug window
add ability to change the delay via the UI
User displayname into session

Signed-off-by: Md. Latifur Rahman Maruf <marufbd@gmail.com>
div shit.
Intentando enviar las llaves
Intento 2
ADDING JQUERY VERSION FOR JQUERY
Merge branch 'master' of github.com:mattdiamond/fuckitjs
Added the initial manifest file.
Inserting the .project from Eclipse preference.
tick_interval -> fps

Signed-off-by: Matthias Schmeißer <mjs@grin.com>
switching httparty to excon
let people know that wget is required for rake neo4j:install
fixed namespace issue and arraylist issue
Finish two blog posts
Removed pyc files and re added config-sample.cfg
Merge pull request #1 from Mikie-Ghost/master

Clean up pyc files
History support completed
Don't explicitly set name in HttpError
Added UserSettings singleton
Merge remote-tracking branch 'origin/master'
Info and Settings view controllers
Fixed the tab script so links to the outside will work
Merge branch 'tabs_outside_links' into staging
Adjusted the padding on the toplogos
Shrunk MU's logo
Fixed dependencies & build.
checked in the game window placeholder
Updates for my school computer: lsdyna, view instead of greedyview
Div#top_strip
Added django 1.3.1 to example project requirements.
Reload RVM
Cookbook for installing nginx
atom:link
less restrictive Channel::addChild()
removed deprecated SimpleXmlElement
MIME type for favicons
remove code duplication
fix a problem with queries containing non-ASCII characters
remove strange Unicode representation of `EditorGroup`s
Merge pull request #388 from cspurk/various-improvements

Various improvements
vimperatorrc stuff - all of Ericks juicy suggestions, a bit customized
Merge branch 'master' of github.com:metasoarous/dotfiles
Removed VCR serialization setting to syck
Updated the test so that it writes to the DOM
finished url shortener, better than lachy's
changed redirect on url create and update to index
removed view for url show, since we're redirecting to the url for that action
changed url index view to show the actual url
added flash messages for create, update, destroy
Add diff tool to git/config. Add status line to vim/vimrc.
Latest Mario game updates

- added jumping! no more flying the fuck around! (needs work)
- updated test level a bit
- much better commenting throughout
On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	deleted:    loadPlanner.iml
delete
Include sections and tabs for the UI.
My first commit
pulling update branch
Merge branch 'master' of https://github.com/minifigmaster125/rhr
Updated ChangeLog
Update ChangeLog
add a script to convert graphviz output to scaffolder yaml
Merge branch 'master' of https://github.com/minillinim/ionPairer
Update readme for dot_to_scaffolder_yaml.rb
Merge pull request #1 from wwood/master

Can you update your readme so that people know how to use scaffolder.pl please
Update README.md
minor updates
Update README.md
Update README.md
Update contig_linker.rb
Update scaffolder.pl
Merge pull request #12 from fauziharoon/master

fixed a few stuffs
Updating padrino
Changing production db configuration
Added CallStackGet and CallStackDump
Gave the README file some content.
ban navigation
Merge branch 'master' of https://github.com/misteryyy/project-f2
Fixed a couple bugs with the well-form check
refactor observer class
PS should no work reliably
add auth
layout
robots
carrierwave
stuff
stuff
gitignore
deleted pics
style
stuff
changes
css
stuff
stuff
stuff
stuff
mysql
test
server
stuff
ENH : add tmin = tmax to compute_covariance
DOC : improve example docstring
merge conflict resolved
Harshit & Duck | Hooking up + button in EC list. Also, showing completed todos properly in EC and ANC detail views.
Updated README with travis status image.
dependencies cleanup
deletes again
twitter bootstrap added
suo ignore added
rebased
Merge branch 'twitter'
error style and index routes
Prototyping of Scoobi
Remove splash css
Fixed typos: it's -> its
Merge pull request #179 from joshleitzel/master

Typo fixes
Add ToString override for task category
Added DirectoryPicker.
VERSION 0.0.1: includes Basic Rails Integration
Changed required library from json to yaml
Changed header to link to the home page
Removed dummy posts
Modified header styling and added pygments code highlighting CSS
Added 'Extending Jekyll' blog post
....DDS
s/paxos_yak/yakyak/g
Plume client msgpack wrappers and X509 stubs
introducing task queue
Debugging and fixes commit

Debugging for modules/aliases.py
Fix for modules/optionsPage.py
Remove debugging in modules/rpchandler.py and modules/rss.py
Fixed arguments for AJAX call in options.js
Attempt to fix filters

Issue #30

Also a few CSS changes
Include cached and buffered memory in memory usage calculation

Closes issue #31
Issue 85. Fix IndexMissingException.

The test code in branch-0.5 is icky. But, this should fix the problem with
pyes 0.15.
Issue 84. fix get_indexes/get_doctypes silliness.

This is essentially 7dcc0344 ported from the master branch.
fixed #54, <base> tag 'href' attribute is being sanitized
view per type
Merge branch 'master' of github.com:nisargshah100/feed_engine
Merge pull request #11 from mrgilman/master

CarrierWave
Merge branch 'master' of github.com:nisargshah100/feed_engine
merged
Add self. to methods for limiting timeliness
Merge branch 'li_clean' of https://github.com/N3MIS15/maraschino into N3MIS15-li_clean
More animation and handdrawn objects. 

Steps are part way implemented but need to have a top to the hezagonal prism.
isql variables
figures

Added figures and abstract. Added corresponding author
Cache digests
Changed csv import to fix method problem
Fixed double render problem on CSV import page.
Added Indeces and fixed relationships. Tested relationships between blocks and buildings only.
Fixed a bug in the Ruby EVAL example.
utilities functions
include utils source
Correct some bugs
bug fixing
Removed unuseful source
Added commit REST call

The commit REST call is used to get only the top-level
commit portion of the package repository. Since that is
the case, only the url and ref parameters are required
when querying the API.
more work on the bufferDaemon
clean: node-xapian.h invoke - assignment on the same line and using short var names
Updated appscript for 10.8
Forgot to register the FactoryRegistry
Fixed deploy on embedded container in cargo
debugged banded/log grid updates so it compiles
addding some comments
Updated readme with link to getlavaca.com
Tuned the tracking
replace sql in roles settings controller
Simplify sequence parsing
fix bug when page redirects before passing context to remaped handler
update release notes
test3-1 added
Add work results
Github will generate packages, so no need for package generation script.
Put the workq back on its runqueue even faster.

Implement some C++ wrappers for code.
C++ wrappers are needed for two reasons:
- writing high level code on top of a C interface is cumbersome,
- I want part of the library to use C++ (especially the connection
  negotiation part, which is currently rather messy).

Lots of defines based on compiler, since C++11 is rather new.
Modified main HTML to fetch NYT articles

Added a JS file that loops through sample tags then gets related news
articles for each. Also modified CSS font to use bootstrap font (font
types lets u see more content)
add controller and view for add a item into a view
Fixed even/odd float locations.
remove Readme.MD
Added aliases for running Rails on different ports (3001..3009)
Added awesome styling and random map selects!
Cleared error after redraw; still not populating correctly with concave polygons.
Replaced perl cookbook which does not support 5.14 with latest version which should
Added cpan cookbook from github/hlezhik
Added http port forward
Updated default run list; still failing because of missing cpan_install
Removed perl-old cookbook which does not support 5.14
Working build of srvtest from svn
Added non-working ssh wrapper to srvtest-demo
Initial commit, svn rev 255
Merge branch 'master' of https://github.com/neduard/Javacavemaps
修改版本号
修复信息输出中的两个小bug
updated README and added app code
Added bira_venv theme
Added /shop alias
Recrop images, changed image attributes in README (round 5.)
fix encoding
a physical index.htm file for welcome-file-list to work
Merge pull request #14 from nfrancois/addTest

add test on schedule getSpeaker
fix test
small compatibility fixes
Resolved a bug that would not account for the last chunk being larger than the other chunks, resulting in some files never being created. This now checks the size of the directory rather than #chunks * chunksize.
fixed the referencing in the form to use specified names
better testing of the setup function
Problem with "options.animation === "fade" fixed. The Modal-Background (modalBg) was not removed after opening a number of "queued" modal dialogs. Flag modalQueued must always be reset in closeAnimation() and there is no difference between the different animation-modes in that respect.
add overflow:hidden to .prefix class

I noticed that if width of the browser window was such that the content of the Prefix element was too big for the element, then it was overflowing onto the adjacent element (ie, the input), obscuring the input.  Adding overflow:hidden to the .prefix class should fix that.  It may also be needed for the .postfix class, but I have not yet used that or tried that.
Fix tooltips to have extendable settings
Fix broken test
Update scss/foundation/components/modules/_reveal.scss

.reveal-modal.small is slightly off-center (too far right) due to an incorrect margin-left value.
Add support for use as a navigation element
don't reactivate reveal on a modal that is already open
Other menu properties count from $navBarHeight
Fix
fixed vertical nav styling overrides
Fix tooltips in IE8 that doesn't implement Array#map.

Use $.map instead of Array#map that is not implemented in Internet Explorer 8.
Merge pull request #837 from KL-7/patch-1

Fix tooltips in IE8 that doesn't implement Array#map.
Merge pull request #827 from stenlyk/patch-4

Fix calculation of other elements based on variable $ navBarHeight
Merge pull request #813 from AlvinLing/patch-1

Reveal .small horizontal centering fix
Merge pull request #789 from Enceradeira/master

Fix for not removed modal-background in foundation.reveal({animation: "fade"})
fixes #802 and explicityly states font-family based on variable
Merge branch 'master' of github.com:zurb/foundation
updated files
update
updated, need media
Started Adding Framework for Upload Side
[feature/new-tz-handling] Add a function to get the timestamp of a date

The function uses the given timezone and returns the correct UNIX timestamp of it.

PHPBB3-9558
[feature/new-tz-handling] Add tests for get_timestamp_from_format()

PHPBB3-9558
corrected gitconfig
Status bar now lists roads too if they exist on the hex
removed test png
api changes
Updated readme for api changes
renamed links_checking to add_downloads_to_check
Added tools descriptions
Updated proxy and parsing for new riot changes
zip ファイル用のディレクトリを無視
Changes to bootstrap style
差分ファイルのコミット
Debugging showPunches() x16
Cosmetic changes
Add To and From conversion field Day and UTCTime types
fixed xml comparison
Fix error when where arent any features defined
Fixing missing file in gem release
Temporary output in sidekiq middleware
Merge branch 'modeling-users'

Conflicts:
	Gemfile.lock
Merge branch 'release/0.5.1' into develop
temporary file is reneme and its address move to home, not dropbox.

	modified:   todo_git.sh
remove comment
	modified:   todo_git.sh
Merge branch 'release/0.5.2'
added description to attributes
Merge remote-tracking branch 'Chris/master'
Merge pull request #22 from CMcStone/master

added description to attributes on reservations model
Merged branch
Merge pull request #24 from okadri/master

Wizard navigation partially works
Add hint how to add apps
Link to entire consultation's results page, instead of only the current category.
Implement retry times for harvest objects
Header handling greatly improved!
Rename test files, add new ones
Rename headers in test data
Raise exception when no handler for a forced_tyoe
Rename the variables
Fix tests!
Refactoring

SQL querry added
Refactoring 4 MVC model
Code cleaning
Twitter Bootstrap Framwork added and working fine
editing and updating games
Shorten message, culprit and logger prior to send and:

- Ensure "shorten" really shortens to string_length, and not string_length + 3
- Do not require simplejson when plain json is available
- Various cleanups and pep8-itification.
Merge branch 'master' of github.com:opbeat/opbeat_python
added basic parse management
added reho
Fix MySQL charset error.

If using MySQL, there's a bug with the charset setting which is declared as
a variable whereas it should be a string. This fixes bug #1092856 and adds
a test for this.

Change-Id: I76e19e2dd86f920aa7c9f792da7057d42ed3e9c9
Add webkit recipe files to build webkit using OE-Core.

Change-Id: I69f205a72f1f2f916a7e804dde09b62fcc58fa88
Implement recipe file for npapi-headers in OE-Core based on recipe from nova-main's OE-Classic

Change-Id: I6eb6e8abce655b19c0531f0555ddc22d9039ffc3
Implement recipe file for adapterbase to build using OE-Core, based on adapterbase recipe from nova-main.

Change-Id: Ib800bf590aa800140e6fea826b7fec62a9d9c2ec
Implement recipe for webkit-supplemental in OE-Core, based on nova-main's OE-Classic webkit-supplemental recipe file.

Change-Id: Ifb313a23a8e9f5c1541c2f73694c8fbc912446f5
Renamed webkit-palm.bb to webkit.bb. Previous name existed as it was dependent on qt-palm,
and hence tried to maintain naming consistency, which is not needed. Hence just webkit.bb

Change-Id: I0688fc3b195e98684db2ad4adfb5fcca9159d122
Merge branch 'master' of git://github.com/openwebos/meta-webos
Merge branch 'sravan-recipe-webkit'
update DEPENDS macro value from webkit-palm to webkit, as webkit-palm is renamed to webkit.

Change-Id: I047522d98c18720f1a593a13435d6f94fdb639ca
Updated webkit-palm.bb to webkit.bb to test the build in this branch too.
And since this is going to be latest push, it does'nt hurt to push this file
as part of this branch.

Change-Id: Iddcadab386aa3d2f23ff823996d7cc32b4e51f9a
Updated webkit.bb file for tab spaces.

Open-webOS-DCO-1.0-Signed-off-by: Sravan Sandela sravan.sandela@palm.com

Change-Id: Ia7d5a39a6ab666dad13090730a371f21f8eda359
Merge branch 'sravan-recipe-webkit-supplemental'
Incorporated Iyad's review comments, except for #2, as we are cloning from isis repo and not openwebos repo.

Open-webOS-DCO-1.0-Signed-off-by: Sravan Sandela sravan.sandela@palm.com

Change-Id: Iab5ab427c3514f47a3f94a51acfdd7fb331c6b91
Merge branch 'sravan-recipe-webkit-supplemental'
Update webkit.bb file with review comments from Morphis and start using
ISIS-PROJECTI_GIT_REPO as the source URI.

Open-webOS-DCO-1.0-Signed-off-by: Sravan Sandela sravan.sandela@palm.com

Change-Id: I7ba9d4a88788176d330f07e5e2ca4d1df09d686c
Merge branch 'master' of git://github.com/openwebos/meta-webos
Merge branch 'sravan-recipe-webkit-supplemental'
Clean up other packages from this pull request, as they are not
needed to build webkit. And, update webkit.bb file with downloads
URI.

Change-Id: Ib4d9db88b538e66cea314a6060a09f18be3e82c8
Merge pull request #10 from ssandela/master

Implement recipe for webkit
Add storage/database fixture

Signed-off-by: crynobone <crynobone@gmail.com>
некоторые баги исправил
Последнее что было на моем компе
Сделал переключение меню
battleSystem
Add UsersController & routing DSL.
new file:   res/drawable-hdpi/ic_search.png
	new file:   res/drawable-ldpi/ic_search.png
	new file:   res/drawable-mdpi/ic_search.png
	new file:   res/drawable-xhdpi/ic_search.png
	modified:   res/values/strings.xml
	new file:   res/xml/searchable.xml
	deleted:    res/drawable-hdpi/ic_tab_query.png
	deleted:    res/drawable-ldpi/ic_tab_query.png
	deleted:    res/drawable-mdpi/ic_tab_query.png
	deleted:    res/drawable-xhdpi/ic_tab_query_selected.png
	deleted:    res/xml/search_file.xml
fmbt-editor: update previews on save

Timer-based preview updating abandoned, menu option added for
switching on and off automatic preview update on save.
Merge remote-tracking branch '01/devel'
Handle end_hooks even when loading configuration file failed
make git use vim as default editor
fix it also for edit ranking
Add Dispath#domestic boolean
Fix TravisCI integration
Set `Dispath#domestic` default value to nil
Merge pull request #2 from papercavalier/ships-domestically

Add Dispatch#domestic boolean
Merge pull request #26 from passerbycrk/master

fix some bug
change tabbar UI, add new pics
Merge pull request #6 from ofshellohicy/master

改了下tabbar,  做了点美工
Enforce table creation just on schema-generation; fix
Support Unicode 6.2 (Add Turkish lira sign)
Update changes for 8.6b3
...and the date too.
verify zlib package presence and version
borrando de nuevo el classpath
remember: always test before commiting
chnaged   to  add  jdbc drivers     for  hsql openid
New PicasaFeed, altered comments in snippets, updated README
Initial configuration for the JPAIdentityStoretestSuite.
put bing api call into a timed while loop
fix bugs
Merge branch 'master' of https://pentium100@github.com/pentium100/ExtjsTest.git
Resolved issue of displaying full image in PhotoViewController
Revert "rtc: tps6586x: Fix for proper wakealarm"

This reverts commit f0d7e790d953b0533b5455ad0835fb771d95f754.
Revert "rtc: fix tps6586x startup crash"

This reverts commit 8dd228957374f37c92ab758d4f9d4f88eb8b41bb.
rtc: tps6586x: Fix for proper wakealarm

In the driver probe function, call device_init_wakeup() before
registering rtc device, so that wakealarm sysfs will be created.

BUG=889820

Change-Id: I957fdffb02cd7e43dd96db0794e2e9f8dc7bd3ee
Signed-off-by: Wei Ni <wni@nvidia.com>
Reviewed-on: http://git-master/r/58937
Reviewed-by: Allen Martin <amartin@nvidia.com>
touchscreen: atmel_mxt1386: re-enable MXT_FACTORY_TEST and ENABLE_NOISE_TEST_MODE
Rename Arena script (and resources) for consistency
Remove default value from POL_SetupWindow_browse

That cause more user confusion than anything. Wait for POL_SW_browse
to improve.
XIII: use Wine 1.2.3 on Mac

Problem with xinput2 since 1.3.16 ? (ptinou)
Re-enable immediate flush for console and file logging.

Having the logs trail the application arbitrarily sucks, and with AsyncAppender it's unlikely to affect application performance.
Add @Range constraint for Size and Duration

Provides a convenience for defining a range constraint on `Duration` and
`Size`, using `@MinDuration`, `@MaxDuration`, `@MinSize` and `@MaxSize`
that was introduced in #115:

```java
@DurationRange(min = 10, max = 60, unit = TimeUnit.SECONDS)
private Duration timeout = Duration.seconds(10);

@SizeRange(min = 1024, max = 10240, unit = SizeUnit.KILOBYTES)
private Size chunkSize = Size.megabytes(1);
```

The _unit_ parameter defines the unit for both the _min_ and _max_
parameters; it is not possible to mix quantities of different units
in a range constraint.
Merge pull request #116 from nicktelford/feature/size-duration-range

Add @Range constraint for Size and Duration
fixed typo
Fix JacksonMessageBodyProviderTest.
Don't run the tests in parallel.

Enabling it means dropwizard-core doesn't ever run its tests.
Merge pull request #117 from dstendardi/patch-1

fixed typo
Fix underline.
Added David Stendardi to the contributors list.
Refactor AssetServlet

* Specify assets by URL, as well as by path. This is more general, and allows serving of assets within jar files as well as ones within the resources directory.
* Use real last-modified times for assets whenever possible.
* Make default filename configurable; the default remains "index.htm"
* Add lots of tests
Merge pull request #118 from emerose/serve-assets-by-url

Refactor AssetServlet
Minor style fixes.
Put Sam in the Hall Of Awesomeness.
Merge remote-tracking branch 'upstream/master'
new_api/ZFS: alloc_handle() has been changed to cache attributes in FSAL handles, as VFS does.
add URLs for each library
"Added more javascript code. Try as I might, still having problems."
Adding url line to browser
Adding windows command line configuration
init S4Kmeans
called back the README.md because of too much "git rm ..."
small scroll to fix
изменен почтовый ящик для получения почты с формы обратной связи.
на мой
script hívás layoutba

Signed-off-by: Balázs <balazs@balazs-Inspiron-N7010.(none)>
Starting to make the GUI for the actual program.
fix placeholder reference regarding migration guide
merge fix Global.onStop is not called when netty exists
Support for setting pid-file path using system propertie.
[fixes #342] allow more flexibility when it comes to PID file handling
upgrading closure compiler
fix NettyServer merge
Merge branch '2.0.x' of github.com:playframework/Play20 into 2.0.x
Allow AsyncResults in functional tests.

See lighthouse ticket #454

https://play.lighthouseapp.com/projects/82401-play-20/tickets/454-cannot-use-asyncresults-on-functional-tests
Merge pull request #293 from fernandezpablo85/master

Support for AsyncResults in functional testing
Removing node_modules
Adding tests and code for initialize and mount
refactor. still buggy
Adding mixing tick.
Add sprite scaling & alley

Add sprite scaling in some rooms
Add graphics for starting alley
Fix sunglasses' graphics
FirefoxでRightToClickを使用していると動作不備を起こす不具合に対応しました
Corrects mistakes
Improved building of frontend json
Do not clean the target folder when the manifest file doesn't exist.
Removing the older and unmaintained entity-based of ERRest
Merge pull request #310 from pascalrobert/remove_oldrest

Remove old ERRest implementation
удалил файл в тестинг ветке
Add lint test for short_open_tags
Remove short open tags
build.sh: Fix whitespace
Add missing packages for gcc
completed first pass of C# snips
Bugfix: removing print statements
Update flymake-ruby.el (fixes #2)

Make the regexp a bit more restrictive
Missing files added along with gitcheck.php
added column numbers to tokens
compProj
Merge branch 'master' of github.com:qilin184816/exercise
compProj
With viscosity
Growth form a point
styling added to app.scss
binários win32 com mingw32
binários win32 com mingw32 -mwindows
deleted:    lista2_ppc/bin/l02_01
deleted:    lista2_ppc/bin/l02_02
deleted:    lista2_ppc/bin/l02_03
deleted:    lista2_ppc/bin/l02_04
deleted:    lista2_ppc/bin/l02_05
deleted:    lista2_ppc/bin/l02_06
deleted:    lista2_ppc/bin/l02_07
deleted:    lista2_ppc/bin/l02_08
added Bacon.fromCallback
0.0.3 for .spec.
0.0.4
Merge branch 'release/0.0.4' into develop
Deleted Occupation class. Adding code related to area occupation by units/players to the Board class. Moved Board class down in the file.
Merge branch 'master' of https://github.com/ramiromagalhaes/agot

Conflicts:
	classes.js
	tests.html
Add word analyzer
add some class
Change some lib to the folder
fuck
can now add keyword to database
fix mass problem and change namespace to Mockup
v0.2

- Expanded comments
use Raphael
Improvements to features, mailinglist info and support
gitignore
giving our sidebar some version control
dont version cache / compiled files
added command for sass watching
initial sass codebase
variables for later use ;)
Rspec for setup command WIP
Moved TODO.md contents to Wiffle issues.
Criadas as telas do JE System.
Anexado arquivo de requisitos para o JE System
criação da versâo inicila do JE System
Ajuste do acesso ao Dialog para novo kit
Merge pull request #2 from alyssonbruno/master

Código Inicial do JE System
Add new patch, as 1.0.1 did't work with drush 4.5
Set correct version
Merge branch 'hotfix/7.14-1.0.2-rc5'
Bug fixes and coding style improvements
More Profile Work. See #74 and #76
Added first draft of the ispy interface
document: list items should only have one newline between them (formatting)
mention that crashcatcher has command-line args
Removendo diretorios absolutos da configuração
ajustes no lightbox de estilo musical
Merge branch 'master' of github.com:rhmenegasso/Labandas
Novo lightbox de upload de imagens
Merge branch 'master' of github.com:rhmenegasso/Labandas
more tweaks to thumb_group partial
preserve do still seems cleaner than = <div>.html_safe
Merge pull request #118 from doktorj/master

more tweaks to thumb_group partial
Add support for converting buttons too.
deleted redundant "unless" line
Fixed README.md syntax.
empty purchased/created default messages and username/password logging in validation
chris' stuff
magglass spacing on query block
RPV-37 css changes
Merge branch 'feature/ibd' of https://github.com/robworth/patientview into feature/ibd
Rakefile: sync up better with rb-trepanning. Makefile: add check-short and comment targets.k check-filter.rb: reduce garbage output on tests.
Name files in the queue
Add git-commit mode
Make git-commit mode easier to use
Set column to 72 during git-commit mode
Add ability to discard commit with C-c C-x
mofile: use more meaningful name

mo -> translated_messages
rgettext: update description by comments
corrected tiles-ready buttons, rearranged game look a little.
Bug fixes found while working with code
Moved page templates to new directory
beginnings of a photo gallery
Update controller admin, change config routes

set default route buat admin ke $config['default_controller'];
Don't force a name for compute endpoint

This is optional and there should be a configuration option for it if we're about to force it.
Option to use private ip for deploying

Some environments will only set a private ip.
Use same option name as AWS
Merge pull request #135 from duego/fix-openstack-opts

Don't force a name for openstack compute endpoint
Merge pull request #134 from duego/use_private_adress_fallback

Option to use private ip for deploying with openstack
Add logging configuration settings to the base configuration file.
Add supporting code for `--versions-report`
Switch salt-cloud cli parsing for salt's parsers code.
Cleaning up openstack driver for rackspace
There are no `self.opts` now, it's `self.config`.
File logging should also have a default logging level.
Merge pull request #136 from techhat/issue55

Cleaning up openstack driver for rackspace
Merge pull request #137 from s0undt3ch/features/parsers

Switch salt-cloud cli parsing for salt's parsers code. 
Adding release notes for 0.8.2
Updating AUTHORS file
Merge branch 'develop' of https://github.com/saltstack/salt-cloud into release
Fix issue with map file not loading
Only execute map if it is not a query
Fix log file logging not getting the proper log level.
Merge pull request #140 from s0undt3ch/features/parsers

Fix log file logging not getting the proper log level.
typo fix
Add the atom.xml
Add TODO|FIXME|BUG highlight
sessions
assets
mostly assets
Various AMQP changes for more stability & better operation

- Message persistence comes from the configuration file
- Message publishing being done in a safer fashion
- Only broadcast the most recent update within a transaction
- Ensure failures in callbacks don't prevent record saving
- Allow chaining of sends
Merge pull request #459 from mattdenner/refactor_amqp_controls

Refactor amqp controls
[#29305567] Migrations and initial changes
[#29305567] Studies can have three ethical states

Support for 'null' ethically_approved states for
studies for which ethical approval is not needed.
Contains validation to ensure that the null state
is not used for studies that need ethical approval.
Also, studies that don't need approval will be set
to null, rather than false.
[#29305567] Refine validation on ethical approval
[#29305567] Add HMDMC approval number
[#29305567] Update admin view to include HMDMC no.

Admin view includes HMDMC number, and contains cosmetic
changes to ethical approval section.
[#29305567] Corrections to tests/fetures
[#29305567] Improved valid_ethically_approved? clarity

[#29305567] Improved valid_ethically_approved? clarity
Merge branch '29305567_changes_for_ethical_approval_of_studies' of github.com:JamesGlover/sequencescape into JamesGlover-29305567_changes_for_ethical_approval_of_studies

Conflicts:
	db/schema.rb
idがないときの対応
Added WebDriverDemoShootout test
Use gitlab init script as a template instead of static file
update docs on UMASK in gitolite.rc
Huge update: split class files, more parameters, more templates, etc.

- Split the init.pp manifest up by classes. This make reading and
  updating classes simpler. It's also the recommended style according to
  PuppetLabs.
- Templatized gitlab.yml.
- Unicorn template.
- Omniauth template (with new class parameters for configuration).
- Nginx template.
- Cleaned up pre class to install bare minimum packages.
- Manage /etc/ssh/ssh_known_hosts so that gitlab rake setup succeeds.
- Add the admin user's SSH public key to the gitolite user's
  authorized_keys so that the gitlab setup process will work properly.
- Create tmp directory under gitlab installation dir.
- Enable Gitlab automerge:
  - Required new gem (journey).
  - Required additional rake task on install.
- Chown gitolite/repositories 770.
- Allow selection of gitlab branch/tag instead of 'stable' to allow
  easier testing and requested upgrades instead of unexpected upgrades.
  The old method of always checking out stable meant that as soon as the
  Gitlab folks released a new version your installation would be
  auto-upgraded. The new method allows you to specify the tag and only
  upgrade on request. This also affords the ability to test the upgrade
  process in a controlled manner on a test server (throw away vm) before
  changing the config for your production node.
- Created a .profile for the gitolite user to set the default umask.
Merge remote-tracking branch 'origin/master'

Conflicts:
	manifests/init.pp
Update README.md
Update example to use renamed git_admin_pubkey parameter
Merge pull request #7 from elementalvoid/master

Big update to better match PuppetLabs guidelines for classes, more/updated templates, more parameters, etc.
made it huge to demo
some work on color picker
hausi's content changes
#3 - moved technical network construction from fse-reject
fixes SVG z-index problems with TL
gets rid of console.log
bubble positioning logic done, needs connector arrow
fixes double-title on exhibits browse
fixes more template variable name errors in editor
Changes all routes to use /neatline, scrubs old editor views.
updated bundles

	modified:   bundle/fugitive
	modified:   bundle/ipython
	modified:   bundle/surround
	modified:   bundle/vimux
Modified bundle

	modified:   bundle/vimux
Markdown keys are now buffer-specific AND added blockquote
Explicitly mark *.md files as markdown
Add vim-pad bundle
Updated modules
Added a new markdown syntax for "@word" for easier
Add new command Hexmode and Hex
Changed to 4-space tabbing by default
Add support for vim-pad
Turn off backup
The 'K' key now displays 'man' of word under cursor
Various small changes to vimrc
Turn cursor-line highlighting back on for W3m
Merge branch 'master' of cello:/home/derekt/dev/dotvim
Update to vimux
update to vimux
Trying new M-direction  mode for split selection
Update bundles
	modified:   bundle/commentary
	modified:   bundle/fugitive
	modified:   bundle/pathogen
	modified:   bundle/vimux
Fix vimux commands and update to new format
some code and indentation cleanup
moved to latest django version
first steps to use virtualenv
Removed old sql stuff from eve module
added ones() and zeros() to vector generator
Made "circular settings calculation" automatic
Coupled regeneration to reducedDamage status
commit FireManager::Netfilter
change database yaml to mysql
Update Make My Day/header.php
Apply sage color to #errmsg
fixed xtst support
Line height and font size now in ems.
Title measured in ems.
Center align the name and title in mobile views.
Roughed out a possible approach
added units to rrd graph
prevention of UnicodeDecodeError on comparing
(new:minor) In system_identification class, write a header to the output
data file.
Exercise 3-5-2
correct a tiny wrong in department.rb
Finished 08_higher_order_functions
Added printing default message when no arguments passed in. Added searching for .cindex in directories above.
первичная поддержка тегов
вчерашний выпуск
Merge remote branch 'upstream/master'
Переработал нафиг поддержку тегов. Теперь еще кривее и смешнее
Шаблон шаблонович
Чуть не забыл 
бури на марсе. Завтрашний выпуск уже сегодня
PEP8
couple of vars seems never used and was commented out
добавил парочку
Merge pull request #30 from sitnin/master

Small cleanup
добавил про sgs3
про сири забыл
вррррруммм...
чуть поменял дефолтный шаблон
вррррруммм...врумврумврумммммммм :)
remove comments
fix that damn 'LAST'.
It's still workin I suppose.
Солчнеой => солнечной
Merge pull request #31 from leonardinius/patch-1

Солчнеой => солнечной
fix command line arg --minify
remove mount points: they appear to be hard to compose
Remove LSMASH_CODEC_SPECIFIC_DATA_TYPE_MP4SYS_ES_DESCRIPTOR.

This is a constant for makeshift usage.
Merge pull request #19 from silvioprog/master

Calls the prepare method correctly.
mpi and trace added
Created fncRegionQuery.sqf
- Added a check to see if the worker is busy or not.
Refactor to remove blockLock_ (source of trouble) and remove Tiger-specific deadcode
增加获取target列表功能
Added: Print Catalog (draft) on Bibliographic Menu
Merge branch 'master' of github.com:slims/slims5_meranti
test tool framework
1. added enums for the FrameParameters switch
2. built the bridge for xml data - carryover from original design
3. expanded the Frameable interface
Adding step by step to readme
refactoring idea
some work on options
correct code to close open files
don't ignore digits
version bump
added thank you text to report form.
CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing
page after error message appears

- fixed
CC-3605 : Create 2.1 upgrades
CC-3605 : Create 2.1 upgrades
CC-3605 : Create 2.1 upgrades
CC-4754: Replay gain modifier

- Initial commit
cc-4347: Fixed missing AND clause
Adding the noreplace directive for files marked as configuration files.
This prevents the rpm install/update from overwriting local
modifications to config files.
Merge pull request #206 from specialunderwear/master

Python packages that are pinned to a specific version can not be packaged as .deb
Merge pull request #194 from lum/master

Adding the noreplace option to config files in the rpm spec template. 
- Set json and clamp versions explicitly since I don't control those libs
Simplification of ponysaylinklist.pl as well.
added ruby 1.9 requirement to readme
serialize and deserialize filelist to keep history
Fixes for selinux policy
Modular Admin Panel and Unit Tests
Map Assoc - From Drupal
String Truncate Support
Comments
TODO: Real Implementation
String Format Fixes, Template Extension (Container Template), Begining
the new New CSS/JS Resource subsystem, Starter Common Template helpers.
Resources
format -- I wish every commit didn't show up in my feed
Updated version: IDataTransformer returns object array.
APi doc
Add modified_at to user create
add modify project api endpoint, model method
Change paging
Bump filebrowser-safe version to 0.2.14
Don't run redirects tests for Django 1.5
More commit log filtering for changelog.
Version bump to 1.3.0
Added tag 1.3.0 for changeset 03d94c1c6c11
Update generated changlog, settings doc, etc.
Project Euler Problems 21-25

Problems 21-25 solved
Cleaner implementation of the search view
Removed CLTableViewController subclassing
update .bash_profile

add git completion
Bring in Ville (HTC One S)

Change-Id: I337fb8e3457d12a7fccabef5d6adc39510f3a77e
Merge "Bring in Ville (HTC One S)" into ics
add espressowifi

Change-Id: I99f2ce6db446db3803d686688ff7cccf5ff5e919
espressowifi: add SystemUI config overlay

Change-Id: I7ae734ba399f62b17c5bf8a2608a41a5a4658a56
Merge "espressowifi: add SystemUI config overlay" into ics
update NovaLauncher to 1.1.2

Change-Id: Ie3eba4fa7315f0dcbde2581734a0b02bfd7d4c07
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
tf201 aokp setup

Change-Id: Ia43515f6c5834d50409b6f40ff7e782e2aa42645
fix tf201 path

derp

Change-Id: Ie7f5b0ee0a229132a1752c4c30c59acdccd39936
bump to build 36

Change-Id: I0d233ecc916c0bada9eec0a41ae8b78780242c28
move camera-sound build prop away from versions

Change-Id: Ie065a9cc0c6df322466af9b8d3d76ea3a7f702d2
include SwagPapers with all builds

Change-Id: I532f9a20d22493f46236edb6a75f9df14e47f20a
disable signal bars by default for tablets

To fix their padding. Also enabling stingray's by default

Change-Id: Ic5753fcef64bc56a31acb1f616ae43ba79dc748c
Merge "include SwagPapers with all builds" into ics
update overlays and toggles

Change-Id: I56273dc25cf0be5cd9cd17fcb3e1cb4d3d079428
Revert "disable signal bars by default for tablets"

This reverts commit 5e6dd071bfb9c039ac36014033fb493ed6469a24

Fixed with http://gerrit.sudoservers.com/#/c/750/
Merge "Revert "disable signal bars by default for tablets"" into ics
Merge remote-tracking branch 'upstream/ics' into ics

Conflicts:
	configs/common.mk (resolved)
	products/AndroidProducts.mk (resolved)
	vendorsetup.sh (resolved)
Got carrier wave working and songs fully working
Less verbose node names
Use void pointer for root
Add generic node type
small update to histogram sample
Begin teaching chameleon about install / recovery partitions.

git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2102 b5af796a-00a8-11df-919b-ffff7a100b7d
Give option to load network into different collection

git-svn-id: http://chianti.ucsd.edu/svn@30449 0ecc0d97-ab19-0410-9704-bfe1a75892f5
add: version pins to buildout
products2 acts_as_tree
products tests
purchase products
products
products and specs and refactor
more product specs
merge prod2
delete unneeded
Flyspell on by default in Markdown documents
Completed part 1 of lab 6

Will generate a PWM based on values from serial input
Added by reference option to choice type
Many bug fixes, specially for Internet Explorer.
minor change
Solved 53
getteri ja setterit tageille
adjust position of routes key maping
change snipMate tragger
add json formating hotkey
opt langs
Merge branch 'opt-langs' into new
error login
I was getting error here as the variable was a number, hence no need to check for currency symbols, nor indexOf exists. Was using the nuget package 0.1.0 when testing; so this might be avoided in other part of code.
added support for direct and presence mode tokens
Merge branch 'master' of github.com:tamburio/ruby-tambur
make_dao_tool
Relax upper bound on bytestring
Merge pull request #3 from ghcjs/master

Please relax the upper bound on bytestring
Add FollowerUser Class

1, fix a bug in BIAEProject_Schema.sql
2, change the WeiboAcc to support batch insert
3, fix bugs in WeiboUser class
Just beautification
[spec/requests] Set primary contact under students/contacts_spec
[spec/requests] Delete a note in students/notes_spec
[spec/requests] Image upload under students/images_spec
Clean students_controller
Merge branch 'master' of git://github.com/tapalilov/GAKUEngine
Merge branch 'master' of git://github.com/tapalilov/GAKUEngine
Clean routes
[spec/requests] Add check for flash msg in students/images_spec
Merge branch 'master' of git://github.com/tapalilov/GAKUEngine

Conflicts:
	app/views/students/contacts/_show.html.slim
	config/routes.rb
[guardian address] CRUD and make primary logic
Little fixes
Merge branch 'master' of https://github.com/kalkov/GAKUEngine

Conflicts:
	config/routes.rb
Added default responses future
Reset p->status to 0 when entering s_status state.
Rewritten to_uint32 using shift
Add method: GetUserTokenInformation
Add method: DeleteUserProfile
Change: Test program now also deletes the user profile
Merge pull request #14 from tdctaz/add-delete-user-profile

Add delete user profile
Added readme and jade runtime client files.
the compiled coffee-script
edit gitignore and add .htaccess.
Fix an E_NOTICE (thanks chubbypama!)
Prefix a private member of mert/CderScorer with "m_".
Merge pull request #12 from moses-smt/prefix-private-cderscorer-member

Prefix a private member of mert/CderScorer with "m_".
Add error handling for Mac OS X users who have not installed MegaM.

OS X users (including Windows users) who want to run PRO for tuning
normally need to get the MegaM's source code and compile by hand
since Hal Daume III has released the precompiled binaries only for Linux.
Handling one more case
Space ship can move! Reasonably well, too.
v0.50

     Now requires Pinto-0.052, which stores the index for
     each stack in a static file.  This makes the server much
     simpler and faster.  But beware that repositories created
     with older versions of Pinto are not compatible.  Contact
     thaljef@cpan.org if you need a migration path.
Should be 0,00001% faster now!!!
begin signing functionality
add test for failed signin
second account
Merge branch 'master' of https://github.com/themoriarty/mmonitor
groups
ip6tables : Clean up for the initial forge release
added poco lib 1.4.3pl1
Core/DBC: added cloak mask to armorMod and did some cleanup in ScalingStatValuesEntry
Core/Misc: Random cleanup
Core/Spell: Add some missing cast results which require additional data when sent. And rename two researched castflags (thanks TOMRUS)
Core/Opcodes: Defined a new opcode
Core/DBC: Updated ScalingStatValues format string
Core/Spells: fix shield slam giving nothing to dispel error.
Merge branch 'master' into moje
changed oh my zsh to proper upstream
Novus repo in resolvers no longer necessary
Moved model class Employee out of object Messages because Salat doesn't support nested classes
Merge pull request #1 from rktoomey/master

Salat doesn't support nested classes
Fixed selector issues
update readme + add a toInt method for Color class.
tweak to utility package structures. touches alot of classes.
Format coding style
Add test for 83, 90
Made simple designed for portofolio and pictures
initial pom.xml
eclipse resources added to .gitignore
embedded glassfish dependency
embedded ejb test base + simple bean
java 6 compilation level
basic jpa setup, minor improvements
starting/stopping ejb container before/after class, not test
simple orm.xml, new entity, simple criteria query example
additional mapping details, embeddable address
changed packaging, Company entity
changed packaging of tests
more entities, mappings + some collection queries
example of @CollectionTable usage
example of ElementCollection of Strings
example of @OrderBy usage, logging config, schared cache config
rollback for each test, example of criteria query
Update to lat and lng
Added search on email as well
Seemingly working self-updating board
Fixed board printing. Still have a segfault in makeBoard.
Merge branch 'master' of https://github.com/zlocket1/thread_gol

Conflicts:
	gol
	gol.c

	modified:   gol
	modified:   gol.c
Updating global.asax to only redirect mobiles
Shortened Getting Around and Locations so it would fit on CP page
Merge branch 'refs/heads/v0.2' into main
Squashed commit of the following:

commit 6d6bba77605695df46b7438ff23ea2cb65196d32
Author: Tom Stringer <t.stringer@unimelb.edu.au>
Date:   Tue Jul 3 11:47:50 2012 +1000

    Deleted excess files

commit bba08ebb763ff8ebecaa10217a28f77bdd2249c3
Author: Tom Stringer <t.stringer@unimelb.edu.au>
Date:   Mon Jul 2 16:16:22 2012 +1000

    hangining changes
Working on bundles for MAC
add users database to creation script
move auth to new module, make auth methods async and add ensure-methods
check if connection with same from and to actor is available
bugfixed role drawing
setCustomers in CustomerDAO private
+get customers entfernt
+kommentare
Kommentare in ShowAndChange1 etc.
Update README with new image
Add "external_auth" field to user model to determine if password is required
- Add cancan authorizations for new sections in admin interface
- Update permissions routing path to reflect location in admin namespace
- Clean up User model of legacy methods - TODO: Verify if old password validations can still be used
unify initialize/finalize/state in signal. closes #11
Update iap/launch/iap_usb_cam_2d.launch
update logs for: 2012-05-21
Added MongoDB PHP integration for cli
Fixed Model problems
Remove the debugger line.
Comments out the alarm function description...