labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #69 from amscanne/master

Touch the disk file on migration and on launch
Must always fetch descriptor in migration case.
Merge branch 'master' into stable/diablo
Merge remote-tracking branch 'gridcentric/stable/diablo' into stable/diablo
Merge 3463d9fc72117f7fefc3fa47158f691a4e5fd721 into 51fe2eadc3f5ecd0e4709245c9f9fb0c1219226d
Force Groovy compiler level for building.
add null check
remove unused file.
Re-fix failing tests.
always run CompileStatic/TypeChecked on reconcile
Merge branch 'master' of https://github.com/groovy/groovy-eclipse
Added Samsung Q1 (GT-N7000), thanks to Entropy512.

Changed Samsung C1 to U1 #becauseSamsung
updating commit tag
locks screen to portrait for lessons
viewing/navigation of major lessons content done
added transifex configuration
added support for RTL rendering and locale switching
Merge pull request #5 from n8fr8/feature-101-interactive-trainer

Feature 101 interactive trainer
solicitacao javadocs
Update m_icecat_importmanufacturer.php
Fix setup/teardown bug.

* Thank you, M.K!
Per discussion in the issue tracked spurred on by the decision at the parent project, removed appcache generation. fixes #59
更新个人信息编辑  此模块已完成

Change-Id: I3b61149cf1023a1c4d3976dd7c4bbb40494eeb77
adding analiser better buffering
adding file api and better decoding
Now detects if user is typing, which can be sent to server.
get email addresses of users array passed
added multi game rule
restored a non-optimized image that looked better
Added some example configurations

Signed-off-by: Hayden Stainsby <hds@caffeineconcepts.com>
A minor change to urls.py

The administrator can now access the admin page with both mainrul/admin/
and mainurl/amdin
This is a small regex change, but could save some trouble.
Fixed major bug in last commit

Changing the language from the menu is now working again.
[lines] in order for lines [] to work, the brackets must be removed, not named
Merge pull request #12 from portertech/lines

[lines] in order for lines [] to work, the brackets must be removed, not named
add img-dezine
Execution line
Remove the not working scripts
Use long and double to prevent overflow
Adding vagrant as dependency for a test
After adding some wrong tests. Need to use mock object for new
Replace carrierwave with paperclip
make text sqlconverter implement isql4nosql interface
add Input:eventAdjustHook(ev)

so we can adjust input event for KT on the fly.
the touch input event coordinates in KT ranges from 0-4095
instead of the screen size.
More see also notes, expand variable-length token explanation
Merge commit 'a354167a8759e39c3928947a9c1308ba168c35af'
Merge commit 'bca17cc1cc061ebf2b1abe4222663fa55d057240'
Merge commit '23861de2410707477c9bf610922c22afde6921c6'
Merge commit '1d7e2a4a7fb9e46a0e55de26748f66e1c3ae3df7'
Pull in snapshot_key from config instead of hardcode
Merge branch 'remove-sk-hardcode' into build
Revise gemfile for 2nd edition
Add rspec files
Improved ability to run fake mode in CI environments.

* The reddwarf-server script can now fork itself and save it's pid.
* Changed the tox.ini to not start the fake mode server. Now, two new
  bin scripts start and stop the server. This should make it easier to
  run in CI environments.
Merge pull request #182 from TimSimpsonR/local_runner

Improved ability to run fake mode in CI environments.
adding lfhost config viewer
昨天和今天的更新

Signed-off-by: liaosiwe <liaosiweiorxiaowei@gmail.com>
expanded glossary
Merge branch 'master' of github.com:hypesystem/SliceOfPie
neurospora population genomics download all data
Issue 14 resolved. New Research Paper form tags edited.
fix a bug that would always treat MAX_VOTES as 1, except when it is -1
add a gemspec and railtie for rails 3.x, remove rails 2.x code, bump gem version
Remove Ardes namespace, use streamlined Rakefile
Remove Gemfile.lock, ignore Gemfile.lock and .rvmrc
Update dependencies, and keep last know good deps in Gemfile.lock.development
Get specs working again, update README
Docfix
table alignment finishing touches
fix'ed SQL typo
changed phpstats dependency to my forked version
removed phpstats from composer moved in app, need to get composer install working
updated docs with composer support
fixed formatting issue
removed references to pear and changed to composer
removed dev env setup files
added regx datatype
maven-osgi-test-plugin uses another property to skip tests: Dmaven.test.skip=true
More filtering options

New option to filter IU by provided package.

New option to treat provided pattern as prefix or as exact string.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
stable jnlp url

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
tycho 0.15.0

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
First TriggerGame commit
.pro file added
The screen flickers now, but it will adjust the positions of the elements,
bonds, and arrows when you select something and the menu comes up. This
way, the user cannot place elements in areas which would be off-screen.
However, there is an issue where the user can place elements where they
don't want to just yet.

Signed-off-by: Ian Graham <ianrgraham@gmail.com>
Faster database check setup in every page reload
functionality of pagination and importing of data from isbndb.com into local db
UI tweaks
tried to merge
Item added message on shelf screen
fixing submodule...
refined vim backup
gitconfig will be copied instead of linked. it is rarely changed anyway.
Use the system defined caches path, and the current class name to determine the cache path
Merge pull request #4 from tonyarnold/artwork-cache-fixes

Use the system defined caches path, and the current class name to determine the cache path
face plugin
face plugin
Merge branch 'master' of github.com:ingenuitas/SimpleSeer
Merge branch 'master' of github.com:ingenuitas/SimpleSeer
ipython-notebook as an apt-get dep
image view css fix
rever delete of fabfile
fixed inefficiencies in clearing out temp vectors. code is now roughly 3-6x faster depending on the test matrix.
added new test matrices, more documentation
require and backbone
frontend setup
backbone
more backbone
updated port to 80
Merge branch 'master' into db_entities
check for redirection
added control for empty audio size
hokuyo marking but not clearing
BZ848661
fix for bug 849117
fix for bug 849098
Add missing variables
Fix for bugz 846108 - passenger_status fails due to missing gems. Add
missing gems to spec.
Add missing variables to mysql stop
Updating gem versions
Automatic commit of package [rubygem-stickshift-controller] release [0.15.8-1].
Merge pull request #398 from bdecoste/master

Merged by openshift-bot
Merge pull request #399 from abhgupta/bug/849117

Merged by openshift-bot
BZ 849058: Add Postgresql to the list of cartridges which exist in both the top level and embedded level.
BZ 849074: backup and restore didnt take into account the secondary gear.
Merge pull request #401 from ramr/master

Merged by openshift-bot
Merge pull request #400 from rmillner/fixmongo

Merged by openshift-bot
Merge pull request #402 from rmillner/postfixbugs

Merged by openshift-bot
fix for bug#849385
Merge pull request #403 from rajatchopra/master

Merged by openshift-bot
add stub for the WPS endpoint.
migrate a first valid-but-slim GetCapabilities.
add a check for Request parameter
migrated basic DescribeProcess. No I/O yet.
add REST API for add/remove script (no metadata parsing)
First fonctionnal WPS play based server.

(all changes as a big squashed commit ; I know...)
Merge remote-tracking branch 'gourlaysama/wps' into wps-merge
Merge pull request #10 from agueganno/wps-merge

Wps merge
Added simple non functional tests
Changed to calculating coloured GOOD/BAD once
Assignment 1C scanned
change to order of sample data
Issue 13: errors compiling orange with dmd 2.059 beta 2.
small fix to base.rkt
add reverse colors support (issue #9), use more appropriate color names
Use the REVERSE variable to use black on white

Having to edit the liquidprompt.bash file to select a configuration is a
bad idea. Configuration shall be external to the file to avoid any
modification compared to the official version.

It is easy to pass paramaters to the script by using (in the present case):
$ REVERSE="1" source liquidprompt.bash
Revert "less indirections, directly call FreeBSD primitives"

This reverts commit a00de370c58fe2c18a49944821e113617caff1c4.
undo commit a00de370c58fe2c18a49944821e113617caff1c4, let Darwin be specific again
move configuration variables in a separated file
Remove spaces around numbers of SVN changes

With 1 file changed in the SVN repo I get:
± svn status | grep -v "?" | wc -l
       1

So the prompt is:
[...] trunk(       1) ±
with the white spaces at the left of 1

By converting the number of commits from text to numeric the white
spaces are removed.
Support directory names with white space(s) inside

If you "cd ~/Library/Application Support" or any directory containing a
white space then bash will run in an endless loop.

This is because __shorten_path $PWD $PATH_LENGTH is used instead of
__shorten_path "$PWD" $PATH_LENGTH
Note the use of "" around $PWD in the fixed version.

In case of the bug we have in the __shorten_path function
$1 is set to ~/Library/Application
$2 is set to Support
$3 is set to $PATH_LENGTH

With the fix we now have:
$1 set to ~/Library/Application Support
$2 set to $PATH_LENGTH
update the doc about the configuration
bugfix: do not use 158 if not set, defaults to 80
Merge remote branch 'upstream/master'

Conflicts:
	liquidprompt.bash
Set default value only if not already defined

Use the bash construction ${parameter:-word} to define default values
only if they are not already defined.
Merge pull request #12 from LudovicRousseau/master

Set default values only if not already defined, support directory names with white space(s) inside, remove spaces around numbers of SVN changes.
remove feature list (see the README), add the list of authors
try the XDG Base Directory Specification if the dotfile is not here
use the -rc suffix for the config file
clean PS1 building
You can temporarily deactivate the liquid prompt and come back to your previous one by typing . Use  to bring it back.
do not overwrite PROMPT_COMMAND and set it back with prompt_off
keep existing PROMPT_COMMAND if available
show the number of added/deleted lines, if changes have been made in a GIT repository
Javadoc added
Test spec updated
Deleted .ini
Bass process with rp16 -- nice, nice
messing with bullets in the readme
bit by bit :)
fixed pigeon
 wow what an improvement
 oh my monad
 latest settings
 better than ever
 even smaller and no lost of functiionality
 hmm
 i em happy
 better switching from, workspace
 better keys, and file size
 check, continental breakfast
 most if not all settings are at the beggining of file
 edited some thing can't remember what
 mocp stop kills mocp server
 subkeys and rot slaves
 f-ing awesome
 this looks good
 even better transperancy
 it just keeps getting better and better
 cool new fade
expand radius from 10km to 30km
refactored threadcheck
Added crud.js and created edit action in glossary controller.
Initial work to return an ome-tiff if file not archived. (see #7754)
Download archived or ome-tiff (see #7754)
Do not display selected group in move to list (see #8541)
Indicate location of the move (see #8541)
Improve move to workflow (see #8541)
Fix documentation and possible NPE.
Exit splashscreen (see #7718)

Exit splashscreen when an error occurred during the
initialization sequence e.g. when a jar is missing.
Remove unused import.
Fix documentation and clean code.
Fix documentation and clean the code.
Modify the message when no container available. (See #8541)
Add listener to turn on the move button (see #8541)
Improve display of message when no container.
Add tree to display when not initially displayed (see #8541)
Merge pull request #148 from jburel/sprint13-insight

Sprint13 insight
Fix broken CLI importer. (See #8627)
Merge pull request #153 from chris-allan/8627_cli_importer

Fix broken CLI importer. (See #8627)
Merge remote branch 'openmicroscopy/develop' into permission

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerControl.java
Add shutdown hook to halt others when network goes down.

The hook is only added if the network is down when
attempting to exit.
Update test following changes to import images.
removing floating ip creation for the moment
CommandHandler: Use invoke->result instead of calling a send result from processors
Adapted processors to interface change
Moved command interfaces into own package
Tweaked server Rake task to accept environment parameter.
Cleanup
Icon-font-ified the logo!
Removed the bitmap logo
profile: set the os of the user.
Adding new version of the map
Removes twitter keyboard from search
Base functions of the project
Merge github.com:jescribano/Antiagenda
Updated rails, rspec, and rake to the newest versions so that annotate could work.
Finished first cut of the User model.
User model with passwords, and user show page. Also reinstalled rspec/spork as they were broken from the upgrades.
Update object name.
New isSupported() method.
Update size() method.
Update comments.
Update clear() method.
Remove exception.
Remove callback function from clear() method.
Update save() method.
Use strong comparisons.
Update load() method.
Update the remove() method.
add support for mongo dbs
remove print
change to stylesheet for gradients
javascript wholebrain() fix for dummy viewtype
making smaller sliders so slice containers have the right size
dealing with prefetch error
Merge branch 'master' of https://github.com/jmeehan16/whitematter
Update README.md

add common pitfall and update doc for composer...
Dies ist die 18-Dev Version ab Client Build 15050 (4.3.0)
Increase expressivity and user-friendliness
Bump version
Montecarlo initial readme
Made a lot of changes based on suggestions from reddit user sbrown88. Thanks for the great advice. I looked over every comment and changed everything except what was implementation specific (ei. I need to do it that way for reasons I didn't previously state). Learning a ton. :)

Making this one giant commit because I'm lazy and changes are self-evident.
Added bilbiten.py
Added bilbiten
created a link that goes to live app on git hub for testing purposes will be commented out on final
store#new rebuild start
step 1: forward and reverse working
jQuery cart almost done
step 1,2,3 forwards and backwards w/o skips
step 4 - forwards and backwards w/o skip
clean-up
upgrade .gitignore
remove attempts to load environment from registry
update .gitignore
Minor changes

Signed-off-by: JoonasJ <joonas.jauhiainen@metropolia.fi>
Added Config class for holding configuration data
Renamed config to conf
new data format / parsing

app client sends version/build number as well as other content that is
parsed differently, parased differently also on the front end side.
imagen banner y ubiquiti y logo
Changes: added board changes
Implementando sufixar.
Update link for getting xmllint and xsltproc.

Fixes #71
Clean up jQuery.Callbacks entry
Did enrichment for modules with at least one prob > 0.2 instead of > 0.4
factored utility classes so they are extendable

worked out a simple way to avoid making static method calls on utility
classes, allowing most of the hard coded functionality to be overridden
through subclassing if needed
subscription pages now works and looks a lot better; with sample jquery jsonp call
Reverse option for Revolution feature, to avoid having to use negative angles
added browser ENV for teardown
make blockquotes italic
h1 center and lower
more h2 margin top
add cfp
iterate through node list in reverse when deleting elements
Merge pull request #30 from gregbanks/fix_node_delete

iterate through node list in reverse when deleting elements, to prevent index errors when deleting multiple nodes
allow new timeout attribute to be modified
add new timeout attribute as an explicit default to create() method
allow any attribute to be updated even if it was not originally returned by the rackspace api.

this covers a specific case i have encountered where the rackspace api will not return the
'timeout' attribute on some loadbalancers until it is explicitly set. This happens infrequently
but I have experienced it.
remove all the .pyc files from upstream
Update version to 0.6.0dev
Merge branch 'master' of github.com:rackspace/python-cloudlb
Stubbing out the league stats
Add dictionary lookup for object type to return friendly name
Store clockView as ClockView, not View
Add ClockView.update{Alarm,Timer}Handle()

We need these to set the initial positions of the event handles based on
the values stored as shared preferences.
Add loadPrefs() and savePrefs() functions
Save and restore prefs in onPause() and onResume()
Merge branch 'prefs'
trying to fix the device parsing
response does not work yet.
easyui pagin issue
Backend layout
Merge branch 'Layout' into Deliverable
Mezcla layout
added regression script for editcount
Brute force fix for Mcollective config being left non-functional.
Missing fixes from davies master merge
在readme中添加了目录结构
Added 'split_spherical' branch.
Created spherical/hi.txt.
Created spherical/hi.txt.
Reworked the split_spherical makefile.
Merge branch 'split_spherical' of github.com:jvriesem/MHD-Research into split_spherical
Merge branch 'split_spherical' of github.com:jvriesem/MHD-Research into split_spherical
Updated ma makefile.
Improved makefile.
Made output from multi-file.
Huh?
Merge branch 'split_spherical' of github.com:jvriesem/MHD-Research into split_spherical
Split_spherical branch produces the same output for all ASCII files to the 16th decimal place.
Added diffusion code to repository.
Fixed under NUnit 2.5
Removed SimpleInjector
fixed log
毎回変身するように修正。前回のメッセージを覚えておき返信するようにした。
Roll verson for upload
Added PlinkBEDConcordance
setData form event
added README with actual info --KW
Check with exception if c exists
Added self.roles to c in try block
removed olark js, using generated surveyor_all.js, fixed vendor creation bugs
Merge branch 'release/0.2.85' into develop
lots of event goodies, pagination in admin events view
scaffolding for admin contacts and organizations
new files
links to and from admin views on events and vendors
bump da version
Merge branch 'release/0.2.86'
fb comments plugin
bump da version
Merge branch 'release/0.2.17' into develop
events index view
Fixing finding uncapitalized subjects
add new main.cpp + class menu
Added missing register.php page
(#WIP) Add Puppet parser functions
New template for requirements and weightage
Merge branch 'feature-requirement'
Merge branch 'project-master'
Merge branch 'master' into hock_phase3
Merge branch 'project-master'
Added null for videoHD on details phase
Merge branch 'hock_phase3'
Merge branch 'master' into project-master
phasePersonality_clips_code
Merge branch 'master' into project-master
Resolve Conflict
Add plans calculation. Currently not firing
Plans calculation currently firing
Merge branch 'feature-plans-calculation'
Remove unneeded prefix check
Command-t updated.
corrected markup styling
Signed-off-by: kishor khambu <kishor.khambu@gmail.com>
Xstream update to 1.4.2
Merge branch 'master' of github.com:klauswuestefeld/sneer

Conflicts:
	code/.classpath
Experimenting with gradients
Refactoring sphere painter
whitePiecesColorSettings
blackPiecesColorSettings
Changed class name to piece painter
Improving piece drawing demo
Painting with new stone painter
Removed grid painting over pieces
Bigger default cellsize
Merge branches 'piecesWithGradient' and 'piecesWithGradient' of github.com:klauswuestefeld/sneer into piecesWithGradient
Adding hover piece and dead piece
Merge branch 'piecesWithGradient'
Merge branch 'master' of github.com:klauswuestefeld/sneer
Fixed problems with kendoAutoComplete.
Update README

I've just tried to pull...
model
Modification model
Modernized tests

Don't extend TestCase and use nicer assertions and matchers.
Added a method to assert single lines in output tests
Removed subdir test again

This will require some additional work, so that JGit really finds the
synthetic _git directory.
Workaround for JGit's .git search

The object database is not reset when RepositoryBuilder#findGitDir() is
used.
config my own silex
Network code seperation from Bootstrap
Changes to Bootstrap, Prefabs
fix crash with add/remove portgroups and web ui
primer commit configurado symfony
merging README.md
Maps inherits
Add a Gravatar image and a sidebar
Finish user signup
Add SSL in production
Exercises for chapter 7
Finish sign in
upgrading is fixed. New mode: either in polyf. or res. pool, when sides==resources and upgrade gesture is performed
fixed scheduling some more, added translation of edges into address structs
few more meta fixes
halfway thre
optionally allow to pass in the path to the bitcoin.conf file if it is at a non-standard path
Merge pull request #6 from haraldschilly/configfile

optionally allow to pass in the path to the bitcoin.conf file if it is a...
order card ok
[ikc] outiegogo name
add bash script to generate code
moved boilerplate less files
Merge branch 'master' of github.com:lastralla/boilerstrap
Fixed error checking in game
fixed game crash caused by missing brackets
Merge branch 'master' of https://github.com/laurenryan/LyricsGame.git
Updated Doxyfile to alphabetize functions properly.
First stab at visitor class.
Merge pull request #1 from leejonggun/work

add String tests
update test files
Add String(Multibytes) tests
t
Dijkstra init.
Fix a gramatical error
added logging to core and cli
MediaPicker Delegate
1st commit
Amazon api product search working
Nested indentation.
Added missing Buffer.cs data objects
Signed-off-by: Lon Kastenson <UWP_User@ULR009-7.(none)>
Update to latest gnulib.
Version 1.19.2.
update detial
Merge branch 'master' of github.com:lifang/gankao_season3
update detial
Merge branch 'master' of github.com:lifang/gankao_season3
[VM] Fix the namespace base computed during ABCContext construction
[VM] Improve precision of error messages
[DisplayObjectContainer] Fix removeChild for non children
[Tags] Small fixes to DefineMorphShape
[Tags] Add initial suport for DefineMorphShape2
[Decoder] Support ffmpeg 0.11
new macc_reduce_core passed full reduction tests
Initialize xu->drc in allocator

Signed-off-by: Adam C. Emerson <aemerson@linuxbox.com>
MINOR FIX: images broken #2
hide elements from selective rooms
Add gnome3 and windows support.

The gnome3 and gnome support may be integrated together in the future.
While the windows version is not tested yet.
fix a bug of category
petit modif

move cursor to the end of participants
handle double comma bug
shit
Revert "shit"

This reverts commit 96ed83faea9eb5609a15f09f1f161b3b7767bca1.
shit2
Fix tests after refactoring from_address
Wordpress Simple Theme
Increased flooding-lib to 2.4.1, hopefully the import actually works
now...
Preparing release 1.6.1
Back to development: 1.7
Prueba 1..3
Added "hidden" class; weird that bootstrap didn't have that.
Added form validation JS to main template, using jquery.
Add show/:id route
Disable pushstate. It doesn't work well with Pow
Change question container class
Intro question template
Update styling

* Move question container down
* Vertically align fields
AppView::render()

* Fill out the question container with intro question
* Render on init
Bind event handler for button in intro dialog

* Show the first question of the questionnaire.
Update application namespace

s/Hipster/Flexion/
New build
将论坛代码的日志框架从JCL-LOG4J切换到了SLF4J-LOGBACK

更新了论坛的日志框架，移除或者修改了不可移植的日志代码。将原来的11G日志进行了删除-_-，目前的日志模式是每月自动更新，根logger的级别是INFO，只有文件记录。:)
paging coming up
fix selection color ipad
style tweaking
Merge branch 'develop' of github.com:loop-recur/AppCharity into develop
news rows
syntax error and readme
change the package name of chne.designmode.strategy.demo to
chne.designmodel.strategy.demo
add the code of the observer design model
Calendar CSS modifications.
created admin controller with section link, cleaned up error messages in application_layout.html.erb
prov-rdf conversion: added check on empty influencer
pristine-tar data for openmediavault_0.4.1+svn346.orig.tar.gz
Update travis config to turn off emails
added mochitests step
fixed app path name in configs, and syntax error for certs
agregue lo mio ya funciona modificar, dar de baja y la autenticacion agregue lode l carrito pero ya parece q cuando quiero agregar cancion al carrito el carrito no escucha y no la agrega
agregue lo mio no funciona agregar al carrito no se porq :S
added tutorial 7
added link to tutorial 7
corrected  link to tutorial 7
tentative correction
added lein cljsbuild auto
Update libpd submodule
Fix misspelled outlineExtrucion function
Keep the C example Makefile
Still fixing bugs in string add function with {} wildcards.
back up example
Added a few more settings and sorted alphabetically.
[s2505] Cleanup and improve script for Fankriss - AQ40

Notes:
spells 720, 1121, 518, 25831, 25832 required database support

(based on commit 2d2af47)
[s2531] Downgrade Naxxramas Deathknight wing bosses to original script version
First spawn of Worgen Start Zone not Done (Phase 1).

Signed-off-by: Salja <salja2012@hotmail.de>
改回使用 iframe 模式
修正出現位置
The playback service now correctly starts in the foreground while playing a song
File javadoc updates.
Detect if autocomplete can be used.
Dependency upgrades.
No auto detection if no DbUnitCompletionRules annotation is supplied. The rules on the default location could no be compatible with the current test.
Add tests for the ZoomToMaxExtent control.
The ZoomToMaxExtent control should extend the OpenLayers.Control.Button
and not OpenLayers.Control.
Added tests for ZoomOut control.
Changed ZoomOut control to inherit from OpenLayers.Control.Button.
Added tests for the 'type' property which is now inherited from the
parent class.
Added tests for ZoomIn control.
Changed ZoomIn control to inherit from OpenLayers.Control.Button.
Removed erroneously commited alert-statements in tests.
The changed controls should also check whether they have correctly
inherited the property 'type' of the new parent class.
Added tests for OpenLayers.Control.Pan.
Protect the trigger action of pan control by checking whether
we were added to a map prior to calling this.map.pan().
Changed Pan control to inherit from OpenLayers.Control.Button.
Added tests for OpenLayers.Control.Pan.
Merge branch 'master' of https://github.com/openlayers/openlayers into control-inheritance
Merge branch 'control-inheritance' of https://github.com/marcjansen/openlayers into control-inheritance

Conflicts:
	tests/Control/ZoomOut.html
	tests/Control/ZoomToMaxExtent.html
Merge branch 'control-inheritance' of https://github.com/marcjansen/openlayers
correct units in WMTS capabilities
Check whether an event target should be considered for handling.
Adding unit tests.
Merge pull request #612 from ahocevar/612

Touch events do not trigger the default action in attribution links. r=@marcjansen
Added tests for OpenLayers.Control.Pan.
Protect the trigger action of pan control by checking whether
we were added to a map prior to calling this.map.pan().
Site updated at 2012-11-26 11:58:24 UTC
Merge branch 'bootstrap' of github.com:marcoraddatz/candyCMS into bootstrap
merged
config ace-jump-mode
Static file support
These channels are not for input, they are for output. Duh.
Move #should_report_check? into #report_error in loops
finished remaining conntent
cleaed up some stuff
mande a la damier todo
ARCify and go with auto synthesize
Twirl the arrow proportionally
-> v3.2.14-1
Inject Gson
Refactoring the implementation and adding utilities and tests.
core funcionando
criando feats
Fix no groups user and array return
Use PraghaPlaylist * as arguments when is (obviously) possible. 
Move curr_seq_ref and curr_rand_ref to PraghaPlaylist
TODO: Investigate how can fuse the two variables!.
Drop more usage of struct cwin as argument.
More drop cwin usage.
actually done (i think)
Moved include in thor task group
DOC - expand docstrings for sums of square functions

Some whitespace cleanup
waiting 4 threads to finish with append
started interface, added views
Using Blob constructor instead of deprecated BlobBuilder (mantaining BB construction for old versions)
Added support for Firefox download and modified saveFile header to be more generic
added hidden fields for rateplanid
Properly handle abandoned holds when checking out eContent
Store browse values in memory to reduce lookup time during indexing
Define relationship between materials_request and materials_request status
Reduce font size for autocomplete popup in marmot interface
fix permissions for editing and viewing editorial reviews
Show link to classic for eContent
Fix searching uniform title
Trim fields to the correct length when extracting eContent so we don't get DB errors
Break out the views from the controller.
Adding the install page (WIP).
updated readme to reflect 1.5 changes
organized imports
organized imports again
javadocs, SSLUtils, PPN utils

Added SSLUtils, and PPN utils. Ran Javadoc tool and retooled the
SSLTestServer and Client to use the new Utility methods
Added SSL to client and server
Merge pull request #15 from mfullen/mfullen_v1_1

SSL added to Client / Server
Clarify monger.joda-time's purpose and requirements via docstring
admin2
admin css
lp3
more testing gems
bundled
installed rspec
Completed the survey of the CRS workspace, and made a refined one on an octant.
Better error handling when missing SMTP server host name.
Explicitly specify folder separator character in file processing strategy to avoid mismatches between operating systems.
Provide default values when trying to read application parameter/option which has not been set.
#25 Test and run job from GUI
Class inheritance allowing GUI module to inherit command-line arguments from non-GUI application.
#25 Test and run job from GUI (fancier progress window)
#6 GUI for defining jobs (selecting type of destination to add to job)
#27 Application menu with most recent jobs instead of JList
Store window state when closing frame, not just at the window size.
#26 Multiple open jobs
Default job type for new jobs.
I think the charsear.sql human % search works now
More tidying of morphforge core
More cleaning of core morphforge
Small fixes caused by refactoring
Removing some wildcard imports
Renaming of variables
More refactoring and variable renaming
tidying up '_time' in Trace classes
Work on _time in TraceClasses
More renaming of _time _data in TracePoints classes
More cleaning
updated README.md for `matches` validator.
not watching the build directory anymore
Dr Elder
Removed negative margin
Some small fixes in parsing. Added ability to set up number of discs
mutationobserver, listen for qrpostsuccessful at document level
embed jq #17
make feed links open new tab
added qhonuskan votes to requirements
moved django-south requirement to requirements.txt fix #38
django-south is not needed anymore at requirements-dev
added PyYAML to requirements-dev, i'll use YAML serialization for creating initial data for demo app
added sample data for demo app
Updated rebar, fixed compilation issues.
append ant target for lint report
append ant target for lint report
Not flags
Flags, operations outside interrupts, first sup info, Die.
+migrations
Basic webfinger app implementation
Account, API, OAuth2 apps, based on oauth2app example
Added two extra byte for the position of a item in a container.
Implemented first version of the container control
v9.0 (alpha 3). This is ubuntu 12.04 specific release
populate gallery title in template
TDLR-342 view online materials
Enhanced the translations.
Permissions now support multiple groups even in Joomla! 1.5 (using Artof user, for example)
Fixed some translations. Reordered statuses.
Initial docs/notes on setting up DoubleClick templates.
Merge branch 'master' into double-click-docs
Use width/height properties on the placement in Doubleclick example.
Note of non-endorsement in DoubleClick docs.
Include DoubleClick example docs to the index.
Minor reorganization of the tox configuration.
Version bump to reflect current state of master. Release note on DoubleClick docs. Fixes #2.
Adding TravisCI integration.
Update xcache.ini to use extension instead of zend_extension

ius updated the xcache package to version  php53u-xcache-3.0.0-1.ius.el6.x86_64
causing zend_extension to stop working. This change updates the configuration
to use extension instead of zend_extension when loading the module.
Merge branch 'feature/fix-zend_extension-bug-caused-by-ius-update' into unstable/MSGD
Added jquery-ui requirement
adding hover markers
added ball-bar collision sound effect.
-added collapse block, generally the enemy can collision to bar.
-fixed a bug null pointer access when collision game over.
leak of commit for CollapseBlock.
altered variable name.
moved logic of setting initX and initY to base class.
created TransparentBlock and Life2Block.
leak of commit.
Transparent Block and Life2Block.
altered stage settings.
Role needs an "abuse-mailbox" attribute, because the RIPE test database returns one
Switch level format to json, rather than binary dump.
Fix level editor to write json.
Balaji | fixing facility seed to include phone numbers as empty instead of 'null'
Vandana/Aravind | #00 | Made the project name also as performance tests.
Sharvan, Ashish | Fixing logging
Added affix.
Update .osx

Check for software updates daily, not just once per week
Disable local Time Machine backups commented
Refactor sync docs
Remove noise from sphinx config file
Merge branch 'master' into gps/sync-refactor
[sync] Embed graphviz describing client flows
[sync] fix document hierarchy; link orphans
Merge branch 'gps/sync-refactor'
do not throw error if default_locale without locales (bug 777325)
JSF # 008 # 01 : minor fix
fiddle with markdown formatting in README.md
Update to use order_by mongo syntax
iOS6 caching issues and SockJS 0.3.3 support.
Merge branch 'master' of https://github.com/mrjoes/sockjs-tornado
Updated changelog, bumped version.
next try, rename to repository.mrstealth.dev
Adding ability to fire in every direction
Merge branch 'master' of https://github.com/mrwillis21/vrvhackday
building up initial object designs. adding rooms, characters, and weapons.
Fixing image path & Alt text
fix setVolume, was invoking wrong flash method
JSON-parsing (XML replaced)
- Adding fixed asset schedule window.
- Creating the model for Fixed asset schedule.
- Delete.
Rename AccountingYear to FinantialYear
Merge branch 'master' of https://github.com/jakaria42/SmartAccount.git
change to pm.max_children to 'maxchildren' variable on php53-fpm.tpl
RoomStatusRepository
removing comments so you can actually read it
add time-out option
set ver to 0.1.1, use chlorine-1.5.1
initial code to display user title if council is Bromley
add iOS and android app icons
Adding anchor points and smarter positioning.

You can now position a sprite using the  proprety, that
gets a tuple and uses the set anchor to modify the sprite's rect object.

The  property is also introduced, allowing you to alternate
between using any point inside the sprite as an anchor for moving
and modifying the sprite object.
Demo allows changing of ball's anchor point.

Use:
* `a` for the standard, TOPLEFT anchor.
* `s` for a CENTER anchor.
* `d` for a weird (25, 20) offset.
入力したISBNの結果を表示できるようにした
ignoring stupid mac files
introducing code coverage
introducing code coverage
removed rvmrc installation from here
added rake completition
Removed cache for rakecomplete, cleaned up
Renamed scripts (use .pl extension)
ckghsdkcs

git-svn-id: https://svn.csail.mit.edu/rss-2012/group6/trunk@444 f7314c52-06a0-4e27-a275-9b837fc95dca
select by image
Merge branch 'master' of github.com:nghialv2607/tomojisho
add getPhotos
Merge branch 'master' of github.com:nghialv2607/tomojisho
Fix height on resize
Add generated
Zwave and Zigbee integration demo
Merge branch 'master' of github.com:nielsreijers/NanoKong
so i can continue to use arrays to set forms like this hidden field...

			$this->data['user_id'] = array(
				'name'  => 'user_id',
				'id'    => 'user_id',
				'type'  => 'hidden',
				'value' => $user->id,
			);

but with something like this for a drop down..

			$this->data['dropdown'] = array(
				'name'  => 'dropdown[]',
				'options'    => array(….),
				'selected'  => $item->selected,
				'extra' => array('id' => 'adropdown' … ),
			);

with the following code in php:
	better_form_dropdown($this->data['dropdown']);
Add SensorEngine support to Phantom
inline method started
Commiting MySQL warnings patch.
*4 noglets
ok
an explanitory README
Close the channel after send data in tests
use tmpdir as cmd dir to prevent log file cluttering
Add temporary directory, convert video to ogg, output audio
coworfing photo updated
Need to serialize objectPendingDeletion for ERMDDeleteButton to work
with serialized sessions.
signup on homepage
ambil baru
baru lagi
baru lagi aja
versi baru, sabtu
Merge remote-tracking branch 'iman/master'
Merge pull request #2 from ivanolegnum/master

Oke, sudah di merge
Now works for 1000 random grammars
3rd party import: fix group create error; fix tag entity error; convert all api references to v3; code cleanup throughout
some 0.2.0 features added, basic REST hadler and piston
[enn] new prototype scheduler app to manage db upddates
[enh] add pika dependacies in requirements.txt
[fix] add missing dependancies for tastypie-nonrel in requirements.txt
[enh] replace print with the logging module
[mod] blank line, pep8
[mod] informative comment
[enh] allow to disable to caching of scraped webpages
[enh] allow to pass arguments in sended messages through rabbitmq
[enh] better function to check for new documents
[mod] handle_document now received a lachambre_id instead of a document object
[enh] new operation in scheduler to parse an individual document
[enh] if a new document is found, schedule its parsing
[mod] inform that a document has been parsed
[mod] change scheduling backend, use mongodb instead of rabbitmq, way less sexy but avoid a dependancy
[enh] sort Task models by datetime
[enh] index + ordering for every models with a lachambre_id
[enh] new command to reparse all the deputies
[mod] store the creation date of a Deputy model
[mod] blank line pep8
[enh] new class decorator that add a new method that copie an old version of the model in a new row before saving the current modified one
[index.html][xs]: add Romanian to list of languages in dropdown.
Merge branch 'master' into gh-pages
Attribute creator on Comment
Add Creator to Likers
New activity ma_person:share:ma_file
PTBR translation update
Updated my own fork and then just fixed the ruby script
dummy - if not , removed launcher leftovers
Ugh
Removed leftovers of OpenALCheck
Removed BitmapUtil because unneeded
Unneeded leftovers removed
Merge pull request #956 from AngelDE98/develop

Fixed Ruby script loading
Fixed bomb mod
Merge pull request #955 from Shishioh/patch-1

PTBR translation update
Merge pull request #957 from AngelDE98/develop

Fixed bomb mod
Merge branch 'develop' into feature/levelRefactor
Geometry header file
Ajout d'une interface obligatoie pour les service

Reordonance automatique du chargement des services selon les dépendances
Ajout du'n possiblité de gerer des route depuis index.php sasn controlleur
Chargement automatique d'un service non chargé automatiquement l'ors de l'utilsation de celui ci

Utilisation du service zeroframework.loadconf pour charger la configuration de l'application a la place de l'ancien qui permet une gestion des multiformat gerer par le service
Suppression de isAutoload pour le routing
Ajout de l'autolad true pour le routing
Dernier changement
fix type/scheme on url regex
Document issues with Google v3 layers
Google v3 docs amendment
Merge pull request #476 from probins/googledoc

Document issues with Google v3 layers
use the nightly version of Google Maps API in the examples, and provide some information about Google Maps API versioning in the google-v3 example
Merge pull request #480 from elemoine/googleexamples

Use nightly version of Google Maps API in examples
Grid.removeExcessTiles removes more tiles than it should, refs #481
Merge pull request #481 from elemoine/481

2.12-rc4 Tile.js script error (Firefox)
set VERSION_NUMBER to Release 2.12-rc5
Merge branch '2.12'
Initial commit for demo map view.
Allow the test database user to create databases on the CI server
path with locale for news
Resolve issue with AppLauncher and SystemUI

Change-Id: I08e7be74027345cfd0dfd5439baad50903802d64
add support for nokogiri chef_gem
Merge pull request #1 from josephholsten/ruby

add support for nokogiri chef_gem
[KNIFE_WINDOWS-13] ensure PATH value is properly quoted to handle paths with spaces
Merge branch 'KNIFE_WINDOWS-13'
Remove more pesky trailing commas
Fixed "inconsistent types" compile error on Linux
Applied dersaidin's patch for pk4dir support

Resolves issue #2971. Minimal testing performed to ensure application still
works, no functional testing of the pk4dir behaviour.
Log errors too
No more gaug.es tracking
Merge pull request #1 from organillero/master

Workflow improvements
Store userid on preferences

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Facebook SDK jar file added.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
'PagaTodo' removed as Android library reference.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Ant support added.

Detail:
- Files added were generated using `android update project -p .`.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Merge pull request #2 from organillero/master

Login implementation start
Improvements for 'LoginScreen' activity were added.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Improvements for 'RetrievePassword' activity were added.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Fixed a bug.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Removed unnecessary code from 'Splash' activity.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Helper method to save user id in application preferences added.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Fixed url.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Improvements to methods for load and save 'user id' in application preferences.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Improvements for load and save 'user id' in activities.

Signed-off-by: Israel Buitron <israel.buitron@gmail.com>
Merge pull request #3 from neoriddle/master

Actualizando
Added scoring and highscore display
Issues #285 and #286 resolved. Added price field to Rails Admin and moved code setting offer.available_count to before_create method.
Testingを追加
Merge branch 'master' into develop
Task for element resizing
Merge branch 'develop'
Bug fix: verifyReceipt - set sandbox environment on 21007 status
Bug fix: verifyReceipt - set sandbox environment on 21007 status
Bug fix: verifyReceipt - set sandbox environment on 21007 status
Bug fix: subscription fix
fixat gui steg 1
test
moving dns stuff to its pertinent project
new commit (?!?)
add footer nav options
lagrange twojointarm link
Removed Cloud9 Items
Make pysimulators independent from tamasis/PACS, part 1.
Make pysimulators independent from tamasis/PACS, part 2.
- AVR32 Progress
mailgem edits
fix author and publisher in metadata
sdas
sdsdsf
streamline Timer types
Merge branch 'master' of github.com:pelican/pelican-lofar
bugfix: compiling again after Timer changes
cmake: add lofar-dal libs to the link line
Added basic openid login process
Added Ninject
Added user auth Models
Added Ninject libs
Added debug logger
Changed the way of using ninject
Added a simple user saving/loading  from database operation after the auth process.
Separated UserRepository interface and injected it to UserController.
Added simple registration process.
Added user roles related classes.
Update Readme.md
Added admin setup process.
Added the roles mechanism.
Reformated structure.
Merge branch 'adminka' of github.com:pengwin/SampleProject into adminka
Admin area populated with scaffolds of controllers for models.
Added blueprint search
Added blueprint model and controller
Started work on editor part
Added twitter bootstrap
Added ApiKey store
Added blueprint controller
Added REST-like ajax controller
Added backbone lib
Started work on javascript editor
Compleated canvas saving and drawing
Added raphael svg graphics
Added backbone views,models
Compleated canvas saving and drawing
Added add/del actions with rectangles
Completed actions add,edit,move,delete
Completed ellipses
Frontend refactored
Added draw actions
Elements operations have been moved to elements controller
Deleted code contracts dependencies.
Replace ComboBoxes with ListBoxes
Tweak width calculation for WidgetListBox
Remove WidgetComboBox
Merge pull request #958 from dorkster/bugfixes

Remove WidgetComboBox
Don't use aim_assist when MOUSE_AIM is disabled
Merge pull request #959 from dorkster/bugfixes

Don't use aim_assist when MOUSE_AIM is disabled
Fix invalid power keys
Merge pull request #960 from dorkster/bugfixes

Fix invalid power keys
Allow for arbitrary buff/debuff visuals

Closes #856
updating mailmap file.

# Finding out duplicates by comparing email addresses:
git shortlog -sne |awk '{ print $NF }' |sort |uniq -d

# Finding out duplicates by comparing names:
git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
Fix minicore power frame size/offsets
Remove Vengeance from powers.txt
Remove old Vengeance code
Merge pull request #962 from stefanbeller/master

Updating mailmap file
Merge pull request #961 from dorkster/effects

Allow for arbitrary buff/debuff visuals
Remove extra call to getColor in MenuEnemy & fix VALIGN_BOTTOM for labels
Merge pull request #964 from dorkster/bugfixes

Remove extra call to getColor in MenuEnemy & fix VALIGN_BOTTOM for labels
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.mailmap
	mods/320x240/menus/config.txt
	mods/core/menus/config.txt
	mods/fantasycore/powers/powers.txt
	mods/minicore/engine/effects.txt
	mods/minicore/powers/powers.txt
	src/StatBlock.cpp
Item balance adjustment, shield adjustment to match new effects.txt
The readme is actually markdown, not rdoc
tasks listed
raise 'CosmError' instead of 'Exception'
Merge pull request #11 from ponty/own_exception

raise 'CosmError' instead of 'Exception'
Teszt commit.
commitsimple
PSR-2 constant.php
PSR-2 core/libs/config.php
consistent use of dots in section numbers
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Merge remote-tracking branch 'origin/QA_3_5'
Merge branch 'MAINT_3_5_0' into QA_3_5
Merge pull request #26 from mynetx/codemirror_enable

Allow disabling CodeMirror
removed sqlite3 from Gemfile
removing vendor/bundle from git
Corn muffins successfully exchanged
radio improvements
Merge branch 'master' of git://github.com/piotrf17/puellaardens

Conflicts:
	puellaardens.c
quick hack for sending messages
Added bouncer.hex for use with the dev board as a repeater
Peer to peer chat works! (popup, not using the inbox)
Increased preamble quality threshold to reduce bouncer jankiness (it's still janky)
Received messages go to inbox.  Beeper alert for new messages.  Slow
data rate.  This version shipped to Alida!
put sent messages in the inbox as mine
prepended > to inbox view, added instructions on startup
added radio info view, pinging capability
some refactoring, clean up of alt keys, fix keyboard jankiness
nieuwe key argure
Merge branch 'master' of github.com:piratenpartij/systems
add my books to the sidebar
I was querying the wrong table for rss this whole time. Now querying Rss instead of BlogPage.
Trying to get postgres installed for heroku
allow more flexibility for the ImageSaver
unify macros
upd
dev doc update
incorporate some ideas from Andrew Eddie, most notably section numbering and the 'Files' section
Merge branch 'psr-1-style-guide' of github.com:pmjones/fig-standards into psr-1-style-guide
cse: Call the override callback on page load as well as results load
user login checks happen when classes are called
For HQMF V2, have the parser return an instance of the common model rather than the HQMF V2 parse tree.
Add support for child data criteria references in data criteria
updated precondition grouping logic to properly invert negations
fixed tests for negation inversion change
Add documentation for PM_SU_CMD to the sample configuration file
Merge pull request #11 from p/pm-su-cmd

Add documentation for PM_SU_CMD to the sample configuration file
Formatting change to Param#inspect.