labofsahil/github-event-dataset-2012 huggingface dataset:
changed vim to Tomorrow theme
wrote down the questions for each one
Fix resolves
optional limit parameter
reverse getFile parameter order to stay with update fork
This and that to get a running functional vm booting from an iso
working.
css 4 mobile theme/  rm script from index.php
Merge branch 'master' of https://github.com/splatterb0y/ISC
Updating submit button text
Moving conjugate manipulation JS to seperate file
[master] Error handler and slight noise
[master] Socket will depend on pool
[master] Some more noise for job completion while the pool is young
[master] Handle more edge cases where a read on a socket might be fatal
[master] Deferred connect
[master] Describe any errors that show up in the pingpong example
[master] Notify user when the pinger connects
[master] Don't prematurely close the socket just because it's not connected.
[master] Async socket connect
refactored DeathLight to FadeLight (for double use with sleep mechanic), fixed null cast bug in DebrisFX, fixed armour graphics library (broken by promoting chaos armour)
Fixed comment wording in sql/where.py

Thanks to Simon Charette for noticing this.
Fixed widget parent class in generic_relations test
Documented utils.html.escape and conditional_escape
Added 'format_html' utility for formatting HTML fragments safely
Changed a lot of internal code to use 'format_html' where appropriate/possible
Removed various unnecessary instances of mark_safe applied to URLs

Also fixed some test breakages introduced in last commit
Fixed incorrect URL to object on delete confirmation and history page
fixed typo
Fixed #17997 - Documented that the debug server is now multithreaded by default.

Thanks trey.smith@ for the report and vanessagomes for the patch.
Fixed #18362 - Made model.save() update_fields accept attnames
Fixed #18330 - Made cache culling 3rd party db backend friendly

This is Ian Kelly's patch from #15580 with minor modifications.
Fixed #18572 - Python26 string format incompatibility

Thanks to anonymous/AeroNotix for the report
restored a missing \ in uwsgi docs
Used skipIf decorator to skip image tests when PIL is not available
Fixed #18576 -- Added missing import in tutorial02

Thanks jaaruiz at yahoo.com for the report.
Fixed #18484 - 'display:none' on CSRF token div is redundant and causes problems with some browsers

Thanks to hedleyroos for the report
Fix copyright holder
Merge pull request #188 from semente/patch-1

Fixed copyright holder in baseconf.py.
Merge pull request #187 from evildmp/docs_typos

Added a missing \ in uwsgi docs. Thanks, evildmp.
Merge pull request #183 from rpedigoni/master

Fixed typo in 1.5 release notes
enable notification with just one switch instead of multiple switches
removed old files
set up Rakefile
msvc_sdk : moved the sdk tutorials.
More unsucceffful item removal
Constant speed for monster movement
"Count this bug" instruction screen before each round
1. if user not logged in redirecting to login page on share button
click.
2. Accepting email address on enter and sending mail only on
click of send button.
Merge branch 'master' of git@github.com:strandls/biodiv.git
change colorscheme to jellybeans

Conflicts:
	.vimrc
add ignore for mac os files
changed PS1
change colorscheme delek
Fixed typo in Lindemann.isIdenticalTo() documentation
Fix paths in autodoc documentation build.
Added introduction and Windows installation instructions for RMG-Py.

Aiming for a similar user manual layout to the other packages.
Tweaks to Windows installation documentation.

Just added a little more commentary.
Added Linux installation instructions
Shortened Linux installation instructions.
Added MacOS X installation instructions.

Perhaps could be more detailed, but it's a start.
Moved dependencies list to installation section
Don't trash github pages repository info when cleaning documentation!

The manual hosted on github pages is placed there via a push.
Updated the documentation Makefile to help publishing to github.

Now, from the documentation directory, you can do 
  make setup_github_pages
To configure it once, then
  make clean
  make html
  make publish
To push the latest documentation to http://greengroup.github.com/RMG-Py/
Change to documentation homepage.

A brief description of RMG-Java vs RMG-Py.
Updated README.rst
Merge remote-tracking branch 'rwest/documentation'

Conflicts:
	documentation/source/users/rmg/installation/index.rst
	documentation/source/users/rmg/introduction.rst
Modifications of return value of Resource#doGet, WIP.
extended BulkSetUuidCommand to treat relationships as well
Fix the atom handling and fix the title setting. Thanks to Carlos Pita!
change icmp tunnel type definition
update snd.cpp
Proje dosyası oluşturuldu. Kaynak kod geliştirildi.
GEPS008: Re-structure merge files

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19665 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Geography : Adding a new view : all places visited by one person and his descendants
            and this by generation.


git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19538 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Merge branch 'master' of git.dt:qomo-linux
rm cache
remove firefox
中英文包分组
Merge branch 'master' of git.dt:qomo-linux
add products table.
generate backbone for product.
add cover field for both grouptag and product.
add cover field to the packages table.

cancel the migration of adding cover field to the products table.
add lightdm
add thunderbird-i18n-zh-cn to zh group
Merge branch 'hotfix/yum-cache' of git.dt:qomo-linux
add firefox to sony group
grub可以识别出Qomo
Merge branch 'hotfix/group' of git.dt:qomo-linux
Merge branch 'hotfix/grub' of git.dt:qomo-linux
add usb-charge to sony
Merge branch 'hotfix/group-list' of git.dt:qomo-linux
add xorg-xmodmap
Merge branch 'hotfix/group-list' of git.dt:qomo-linux
add app category to info.plist
add link to github project in about window
update deployment target to 10.6
Removed stderred
bugikorjaus ym.
Windows: Add off-screen rendering support (issue #518).
- Popup menus, drag&drop and GPU acceleration are not currently supported.
- Testing is enabled in cefclient by passing the "off-screen-rendering-enabled" command-line flag.

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef3@919 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
added Cs output (fixed issue #1156)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5298 f16182fa-f095-11de-8f43-4547254af6c6
fixed support for closure on Array.iterator

git-svn-id: http://haxe.googlecode.com/svn/trunk@4774 f16182fa-f095-11de-8f43-4547254af6c6
make JQuery iterator() optional (only if used)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4775 f16182fa-f095-11de-8f43-4547254af6c6
Group mrtrix tutorial runs properly
Difference graph interface
Interface can produce three types of graphs: uncommon, common, both
MATLAB outputs for DifferenceGraph
Fix for difference graph interface
Network cost computation
Initial TracksBetween interface
TractsBetween runs properly
Updates for setting edge key to threshold
NetworkBasedROIFiltering interface
Interface to filter stats files from a network
Interface to convert NetworkX graphs to Nifti images (e.g. for PRoNTo use)
Interfaces to return common edges only, and to threshold edges
Fix for MRTrix2Trackvis for warped track datasets
content type updates
Merge branch 'styles_and_html', remote branch 'origin/master'
Revert "Uploaded the html working with our css template.  Also, removed inline styles."

This reverts commit 2189562e29d641e1cc6d7b8043c11b27fe339d13.
Backed up the server
merged branch drak/caed (PR #3783)

Commits
-------

d04638a [EventDispatcher] More logical positions for classes.

Discussion
----------

[EventDispatcher] More logical positions for classes.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

---------------------------------------------------------------------------

by stof at 2012-04-04T18:59:02Z

ah sorry, I looked at the patch too fast. Only the interface is moved
[Form] Hardened code of ViolationMapper against errors
merged branch bschussek/issue5578 (PR #5655)

This PR was merged into the 2.1 branch.

Commits
-------

2568432 [Form] Hardened code of ViolationMapper against errors

Discussion
----------

[Form] Hardened code of ViolationMapper against errors

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

This ticket improves the code of ViolationMapper to reduce the risk of bugs and in order to make further bug fixing easier. It was implemented while trying to solve #5578 and is semantically equivalent to the previous version.
validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.
Unit test for patched method OptionsResolver::validateOptionValues().
merged branch fabpot/moved_optionsresolver_1 (PR #5657)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5657).

Commits
-------

939d387 Unit test for patched method OptionsResolver::validateOptionValues().
61d0f80 validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.

Discussion
----------

Patch method OptionsResover::validateOptionValues().

This PR was submitted on the symfony/OptionsResolver read-only repository and moved automatically to the main Symfony repository (closes symfony/OptionsResolver#1).

When we define allowed values for an optional option and the corresponding option was not set. On resolve, OptionsResover::validateOptionValues() was throwing a notice.
week 1. 100 of 100
Port to Qt5 (Windows)
use mingw 4.7.2 on build server

qmake must be in PATH
new font for vim
use iterators instead off indices
use a sorted vector to store the node childs
add gemspec
make spec dir and add spec_helper
add lib/myslog.rb
add empty methods: parse, parse_record
add spec/myslog.rb
MySlog#parse_record should return an instance of Hash
add description of response of MySlog#parse_record
implement MySlog#parse_record
add spec of MySlog#divide
implement MySlog#divide
add spec and implementation of MySlob#parse
Merge branch 'develop'
edit download button :p
Portage rsync://rsync.de.gentoo.org/gentoo-portage at 2012-12-01 02:04:57
Allow for numbers in templates and substitutions in match
confirming substitutions work in match, adding test case
adding test for templates in min and max
Make it possible to add tags directly in instruction
adding tag_match to find
Bump to version 0.0.16

* Adding `tag_match` to Find command
* Adding `tags` to all commands
* Allowing substitutions in `match`
bug fix gff.load(): initialize missing variables
revert two recent changes in graphics.tree
add highlight blocks functionality in graphics.karyotype
fuck your specials
Merge branch 'master' of github.com:tangmi/td-multi
Started adding js
fixed and slightly improved shader class \(it's working now!\)
provided modern GLSL support, added another event processor, fixed model drawing
fixed camera moving logic
changed method's name
temporarly changed mesh class' acces qualifier
repo: implement repo as a master driven source step

This commit reimplements the same feature and API
as repo from oldsource.py
The big difference is the test coverage that is now 98%,
and thus the maintainability of the code.
Most of the code is also now written in inline callbacks which adds
a lot of readability.

Additionnal features compared to oldsource.py:

- repo is now capable of importing patches to the manifest directory
  This allows for gated-commit process to also verify that manifest patches
  does not break the build
- better handling of tarball (automatic update on a weekly basis)
- support for repo sync -c, which speeds up a lot in very big projects
- better clobbering behaviour. The working directory is kept as much as
  possible for obvious speed reasons

Version2:
- reworked the flow to use less unneeded methods (like continueVC)
- reworked setText for concision
- reworked manifest patch handling which did not actually work with repo
- also remove the lock for manifests repository

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Add pry as development dependency.

We use pry in tests to help with debugging.
Add constants for representing regular and goofy directions of travel.
Distinguish between directions and headsigns.
DRY'd up RouteTest.
README makes references to the GTFS.
try fcitx
Pythonic naming applied to 'tabootScript'.

Still have to fix the camelCase method names.
switched encoding methods for jruby compatibility
working JSON editor
new file:   index.php
	new file:   index.php~
	new file:   new_RYFAS.html
	new file:   new_RYFAS.html~
	new file:   treat_new_film.php
	new file:   treat_new_film.php~
Merge branch 'master' of https://github.com/tcitworld/tests
Put win/* nmake support files in the distribution.
Adding .sos from contrib to build path
First Perk in action... now to rewrite the whole thing
Major improvement for git prompt

- Add cache
- Split up into functions
Update window switching shortcut for tmux
Remove sign-off comments from git config
Added tags to global gitignore
Signed-off-by: Terje Larsen <terlar@gmail.com>
Rename backup files
Modfied to search for "ttyACM*" devices along with "usb*" devices. (Support for Fedora)
1.0.2

-Added BIRN Favicon
-Fixed an issue where Firefox could not load the stream
-Added a help page for those who have trouble listening in their
browsers
-Other minor fixes
DS_Store
fix bug about array script
background fixed
Merge branch 'gh-pages' of https://github.com/thinkxl/todoapp into gh-pages
Update the sandbox example.
Remove Bootstrap application.js
Added application-specific JavaScript file
Replace ':' with '-' in skeleton names
.write test
my first commit
removed sqlite3 from gf
try again
try again
try again
try again
www
test
www
wwww
www
openid
ddd
uglifier
add the rubyracer
change title
change title, change css
add instagram widget
added Travis-CI configuration.
removed more fonts, I think we can run with this number and not get too bad of a performance hit
restructured the textures 
broke out the teams page into it's own /base/file
added the background for the site back in
added kerning JS for our logotype
changed the way the login button for home was shown. (we now have a perma-login on home and a separate signin page
minor maintenance
begin loading page
Ok, we show something sensible for confirmation count..
Added EPGM transport
PX=config の出力を整形。
- フレームワークで定義されている項目を、(設定されていない場合でも)明示的に表示するようにした。
- mainconf.ini に、定義済みで初期値を持たなかったいくつかの項目を、コメントとして追加した。
Fixed show_entries template to use slugs
Update Library/Formula/fop.rb

fop-1.0-bin.tar.gz isn't available over the given url anymore.
functiona
Add note about pending PR to scikits-image.
Klasa Bazowiec
Klasa interface. Potrafi tworzyć okna i coś tam wpisywać.
osobna klasa menu
Rozbicie menu i window na osobne pliki
literówka
Merge branch 'wczytywanie_bazy' into interface
przewijane menu
znaczki przesuwanego menu
bouncing cubes
added .opensdf filter

Signed-off-by: Velitchko <velitchkofilipov@gmail.com>
Merge branch 'master' of github.com:toshe/Survivors

Conflicts:
	Survivors/src/Unit.h
Added bind() fallback
Renamed generator file
auto-completing archetypes available
auto-completing only 'create' command with available archetypes
auto-completing 'create' command with directory names
avoiding unnecessary array creating when auto-completing 'create' command
remove all device entries from the manifest. these will all live in local_manifest. this manifest will only be used for CM core.

Change-Id: I07f7734dfe463cfec9409b8c9830e9e4e854dc84
Add qcom mm-audio encoders

Change-Id: I8fa547b34e02bc848a11c97ed3b19dd60aac3dde
Replace Music with Apollo

Change-Id: I22d04b3ab027a974fe1872e237128a7644e4d5c9
Reintroduce Music

Change-Id: I8356524ea04f1a3f2c07250385e4308b36c49fd4
Add atheros supplicant lib

Change-Id: Ib93ead978abd72fced7ad37b97eaa379e6804198
Add GanOptimizer to manifest

Change-Id: I402976922bae44192cd300d2add206abb450bb15
OCD fix

Change-Id: Ia6e7d3f2bd9c629b2a1920c185ce1d576de8170d
Update Google sources to 4.0.4_r2.1 (IMM76L)

Change-Id: I2d08e7e2fdeef3b054c739d49fd03152f3508591
hice los diagramas de secuencia
remove default handler for action
Rip out timeout customization

(sorry for my bad idea, @samaaron)
Bump version to 0.1.0-beta3
Back to snapshot
The first two sections of the Introduction export correctly.
Update new code for myfamily project
Add a --jvm-run-only-print-cmd-line flag to pants.

This is useful when using pants in scripts etc. and since you can't
run multiple concurrent instances of pants.
Merge pull request #46 from benjyw/master

Add a --jvm-run-only-print-cmd-line flag to pants.
doxygene de Tarek done sauf donnee, complexe et cstexp
Use covariant return type
Merge the script with nesi script and automatically generate nesi job submission file.

Tracker item 2729.
add: application.yml to ignore
moved all samples to new sample controller

will distribute sample controller along with boilerplate
include sample and application controllers
sample should go in Views, plural
proper path addressing for nuspec
don't need model in form view
use url directly by default, with todo message
cleaning up service error message
new db pw
delete setTimeout
add test
fix bug
change names
version 2.0
version 2.0
ajustes

ajustado as migrates
Tweak readme.
Whois .rs and .ru parser.
Whois .se, .tv and .us parser.
Whois .xxx parser.
github terms and privacy
first rough sorting of relevant services up top
画像の編集が出来るようになった。
Sort the invitation list so that the newest invitations are always first.
Merge pull request #210 from mfairchild365/develop

Sort the invitation list so that the newest invitations are always first
More trial and error on color picker settings.
diRf now on github
vim scala
append brew bins in front of path
一括ファイルアップロード時のエラー処理をブラッシュアップ
通常アップロードの validate 処理を改善
ファイルアップロード機能(一括ファイルアップロードを除く)にメンバーごとのアップロードファイルサイズの上限機能を実装
一括ファイルアップロード機能にメンバーごとのアップロードファイルサイズの上限機能を実装
Added support for Storage and JSON
Merge branch 'master' of https://github.com/vannatech/blade
Merge pull request #15 from Ventajou/master

Added support for JSON and Storage to System.Core
Finished organization types.
Merge pull request #4 from vasilyevd/organizations-main-page

Finished organization types.
Add dwm configuration
Add a simple tmux setup
Add a mail checker script
update some php configurations
Add KeyStore file for test package
Keystore password is 12345678 and keypass is 12345678
Improving drop downs documentation
add fix
merge azeite/master
Merge branch 'master' into azeite
Merge remote-tracking branch 'azeite/master' into azeite
script.JS should concentrate all JS Logic spread across the project
making templates to match new script.js concentrate-all-js-logic rule
search school autocomplete should also filter by estado; Filter number of results to at max 10 elements
bug: vote should redirect to problem details
Merge remote-tracking branch 'azeite/master' into azeite
merging origin/work over azeite/master
using autocomplete from script.js; problem.form.js.html contains autocomplete.js.html
templates footer_js to include includes/js snippets
edit problem form should init w/ estado+cidade data (fetch from school model)
problem.card photo should be a link to the problem details itself
get_absolute_url on schools/models
school name in problem.card should be a link to the problem's school
addind script.js readme file w/ some clarifications
it is not even possible to reach autocomplete of cidade without a previous estado pre-filled
changing problem.card to match problem.get_absolute_url (preferred way)
changing search.html template to show problems cards on results
ketan commits
change
Merge remote-tracking branch 'upstream/master' into check
change
Image not showing up
cant put HTML effectively
cant put HTML effectively
Merge pull request #2 from KetanPandhi/check

Check => Some Front-end
Update lib/piet/carrierwave_extension.rb

Don't know if MiniMagick part works, but the RMagick part now should... It was not processing the image in my previous attempt.
bug fix insert buffered raw...
Merge branch 'master' of https://github.com/vispax/kd-cloud.git
url, xml I/O in ENGLISH
code cleaning
fix categories bug and route to /tips
xtend-maven-plugin hack (incorrect, but still not working, why?!)
improved the downloader a little and added wscript
added .gitignore
Update index, login controller, and session model for logging in
did part of linked-video code
youtube embedd working
comments - add/remove, remove video working
got the thumbnails to work
Added some timeline stuff, working for photos (basic page & adding to list once timeline is enabled) as a test, will add rest of the triggers later
Merge branch 'master' of github.com:w7cook/OpenBook
fixed some small bugs like remove not working and added videos to favorites in lhshtml
removed NOOOO
made linkedvideo inherit from post, correctly shows up in news feed
Merge branch 'master' of github.com:w7cook/OpenBook
Merge branch 'master' of github.com:w7cook/OpenBook

Conflicts:
	app/models/Timeline.java
	app/models/TimelineEvent.java
	app/models/TimelineModel.java
	app/views/Timeline/Timeline.html
	app/views/tags/post.html
	conf/routes
Merge branch 'master' of github.com:w7cook/OpenBook
removed timeline backup files and bootstrap.zip
removed timeline backup files and bootstrap.zip
Merge pull request #212 from pk1m/master

Added Linked Video functionality
Merge pull request #68 from darbs/master

Tests and page deletion
Use profile picture for news items
add filetype change
add Rakefile
add basic rakefile system. complete version.0.1
Merge branch 'work'
version0.1
Using vectors for all stratified sampling needs, dropped dependency on random-shuffle.
Added config vars to coins!

Awesomeness!
Holdem

Removed irc.reply lines
Added method for extracting the table name.
Renamed table naming scheme
Referenser ska nu vara bäst
changed year to start from 0000
Tests for Layer Store
Merge branch 'master' into LayerStore
Merge remote branch 'upstream/master' into LayerStore
Add bind/unbind function to LayerStore and tests
Adding layer interaction back to example.
constructor instead of construction
Configure the MapPanel's layer store with a map.
Removing second callParent call
Add LayerStore sync functions
Merge branch 'master' into LayerStore

Conflicts:
	examples/legendpanel/legendpanel.html
add LayerLegend tests
fix broken LayerLegend tests
add LegendImage tests
moved properties out of the config
use Ext.loader for Ext and Ext.create in Legend.html tests
Merge pull request #46 from weskamm/fixes

moved properties out of the config, test is going to follow
more work on the legend tests: Ext.create and Ext loader for Ext
Fixing Map - LayerStore synchronisation
Merge branch 'master' into LayerStore
Do not depend on MapPanel
update tag & deps
bump version
fix tag
Added git pullh alias, for pulling just the current branch.
Bug 770293 - updates from https://bugzilla.mozilla.org/show_bug.cgi?id=769808;r=ahal
Bug 760722 - automatic version bumping for mozbase;r=whimboo
Bug 770891 - mozhttpd proxy test needs to uninstall url openers after use;r=mcote
Bug 771144 - Should be able to log requests made through mozhttp web server
Bug 772106 - Add options to list and remove files to command line sut tool
Bug 772661 push no longer requires remote file name, only dir. r=wlach
Bug 772654 Push local directories. r=wlach
Bug 770821 Allow protected mode flash ability to create job objects r=ahal
Bug 722804 - mozprofile preferences delimeters should have a nonce;r=jhammel
Merge branch 'master' of github.com:mozilla/mozbase into relpath
added pg to gem file and set it to production use
Wyczyszczono folder
Update assets/resources/application/cs.xml
epub code is included into native library
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
more c++ files
Merge branch 'master' into epub-native
more experiments with native ePub support (not compilable yet)
code is compilable
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Merge branch 'master' into epub-native
Fixing issue #428 where role was not saved for newly added user.
Fixing post deletion, updating report button
Updated gitignore file.
Fixed submodule configs.
Merge branch 'master' of github.com:FoolRulez/FoolFrame
[#29588949] Agora o componente mantem o estado de allocationTags selecionadas quando a tela é recarregada por meio de um submit.
[#29588949] Estado de grupo sendo apagado corretamente no componente
share baselibc
checked the SMPTE spec, 29.97 =!= 30000/1001.

"[..] field rate of an NTSC television signal is 60/1.001 fields per second"
1 = sec_NTSC = 1.001 sec_REAL
some test code
deps
Merge branch 'master' of ssh://github.com/xPapers/xPapers
misc
fixed invisible Villager
Updated twitter bootstrap override CSS due to error in assets:precompile
xlibrary structure
CA-80468: VM migrate assertion should fail for cross pool migrations if the VM has more than one snapshots.

Signed-off-by: Rabin Karki <rabin.karki@citrix.com>
Merge commit 'd810bd292bef37a197cca6c12d788bb65b25eb22'
开发，包括一些PySide代码
开发，包括一些PySide代码
Merge pull request #190 from ina6782/master

Programming_Language_Comparison 과제입니다
Pull from git before running cake
Update scala-io to 0.4.0
Fixed up some minor things
exception
support empty rule
issue #118
Nooock edits text
Merge branch 'master' of https://github.com/xinexo/TimeBank
Merge branch 'master' of https://github.com/xinexo/TimeBank
Merge branch 'master' of https://github.com/xinexo/TimeBank
Merge branch 'master' of https://github.com/xiongyw/xiongyw
linker and loader
tmux: update config

* remove reattach-to-user-namespace
* remove unused key-bindings
* added several key-bindings
* added key-bindings for each window
* replaced user with host on status-left
* polished theme
admin index modified
Add PYTHONDONTWRITEBYTECODE setting in zshrc
Fixes it as it previously didn't work
black text in input box
Hello，第一次commit
Affichage des distributions de PPN dans l'export xls
New release 277
Add .git folder for dummy repository in specs
Add Travis CI support
update client & server. and rename.
- change iAd code, set a single iAd into AppDelegate.
The first non-default index.html in project.
updated creating the admin
Merge branch 'master' of https://github.com/yogthos/yuggoth
Fix bug where echoNestArtist was undefined
Improve style and copy for profile edit box
Move playlists out from index.html
Load current user with AJAX
Use UserManager.isLoggedIn instead of logged_in
Remove usage of my_user_id
Don't use global vars from flattr/lastfm usernames
Move settings, languages and such to /api/main
Fix problems with SettingsPopup and HomeScreen
Set correct login/logout URLs
Move some init's further up
Move user info to /api/main

There's so much init logic that depends on it
that it makes sense to have it there.
Inline popups HTML

{% include .. %} caused problems for the build
script.
Add initial version of build script
Write output to a zip file
Initial version of manifest

Also remove zip file as it's more important to
be able to load the packaged app from a directory
at this point (dev mode in Chrome requires it).
Add background.js
Copy static dirs as well
Fix bug in manifest
Always use local jQuery
small changes to make R CMD check happy
add newdata argument to predict function
rm HTML5-slide
加入python管道调用
- 删除错误目录下的indextree
Merge branch 'master' of https://github.com/zapline/zpublic

Conflicts:
	public/algorithm/indextree.cpp
	public/algorithm/indextree.h
Update heroku blog link in index.md as well (#33)
Simplified index.md
Converted octal escapes to hexadecimal.

CoffeeScript 1.3.3 strict mode forbids octal literals.
added German translation
resolve merge conflict
metatags, fixes #21
'chanes'
leak less...
track handled
multi selection using UITableView demo code
increased visual boost
made timers thicker to ensure touch at high speeds
Fix regression introduced by 44f7fa4b
updated scss docs with subnav
Merge branch '3.0-gem' of github.com:zurb/foundation into 3.0-gem
litle bug
More helpful error message :-)
More exceptions causing major problems
get rid of blogs and projects
change header font
get cucumber specs passing again
rename posts to stories
remove 'more' from stories
fix up some layout
增加tile
service call
service call
service call
json service
New calculate
remove titles for login/signup
move fb login from navbar to signup/login pages
Similar article ordering changed
Fix license
haskell-cgi: update to version 3001.1.8.3
haskell-zlib: add version 0.5.4.0
haskell-X11: update to version 1.6.0.2
haskell-data-accessor: update to version 0.2.2.3
haskell-explicit-exception: update to version 0.1.7.1
haskell-ghc-syb-utils: update to version 0.2.1.1
haskell-instant-generics: update to version 0.3.6
haskell-regular: update to version 0.3.4.2
haskell-vacuum: update to version 2.1.0.1
haskell-void: update to version 0.5.8
python-packages.nix: remove trace message

The attribute

  builtins.trace "beatifulsoap is a typo" beautifulsoup;

looked like it was checked in by accident.
python-packages.nix: drop trailing whitespace
ghc-wrapper.nix: cosmetic
ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped
ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x
ghc-head: update to version 7.7.20120912
Fix Nixpkgs evaluation

http://hydra.nixos.org/build/3020333
Gajim: update to 0.15.1
Gajim: make OpenSSL code work
delete old unusing files
delete old unusing files
Update notes for submitted changes

* d2vzw: update fingerprint to latest release (HD)
definint grid within grid a bad idea
Prevent expanded dictionary bar collapsing when cursor moved over tooltip or context menu
README added
README renamed
.gitignore added
.settings folders removed from the project
Edited README.md via GitHub
Edited README.md via GitHub
clearing projects
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	.gitignore
=Prueba
Included some asm and binaries that shouldn't be in source control.
add new colibration dialogs
commit for help
merge zakhar`s and george`s changes to master branch
using convertions added
add mvl realtime counting
Added Fits for all three datagroups
Updated Todo
Merge branch 'master' of github.com:AndiH/CUDA-bench
Com controle de acesso ao clube
Adding more stack operation opcodes
Test get_arg_spec
Removes unnecessary word list creation
Merge pull request #54 from ajy/faster_update

Removes unnecessary word list creation
[12092] Add TargetLimitation for spell 52438

Thanks to Xfurry for research

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Blank EDE projects configuration.
Updated ccmode to use CEDET.
Updated custom files due to CEDET.
Updated C++ templates.
Added template for .cpp files.
Added a major mode for PHP.
Player Spawn

Player now spawns at right position
Player now faces the currect position at the time of spawning
Ah, yes. Mr. Jake Cooper also.
by dron
Merge pull request #276 from ChineseDron/dev

by dron
Unneeded files have been deleted. Resources have been added to the project for being displayed properly.
UICatalog example project has been converted to Obj C ARC.
Debug logs for "ControlsViewController.m".
"ControlsViewController" now working. All controls except UISwitch are uncommented.
Add support for Object.observe and friends
some minor optimizations
build
small fixes for list
Floor texture color variable added
some wall fixes
Some fixes for music songs and playlists
Merge remote-tracking branch 'origin/master'
make use of 3d cover at all places
Removing some debug files, make .gitignore before adding!
Removing some comment files and adding .gitignore files
Merge branch 'master' into dev
Swapped the dev branch with the master, I know I shouldn't of done this but we borked the chain.
Swapped the dev branch with the master, I know I shouldn't of done this but we borked the chain.
changed asset precompile for heroku
added searcher logo and link to template,
get_logo and get_searcher_url to searchers
Merge branch 'params' of github.com:Blanko2/vic-mdid into params
fixed dnz getimage
Fix positions round 2
Run a better check to make sure we're only skinning minimap icons.
coupleof lua errors see changelog
Fix lua error while binding to spellbook/macros
Removed the experimental Profile Binds option. See: http://wow.curseforge.com/addons/elvui/tickets/258-improvements-to-profile-binds/#comments
Fix issue where right clicking on B.Net conversation to invite more friends caused a lua error with the blizzard API.
Fix lua error for Spanish/Mexican clients. Caused in the lootframe.lua file.
Fix issue with cooldown text. Days were being displayed in hour format.
Minimap Location text is now only displayed when mousing over the minimap.
Add option to player unitframe's castbar section to display the current target on the castbar. (Default is Off)
The In-Game config has recieved a bit of a overhaul to make finding stuff a little easier.
See changelog file, several changes.
Fix a few compatibility issues with WIM.
Merge remote-tracking branch 'ElvUI/master' into v333

Conflicts:
	config/global.lua
	config/profile.lua
	locales/english.lua
	modules/minimap/minimap.lua
	modules/unitframes/update_elements.lua
v1.2.1

Added complete README, plugin will copy to data folder when enabled.
resumable put -- to be continued ...
conf.c add chunkSize, retryTimes, rs_put.c
Merge remote-tracking branch 'xusw/master'

Conflicts:
	qbox/rs.c
	qbox/rs.h
Modify interfaces to match the standard interface provided by Go version.
change to BruceLan
add dancing googlers
add recycled numbers
Rotation scheme now moves with finger
implemented new eventtostring fns
implemented new eventtostring fns
implemented detail view
implemented detail view
implemented detail view
Rotation now moves with finger, snapping into place enabled in month view, finger down on wheel emits blue circle
Merge branch 'detailview' into betterRotation
Rotation branch merged with Jay's detailView branch, SIGNALS and SLOT setup for edit event
only emmitting edit event clicked if event pointer is not null
Fix the issue with time not counting down before game start.
Fixes to the toolbox and APC commits.
Added support for the LAN interface
Minor code cleanup and test improvement.
Added google analytics
Adding Google Mail subnet
adapted style to fit mockup spec, added orientation test
Make watch recursive
Latest DB changes from gmuganda
Shorten search form class names
Restore HTML title
Import jQuery from Microsoft CDN

http://www.asp.net/ajaxlibrary/cdn.ashx
Add 3rd-party Zend_Form Bootstrap decorators

This code is licensed for "commercial use with no restrictions".

See also: https://github.com/Emagister/zend-form-decorators-bootstrap/issues/22
Maps form with geocoding and address normalization
Change member search wording
Make map search show maps
Add a "New Client" button to map form
Finish client-side portion of maps
Use Twitter bootstrap classes for search form
Fix search form class naming
Strip out unused index/index.phtml view script
Clean up default error view code; add HTML escaping
Remove empty old map form
Organize client and case forms
Jons changes
Use the race ID specified in the ref base's record instead of the race record

The latter is localized and doesn't match with international versions.
Use a unique loader for each skeleton resource
Load the proper NIF skeleton
fix cpack config for source package and fix cygwin cmake bootstrap
add file named History
arquivos de login
Popup Cookies

Subscribe popup shows when first time site opens. Than coockie variable
sets to 1;
Merge branch 'master' of github.com:D4L/projectEuler
fix 3d clipping sample in tutorial
Merge pull request #360 from mtola/clipping-doc

fix 3d clipping sample in tutorial
pion ok
fix unit tests for the changes made with express support
add note about the api change
Minor copyright update in the license.
Label histogram median's correctly.

Fixes #161.
removed nodelist
Progress on hover robot
Merge branch 'master' of https://github.com/David20321/7DFPS
Updated help to work with glock
Help works with revolver
Help update
Help update for flashlight
Maintenance notice template added.  Well, at least an example of it.  You need to add a templates/maintenance_template.html to your project, following the example file, to get it working.
Image upload: the pre-upload summary now correctly says how many images have points/annotations in the annotations file, how many don't, and how many points/annotations will be uploaded total.
- Also, a little bit of Javascript refactoring, including reducing redundant use of jQuery ID selectors.
Image upload: added lots of help text to the annotation file field.
 - Also, improved some of the comments in AnnotationAreaUtils.percentages_to_pixels().
Added 'upload' app.  This will eventually contain everything to do with image and point/annotation uploading.
Added tests to upload/tests.py, based on the old tests in images/tests.py.  However, these new tests are much simpler due to having no multi-image-upload view to deal with.
* export src as []rune
Fixed bug where object has been deleted.  Also fixed a bug where the object is not a JSON object.
up feat multiple : following views update
up feat context home and global : remove old boxes settings
Removing connect dependency & refactoring w/ tests

* fixing arguments re-declarations
* adding mocha test suite
* use _.defaults
* normalize header access to work without express/connect
* adding license info / normalizing package.json (via npm init)
* bumping to version 0.0.2
Merge pull request #1 from wookiehangover/master

Removing connect dependency & refactoring w/ tests
Updat BOLDS species-level taxa connector to work with new BOLDS version.
WIP - the rake tasks seem to be working (again)... time to test the CodeBrdige...
Moving stupidly-named file, fixing wrong method name.
Helper scripts for updating the chef server.
Added Vagrantfile.
Customise MongoDB cookbook.
Remove the client and node form the chef server on destroy of box.
Use Upstart for MongoDB service.
Another method of removing the client and node from chef server.
Auto removal is too brittle. Just do it through the web UI.
Use a Gemfile for required gems.
Use 10gen repo for MongoDB.
Remove static hostname.
Ensure ubuntu user exists and can sudo without password.
Delay restart of api services until end of run.
We now use a standalone loadbalancer.

Ports updated.
Make sure vagrant can sudo without password.
Use the encrypted key on the local system if available.
Use ubuntu user even on vagrant systems.
Fix role name error.
API port is 8080.
Use bridged network IPs now as we are using Chef.
Testing DB seeding. This will be changed later.
adding layer manager to changelog
Minor window fixes for new Juce
starting major refactoring
tests structured, version
livetex prechat for stable
Also set root var from CO_ROOT
Set install_name on Darwin dylibs
Merge branch 'master' of https://github.com/Eyescale/CMake
Fix install_name for Darwin dylib
More separation work
Visual tweak
Update version mapping
Improve logging in FLP
Update FindPackages
Merge branch 'master' of https://github.com/tribal-tec/CMake
Big endian compile time define for Eyescale/Equalizer#146
Merge branch 'master' of https://github.com/Eyescale/CMake into endian
Merge branch 'master' of github.com:Eyescale/CMake
Merge branch 'master' of https://github.com/Eyescale/CMake into endian
Check protocol version during node connect
Merge branch 'master' into endian

Conflicts:
	co/node.cpp
Transmit and store endianness of node (Eyescale/Equalizer#146
Fixed myriad errors from today's compilerless coding
fichiers manquants...
Suppression des individus et modifications diverses
Added page-by-page display of assets within a collection.

This new method duplicates the javascript-centered page navigation
screen, but does all image loading on the server side.  It is more
appropriate for large asset collections whose image files cannot
easily be loaded into browser memory all at once.  Pagination will
be slower than the old AssetCollectionController:show action, but
will be possible.
Merge pull request #1 from FriedRice/master

Moved README file to the project root
Merge pull request #6 from FriedRice/master

Deployable to Heroku
Merge pull request #7 from FriedRice/master

GitZen accounts are now configurable and the home page now has baseline functionality
Merge pull request #8 from FriedRice/gz-5

gz-5: Reduced load time of home page so that it will load on Heroku
Merge pull request #9 from FriedRice/gz-6

gz-6: Added basic incorporation of bootstrap and redesigned the layout of the homepage
Merge pull request #12 from FriedRice/gz-7

gz-7: API calls are now optimized so that they request the correct tickets and allow the user to set the date range
Fixed conflicts
Merge pull request #16 from FriedRice/gz-9

gz-9: Use OAuth2 to access the GitHub API
Merge branch 'master' of github.com:FriedRice/GitZen
Began rewriting code to use github api directly instead of a wrapper library that is no longer supported.
Finished rewriting code to now use the github api directly instead of using the unsupported wrapper class.
タグの選別まで完了

さらにいらないタグを除外する
eine neue Zeile
Bugfixes to Minefield
Stuff going on!
Fixes erroneous clipboard behaviour related to type data

Previously, the type data wasn't considered when the editor label was fetched which could result in a higher number of marked items (since all marked items of the relevant object type were used). This commit fixes this in such way that avoids multiple checks. Before anything else, the objects are filtered by the clipboard action handler *once* using the type data, and then given to execute() and getEditorLabel() where no filtering will be necessary.

Changes in other classes because of this bug fix are minimal: If you don't support type data, simple extend AbstractClipboardAction instead of implementing IClipboardAction and remove the third parameter of execute() [since it's optional, keeping will not break anything, but keeping it there makes no sense].
Fixes description
Further documentation fixes
Removes trailing tabs and whitespaces
Merge pull request #970 from Gravatronics/enhancement/cleanup

Removes trailing tabs and whitespaces
Fixed broken to top/bottom links
Fixed some small issues
AbstractDatabaseObjectAction no longer ignores unknown actions
Added support for invalid group type filter
Add missing import
Fix IconCacheBuilder
Fix CronjobScheduler
Add missing import
Object type definitions are now globally unique

Fixes #971
Clipboard now removes zombie object ids
Fixed progress calculation
Merge branch 'master' of github.com:WoltLab/WCF
Enforcing ASCII encoding for all files (except XML)
Fixed upload button
Merge branch 'master' of github.com:WoltLab/WCF
Initial commit
Merge branch 'master' of github.com:Gymmarn/test_app
adding stuff to analysis
Minor changes
Made text appear
A bit more fixes
started on showing hitboxes at randome
merge fix
Added precompiled header to project
Added graph related classes and typedefs
Modified adjacency list structure
Merge branch 'feature/graph-types' of https://github.com/Hindol/community into feature/graph-types

Conflicts:
	adjacency_list.cpp
	adjacency_list.h
	graph_types.h
flag icon fix
compileint/compilefloat fixes
put blue armour back in ffa
reduce blue armour to 25
derandomize hb/quad spawn times
raise MAXTEAMS to 128
use menufps when minimized
print player name in forced mapvote
ignore channels > 2
make quad spawn time 70s
sound preloading
gui model previews
fix modelpreview shader params
fix g-buffer timer
occlusion queries still broken on apple + intel
different workaround for apple + intel oq bug
Revised the section title Jobs to Your jobs
added function fetchActivityRecord()
display profile now also able to display activity data
profile can only be viewed now.
information can only be changed in settings
edited settings
Merge branch 'viewprofile'
Лабораторная работа с интерфейсом
Clean up parse.hs, improve comments
first pass at unconstrained IQueryables
Would probably help if I linked the library against libx11
Added onHide callback and ikhide trigger
travis: Fixed a bug in install_vigra.sh
Removed dummy variable, fixed error in the validator.
allow nil urls in temporary urls

	public/heroku_500.html
horizontally align avatar and remix title on side pane; push share actions down to the bottom [ci skip]
need to require this file for production mode
Merge branch 'master' of https://github.com/makrio/makrio
[#24] wire up start/stop/restart buttons
[#24] implement start/stop/restart
fix tests broken by renaming Deployment.appName to Deployment.name
rename FoundryService -> FoundryClient
rename files FoundryService -> FoundryClient
CRUD methods for services
[#105] Adding an app is just an NSOpenPanel to pick the directory.
[#121] source-list style navigation
[#79] [#123] Menu items for creating new apps and targets. respond to delete key when source-list is focussed
Merge branch 'master' of github.com:Adron/Thor
Merge pull request #125 from Adron/master

Major UI Refactor, Focus on Changes on Workflow
Add OpenLayers 2.12 library to Libraries
keep OpenLayer popups on the map
make OpenLayers popups prettier
Feature: Better Project Map
Add Cabin Font
update: openlayer_plus (I don't think this is very helpful)
implement some Cabin fonts (may be too much)
Agregado mini GDD
Use Bukkit scheduler instead of thread, login-firework delay is in ticks now

Signed-off-by: JWhy <jwhydev@jwhy.de>
signin added after save
code formatted
first step in integration of paperclip
KT-1712 Formatting for getters and setters
 #KT-1712 fixed
fixed up wrong repo URL
Fix compilation yet again

(Not my day, apparently)
Generated gh-pages for commit a9ce862
Author: Jonathan <gamma_chen@yahoo.com.tw>

    update index.rst
Working on charset for urlencoded
Updated globalredirect
sincronização  implementada completamente
minor tweak & typo fixing
Converted greet to new format
Verbose Linux deploy
Forward VTK to gerrit/master

Change-Id: If9c3bec25d3119ecedf8918bc24d39210a3f7930
Merge topic 'forward-to-vtk-master' into next

edece5c Forward VTK to gerrit/master
ENH: Describe what GMVReader plugin provides
Merge topic 'update_xml_doc' into next

6597239 ENH: Describe what GMVReader plugin provides
BUGFIX: Correct input types to vtkOverlappingAMR

Changed the input type for the vtkAMRCutPlane filter and
vtkAMRToMultiBlock filter to vtkOverlappingAMR.

Change-Id: Ibf0c166c9166bd8888548ebd3c6159b746eba827
Merge topic 'amr-plane-cutter' into next

613b445 BUGFIX: Correct input types to vtkOverlappingAMR
Fix examples dependency.

Change-Id: I0fd096a74ad80fca96f41df49005b46463bfac60
Merge topic '13567_fix_manta_view' into next

b9bf414 Fix examples dependency.
added toast class. changed background defaults colors to match bootstrap. added tapToDismiss property (default to true)
support for o5m statustics output
Try to fin gitignore file
More character creation fiddling
kakutyou
Fix Sunder Armor & Explose Armor stuck.
Do not allow remove Sweeping Strikes when switching stances.
Totems not immune to dots.
Fix Find Weakness, add damage for Mutilate.
Cause caster & hostile targe to enter combat due to dispel.
Sap remove stealth, also fix stupid typo.
// Allow Lifebloom & Earth Shield crit.
Player must enter combat with pet.
Implement talent Bestial Swiftness for Hunters.
Don't sync pet speed with owner if owner has aura mod decrease speed.
Add steal resist chance.

Add druid heal in case steal Lifebloom.
Lifebloom fix
Change Chain radius for chain damage spells to 20 yards & chain heal spells to 40 yards.

Change Prayer of Mending jump radius to 100 yards ( offlike ).
Add trigger for Entrapment.
Fix Hunter Expose Weakness
added ResetStore method for IAppendOnlyStore and created new unit test for this method
suppression mauvaise fonction createEvent()
Signed-off-by: Vincent <ricard@intechinfo.fr>
ignore file so the whole project settings isn't committed
Hash Tags, Origin/Destination saving, Plan a Route, Showing trip buttons, error messages, show list on page and refresh on play page
.

Signed-off-by: MELLION-Y <yann.mellion@ciel.com>
Merge branch 'Sprint2'

Conflicts:
	Nouveau document texte.txt
Fixed Ranks (?)
Added kills, deaths and k/d ratio to rankings
reformat Xdefaults
Try to install Android SDK into /run.