labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #12 from suapapa/master

README 내용 보강
Mobile web and QR code sample
Merge branch 'master' of https://github.com/golanger/braille-printer
NH: Fix bill failure
MA: Events: Chambers were backwards.
MD: legislators offices
Merge remote-tracking branch 'origin/master'
HI: Fix current failure
remove dependency on sysv, use pure file cache for jobs
complite init flow
delete prj file
sync
Nombre de la aplicación
fixed: Bug #3310 - P&ort in settings screen

git-svn-id: http://synergy-plus.googlecode.com/svn@1676 33c40d52-04ba-11de-a43f-ff96a2b7a9af
Solution start-up.
Use tr to translate one character into something else instead of sed.
Learning Github.
Merge branches 'testing' and 'master'
misc hashes
Merge branch 'master' of github.com:tageorgiou/cloakedsnake
fix is_queued function
better author
add brace explicitly
move event handlers definitions to create_child
Add DebuggerStepThroughAttribute in the class, add extension methods
* Bug a nyomtatóra küldéskor a szerver oldalon. Exception keletkezik, egyelőre ismeretlen okból.
* Nem tudok rájönni, hogy hogyan kell normálisan tördelni nyomtatáskor...

Signed-off-by: takraj <takraj@gmail.com>
libvirt_monitor
No reason to comment this out anymore.
add comment
update office.xml
fixing bug when the plone site its not called Plone
added toolkit support
Fixed last update's CSS to use relative paths
Merge pull request #7 from terrancerobb/master

Fixed CSS
some new styes
Commande modif final
Setup language file export for 4.5.0-beta.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3962 2fea6a4d-a838-0410-917b-93a53c48e9d2
Use remove_user() for multi-edit on Users panel.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4877 2fea6a4d-a838-0410-917b-93a53c48e9d2
number argument and for loop complete
Update webgui/templates/default/css/jquery-ui-1.8.24/images
Rename package from 'fbxsdk' to 'fbxplugin'
add ignore for targets and settings
Ticket 1719

Work only for PHP 5.2+
improve auto-clickable urls in custom fields
featuregroups are selectable
MA13221
ignore stability in early game
fixed map editor to save initial map creation
Update check_es_cluster_health to 1.1.
fix syck error - it doesn't like parsing nil values
add galleria
remove IPortletAvailable adapter
Using precompiled headers
Merge branch 'master' of https://github.com/thomasmacpherson/piface into spi_visualiser
Merge branch 'spi_visualiser' of https://github.com/thomasmacpherson/piface into spi_visualiser
finished visualiser and sender but I think I've broke the board... oops
commented and refined simon game
added some of the game logic
Merge remote-tracking branch 'upstream/with_complexity' into with_complexity
merged Josh's fixes
Ajout de l'accéléromètre numérique dans le schéma électronique
Fix bug with displaying afl_round that has no ffl_games
Added OpenGL Shading Language support
Merge pull request #93 from tikhomirov/glsl

 Added OpenGL Shading Language support
Move GLSL snippet next to other 3D languages
WIP on modularization:

- build.py now supports --target browser
- :common + 1c + actionscript converted to bare functions accepting hljs
- added new build path to .gitignore
Correct path to highlight.pack.js from test.html. Fix creation of hljs global var in the browser build.
Converting the rest of the languages into anonymous functions
Build target "node"
Refactoring build_path maintenance into the build() function
Fixed "node" target name in --help
Forced exit after reporting the unknown target error
Better help for the build.py
Fix nested comments for Haskell
Merge pull request #94 from vthriller/master

Nested comments for Haskell
Build package.json for node
Merge pull request #95 from Sannis/package-json

Build package.json for node
Replace site URL with email for Alexander Makarov
Preliminary changes to package name, license, version and homepage in package.json
Refactoring authors parsing from AUTHORS.en.txt
Python 3 version of build.py
Simpler flattening of cat_languages
show timeleft for each controlling user
挿入ポイントが見つからない場合は抜き取りもしない。
Removed superfluous-looking "Ubuntu (version) redirects here" lines
Update README to point users more firmly to Razor

Now that we have a good set of community guidelines in the public Razor repo,
point users more firmly at it from this repository.

Signed-off-by: Daniel Pittman <daniel@rimspace.net>
Merge pull request #10 from daniel-pittman/community/master/add-contribution-guide-and-governance

Update README to point users more firmly to Razor
Merge pull request #9 from tjmcs/master

Fixes issue #8 (TCL ISO mounted without '-o loop' flag)
Add The Salon thumb
convert RGBA to luminance in the range [0..1]
Scraps of documentation updated
Link specific timing data to a report
- updated feature, to get cinema list for a movie, and get session
time for cinema + movie (in progress)
Switched to exposing Async API plus some cleanup

1) Changed UserClient to expose a Task based async API. This is the
pattern that will be used for the rest of the client's public APIs. Also
changed the two tests to use the new API.

2) Minor code cleanup to check for empty / null query parameters

P.S.
Note that Consumer clients like Windows Phone only support / prefer
async calls - hence this makes sense.
change and to or, log msg for missing path
fixed some failing specs, broken since some heartbeat payload changes
all log messages should go to reporting.jobs.logs and job state updates to reporting.jobs.builds
make some tests happy
left in a variable assignment, borked some tests
Bump travis-build
Bump travis-build
Bump travis-build
Bump travis-build
merging the merge of mergeness
Add in a composer/packagist
added copy function for templates
выпадающие списки
мелкие правки по спискам
Working on finding the shortest path
Integrating the path finding algorithm to the rest of the code. Issues still relevant: assigning route numbers to the path; using ints for bus stops.
Made variable types match with each other so the program compiles. Issues still relevant: need to assign route numbers to the shortest path; need to change format of the shortest path passed to PathTiming; need to fix which id's are used by which route
Merge branch 'master' of github.com:elisehein/IBMS-system
Change the connection from 1 to the duration to get to the next stop
Updated UI to give results of journey
corrected some constraints
Update CustomerUI.java
Update CustomerUIRoute.java
Merge branch 'master' of github.com:elisehein/IBMS-system
PathTiming class v1.0
Cache all viewable pages

- Cache all locally-hosted static pages
- Cache the Releases index
- Cache any pages that hit Facebook
Shelf was in Over Layer moved to Fringe, reported by Johanne Laliberté
added missing tiles at 177/179,75 and 2 more
Changes for kylian's foodstore
Add Fine Dress and its dyed variants
Added new Maps 055,056 + minimaps + changes to adjacent maps
Fixed mapbugs reported by Chicka Maria, Pluto and Zdln
Collision fixes
Fixed collision errors + added spikey mushrooms
collision fixes, yes i'm also getting tired of it
Add SnakeSkin set made by Ali-g. Reworked stats a bit.
Merge remote-tracking branch 'origin/mapfix'
Merge remote-tracking branch 'origin/testingserver'
Expose context options.
Add setTcpAcceptFilter.
Prepare new release.

Update AUTHORS, README.md, file headers and examples.
twitter account
merge conflict solved
adding interesting parameter inspection
removed sqare text
add __unicode__ for BitField
docs(typos): fix typos in dev guide

As per suggestions from community discussion
carregando a url em background.
Added optional ftp deployment task (requires grunt + underscore 1.4.2 (default is 1.2.4))
move to categories
Still have a problem unsolved. Checked about TODO in comment.
Refactoring home page.
git pushMerge branch 'master' of github.com:unife-hackathon/help-us
updated contributing guidelines and necessary documentation for contributors
updated contributing guidelines and necessary documentation for contributors
updated references
updated the graphics dependency
updated the graphics dependency
callbacks added to gtk
コミットし忘れた内容をup
Base CellGrid -> GGrid, other CellGrid -> Grid, cell_grid -> grid
Rename gridlocate/DistDocument.scala to Document.scala
Bug fix for returning empty string from META
10 trials with 10 reps
Adds default mappings for l/r triggers.

No idea if these are a reasonable default, but they're what my
controller uses, so it's good enough for me.  ;)
Adds a getter for a vsModel's Transform3D.
Update src/util/csv.h

Conform to style guide.

I'm not sure this is going to work.
Changed database schema for table Locations
novo script de horas multi projeto
PRIu64 instead of %lu is being used now for compatibility across OSes.
Final commit, two Fitness implemented.

-euclides
-bucket in destination state(fitnes +3) right state in wrong bucket (fitness+1)
fixed
Merge branch '286_school_creating'
Version 1.0.5

Skip indenting results if over 400 lines
Warn if xquery buffer has changed but was not saved
Add XQexploreDb command and Mapping
    List documents in database with some extra info
    (somewhat like "Explore" button in Query Console)
Version 1.0.7

Add settings to customize mappings
Add mappings to results window
Update docs
Version 0.2: you can choice use youdao api key or use pyquery/lxml
support native auth (swauth, tempauth) next to existing keystone
Javscript started
Multiple Windows services support
Merge pull request #16 from vitalyster/win_service

Multiple Windows services support
Better error message when backends can't be started
Added NetworkPlugin::StorageBackendNeeded instead of -2 constant
Postpone room subject forwarding if we haven't sent initial presences yet
Fix qt-moc error while parsing boost headers
Store last tweet ID in database so all tweets are not forwarded on reconnect. Send proper timestamp of tweets
Merge branch 'master' of github.com:hanzz/libtransport
enable twitter and libcommuni builds in windows
merge
Shopping Order Processing fully Completed..

Signed-off-by: Vijnedra Shid <vjursdragon@gmail.com>
完成Toft分析的标尺缩放和AScan的功能

Signed-off-by: ElmerNing <ffxhina@gma>
pagina opgemaakt, swipe verbetert, swipe icons toegevoegd
Converted readme file format
Cleanup from merge. Hide plugin selector
3 lines in some headers
fix hard code
3 lines in header
Embryonic support for op_iteration_space

Recognise op_iteration_space constructs in parallel loops and
correctly populate sub-iteration-space extents in op_arg_mat calls
that match with them.  The magic symbol op_i(n) in the index position
of an op_arg_mat means that the upper extent of the loop over map
dimensions should be taken from the nth argument of the
op_iteration_space construct, the lower extent is always taken to be
0.

So for example:

  op_par_loop(..., op_iteration_space(set, 3, 4),
              op_arg_mat(mat, op_i(1), map, op_i(2), map, ...))

produces code where as well as an iteration over the elements of the
set, the kernel is executed with extra arguments i and j where i runs
from 0 to 2 and j from 0 to 3.
Add better documentation of op_mat code generation

Mainly, just mark places where we're doing the wrong thing.
testing plaza and kr
Github #86: Temp move PostcodeResult back to com.wwm until we rebuild data file
Updated rebase transplant graphics to show orig now-unreachable commits
initial cinder support
Fix Preferences saving in Joomla 1.5
Implement non-fluid layout
Cirado o método Cliente.getDadosEmVetor()
FormBuscarCliente.form
Merge pull request #2 from tassioauad/master

FormBuscarCliente.form reposto e Cliente.getDadosEmVetor() criado
Merge pull request #1 from wwojcik/master

Filmy z prezentacji
Merge pull request #3 from wwojcik/master

Zmiana iframe na object
Bartek contact info
Merge pull request #2 from cakper/master

Kontakt do Bartka
Use the OpenSSL iphoneos-cross target instead of the generic BSD one.
Use the CROSS_* variables to simplify the script a bit.
Merge pull request #7 from catloafsoft/master

Use the iphoneos-cross target in openssl
very basic semantic analysys
Added toUri implementation for absolute paths
Add module directory to composer class map

Fixes #19
- revert last revision change
# fpdf 1.0.0 already exists as release
增加直播时间选择方法
Revert "增加直播时间选择方法"

This reverts commit f4f98141319dbe575cee339f022ba051f2a8e793.
Revert "Revert "增加直播时间选择方法""

This reverts commit 8dba7213d6c5c32823780793234b4546289263ad.
Revert "Revert "Revert "增加直播时间选择方法"""

This reverts commit 317d8ba3d0c2ca7cb49c8ea068005ccdca19eb1c.
Revert "Revert "Revert "Revert "增加直播时间选择方法""""

This reverts commit 138692ca5cf52bcdc1faa0881e7f184bf70826fd.
修改
delete
fixed errors for multiproc
Make page change currect
Add current party info
track party change
add skinning for the sliders
Fix showMarkers
data - make more extensive utils
data - refetch up-to-date data from api
use cached version for member-agendas
focusterm -> focussame (fixed)

Renamed focusterm to focussame and fixed it.
1.4.5 Update release
Add namespace and experter example
Add charts lib
fix typo
add specs
Imporved alert message
Use port_env instead of port_envs in ossp_uuid's rebar.config
Merge pull request #6 from yrashk/port-env

Use port_env instead of port_envs in ossp_uuid's rebar.config
update index.jsp
update class file
update file
update file
update spring config
finished parsing .cel files
Added remaining form fields and submit button.
Added placeholder for name field
Added JQ Validate to js\libs
Added some JS for form validation
Placed form fields in 'fieldcontain' divs for better seperation
Stylized validation errors in cs

Signed-off-by: ZekeTheSquirrel <zekethesquirrel@gmail.com>
Grouped submit and reset buttons
fixed outside links with data-ajax="false"
removed some white space in code
Themed form buttons
Changed page transitions
Displaying data from JSON in neat litle list now works.
Added filter to list of items
git ignore deleted?
Altered structure for Zikula 1.4
Added my amazingly cool md file
Merge branch 'mytextfile'
Merge pull request #6 from DavidZey/master

Added my file
Minor position adjusment of the inner ipad picture.
move everything left a little bit
donate
Merge branch 'master' of github.com:zurb/giving-tree-static
added tax files
Merge branch 'master' of github.com:zurb/giving-tree-static
DXDAL 0.0.8 multipart form data request and data provider
added NJDXDAL
Merge pull request #4 from Maks-Jago/master

added NJDXDAL
Importing Calcul test suite
Merge pull request #7 from 0xC0FF33/master

Calcul test suite.
added items to actionbar
Merge pull request #2 from litao91/master

Style changed
Change to Gemfile to dev on OS X
libpixelflinger: Build NEON optimized routine per target configuration

The variable TARGET_ARCH_VERSION variable has been renamed to
TARGET_ARCH_VARIANT, and armv7-a-neon is the exact target enables
ARM NEON instructions.

Change-Id: I999e3b0b8f3a03ff31346f83eb66ac52edc8d551
See: https://android-review.googlesource.com/#/c/22208/
Disable JIT Compiler for now
Initial Patches from Mani, minus the duplicates that Prasanna had already submitted
Implement negative dependency on unknown principals
Implement dump/flush of XIP's DST table

This feature simplifies testing and debuging of routing, code that
implements positive and negative dependency.
attempt to get map working.
added internationalization
Merge branch 'master' of https://github.com/AndriIushchuk/barbershop

Conflicts:
	src/barbershop/templates/base.html
ticket_5 form, view, template
Merge branch 't5_edit_form'
Merge branch 'master', remote-tracking branch 'origin'
Gave a bounding box to the renderer.
new UI mockup management files
Adding an Image
Adding Queen Stuff
added support for catching unknown flags
created constructors for the header style class
got rid of the new Header function
CHANGED plugin.yml
Added Version class
Changed plugin.yml
Changed AtomicConomy class
update
latest changes
minor design improvments
Icons for sure/dontknow/notsure buttons implemented on learning_card.xml
and EditCard button implemented in OptionsMenu in Class Learning Card
Add mob disguise. Fix #9.
Remove first spawn feature from SmallPlugins as it is already in BetterDevAdditions.
final for project 4
Added new slots for metal forge container
No actual changes
Обновлен Gemfile.lock
Implement multi package messages in end device.
Changed how MF_URI is set

Fixes an issue on WordPress installations that require SSL on admin pages.

Newer versions of Chrome default to blocking assets loaded from insecure sources, 
and the current method for determining the MF_URI constant doesn't take SSL into account.
Removing preset styles

This is a fix for having matchHeights on a responsive site. When I would resize content I needed to strip the min-height. Probably can be full proof by removing just min-height or setting min-height to 0;
Added some configs and organize the .vimrc file.
Fix ConqueTerm repo link.
Add NuGet example project.
Examples, learning Spirit
update rc1
comments and fiddle
rename to match MIB file
more fiddle
Merge pull request #3 from djzort/master

more code fiddley and perltidy
Fix model_name uses
Added lotsa stoof and some gifs
The layout is somewhat done
Remove a bad function call
Merge json experiment into file-creation branch
Remove emacs crud
Fixed bug where the helper could be considered the previous item in the list.
This bug made it so if you were to drag an indented item to the left, and then back to the right to its original position, it would be impossible to then drag it to the right one more level to indent it below its the sibling above it.
Rea: code factorisation
Some label fixes, ceret to end for overlay text area.

Signed-off-by: Austris Landmanis <aus3ys@gmail.com>
Merge branch 'master' of github.com:CreativeMobile/socmap-mp
Site updated at 2012-08-23 05:35:28 UTC
[SERVEUR] Optimisation de chargement + Résolution du bug des VPS
exit from generate_index when find length is zero. This handling can improve the video opening time
Fix the Generate index to improve the video open speed.
Added roofer Icon
Roofing icon css tweak
Icon styles
Added package info about soft references.
cleaned core files
cleaned up core files
added some init setup
Fixed UI Bug Leo
PersonalMap: added gpx download link after save
Snip

Removed ItemSave and SaveEXP, this is now a part of the new plugin
"EtriaUtils"
Removed ChatManagement, will add to EtriaUtils soon.
Back added to ec.admin
Полное удаление
Moved code guidelines to wiki
deleting a bunch of crap and adding some cool ..

matas and link tags :)
asking for help now
book generated and deployed at 11/06/2012-17:58:11
[pt_BR][Code][Standards] translated to pt_BR
Default root password changed to ubuntu
made example scripts handle the new outputs of psfcorr.py routines
(#331)
Fix warning for gcc 4.3
Merge branch 'master' of github.com:GalSim-developers/GalSim
First set of Language System
Index page titling
...
Security Class & Signatures
more signatures
Merge branch 'model-editor' of github.com:GilesBradshaw/BatchScada
more buttons
signature/securityclass details pages

*not working*
signature/securityclass index pages
more signatures
Merge branch 'model-editor' of github.com:GilesBradshaw/BatchScada

Conflicts:
	SiGyl/Areas/Runtime/Views/Unit/Create.cshtml
	SiGyl/Areas/Runtime/Views/Zone/Create.cshtml
	SiGyl/Areas/Runtime/Views/Zone/Delete.cshtml
more sigs ..
Unbounded Queue with linked Nodes

The completed Queues class from the notes with linked nodes.
only use primaries to count docs in an index
psplash: fix patch application ordering

By making the image header after configure, all the dependencies
are met, otherwise you could not yet have the gdk-pixbuf-native
built when the patchextra() was called.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Change LIC_FILES_CHKSUM to be relative from THISDIR

Signed-off-by: Saul Wold <sgw@linux.intel.com>
pulseaudio: don't error if file is missing on remove

This was causing an error when the file is missing, add -f  to
force removal and return OK.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
added CL support for bios.
selfupdate, latest
Merge tag 'feh' into HEAD
build bzr, dont build mplayer, firefox, or virtualbox
missing gcc group in port select
dont build bzr its something in my fork that prevents it from finding
py27-paramiko
-initial commit
Merge branch 'master' of github.com:HickTrick/paulhicken-com
Improve CP version checking. Fixes #18.
fixed comment identifier colour for admins and authors
added categories and tags to archive page
amended tag size
colour change for archive lists
try to provide compatibility with footnotes plugins
added footnote compat function call
added footnote quick-scroll
added consistent footnote styles
updated footnote styles
Merge pull request #22 from christianwach/master

first attempt at compatibility with footnote plugins
Adding Progress Bar for A to G
getting all us-ified
Use rtfd link for hubugs built documentation.
Use rtfd link for jnrowe-misc built documentation.
Use a Windows icon file for favicon.

This only seems to cause problems with very old weak browsers, but if you report
it I'll fix it ;)
[QA] Very minor PEP-8 fixes.
Fix copy&paste error in shelldoctest examples.
Added a new Arena map with a hill in the middle.
Writing reference in LibreOffice now (easier) and will export to html/pdf when finished.
added some more code for SelectionList.
build.xml: compilation (typo) fix
Merge branch 'Nika' of git.labs.intellij.net:idea/scala-plugin into Nika
__init__.py
helpers.py
Added Sinatra link to blog post on per-project consoles
ya terminado
Remove autochdir.
added open file table header
사진슬라이드, 구글맵, 리뷰 수정
Beta 1.6.3 - begin migration of Scenario structure to Engine
add making label step to source_compute_cluster_stats.py
changed lang ROI label in source_compute_cluster_stats_in_label.py
change plotting parameters in source_plot_mean_label.py
added additional stats scripts for MEG source ROIs
preProc_avg.sh: updated the srcript to call the new renamed rej_ script
rej_MEEGArtReject.sh: minor/no changes
rej_rej2eve_projon.py: edited script to have the new modified name in teh module
ssp_call_ecgeogProj.sh: Including both SSP vectors for EOG Projection in mag/grad/eeg and only 1 SSP vector in ECG Projection in mag/grad and 0 SSP vector in ECG Projection in eeg(since there is minimal/no ECG projection effect on teh eeg channnels).
ssp_ecgeogProj.py: Included hack for ya30 since in MaskedMMRun1 data signals start recording from 84sec into the run, still checking
Adding ActiveResourcePanel
Version bump
Improvements to variables association on templating
week5 files from class
Removed useless project file, not needed.
Added python alias,  with example documentation
Added admin aliases
refactoring de tablero y tests unitarios
It starts to look like something...
Blue Route Updated
Changed useragent system to be compatible with openJDK
Custom post type support for widget
Fixing small bug in query
Removed old post title
Control packaged added, Pacman code as base to build from.
Documented Direction, added Direction into GameThing
Added: IsoInterface which manages the entire interface
Renamed rotation -> direction
IsoRendererLibrary: updated to work with changes to GameThing interface
Removal of Clock and Slave, rename of Master->Server, and changes to closer align Server and Main to reflect implementation model
IsoGameModelDataSource.transform, added rotation, not tested yet
Client now connects to the server
Talks correctly with Tom's client (just sends simple message at the moment.
Uses buffered read & write.
added rotate and direct
Added setting the viewableRect on the dataSource from IsoCanvas
Renamed package to server
Added temporary converter for server's GameThing to client's GameThing
Added a whole pile of resources for grey ground and water
Tracks disconnected users
Added example GameThing, GroundTile.
Made it so GameThings just start at ((0,0), north)
trying with a separate thread
IsoImage: doesn't remove white to alpha
IsoRendererLibrary: loads all images for different directions etc.
Rename ColorView to DelegateView. Add credits to readme.
changed source file headers
Added Macedonian-Serbian italic variant
Switch to 1.7-SNAPSHOT

Signed-off-by: Meldanor <Bhaals@gmx.de>
Use tempName for initializing the plugin but a pluginName as a final
static string must be declared by the plugin itself

Signed-off-by: Meldanor <Bhaals@gmx.de>
Add another helper method for getting a message from arguments

Signed-off-by: Meldanor <Bhaals@gmx.de>
Merge branch 'master' of https://Meldanor@github.com/Minestar/MineStarLibrary.git
tyyli.css: be valid CSS
PGP/: move key.txt to 0x82A46728.txt to ensure that possible future revocation certificates can be received.
PGP/0x82A46728.txt: use this file as keyserver.
etc/chromium/default: add my /etc/chrome/default
Updated file size under 'lightweight' bullet
Separate ConnectionActivity
Initial commit
Migration for adding user_id to book
Merge branch 'code_base'

Conflicts:
	.gitignore
	README.md
Merge pull request #1 from MrTime/book_list

As user I want to see list of books, and be able to add/see/delete/remove them (CRUD)
Implementing search controller
Merge pull request #5 from MrTime/twitter_bootstrap

twitter bootstrap is now working
Merge branch 'master' of https://github.com/MrTime/ruby-test-project into registration

Conflicts:
	config/routes.rb
	db/schema.rb
updating schema db
Merge pull request #6 from MrTime/registration

registration is available
Merge branch 'master' into book_belongs_to_user
Merge pull request #7 from MrTime/book_belongs_to_user

Migration for adding user_id to book
Merge branch 'master' into user_image

Conflicts:
	config/routes.rb
	db/schema.rb
	public/index.html
updated schema rb
Merge branch 'master' of https://github.com/MrTime/ruby-test-project into user_image

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #8 from MrTime/user_image

User image
Merge branch 'master' of https://github.com/MrTime/ruby-test-project into haml
Merge pull request #9 from MrTime/haml

Haml
Merge branch 'master' of https://github.com/MrTime/ruby-test-project into users_and_books

Conflicts:
	config/routes.rb
Merge upstream branch
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Merge branch 'develop' of github.com:obiconbig/CodeIgniter into develop
The current name is too wide change to get_content_type()consistent with set_content_type()
Update changelog
Merge pull request #868 from narfbg/develop-db-oci8

Improve the Oracle (oci8) database driver
Move changelog line from verion 2.1.1 to version 3.0
Merge pull request #1234 from obiconbig/develop

add function get_content_type to output class
Some improvements to the additions from pull #1234
Alter SQLite tests config to use the sqlite3 driver under PHP 5.4+
Fix issue #14
lpf graph
added a placholder polyfill

requires jQuery, and attention: needs to be re-initialized
-Set project up for use with Eclipse
-Updated the README
-Added the library's classes
Added code documentation.
added a gitignore
setting up git for XCODE
New DTS magic bytes supported
arst
gitignore pifiao :C
Fixed broken links in threads page (incorrect URLs were formed, category was in subcategory's place. Debug alerts in JS removed
Changed footer arrow spacing to get a better readability
Change credentials to db according to #53 issue
Merge pull request #57 from igreactive/master

Change credentials to db according to #53 issue
Added teams
Added mujina and teams hosts
Fix mujina
Fix mujina
Centering the vote button.
Merge branch 'master' into demo
Version 1.19.4
Bukkit 1.3.1-R1.0
Allow for usable controls in all screens.

Signed-off-by: Pamelloes joshua314@sbcglobal.net
Add back blur for autocomplete
Massive cleanup (keeping only SGS2 device tree)

Change-Id: I41ec700f094af62cbc1c0189b017e3313ba1ee68
Added everything from Docs into master
Fixes and removed duplicate variables

Fixes and removed duplicate variables
Added credits and references for functions and methods.
restored some files?
progress on paypal callback
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
Fixed scriptdev & tbbmalloc breakages. Lots of build system improvements.

- Fixed Prefix.cmake for linux.
- Made a few tweaks on how we handle user options.
- Went trough my todo list for precompiled headers.
- Visual Studio can now build both configs independently of the DEBUG flag
    passed to CMake.
- The build tree path can now contain spaces.
- Removed tbbmalloc DEBUG_SUFFIX shenanigans.
- Specifying USE_STD_MALLOC now correctly removes the depency to tbbmalloc.
- Installed more pdb files for the Debug configuration.
- Configuration files are now located with a path relative to the position of
    the binaries.
- ScriptDev0 now can find its config file.
- Resolved a crash caused by the fact that scriptdev was freeing with the
    standard free memory allocated with tbbmalloc by mangosd.exe. I added
    tbbmalloc to scriptdev. In the long run, we need to make scriptdev into a
    static library instead of a shared one.
- Deleted FindXXX files that were not used, moves the others to cmake/find.
- Added include guards and explicit dependencies check to *.cmake files.
- Set the current working directory to the executable path in
    src/mangosd/Main.cpp, this allows to set the path of the config files
    relative to the executable path.
- Cleaned .gitignore to reflect that we now enforce out-of-source builds.
Integrated Charles' fix for pets being granted only half the xp gain of the
hunter while the hunter is grouped.
Merge branch 'develop' of github.com:ProjectSilverpine/server into develop
Whoops. Fixed changing current working directory.
hero unit add
h2 database update to 1.3.168, improved handling of database exceptions
and some cosmetic changes. Simplified previous commit
update to check the correct database file name
Update wording, add missing brackets, add error message dialog
Change "database" to "cache"
Show message in all OS
Delete accidentally add imports
Better message wording
fix last update
fix the message
formatting
Simplified message
Revert "Simplified message"

This reverts commit 1ad86d651a8695b63cc83fea8b3d3b9763ba93f9.
Localize the message and show it only in graphical environment
Adding support for Samsung SMT-G7400 (UPC Horizon)
docfixlet
flag/deprecate unused/misnamed code
Rename getUseSubtitles/setUseSubtitles -> isAutoloadSubtitles/setAutoloadSubtitles
sort PmsConfiguration keys
Manually merged pull request 'h2 database update to 1.3.168, improved handling of database exceptions' as it wasn't applicable without modifications (closes #81)
Updated changelog
Updated Chinese Traditional translation (thanks, mcc!)
minor skin updates
Started work on SpriteSheet
Disable DEBUG mode
Added some code for the supplemental page table, not near working.
questions and format
why does it need another commit after this merge?
Sample Jekyll site.

Add Jekyll files and gitignore, and a sample "hello world" post.
flash-kernel: since we cant disable it, lets use it, but trick it to use the custom kernel

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Fixing OpenGL problem with glMaterialfv:
	Issue was that if using void _start as entrypoint the program did not have the correct OpenGL context. This caused glMaterialfv to not function as expected. For now, the program is compiled using standard int main as entrypoint. The tradeoff is about 50 bytes =/
Actually wrote the cfg
More translations...MOOOOOOORRRRRE!!!!!!
added hw7t2
poprawione routes.rb
Added vending machines
Adding settings example
Adding new relais client
Adding new authentication method
Submitting password as parameter
Edited the template's footer.
Completed my part of the impl
Name: PlayerST-SergeStinckwich.8
Author: SergeStinckwich
Time: 24 March 2009, 4:56:23 pm
UUID: 400be9e8-5d1b-4409-82aa-1ac5a97a37a1
Ancestors: PlayerST-SergeStinckwich.7

Continue to work on classes refactorisation
big fix & update
euler 35
ユーザ別一覧画面で削除した後、画面がクリアされないように修正
Made type attribute of section optional.
Use enumerate and item rather than environments to resolve latex number scrunching problem.
Some preliminary testing.
Add project and builder files
Merge pull request #1 from kjax/master

project and builder files
AMQP-274 Local Transaction Issues

When running a listener container with local transactions
(channelTransacted, and no external transaction manager), the
consumer's channel is bound to the thread for use by downstream
RabbitTemplates.

However, the syncronizedWithTransaction boolean was not set so
the RabbitTemplate closed the channel after its operation.

We should never close the consumer's channel.

The solution is to set the boolean when binding the resource.

In addition, when using a RabbitTransactionManager, the
RabbitResourceHolder.closeAll() method would close the consumer's
channel.

Previously, the consumer's channel was registered with a
ThreadLocal in the ConnectionFactoryUtils. This enabled
the doGetTransactionalResourceHolder method to bind the
consumer's channel.

The RabbitResourceHolder.closeAll() now examines the channels
is it closing and skips the close for the consumer's channel.

Added tests to the Local and External transaction test cases
to ensure the appropriate channel.close() calls are executed,
depending on the scenario. e.g. a local transaction with
exposeListenerChannel=false should close() the exposed channel
but not the consumer's channel.
jason hotfix exercise breaking
Merge pull request #1302 from Stanford-Online/jbau-1301-hotfix

jason hotfix exercise breaking
Merge pull request #1303 from Stanford-Online/jbau-1301-hotfix

jason hotfix exercise breaking
Merge branch 'production' of github.com:Stanford-Online/class2go into jinpa-work
Account for textarea in exams [Issue #1292]
	modified:   templates/exams/view_exam.html
Account for textarea in exams [Issue #1292]
	modified:   templates/exams/view_exam.html
Merge pull request #1311 from Stanford-Online/wescott-prod-1292-hotfix

Account for textarea in exams [Issue #1292]
Merge pull request #1312 from Stanford-Online/wescott-master-1292-hotfix

Account for textarea in exams [Issue #1292]
jbau-survey-tab
Merge branch 'jbau-survey-tab' of github.com:Stanford-Online/class2go into jinpa-work
Merge branch 'master' of github.com:Stanford-Online/class2go into jinpa-work
make slide download button line up w/ video download buttons

also add a bit of space between video download button and progress bar
Specify p element to which we should append note for summative ps

Addresses Issue #722
	modified:   khan/static/latestKhan/khan-exercise-c2g.js
Merge pull request #822 from Stanford-Online/wescott-master-hotfix-issue-722

Specify p element to which we should append note for summative ps
Marker jez aber endlich richtig :X

Signed-off-by: Nikolaj <info@nikolaj.de>
Prompt for reason upon clicking kick button
SlickStateTest

First major commit, examples for Slick2D's state based game.
Fixed bad dereferencing.
Added getShipIndex()
1) Added small experiments to determine the limits of Web workers
2) Started on message framework of the provider
added some missing jinja2 files
client: remove assert in proxy function

Throws on the "domain" property (which is set to `null`
in both streams) in node v0.8.14.
-Fix: check for null where needed
-Codechange: applied LexManos' request
do not use executor
Reinstated R.java.
Moved resources accordingly.
define h_not_in with size_t count as per declaration
Merge pull request #2 from pesco/h_not_in-size_t

define h_not_in with size_t count as per declaration
Enabled fast scrolling for season and episode lists.
Restart app after applying new theme. Closes #94
fixed POST and WebSockets
zip translated
Merge branch 'master' of https://github.com/ViniciusMiana/scala-dist
Merge branch 'master' of https://github.com/ViniciusMiana/scala-dist
more iterator translation
Commit eclipse try
Multiple charts possible, axis are named, count up timer
Site updated at 2012-11-08 06:12:47 UTC
We need 'em
fixed ctrl+click for some macs
Added delete messages entry to reset admin page
Merge branch 'master' of github.com:Yogu/BoomBoxBeilsteinWeb

Conflicts:
	admin/reset.php
What is Open Learning? Question and answer
fixed repetitive get record calls,

fixed width for student list
fixed display problem of small header and recordsfield in get records

changed bgcolour of selected student

changed display of titles on get records and new entrymenu
Merge branch 'master' of https://github.com/eomgui/marking-web
fixed auto load big for update/new obs/conv

fixed update conv/obs (type='lrnandexp') not added

fixed click logo to return to main
Merge pull request #30 from eomgui/master

Gui changes
Trocando - por _
[debug]: commenting out last changes to see asset precompilation failed because of it
Added 'color' namespace to standardize calls for color codes
Using color codes defined in charts.js

Also, other minor styling changes
JSONify Decimal.
Merge pull request #30 from eoranged/json_decimal

JSONify Decimal.
switched gunicorn to use resource instead of namespace
Merge remote-tracking branch 'abourget/master'
ldap info
grub ayarlarinda hata vardi , duzeltildi
added microteam to festival page
Contiki regression tests, grouped into categories
Moved the Contiki tests from the tools/cooja directory into the regression-tests/ directory
Regression tests for Rime trickle and mesh routing protocols
Regression tests for RPL that test up and down routing, root reboots, 28-hour tests, and tests with more nodes than fit the routing tables
travis integration of the Thingsquare Mist regression test framework
Removed the .travis.mk, which isn't needed anymore
Cooja platform changes to get IPv6/RPL to work better
#1 se realizan cambios para funcionalidades en los navegadores
Add background and disqus
fix some typos and 'semantics' in the relations
added feature z
Added some, you know, documentation
#145 Ni & Summer: Hard code for test
145 Ni & Summer fix general layout for view book page
145 Ni & Summer change test for book domain object
Conditions sur la modification/suppression d'un contact.
Cleanup no-comply.js style issues found by jshint
Add hint as Makefile target alias for check-lint
Remove debugger statements for when event handlers throw exceptions; found by jshint
Update the jshint CLI from 0.5.7 to 0.6.1, which implicitly updates jshint itself from r05 to r06
Added remaining files from new version of jshint
Removed older unused version of jshint.js
Cause the .jshintrc to be picked up automagically by the new jshint, and presumably any IDEs, by moving it to the top-level dir
invoking jshint at the top-level will now automagically ignore the stuff we want ignored, rather than requiring an invocation of make to supply the list on the command-line
Merge pull request #136 from dmose/jshint-cleanup

Land new version of jshint command-line and core, switch to .jshintrc and .jshintignore in the appropriate filesystem spot, which should make IDEs do the right thing.
Pre-commit hook test
Fix bugs in pre-commit.sh and install-precommit target
add tools/pre-commit.sh
Add trailing newline
Added .git to ignore list.
Make jshint-caught issues non-fatal
Revert inadvertent collision-cubes change
Add TD comment about Windows environment lossage
Merge pull request #138 from dmose/precommit-jshint

Precommit hook that runs jshint to catch errors sooner rather than later. r=ack
Merge remote-tracking branch 'upstream/develop' into develop
Making the collada example easier to follow with some comments and code cleanup.
About and related CSS

Updated.
About and related CSS

updated some.
updating with Tony Buser
Added 3-8 and isPrime and findPrime to prime.py
Refactorizadas imagenes de fondo y perfil en varias tablas. Desacopladas las clases Photo y Users
Refactorizados los códigos del commit anterior
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
arreglados errores en links
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
j/k for navigation
Merge branch 'master' of github.com:alexeypegov/spleanersite
Added jquery plugin interface to the library.

Supporting the jquery plugin interface gives a more standard
and simpler embedding protocol.
github#13 Improve error messages.
result...
Merge branch 'release/0.1.6'
travis: Install an m4 directory before calling autoreconf

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
travis: Enable the mongodb service

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Restore ABI compatibility with 0.1.0.

In 0.1.6, the mongo_connect and mongo_sync_connect symbols were bumped
to LMC_0.1.6, which meant that old programs linked against the
library, that expected to find these symbols at @LMC_0.1.0 suddenly
stopped working.

This was not the intention, so lets provide the @LMC_0.1.0 symbols
along with the @LMC_0.1.6 ones, in such a way that old programs will
exhibit the behaviour expected from them.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Merge branch 'hotfix/symbol-version-ABI-fix' into stable
Merge branch 'hotfix/symbol-version-ABI-fix'
Doxyfile: Remove an obsolete setting.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
mongo-sync: Do not mention mongo_sync_unix_connect

The mongo_sync_unix_connect() function never existed, do not mention
it.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Release 0.1.6.1

Versions numbers & dates bumped, NEWS updated.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Merge branch 'release/0.1.6.1' into stable
Merge branch 'stable' into debian
debian/changelog: Updated for 0.1.6.1.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Functional app. Problems = work when it wants. Display task doesn't show all movement as it is in a lower priority
improved guides for format plugin
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Fixes requirejs loading errors due to incorrectly spelled module dependencies
Fixes a property is undefined error
added a sample pic
Universal change to variable name 'sliceDisgardCount' which should have read 'sliceDisregardCount'.
modifications for image galleries
add unlinked bio page
Site updated at 2012-12-15 15:46:51 UTC
Site updated at 2012-12-02 21:57:37 UTC
Speed improvements to cursor

Improved speed when redrawing hover hex.
Added a hex grid image. For now, I think I am going to turn it on.
Also, adding preliminary castle support in the terrainCodeTable object.
amended the length validation
correcting config header file
Tipped plugin
Subject: edit transaction and account

Description:

1) completed with edit transaction
   xmlrpc_editVoucher
   xmlrpc_editVoucherMaster
   xmlrpc_editVoucherDetails
   xmlrpc_deleteVoucherDetails

2) completed with edit account
   xmlrpc_editAccount
   xmlrpc_getAccount
Subject: Completed balancesheet,Profit & Loss,Gross & Extended Trail Balance

Description:

1) added functionality for balancesheet
   used xmlrpc_getAccountNamesByGroupCode
        xmlrpc_calculateBalance
2) added functionality for profit and Loss
   used	 xmlrpc_getAccountNamesByGroupCode
       	 xmlrpc_calculateBalance
3) added functionality for Gross Trail balance
   and Extended Trail balance
    used xmlrpc_getAllAccountNames
         xmlrpc_calculateBalance
Subject: Completed ProjectStatement

Description:

1) added functionality for getProjectStatementReport
   used functions:
   	xmlrpc_getProjectStatementReport
	xmlrpc_getProjectStatement
   	xmlrpc_getGroupNameByAccountName
	xmlrpc_getAccountNamesByProjectName
Subject: Added functionality for account deletion

Description:
1. added 4 rpc functions for account deletion.
	a. deleteAccountNameMaster
	b. hasOpeningBalance
	c. hasTranctions
	d. deleteAccount
Subject: Completed Bank Reconciliation

Description:
1) added functionality for bank reconciliation
2) added functions as below:
   xmlrpc_getReconLedger
   xmlrpc_setBankReconciliation
   xmlrpc_setBankRecon
   xmlrpc_getClearanceDate
   xmlrpc_deleteClearedRecon
   xmlrpc_updateBankRecon
   xmlrpc_getOnlyClearedTransactions
   xmlrpc_getAllBankAccounts
Subject: Completed with CashFlow

Description:
1) added functionality for cashflow
2) added functions
   xmlrpc_getCashFlowOpening
   xmlrpc_getCashFlowReceivedAccounts
   xmlrpc_getCashFlowPaidAccounts
   xmlrpc_getCashFlow
added nutritions to form
Site updated at 2012-08-23 05:27:38 UTC
ajout actions et méthodes dans MainWindow
Ignoring stackdump-file
Reformulated handling of libraries and lib-path.
Added roadmap-comment
Huge refactoring.
Moved from preprocessor-based kernel configuration to selective linking.
Modified all the code to use the new paradigma. Preprocessor definitions are now given through command-line parameters or replaced by configuration data.
Adapted makefiles to the new system, introduced selective linking for every project.
Moved obsolete projects to separate folder.
removed unused methods
provider item ordering within a list and between the lists
AOJ00018 完了
AOJ00019 完了
AOJ00020 完了
updated qooxdoo
add index for comment management
AU modifications/ break
Update module to params_lookup

- Add parameters to the module and use params_lookup to gather
  values
- Add some stub manage parameters which will handle including
  submodules for specific tasks
Various changes

- Split users and groups management to different modules
  and use params_lookup to gather data
- Handle manage_(users|groups) in class ssh – if it is set
  to a true value, users/groups will be created with the appropriate
  classes. Default is true, but it will not do anything without
  defined users or groups
Changed the behavior of the Settings object to force a flush to disk each time a configuration change is made. This isn't optimal but given the current scale, it's not a problem
Merge pull request #1 from aspgems/master

Fix the call to the class method decode_field
update_attributes: checking for values.empty? (and .nil?) doesn't work when you're sending other values in that might not have .empty?, like XML::RPC for photos, etc.
Merge branch 'master' of github.com:richardun/active_directory
Jon: Favicon, style finalisation and a nice image :)
Service names are now provided by the API.
MooTools update.
sessionのopensocial_viewer_idをxoauth_requestor_idに付ける
Add function to automatically sync before flights, and lots of small improvements
Removed PHP 5.4 version from the Travis config, we'll focus on PHP 5.3 for now
Added some project info
Added more tests
refactor room descript as function calls
Html Formatter
Allow TwigRender to accept options for Twig
Merge branch 'master' of github.com:backend/Backend-PHP-Base
Typo mentions tint instead of shade.
create project analysis and the project analysis style sheet

Also, ignore the .DS_Store
content for product page
annoucements box resize fixed & added date
adding docs for PagSeguro
Fixed Graphite_Graph_CallSpec::findNextOccurrance declaration.

Added missing `static public` modifiers for findNextOccurrance.
add 100-2 button to left navigation
Merge pull request #6 from davidmote/develop

add 100-2 button to left navigation
initial commit with a mock files
usernamen muistaminen
AlarmManager to private
Wakeupchance to 0.3 + logs
change to python test
Merge branch 'master' of github.com:ipa-fmw/cob_robots
remove diagnostics test
commented out some not working diagnostics and modified the Actuator analyzers
changed name of cob_dashboard to cob_commmand_gui
Merge remote-tracking branch 'origin-ipa-fmw/master' into automerge
sick_s300 yaml files to be used with new scan-filter
sick_s300: added laser frequency in yaml
sick_s300: changed laser_frequency to scan_duration
changed lbr config
Merge remote branch 'origin/master'
added diagnostic aggregator for actuator monitoring
changed default trigger freq for left camera, added sensor information to dashboard
Merge remote branch 'origin-ipa320/master' into automerge
sick_s300: introduced scan_cycle_time
Merge branch 'master' of github.com:cpc-pk/cob_robots
made sdh respawn again
added lbr stuff to diagnostics
parameters for left and right prosilica camera separeted from intrinsics calibration
stereo calibration of left and right prosilica
DOCTYPE added to layout.

Signed-off-by: Christian Trutz <christian.trutz@belaso.de>
added README for static files
Rework belongs_to and stuff a bit.
Updated license, slides better for web
Default LESS File
Merge branch 'master' of github.com:bertrandPages/PizzKanban
Updated Bootstrap to 2.0.4. Version 1.0.2-pl
Fixing condition where bad UTF-8 causes failure
changed timing to messages for testing
missing login view files
Bump the base font size.
Update to latest fundamentum.