labofsahil/github-event-dataset-2012 huggingface dataset:
basetest supports retina disabled
Test: shader works on iOS 4.3 using lowp
install-template: removed -u option

Since -u option was not used, it was removed
RenderTexture: Don't force the cocos2d's opengl context

Since it should be possible to use RenderTexture from another thread, it is not forced the use of cocos2d's main thread opengl context
RetinaDisplay disabled on shaders
Added -ipadhd support on iPad Retina Display
Added -ipadhd support on iPad Retina Display
Merge branch 'gles20' of github.com:cocos2d/cocos2d-iphone into gles20
fixes bug #1335
fixes issue #1334

Projection fixed when iPad + RetinaDisplay
missing file for fps_images when iPad + Retina Display
added more comments to the code re. issue #1334
Added support for init method on CCLabelBMFont and CCSpriteBatchNode
CCNode: Added userObject (removed setUserData:retained).
Shaders: shaders are char *

Base shaders are no longer parsed from a file.
They are part of the main "library": faster to parse, easier to migrate to v2.0
re-fixes issue #1334
fixed typo on Director
updated CHANGELOG
Sprite: flip is no longer a bitfield
LabelTTF: don't use autorelease. use retain/release instead
Minor API updates

* Add arg-less "callMethod"
* Add support for ASObject properties passed as an Array
Update libNativeLibrary.a, add .gitignore
make announcements with no expiration date not expire
Merge pull request #156 from natmote/fix_announcement_expiration

make announcements with no expiration date not expire
Removed gender from user settings
Merge branch 'master' of https://github.com/Full-House-UW/fullhouse
Merge pull request #157 from creisman/master

Removing gender from user settings
Merge branch 'master' of github.com:Full-House-UW/fullhouse into topic-task-backend

Conflicts:
	fullhouse/dashboard/views.py
file ommited from previous change
starting to make viewer addition/removal dynamic
Merge branch 'master' of https://github.com/jmeehan16/whitematter
Change location of API calls, add SSL connections
Added new screens, reskin existing.
Add bill total editor, voucher status logic on redeem screen, layout changes
Add logic to handled scanned and expired vouchers.
Add redeem logic, style changes, voucher lookup, exception handling, status dialogs

, and begin work on history screen and db
Begin history / voucher DB work
Add history screen, finish DB system
Style changes to login screen
Merge pull request #1 from jmgolz/createWorkflowBareBones

Create workflow bare bones
Implemented user login and logout.
Implementing editions forms/views in progress.
Formatting code, styling character form

Making use of Bootstrap navbar style in new-character form.  Using
Markdown in README.  Formatting Javascript, reducing code duplication a
little.
added disclaimer template
Some documentation quick fixes.
Added .orig files to gitignore
created sass and corresponding files
init
files
tools
Update splash images
New studio images
New studio images
0
0
Update lifestyle images
Swap lifestyle pics
0
0
Replace image 11
Update image7
Updated images
Switching queue back to prescription (registration queue is much too long from patient import), adding drug details
Defining template dependencies using relative paths
Wiring up the dialog to the create concept proposal view
added .gitignore

Signed-off-by: Chris Jones <chris@jonezy.org>
Added ignore file and UnitTest file
Merge branch 'master' of https://github.com/jongisli/ap-ass1-maze
now can handle a single block

can make a structured grid for a single block

need to make multi block support work
updated file structure for sample in file
updated to be able to handle initial conditions

now the initial conditions for u and v can be input to the vtk
updated sample in file to show the use of changes
forgot why i did this, but it works

don't remember why, but like i said, it works
OOP version of the meshing begun

does not currently read files, but it is based on the other mesh script.
It is able to create, add, and print out unstructured shapes.

needs all IO operations still added.
additional mesh reading routines
temp commit to save work
fixes some addition errors
Fixes an issue with using paraView
Merge branch 'development' into meshing
meshing now able to handle gaps in mesh
Merge branch 'meshing' of https://github.com/jonkomperda/SimpleMAC into meshing
Merge branch 'meshing' into GUI
Fix broken JPEG support in QPA (Lighthouse).

In non-static build, JPEG is built as plugin. We force to have JPEG
support built-in by explicitly change a variable in the configure
script (unfortunately this can't be done via command-line options).

http://code.google.com/p/phantomjs/issues/detail?id=163
Remove support for Flash and other plugins.

http://code.google.com/p/phantomjs/issues/detail?id=418
Add a simple check to ensure that there is no loaded plugin.

http://code.google.com/p/phantomjs/issues/detail?id=418
Be on the safe side and check for Qt == 4.8.0.

http://code.google.com/p/phantomjs/issues/detail?id=272
Fix broken GIF support in QPA (Lighthouse).

This is the same issue like the previous broken JPEG.  In non-static
build, GIF is built as plugin. We force to have GIF support built-in by
explicitly change a variable in the configure script (unfortunately this
can't be done via command-line options).

http://code.google.com/p/phantomjs/issues/detail?id=163
http://code.google.com/p/phantomjs/issues/detail?id=432
Implement fs.readLink to read symlink target.

http://code.google.com/p/phantomjs/issues/detail?id=329
support for backtraces (part 1).

Mostly plumbing in WebKit and Qt bridge.

http://code.google.com/p/phantomjs/issues/detail?id=166
support for backtraces (part 2).

add a default error handler on all pages. people can override if they
need.
ensure error handler can be removed without errors.

Hack ScriptSourceCode so we can pass in a raw string and not have it
validated as a URL

change source location hint for webpage.evaluate().

http://code.google.com/p/phantomjs/issues/detail?id=166
 Please enter the commit message for your changes. Lines starting
Fix try ... catch exception handling.

The hasHandler flag passed to JSC::Debugger::exception only applies to
the current stack frame. It does not indicate if there are exception
handlers in earlier stack frames.

Therefore, we are saving the frame when an exception occurs, but only
reporting the exception if it is still present once the stack has been
fully unwound.
Fix warnings.

Stop passing around lineNumber and sourceID as they are unused and don't
contain useful information.

Also declare Q_UNUSED on them to fix compiler warnings.
Basic tests for the onError handler
sleep at the right place
Added basic PHP to load JSON data
Working example
Working example
One factory building objects depending on the String entered.
Tamaño de foto ajustado
Boilerplate project files.
fix execute_inline_now
Merge pull request #1 from ChowNow/execute-inline-fix

fix execute_inline_now
systemd: pull in network.target

It is not enough to order ourselves Before network target, we must also
make sure it is pulled in. This means that anything that needs the network
to be up before they start can order themselves After=network.target.

Reported-by: Tobias Powalowski <tpowa@archlinux.org>
Signed-off-by: Tom Gundersen <teg@jklm.no>
systemd: wait for network to come up

We need to make sure no the systemd services are only considered
started when the network is actually up. Otherwise, things relying
on the network don't know when they can start.

This means that we need to use Type=forking or Type=oneshot, and in
the case of ifplugd we must daemonize and wait for the daemon to be
ready before we continue.

Also do some minor cleanup:
 - don't include env files that are not used
 - don't ignore return values

Signed-off-by: Tom Gundersen <teg@jklm.no>
Prevent ownership conflict with pm-utils

50 is a better number for netcfg anyway.
add undocumented IP=no option to net-profiles man page

There is support for IP='no' option in profiles to have the interface be
brought up but assign no addresses. This patch adds documentation of
that option to the man page.
Fix handling of profilenames with spaces (FS#28522)

This was the result of commit b6964 which said to fix FS#17406 by reverting to the subshell-less for-loop that is once again removed in this commit.
The real fix to FS#17406 was commit c3276 to the initscripts repository.
Move the website to a website

Give users a way to stumble upon this marvelous piece of literature that had completely been forgotten (it was introduced in the repository around netcfg 2.6, but never installed).
OS-1219 svc.configd should reduce footprint by setting "nomagazines" (copyright)
Sauvegarde de l'avancement

Test IHM
Fil d'arianne
Amélioration système KO sur les profils
8th: DE225 fixed
search working and tested
Merge branch 'master' of github.com:jpope19/GatorAirlines
fixes 131 - accurate description of problem
PUT almost ready
Removed CV analysis, moving to new script
Heatmap now adjusts label size, added parents to mod2 heatmaps
Add views and stuff
sponsor posts
Merge branch 'gh-pages' of github.com:jsconf/2012.jsconf.eu into gh-pages
layout corrections
Merge branch 'gh-pages' of github.com:jsconf/2012.jsconf.eu into gh-pages

Conflicts:
	_layouts/main.html
fix adobe logo
[maven-release-plugin] prepare release backbone-0.1.1
swapped in sqlite
script definitivo y algo en las traspas
Add generated front end controller
complete sevaral command deal with
add relate head file
complite set time
first script for quick opening github
Readme: Github's pull request test t:1 #1
Gemfile: testing out github's pull request t:1 #2
Merge pull request #3 from jurajmasar/new-branch

Test of Github's pull requests.
Added in politician issue filtering
residence migrations
vykresluju krychli
styling updates for festival cells
Probably the last cache related changes.
fwr: code review updates

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@91618 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
fwr: remove TODO remark

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@91619 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
fwr: update error messages, return true in events consumer

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@91620 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
fwr: change ip range to token

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@91411 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
Printing ten functionality has been removed -- don't need this click handler.
Cache ul#examples to prevent qtip interference
Merge pull request #6 from spicyj/power-glove

Misc fixes
Those where in the wrong place.
move tbl_pages-logic to PageManager
move tbl_pages logic from FrontendPage to PageManager
move some tbl_pages logic out of navigation datasource and into PageManager
add pokepartyDB
steal ctrlp.vim and surround.vim settings from others
A few more styles, a bit more content
Support . in TableGateways, for use with Schemas in PostgreSQL.
Remove images from web page.
Don't copy codec_tag

- Some muxers do not allow stream if codec_tag is incompatible
- Sometimes passed input codec's codec_tag isn't compatible to output muxer
added `jekyll` and `reload` aliases

`jekyll` just runs jekyll using `bundle exec`.  This is to help
in my workflow developing jekyll sites.  `reload` is just a shortcut
cmd to reload my bash profile.
condense the paths
commit test files libsvm
set port example to 8888
change license
Revert "isotope relayout after load"

This reverts commit e7a4557e8d713a91aed4b3ebc2300f159cd08e73.
Revert "stream users"

This reverts commit a88d55bddf94be6e1905d5ac22be3af5e9d7aeaf.
isotope relayout after load
add addtime
prevent listeners add on server restart
prevent redmine bot from updating currentTask if appuser has started one
fix redmineBot currentIssue update
fix redmineBot currentIssue update
fix currentIssue start / stop + update moment.js
change GLP license to AGPL license
Merge branch 'dev' of github.com:kernicPanel/skproject into dev

Conflicts:
	assets/js/controllers.js
first tests
add travis conf
add journals to extracted issues
redmine subway style
Add: Additional development iterations

These added iterations are final cleanup and documentation tasks
that need to be completed before taking this package out of an
active development cycle.

Signed-off-by: Kevin Conway <kevinjacobconway@gmail.com>
Cover setting from gallery page if logged in as admin.
need to work on photo resizing.
add actual cover photo.
Update <scm> sections of poms.
settings, twitter bootstrap
REAL forward pings w00t, TCP attempt
ignore failing test for the moment
Udp: StunServer progress
Do not show alert on sent messages
appendix b updates
dont show builds that are still building/archiving
Move from derby db to H2
Update JPA model to match openjpa needs
new profile_list_item_drawable.9
Refined tooltip
Uploaded skeleton for Project 2
Wrote a basic load() implementation, without taking into account indexes. Compiles, not tested.
Merge bitbucket.org:cameronjs/143-labs
Added keyCount field.  Read and write for both node types.
Committing the Asi_Gui and asi_estimator code I Have thus far.
Committing updated Asi_gui with results tab
Fixed errors with Gui and Estimator. Added label for results in Results
tab.
Merge branch 'master' of https://github.com/krendil/asi-estimator.git
Gui and Estimator - Next buttons don't work yet, trying to test a
commit.
ok typo in README
Fixes Bug 18 - TickTick can block with an extra bracket.

 * Errors weren't being percolated up the stack
Refactor the signin for to use form_tag in place of form_for
decouple tests from implementation
Add ability to update user info
Add Authorization
Add user index
Add ability to delete users
Updated the template to include program name and school
update

・ブラウザに画像、ファイル保存機能を追加
・「ブラウザを開く時ペーストボード内のURLを開く
」設定を追加
・イメージプレビュータップ時の動作を設定
・NowPlaying機能のアートワークアップロード機能を改善
・各種ボタンを良い感じに変更
css
Merge branch 'next'
Merge branch 'master' of github.com:kumobuta/menciusgroup
Boilerplatypus CSS framework
shared content variables
Fixed: Unable to select category in project form. Partially addresses issue #61
Fixed: template links outdated. Closes #65
Fixed: Wrong backend attachment button link when using Joomla 3.0. Concerning issue #68
Fixed: Time record form menu item used untranslated language token. Closes #60
Fixed: Cannot directly call dynamic class name method in the dashboard. This is concerning issue #70. Other areas may be affect as well.
More bugfixes concerning issue #70
Fixed: Template links not properly routed - concerning issue #71
Fixed: Goggles "Create" Menu is now hidden when not logged in - concerns issue #71
Fixed: Goggles link to milestone form not properly routed - concerns issue #71
Increased currency sign config field size to 2. Fixes #74
Fixed: Milestone start and end date not properly saved. Concerning issue #72
Fixed: Updating a project would not updated related items
Fixed: Task start and end date not properly saved. Concerns issue #72
Fixed: Permission to add tasks in the frontent were not calculated correctly
Fixed: Again, start dates not properly saved...if a milestone is set
Fixed: Unable to update an uploaded file without uploading a new one. Fixes #76
Fixed: repo directory checkboxes where falsely named as "cid". Corrected to "did". This is regarding issue #77
Fixed: Unabled to delete directory. Closes #77
Fixed: More ACL related issues with milestones, task lists and tasks. Related to issue #82
More ACL bugfixes related to issue #82
updating new dependencies, starting some testing.
improvements to autocomplete and .close
close .close when clicked
allow backspace to remove token in autocomplete
clean up alert styles
update drag and drop area
change uppercase styles to lowercase
update font declaration
added amee lib
code normalization
Now swirl with get global dependencies and global provides
Warning notice added to the docstring of wrap(): the examples are for illustration purposes only, and are not to be used in practice.
manage to achieve...TODO:Handling BUGS
enable to calc int & double type.TODO:(1+2)
Criação de functions JQuery para acesso de link e criado AJAX, além de inicio de sobremim criado.
Comment a bunch of lines. Change cmdheight. Simplify <c-\> mapping.
Remove trailing spaces to make vim happier.
Whyever
Merge branch 'master' of github.com:lerad/MenosC-Compiler
sourc*e*
added openshift
no vim
Add --older,--older-than,--older-mtime and --older-mtime-than to bsdtar to
enable only including files and directories older than specified date or file.
added -deleteWithError: to GTBranch to nil out the ref on deletion
error if the branch doesn't have a SHA
use -lookupObjectBySha:objectType:error: instead
Merge pull request #113 from libgit2/fix-target-commit

Error if the branch doesn't have a SHA
Use a defined session key

Previous to this commit, RubyCAS server did not use a session key to
check the validity of the 'tgt' cookie. This made it it impossible to
invalidate all cookies containing a Ticket Granting Ticket.

This commit adds a **session_secret** key to the config.yml file.
Further, the config.ru now uses Rack::Session::Cookie to manage the
cookies, using the session_secret setting in the config file.
Merge pull request #5 from ccaum/use_rubycas_server_session_key

Use a defined session key
[XML] Support more types in XML and XMLList constructors and generators
[XML] Accessing by array property behaves as a single-item list
make draft invisable in relative topic
first commit
Merge github.com:lineageiori/Paperwork
Add help target and make it default
Track minimal verf change.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
pulling out the actual ajax cart crap
todo功能开发。
todo去掉多任务列表切换。
Added rest of dialog
MOre logging
Merge branch 'master' of github.com:lostkhaos/SMTP-Server

Conflicts:
	Server/main.cpp
added ubuntu version alias
Only serve from cache GET request.  Fixed small bug validatecache^request.
Parse request cookies.
rewrite last suite tests from basic set
Tidypics_batch's access_id correction
Create upgrade file to correct tidypics_batch access_id
Full project website
Introduce a mock connection object that can be used to make testing of
PTPusher much easier for end users.
Delegating to the same socket delegate methods that would be called
using a real socket means that the mock connection behaves more like
a real connection, including calling its own delegate.
Allow simulated disconnections.
simplify vimrc
merging remote branch
commit
pre-commit
Committing current baseline to repo.

Hi Romi.
Completed #35, kick for rule violations

Added WarnsBeforeKickForRulesViolations
Added self-infection check
Added TellAll for bullet damage
Added fix for idle kicks before someone spawns the first time
TeamChange needs more time
Fri Apr 13 21:41:08 CEST 2012
nothing to say
Merge branch 'HEAD' of https://github.com/magicboylinw/examples.git

Conflicts:
	xml/src/main/resources/cd_catalog.xml
x
添加玩家精灵
Added information on creating an .rmskin
netsh: pause between switching actually works
Update code/index.php

Added a reference to Manuel Lemos PHP OAuth API class.
update internal tool
merge mannix code dec-07
update badge parser
Merge remote-tracking branch 'mannix/master'
update collector
Merge remote-tracking branch 'mannix/master'
hot fix top fan memcache
Merge remote-tracking branch 'stephen/master'
Update pdfbox dependency to 1.6.0, official release
Merge pull request #12 from geodata/master

Thanks for noticing that the new pdf box has my fix.
bugfix for tooltip plugin, otherwise tooltip plugin gives a warning, when no tooltips are to be displayed
mongo.lock vacio
Added edit functionality and its unit test. And some StringUtils at bootstrap
Trying out different versions of messenging
Changing way motors are controlled
Setting up gui to manual robot control interface
changed to accept a username & password
Revert type="email" on the registration form to avoid validation issues. see #22183.



git-svn-id: http://core.svn.wordpress.org/trunk@22413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Make WP_Theme::get_files() a general method for retrieving any file types, at any depth, optionally to include parent files. see #20546.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove WP_Theme::is_child_theme() in favor of WP_Theme::parent(). see #20546.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove support from WP_Theme for multiple screenshots until we bring it to the UI. fixes #20546.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Fix typo in a comment, props SergeyBiryukov, fixes #20506

git-svn-id: http://svn.automattic.com/wordpress/trunk@20591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Site updated at 2012-03-17 02:06:00 UTC
some work on the PLE chapter
mer klart
hej
added embed code meta box
almost ready for data entry
added initial expand of tee driver
Completed Styling

Completed CSS styling to match provided mockup look
add help text on how to convert with mplayer
nova biblioteca
added ExceptionHandler annotation
Add ngx_http_mruby_module.h
adding TextureRegion, basic font example, starting work on Lesson4
prettier 2d correlation graphs
BF - remove nipy import from sympy compat doctests

The sympy compatibility layer was using nipy imports for the doctests,
but the doctests work without the imports; comment them out.
Fixing format of test.php to conform to coding conventions
Merge commit 'refs/pull/1/head' of https://github.com/matthewzynga/project1

Conflicts:
	test.php - Kept all our parts
Support sticky for libnotify
Merge pull request #26 from anekos/feature/libnotify-sticky

Support sticky for libnotify
Fixed tests! .cs file wasn't set to compile on build..
invincibility fully implemented
Fixed the CHECKIN_STATUS wwwoption
Fixed the script that hides the out of scope locations to remove the unwanted locations instead of just hiding them
Fixed the script that hides the out of scope locations to remove the unwanted locations instead of just hiding them
Fixed the script that hides the out of scope locations to remove the unwanted locations instead of just hiding them
Merge branch '2009' of github.com:mcoia/example-sets

Conflicts:
	toplogo_loggedin.html
Changed the Help link to help
Adjusted the script the removes the out of scope locations
Server Pinger / Alarm Service
Add web note to display for all account pages
Fix saving checksum so we properly detect updated records
Updates to Marmot acount functionality
Updates to CMC footer
Merge WCPL changes from production, move Reading History link for Marmot to indicate it is only for print titles
Init WorQuest
unfuddle
Merge branch 'master' of github.com:mercystage/exceedraft
First commit
Added information to the readme
Added the readme file
Removed Player.java from source, changed tests in AIPlayer to reflect original algorithm
Fix again, oops.
fixed additional properties bug
excluded built-in log4net properties
Merge pull request #4 from micahlmartin/additional-properties

Additional properties bug
Update README.md
refactored appender
using at-at for scheduling
so close you can taste it
nearly there, some WTF going on
yay, pretty much working
refuctoring
old stuff
added the scraping module
lint in makefile
Merge commit
Merge branch 'master' of github.com:mikehulluk/morphforge

Conflicts:
	Makefile
Typoes in TracePiecewise operator classes
Fixed lint errors
Tidying code with lint
Make NEURON vs neuron more consistent
Added intro text to the Movie main page
Add 'home' to repository owner blacklist
Update Italian translation

Closes #292
install location
blah, annoying unicode crap
more customize tweaking
Now tracking color-theme

Whatever el-get fails I'll host it
in progress
in progress
Merge branch 'master' of ssh://git@github.com/mirekbehan/playground.git
still doesnt work but next step done (db syntax)
Fix up some tests since we should have run them before tagging 0.1...need to get into build server
Primary Commit
images
Adding checkerboard stuff
Adding final studen.py
[Client] Code format
[Client] Changed open container commands as requested by Vilarion
[Client] Fixed crash in case a emote is received from a character who is out of range
[Client] Fixed trade item for containers
[Client] Catch move operations in container slots that are impossible
[Client] Always request turns when moving around
[Client] Fixed usage of open container commands
[Client] Read container ID properly
[Common] Updated credits
[Client] Fixed debug output of drag commands
[Client] Fixed update distance of characters on the screen
[Client] Removed some old functions
add: first try on a redis protocol implementation
add: throw exception on connection.
created gameassets and spaceworld classes, added comments and simplified stuff
fix user input trailling \ Exception in localization (Ticket #140)
bugfix for ModeSourceWorld strategy
added "hsp" alias prefix for ALL HSP commands
Outline through Ybarra
Vandana,Aravind - corrected performance url
V2 | #00 | Added display strings to subscription status to be send to OM
Dev | #0 | retaining search criteria for next & previous page & applying default criteria on page load if exists
Dev | #0 | disabling next button if page result is empty
Dev | #0 | triggering pageUpdateSuccess event after page load
Vishnu, Dev | #0 | search criteria is updated only on filter form submit
Add some more words to spelling list.
[Storage] fix typo
tweak buttons on remember password infobar

Removed big white border, faded out the "never remind me on this site" button as in mocks
SHIRO # 001 # 04 : STAGE INITIAL
ANT # added solid Java EE build
Message encoding refactored
XHRPollingTransport refactored
JSONP encoding moved to Encoder
Heartbeat bug fixed. Issue #19
New features mentioned
small bugfixes to make it work with non-jpa database; also disabled
JQGridTableView in favor of JQGridView; added 'resizable' option to
JQGrid so user can make it bigger.
Updated .gitignore
Updated project for 10.8
MKAudio*: add sidetone option.
Testcases added
layout-Xml hinzugefügt
a
sicherung
a
not ready
a
1
Read midi note from microphone
blablub
Added imports
geht no net
wird noch nicht angezeigt, ansonsten ok
Merge branch 'frequency_to_notes' into rec_to_frequency

Conflicts:
	AndroidManifest.xml
Bis aufs layout fertig
fertisch soweit
Merge branch 'master' into rec_to_frequency

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/at/tugraz/ist/musicdroid/MusicdroidActivity.java
Merge branch 'master' into rec_to_frequency

Conflicts:
	src/at/tugraz/ist/musicdroid/MusicdroidActivity.java
1
a
21.08.2012 WorkingTime Rapository Güncelleme
Added caching to server.
Fix width all the boxes for Bromley.
Tja...
Merge branch 'master' of git@github.com:najtrox/ExpertsInTeam.git

Conflicts:
	Eksperter/src/main/Scenario.java
Fixed remaining NULLable params not being Maybe

Affects terminalSetColorCursor and terminalSetColorHighlight.
add comments
add support for job arguments
delete old tests
Add fromFile to DomainModel.
remove unnecessary whitespace
stock wsgi.py file
Merge branch 'master' of github.com:natea/django-deployer
Update column interface
Apply column filtering
Merge pull request #9 from neopunisher/master

Added ability to see comments and sitemaps and fixed ver error in why function
change search box to be slightly more sublte
change layout of action-links (no longer in one large line)
change content box and add shadows

* content box now #main, not #page
* box now has shadow - paper style
* text outside of box also has shadow
fix submitted date for pages
fix read more and inline links in content
Add pyfragments.swg to list of SWIG sources
Bugfix for create() interfaces to Dataset
update config and submodule
Removes node_modules from repo
Add info on installation for windows
Show welcome message when start the application
Show welcome message when starting application
Added functions for navigating directory tree.
Small refactoring.
Add a console view for interactions
Moved configuration function to utils
Added a way to run tests
Updated app configuration
Testing configuration
Fix b0rked code
Make runtests executable
Add nose to requirements
Done updating of queue's order & machine
Repeating Performance Schedule layout and functions
reduce code complexity by not handing state names
no state name. only countries with provinces are listed
picking the right value from the tuple
changed hostname and hosts file, updated system update script
fixed potential firefox double scroll handler issue (#10)
Merge branch 'master' of git://github.com/JoelBesada/scrollpath

Conflicts:
	script/jquery.scrollpath.js
Added Device Support
nx-home-rc 0.0.67
Merge ssh://github.com/norioxkimura/homebrew
Speeding up partial PUTS
Merge remote-tracking branch 'TwoApart/feature/put_speedup' into 7geese-tastypie

Conflicts:
	tastypie/resources.py
Test changes to LimitedInteger.
Add Gregorian to Discordian calendar conversions.
Moved add_resto.py to a generic resto_cli.py which can delete.
Fixed up the webserver a bit.
gittest: Правильная версия
gittest: Правельная версия
Fixes #5761
Buttons icons added
updated 5-1
add ofa app/template
Модули Роли и Пользователи
Rewrote show/hide functions not to use element cloning. Just works :)
Merge pull request #1 from olegmukhin/noclone

Rewrote show/hide functions not to use element cloning.
Dynamic palettes.. very cool
C2SW1H01.ITM, general cleanup and Polish translation update
actually, having media join would be handy
Update eoi to new path
Service and object resource enhancements due to refactor
Removed old lca_demo preload files
Moved around and added execution CEI resources
Added UI attribute csv file
Bootstrap and r2deploy refinement
Refactored r2deploy bootstrap
Removed obsolete interface files
Refacored container deploy files
Merge branch 'master' of github.com:ooici/ion-definitions
fix wrong deceleration animation when "pull to refresh" triggers while scrolling up
no point in raising an exception, returning 0 is enough
added sponsors and supporters
unsubscribe from events on the proper layer
use two different layers for Split tool's layer and the source layer so as to properly check for event unregistration
Merge pull request #529 from adv-isu/ControlSplitDeactivateFix

OpenLayers.Control.Split.deactivate event unregistration fix.
refers #304 - fixed broken test (due to default proportion change)
Whitespace, pep8 tweaks
fixing deploy link

doesn't work when viewing the readme at the root level of the doc directory on github.
remove 23:59 from until_arr without block
forgot (once again) to commit the built application in addition to the code

I'll remember next time, I hope
Remove FollowSymLinks .htaccess Option

There are no symlinks in the api/ folder or subfolder
Merge pull request #111 from greezybacon/issue/111

cron.php - 500 Internal Server Error

Reviewed By: Peter 07/01/12
updated Datasource::Fields with new API; made some fixes
bump version for new release
Updated config to work better with allready checked out git lernanta
Task for element resizing
Update README.md

readme update for 0.1
Addition of coffee maker unclogging details
Skills drin, aber noch unsauber
MySite:
create company & product table.
MySite:
company list & content . from news.
MySite:
company OK.
MySite
MySite:
是contact us OK了。
Add flashing notification and only autoscroll at bottom.
Pagination on forums

Signed-off-by: karmatosed <karmatosed@gmail.com>
Merge pull request #7 from sfine/master

Added Steven's models: heu-met-fast-008, heu-met-fast-012 and heu-met-fast-014
Updated readme and added graph PNGs
Added chart PNGs
support clang complete for c/c++ mode.

add emacs-clang-complete-async submodule.
add python-mode submodule
add anything dir for python-mode
Merge branch 'feature/python-mode' of https://github.com/pbesedm/Oh-My-Editors into feature/python-mode

Conflicts:
	.emacs
	.emacs.d/ac-comphist.dat
	.gitmodules
Finished initial master page started by pbtohiglo.
Forgot to stage everything for last commit.
master page began... not much here
Set up a bit of the master page header.
Tweaked the masterpage more to get user info. Created dummy pages. Default page auto logs in and redirects to Timelog.
Merge branch 'staging' of github.com:webgeek1234/Timemachine into staging

Conflicts:
	Master.master.cs
Fix botched merge
Properly dispose datareader and connection.
Merge branch 'dev' into staging
Typoed the getuser function.
Merge branch 'dev' into staging
Merge branch 'staging' of github.com:webgeek1234/Timemachine into staging
Merge branch 'master' of github.com:webgeek1234/Timemachine
Yay, copy pasta! Fix broken teacher permission.
Merge branch 'dev' into staging
Merge branch 'staging'
testing testing, 1, 2, 3
This is a message
Login page working.
fix
updated base config with deploy group
Localisation updates from http://translatewiki.net.

Change-Id: I69ce1691eb1997b22ca3134944fa4ab4deac4d53
Localisation updates from http://translatewiki.net.

Change-Id: Ic835960b15fde7f92d6bcc50086a65c556369eb9
refactor metainfo rendering - use misc.xhtml_page and therefore main stylesheet
Another style bug
add setTimesPerChunk method
Fixed stupid mistake in deploy script

I forgot to close the quote marks in the echo command at the end
because I'm a bit thick.
Improved README
Added another castle room
New openSUSE repo.
"openSUSE" was added.
Merge pull request #957 from DAP-DarkneSS/master

New openSUSE repo.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README
clean up filters and query code
override custom JS for nested_forms in the app, usig stock JS for nested_forms.
update time picker [ci skip]
update pjax, update form.pjax, th.pjax and a.pjax support for non-pjax browsers [ci skip]
add spec + bindings for RailsAdmin::Config.visible_models
RailsAdmin::Config.visible_models only list visible and authorized models
remove useless assertions [ci skip]
remove useless page_type parameter
clean rails_admin_basic_list_spec of non-performing tests (sort) and low-perf tests (hooks presence tests)
Proxy on ActiveModel should not retain a direct reference to the class, because of the way ActiveModel reloads models in dev. mode. fix #1000
Cleanup trailing whitespace
Update dummy_app to Rails 3.2
Don't raise exceptions on mass assignment protection for Active Record models
Run specs in random order to catch order-dependency bugs

@bbenezech: Please do not revert.
icon-minus => icon-remove for cancel buttons
fix #1003
Thanks @versilov
[ci skip]
Merge branch 'master' of github.com:sferik/rails_admin
icon-pencil -> icon-pus for new action
Thanks @versilov
fix #1002
[ci skip]
fix a bug where polymorphic associated collection retrieval would blow up
remove disable class on edit button when a new record is added to the filtering select widget [ci skip]
fix race condition with modal insertion in the dom (Chrome => Team/add a new fan => #modal not found when it should have). Somehow .on('show') is too early, tried it too
[ci skip]
add icons for delete page buttons [ci skip]
Ignore InstallLog
Fixed positions of in-game interface buttons.
Fix security hole where users can see each other's projects by hacking URL
get previous blocks
get systems
techimplement added
second run method deleted ( i have no idea how it got there)
typing mistake in attribute name corrected
first comit
fully converted
first comit
fully converted
first comit
fully converted
commit for discarding a psd
commit for xcode
Replacing default_table_type variable

The default_table_type variable was deprecated in MySQL 5.1, in favor of
default_storage_engine.

http://dev.mysql.com/doc/refman/5.1/en/mysql-nutshell.html
Removing options for BDB storage engine

The BerkeleyDB storage engine was deprecated in MySQL 5.1. Keeping the
skip-bdb variable in my.cnf will make the server refuse to start.
Updating replication configuration for Percona 5.5

Using the master-* variables to set up replication in my.cnf has been
deprecated in MySQL 5.1. Replication is now set up via the CHANGE MASTER
TO statement. An extra recipe for replication has been created to
accomodate this.

Also, some default attributes have been changed to match the default
settings for Percona 5.5. Using anything other than the default settings
for innodb_buffer_pool_size and innodb_log_*_size will make this
cookbook fail (the daemon starts with the default configuration at
package install, and when restarting after reconfiguration it will fail
to start because the InnoDB config does not match). There might be a
better way around this, but I have not found one.

With these changes, replication should work out of the box. Just install
a master and a slave with the cookbook and run "START SLAVE;" on the
slave machine.
Merge pull request #10 from masv/5.5-compatibility

5.5 compatibility
add stub for bremen
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
bug #3585695 [CSS] Font size in inline query editor is way too big
Merge branch 'QA_3_5'
Fix merge conflicts
Decoupled LDAPConfiguration from the LDAPIdentityStore.
Decoupled LDAPConfiguration from the LDAPIdentityStore.
text nodes get value assigned
Removed difficulty feature asofnow
Fix bug in setting the position of an annotation
Fix Auth::delete_user_remember_entries() call
Except false-positives from deps
Release 3
Specifically set output tgz when downloading numpy.
Add build_dropbox.
fix tests so they don't interfer
Adding quotes around the path should solve the problem. 
http://superuser.com/questions/119610/spaces-and-parenthesis-in-windows-path-variable-screws-up-batch-files
Updated .gitignore
Force commit of Makefiles
- fixed buffer overflow in ledfade. stepSize was only per led but we need it per led color!
- added test command to wiflycontrol
Merge branch 'dev'

Conflicts:
	WiflyControl.cpp
fix endianess bug
- if we transmit data which is not interpreted as a single byte or a byte stream we always have to convert it into network byte order. This is done by htons(short) for 16bit values and htonl(long) for 32 bit values. same thing on pic. we have to convert it back from network byte order to host byte order, if you are lucky pic is endian but dont trust on it. to do portable code use ntohs() and ntohl() to convert it from network to host byte order.
Merge pull request #35 from tawarisch/master

Bugfix #34
[dashboard] #{} not <%= %>
Small cleanup: remove deprecated features
Merge branch 'release/0.4' into develop
Style age gateway properly
Blogpost now more like post
Remove content css class
Clean up inconsistencies
Merge branch 'feature/remove_content_css_class' into develop
Ajazify django-pagination for smart layer
Get multiple smart batching to work on one page
Update changelog
Merge branch 'feature/smart_pager' into develop
Listings can have pinned items
Ensure listing tags still works
Get pinning to work
Update changelog
Merge branch 'feature/listing_pins' into develop
Prep for release
Merge branch 'release/0.5'
ICL-118 another test
added index to simple_rendered route field
mzml update
Update mspire
Don't forget to delete the uninstaller entry in the start menu. Update ActiveTCL URL.
improve alias
add bucket-opts imageview watermark
add org.slf4j.feature to the mix
Correct type resolve when explicitly importing a class and then
using class.subclass as the type declaration. Should aid #26
Cleaning up the code a little

git-svn-id: https://angelscript.svn.sourceforge.net/svnroot/angelscript/trunk@1465 404ce1b2-830e-0410-a2e2-b09542c77caf
Update lib/resque/status_server.rb
add clear_completed to hash
rename #clear_one to #remove and add tests for it
Merge pull request #64 from leomao10/master

Add Clear_Completed method to Hash
CHANGES FOR SCOTTY
- update name for WAR,RPM,DEB POM
Merge pull request #37 from rackspace/chadlung

- update name for WAR,RPM,DEB POM
Small fix for channel colors
Added text do README.
Add tests for puppet::client::base
i2c make errors bubble and add support for I2C block read and write, some bug fixes
Merge pull request #5 from dsmall/master

Pytronics update for i2c
Vista temporal creada para author
first commit
Adding a bunch of placeholder files
Adding Razor & RazorCharts as submodules
Adding framework for sections, fonts
Moving some images around, adding plus/minus images
Adding mock json files
Adding Archer Book font
Adding some simple JS to use the new mock JSON
Adding a bit of style to the accounts aside
Changing aside account value color
Adding basic page animation functionality

- Adding messages
- Adding sample content for all sections
Allowing FF to acess files from file://
Centering page content
Adding icons, stylizing section nav
Adding some style to site nav to get it out of the way
Adding toolbar to sections
Adding desired code for summary pie chart
Removing Razor and RazorCharts as git submodules
Squashed 'javascript/RazorCharts/' content from commit 8a63b99

git-subtree-dir: javascript/RazorCharts
git-subtree-split: 8a63b99dfb8a0e54ea77f5fc2adda02ea0f28fff
Merge commit '61df146e79fc76a851e0d0ced02dda658582c068' as 'javascript/RazorCharts'
fix nova floating-ip-pool-list command
don't run nova-volume-api under folsom

- we use cinder-api under folsom
- this is handled by ubuntu packaging as they separate the volume-api
  out. Under rhel, we need to specify which api services to run in
  nova.conf. This is also safe to leave in an ubuntu nova.conf hence no
  further separation
Merge pull request #201 from mancdaz/master

Merged automatically by jenkins after successful build test
updating keystone to use mysql_database_user :create and :grant LWRPs
Had the wrong bridge_dev for the 'private' network definition
Merge pull request #131 from galstrom21/sprint

Had the wrong bridge_dev for the 'private' network definition
Fixed Responsive Design View
ZtreeController注释
增加对文件夹的获取和操作

增加category hashMap类，将目录信息存放到全局变量中，在用户输入后，进行模糊查询，并显示下拉菜单给用户选择
Incorporating use of thrift api in schema and schema_test; modified forma-seq to work with current workflow
Merge pull request #80 from reddmetrics/feature/schema-update

Incorporating use of thrift api in schema and schema_test; modified form...
Cleaned up commentary.
added JS loaded calendar to frontend
Merge branch 'parisportugues' of github.com:regedor/GMS-Prototype into parisportugues
Automatic update [Thu Aug 09 18:10:10 CEST 2012].
Automatic update [Thu Apr 12 06:08:23 CEST 2012].
Fixed lexical analysis of strings
Working on lexical analysis for escape characters in deserialize (don't split lexemes around escape sequences)
Tagging v0.1.4 (parses phobos and made some improvements).
added "new" ctgy to stamps
ELIS 2.2.0.11 release
Merge remote-tracking branch 'rl/MOODLE_22_STABLE' into MOODLE_22_STABLE
Handling invalid signin.
Fixes errors and deprecation warnings in specs

- Methods defined in a module extending ActiveSupport::Concern need not
  define an InstanceMethods module. Any method defined in said module
  automatically be available as an instance method to the class
  the module
- We're not using Sendgrid in the development and testing environments
  so only set everything up in config/initializers/mail.rb for
  production
- Removed SimpleCov, which is kind of useless and ugly anyway and
  pollutes the specs with deprecation warnings.
- Fixed FactoryGirl's deprecation warnings
Removed destroy link from project show and index

The project can now only be deleted from the edit page.
Work weeks are now scoped to current company

i.e. We only show estimates and actuals for the work_weeks associated
with projects of the current_user's current_company.
Tried to keep the changes as minimal as possible to facilitate tweaking
and revert if needed.
Merge pull request #59 from rescuedcode/fix_for_all_staff_page

Work weeks are now scoped to current company
Merge pull request #61 from rescuedcode/staffplan-user-id-like-able-delete-project-only-after-choosing-edit-the-projects

Removed destroy link from project show and index
Merge pull request #60 from rescuedcode/spec_fixes

Fixes errors and deprecation warnings in specs
Merge branch 'master' into all-staff-individual-staffplan-weeks-are-out-of-sync-again

Conflicts:
	app/views/staffplans/index.html.haml
sample code
sample.py
sample code
FIX: small fix to layout.  add whitespace.
ADD: definition of _data_model_meta data structure and attribute definitions for metric aggregator methods
MOD: aggregator processing wrapper method is now more broad to accept different types of aggregator methods (read different signatures).  Also defined some attributes to identify method types and to define method meta.

https://github.com/rfaulkner/E3_analysis/issues/17
ADD: added new aggregators to aggregator_dict

https://github.com/rfaulkner/E3_analysis/issues/17
convert web page javascript to coffeescript and put in its own file
add formatting to move list
Optional options for main method
Default options object
All tests passing for simple-test.js
refactored run_em_test to be stateful to fix spurious spec failures due to EM.stop being called prior to all deferred callbacks being processed
avoid double monkey-patch of EM.stop
Merge branch 'v5.8'
Added Policy and PolicyManager classes
add List Tree to section7
Update adminmap
Remove some redundant code.

Sometimes I overthink things.
add set hidden to .vimrc
Show no toolbar in dev tool window
[Win] Handle OS key presses.
Don't ship platform_util in node-webkit, use the ones in chrome.
Manager leer initiiert, bevor wieder alles kaputt geht
OpenGL: add basic operations to test the opengl function

Add basic operations to test the opengl function, draw some
simple rectangles to analyse the code.
Added day name and non-padded date in asString
lagt til bio-link på et noenlunde lett gjenfinnbart sted
Rename the extension to Roots Search
remove commented code
update namespace.  Export integerArray
Revert "Revert "[maven-release-plugin] prepare for next development iteration""

This reverts commit aee218bad3795dc19d9d0d96b13955d3582c42bb.
Revert "changing star to break build"

This reverts commit e8c644d949c36075a8882490e1d753cd8ea86a6e.
Added WTFPL licence.
added sql/plsql snippets
Merge pull request #143 from ekalinin/master

added sql/plsql snippets
Added WTFPL licence.
Added WTFPL licence.
Merge pull request #142 from theocrite/master

Added the WTFPL licence.
added switch, switch with no default, and case snippets to c snippets
Merge pull request #145 from jackStalnaker/switchcase

added switch, switch with no default, and case snippets to c snippets
Changed patfh to fpath. Makes sense due to context
Merge pull request #146 from ddd/patch-1

Changed patfh to fpath. Makes sense due to context
Delete duplicate snippet
Merge pull request #147 from jredville/patch-1

Delete duplicate snippet
Adding a html5 snippet

This html5 snippet would provide the minimum someone could expect in a html5 file.
Merge pull request #148 from theocrite/master

Adding a html5 snippet
Added descriptions for duplicated snippet names.

This is to make the snippets a little more compatible with
neosnippets.
Merge pull request #149 from docwhat/neosnippet-compat

Added descriptions for duplicated snippet names.
Merge https://github.com/honza/snipmate-snippets
Last visible url is added (getChannels)
password functionality
split up actions, removed constraint
Merge pull request #6 from rtxwebdev1/ROC-6

password functionality
removed method from UserInterface
fixed unit test
 fixtures
Merge pull request #7 from rtxwebdev1/DataFixtures

fixtures update
pagetitle, translation, usermanager fix
merge upstream
Merge pull request #8 from rtxwebdev1/ROC-2-additions

pagetitle, translation, usermanager fix
updated login template
Home page suggest title changed.
home.css precompile
收藏图标更改;
psd file update, deploy script fix.
重复代码
Merge pull request #2 from linjunpop/patch-1

重复代码
fixed topic i18n typo
link to contributors page on github.com/ruby-china
fixed more typo

贴 -> 帖
FIX: correct rspec methods
Merge pull request #6 from xiaods/master

再次提交rspec patch,请review一下。
add distributed ci integration,travis
correct topic helper auto_link test case
remove rbx-19mode env
tuning travis.yml.add matrix properties
Merge pull request #8 from xiaods/master

给你pull一个，你做个merge吧。
update README.
update Travis CI path.
Fix home suggest items match bug.
Fix spec.