labofsahil/github-event-dataset-2012 huggingface dataset:
asd
change 2
little fix
Merge branch 'master' of https://github.com/gardenia2007/slimevent
完成推一下和报名的VC
Merge branch 'master' of https://github.com/gardenia2007/slimevent
将所有类别用户的个人页面都指定为'/my',添加学生个人页面'我参加的活动'列表
Merge branch 'master' of https://github.com/KJlmfe/slimevent

Conflicts:
	app/actions/SEStudent.php
Adding more verbose error reporting to the front end (alert box if JSON returns an error string)
Update Trial of the Champion creature text.
Added Drop Down with basic options

Takes in data, text and name fields.
Implemented basic value binding

The value is changed when the change event is called.
application files
adding application files, ignoring tomcat logs and xtf index
Made the sender to be a class so can be used as a module.

Added re.sub() on server response to remove the protocol "garbage" before passing to JSON. Don't see how it is suppose to work otherwise.
https://github.com/capistrano/capistrano/commit/4ece7902d5058c3c0222fe4d198c33b4eaf7110b#commitcomment-2316891
Update services/toggl.rb

Update to V6 as V5 seems not to work. (dont get any tasks to toggl)

what i see from the sample json string in the apidoc it should be enough to provide the project id as object under project.

i'm no ruby coder, so i hope i got the syntax right.
Merge pull request #436 from rufinus/patch-1

Update services/toggl.rb
Fixed a typo in about page.
fix category; version
fixes alert so it always is visible
Removed the custom titlebar as it comes in the way of using a system theme as a parent (Cannot use requested feature with window title). I need to use Theme.Holo when it exists because it looks and feels nicer and going forward (since ics) is the recommended way for developers to go.

Replaced the real title bar with a fake one. A compound control created with a linear layout and some buttons :)
at a good place
syle block quotes
portage_workdir_hacktool.sh: Oops, portage_workdir_hacktool.sh has a new location so reflect this in sourceit
/ ‘c/sdfasdf’
- ‘c/.sdfasdf.kate-swp’
ENH: report statistics of scoring
Add error IDs
Return user in 'user' attribute
Add activity feed API
Site updated at 2012-12-31 07:42:27 UTC
switched to ABS
changing style of how hiring is displayed
initial_report: added figs
initial_report: added figs
Merge branch 'master' of github.com:griffinfoster/medicina

Conflicts:
	papers/initial_report/med_oxford_best2.pdf
	papers/initial_report/med_oxford_best2.tex
Update for NoDog bug
Slotting in the new urls provided by jessi
interpolate variable
add hunchentoot as submodule
use absolute path for dict and model
edited issue18 test
fix useExistingjQuery in include.partial.html
sync site files instead of unconditionally copying them
fixed prop_install
change method computing and stepback
rename files in content
xbmc-*: add -crosscompile.patch
makemkv: build depend on expat
Merge pull request #950 from stefansaraev/xbmc-cross

xbmc-*: add -crosscompile.patch
xf86-video-virtualbox: fix build if ARCH not specified
oscam: update to oscam-7168
connman: fallback to dhcp if ip address is set to 0.0.0.0
Common: Use released URL to API

SR has now officially released APIv2. This updates the base URL
to use public URL

Signed-off-by: Henrik Saavedra Persson <persson.henrik@yahoo.se>
update
updated canvas-orm module
Added in equals for Discipline
Removed stupid tests for equality as it is not needed yet
initial skel class for ibm smartcloud
when adjusting scheduled jobs account for multicore

Jobs where incorrectly being unscheduled due to use of multi-core VMs
adjusting log levels of messages
测试2人物
test change one
test change two
test change three
Scot topic change from Eddie #1.
test change one
test change two
test change three
Scot topic change from Eddie #1.
Scott topic eddie change 2.
Fixed merge conflicts.
Fixing merge conflicts.
Updated classes for JavaDocs
Update README.md
Added Changelog
Merge branch 'master' of github.com:carterpage/JSONassert

Conflicts:
	src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
Merge pull request #11 from carterpage/master

Add changelog
Update README.md
[maven-release-plugin] prepare release jsonassert-1.1.0
[maven-release-plugin] prepare for next development iteration
Update version #'s
Update CHANGELOG.md
#12 provide diagnostics when comparing JSONObject with JSONArray
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
Add monster upon person
dropModelされたモデルのcreate,removeはエラーになるよう修正
createSequence(start,step,returnType)のstartとstepでデフォルト値(1)を
使うかどうかは、start/step==nullで比較するよう修正
テストの追加
・ドロップされたモデルの操作
・ドロップされたモデルのアイテムの操作
・removeされたアイテムの操作
・↑のようなアイテムが持つObsArrayの操作
・createSequence()
Feature Dev package file
Added option to not use the commit dialog to specify the commit message

To better support git workflows which use standard git commit templates or
prepare-commit-msg hooks, the "Write Commit Messages in Commit Dialog" option
has been added to the gitextensions tab of the settings window.

When it is unchecked, the commit dialog won't specify a commit message to the
git-commit, allowing git-commit to do it's behaviour of launching $EDITOR giving
the user the ability to edit the auto-generated commit message, just like on the
command line.

By default the original behaviour is used. (Require the message to be entered
in the commit dialog)
Plugins/AutoCompileSubmodules: did not compile because of previous changes
Code style: convert tabs to spaces
FormRemotes: Rearrange buttons to more intuitive positions. Add a close button (no function yet).
FormRemotes: code style
FormRemotes: Close button closes dialog
FormRemotes: Icons for New, Delete, Save
Use utf8 without BOM and \n as a new line to save config file.
Uncover reason why file is not supported.
Reencoded file name is not needed here.
Fix broken dashboard layout.
Corrected patch processor, now whole header is displayed.
Compilation error
Start with empty module working dir
Merge branch 'FixUnitTests' into UnsupportedFile
Corrected TestLoadPatch
Ignore nunit test files
Include nunit dlls
Translate some German text messages
Translate some German text messages
new flags support in the lua module
ne max worker define
new create workers structure
finally text works in a quick and dirty way
some html trial
Rename OpenSMTPd, improved rc script
support for getting all ik solutions
fix pr2 manip tip offset calculation
Fix for new jquery Versions
main.h main.c
Added @markreid, thanks :)
Switch to Sub::Exporter::Progressive
remove vc10 support
refactoring common base
refactoring
refactoring
[FastSerializer] Added bugfix from Marek Safar.
Write doc, README in .md format (to be fancy in Github)
Fixed bug in firefox in accessing content iframe.
Size for iframe container and iframe set to 100%.
dev tarea 3
Si señor sí señor!
Merge branch 'master' of https://github.com/ikesada/smartsolutions.git
registrarMovimiento está vivo, vivo!
limitacion longitud campos DNI
limitacion longitud campos DNI
aggiornamento finale per i cambi colore
Update, as planned. Tue, 22 May 2012 17:18:01 +0400
Update, as planned. Tue, 22 May 2012 15:52:01 +0400
Update, as planned. Wed, 25 Apr 2012 09:34:02 +0400
Update, as planned. Thu, 24 May 2012 08:18:01 +0400
Use updated API version

Amazon changed the format of the 2012-05-05 invalidation schema for requests.
Merge pull request #3 from philipcristiano/master

Fix invalidation request schema
remove useless monad parameterization in findFP function
fixed versions of some core modules and ignored config/runtime
Gegner eingefügt
Trivial cosmetic changes to the error message.
Fix logic: complain about adding more jobs *after* the solver has run,
rather than before.

This makes the program action be in accord with the error message.
Make unlocking an already unlocked database a no-op, rather than
failing an assert and dumping core.
pkgdb_lock/unlock were misnamed: calling pkgdb_unlock() does not
necessarily cause the database to be unlocked because of the sysem of
lock-counting employed.

Change to pkgdb_obtain_lock() and pkgdb_release_lock() to indicate
that several locks may be obtained on the DB simultaneously, and the
DB is only returned to 'normal mode' once all locks have been
released..
LIVE WORKING DEMO
Latest changes
Merge branch 'master' of github.com:ingenuitas/simplecv-js
Fixed exception calling getRadius of undefined in _fireCreatedEvent and changed where the label text is updated to support the case where a user single clicks on the map
[ALSO Actebis] New ruleset for www.alsoactebis.com
Ilib_Error comes in version 1.0.1
CPAN::Changes compat
'add_jquery'
Project splitted to submodules: server, data-generator.
Updated gitignore.
Some files removed to the server module.
Added troia- prefix to the module names.
Double-apostrophe escape in Bash strings
add some types for sagittal slice extraction
implemented oil extraction of slice
removed redundant code
implemented extracting for aligned32 bit data
astyle
add method to extract a list of slices
astyle
add dir for qt4 support
add config for qt4 stuff
set up install stuff for qt4 component
worked on widget_component
adaptions to isis fvector3 api change
used vector3 if possible
astyle
Change the wording of the sponsors page to thank people who donated through
PeopleFund.it, not encourage them to do so anymore.
Fixed #118 (Broken pipe when closing device connection)
Added example files to documentation
support for other sql adapters, not only mysql
Addresses issue #12 created new API to obtain property value mergers.

Added a new method to the DTOBinder interface:

```java
    public <T extends PropertyValueMerger> T getPropertyValueMerger(Class<T> mergerClass);
```

And a new marker interface to make general use of the PropertyValueMergers
Addresses issue #11 where a general refactor is needed to improve the cohesion of the creation of property value mergers.
deleted test units
Fix URL type [ci skip]
updated methods to add remove breeakpoints
Reformated code using RubyMine.
TYPE- CHANGED 3 YR EARN TO 3 YEAR ELIG
example for own fuseki store
vnsi: set stream properties properly, now stream get opened before CONTENT_INFO
vnsi: missed one parameter in 57056f2ce80b91d70d8e8493677895dec8488446
vdr-plugin-vnsiserver: explicitly request streams we have demuxers for
vnsi: having no signal quality is no error
[droid] add android path checks. Credit Memphiz
[cmyth] Win32: Fixed mysql client lib path in project files.
vdr-plugin-vnsiserver: fix freeze of streaming, thanks to manio who tracked this down for xvdr
Merge pull request #64 from theuni/android

[droid] add android path checks. Credit Memphiz
[hts] fixed - eventId is required by htsp when adding a timer
check for pkg-config and disable external ffmpeg when it was not found. closes #66
[pvr.nextpvr] - fixed compilation for darwin and refactor the ifdefs a bit
Merge pull request #67 from Memphiz/master

fix compilation on ios/osx
Merge remote-tracking branch 'upstream/master'
[cmyth] Prevent crash in cmyth_livetv_chain_update when recorder is not recording.

This checks if cmyth_recorder_get_cur_proginfo returns a null pointer and exits properly in that case.
[cmyth] Changed log message type from ERROR to DEBUG in cmyth_storagegroup_get_filelist.
Add shared tmp
+ getWaveInfo()
Assets for the experiment
Adding low level security
Didn't have gitignore, was dealing with DS_Store files
Removed DS_Store file
Changed base model to instantiate Resty's baseURL with a constant if it's defined, but it really needs to use Dependency Injection and pass in the instantiated Resty object from elsewhere
Merge branch 'master' of git://github.com/jasonrhodes/hoverboard
Favorites show up in favorites tableview
Merge branch 'master' of github.com:jav094/MADFinalProject
Testing viewing favorites.
updated document a bit. Needs more work
updated text
updated after upgrading to ruby 1.9.3
Merge branch 'codeOptimization' of git://github.com/jayostinowsky/GoldStar
Merge branch 'settings' of git://github.com/jayostinowsky/GoldStar

Conflicts:
	app.py
	routes/user_page.py
	templates/settings.html
Merge from master
Added Invite by Star
Forgot to add summary.html
Fixed readme, backticks instead of single quotes :P
argument/attribute name change
estimate ultrametric tree in PAUP*
Fix bug in reading Parameters of labelfield .am file

*  also a couple of documentation fixes
Add a test for parsing of complex Materials from Amiramesh Label fields
Fix syntax error (due to spurious char)
Change default ColormapAlpha from 0.5 to 0.35

* this is consistent with what Greg has been doing for the last year
* e.g. for figure for Nature N&V
* also setCloneColormapAlpha to set this
Merge branch 'master' of jgit:AnalysisSuite

* 'master' of jgit:AnalysisSuite:
  Change default ColormapAlpha from 0.5 to 0.35
Add xyzmatrix<- function that can set coords for neuron or dotprops object
Teach irk.TransformNeuron to transform dotprops by using xyzmatrix<-
Teach TransformNeuron to transform dotprops as well

* though there is a function transform.dotprops that will do this
* TODO unify everything under a single transform function
Actually over-ride default help with my modified help function

* help(x) will still start by calling utilise::help
  but if that fails it will try to extract help from source code
Add a new ? function to override base function

* this means that you can now do ? for any function
  and it will find in source roxygen docs where possible
Teach transform.dotprops to accept registration function as well as CMTK file

* Can uses e.g. MirrorPoints
Organized javascript for using require.js
Implemented require.js and tested
Fixing up require.js implementation by shiming bootstrap. Also addressing flash when page renders but will create a branch to work on fix.
Added domReady plugin to require.js to insure that tictactoe.js game scripting is synced with the dom ready event, just like the $(function(){}) does when using jqueyr without require.js. Removed dynamic less compilation at rendering time and now manually compiling .less file(s). The reason this is needed is because the .css file is needed prior to the rendering of the html and not after which is what happens when using dynamic compiling while rendering and loading the less compiler with require.js.
Added reminder to compile comment to the top of the file
Removed is_addrof -> simplified out/ code -> fixed code gen
Fixed addressing and indirection
Initial ideas for change
Initial split up for asm op changes - compound and normal assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
working compound assignment (x86 idiv fudged up its beauty - asm backend should sort this)
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Modified test code to include more asserts
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign

Conflicts:
	src/cc1/expr.h
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Merge branch 'master' into compound_assign
Added VALs to fix
Added checks for non-bool-tests
Fixed use of intvals on non-val exprs (const folds)
Merge branch 'constness'
Fast array access block - incomplete
Removed/collapsed extra checks for constness
Put incomplete array check back in
added duration
update timelog
refactored relationship
fixed refactor problems
fixed duration calculation
removed comments
added finish at function
added edit form
updated default
added update method
allow set finish time
cleaned up codes to use rails helpers:
Renamed buildorder to build-order to be consistent.
Added a script to remove all pre-commit hooks.
Make root accessible from Innodb::Index
Add support for page directory; Change record to return infimum/supremum rather than NULL
Add dump of page directory to Innodb::Page::Index dump
Remove ph and fh aliases; Cleanup
Davi's suggested fixes for index-recurse output
Added PHPUnit arguments.
Added initial test.
- add image
Merge remote-tracking branch 'origin/master'
แก้ detail เขียน query ใหม่
Merge remote-tracking branch 'origin/master'
Quote.
Refer to the text subdirectory.
Use MAPC.

We don't care about the value.
Simplify.
closes gh-57 - event processing rate for executive in current flapjack instance is now correct, multiple executives can now register and not clober each others statistics
set up selected illustrations in js + linked rest of images in html
Fix examples which used the bogus G value
Working on cleanup of function.
Added link to Heroku dev center article on static sites
use direct address for curl
Fixed stopwords, added evidence passage filtering
enable override for default wrapper node, and updated readme
Putting in better nginx modules
2012-12-19_15.00
;; (require 'custom)
Image Pathing
edited doc.
put wantarray in read_matlab
	modified:   README.pod
	modified:   matlab.pd
write pdls with unique matlab names by default.
spell check.
bump version to 0.002, but not ready to release
edit docs.
docs again
docs
working mmap/ByteBuffer List abstractionn for geoip buffers.
tarea 4 en (las tablas no estan traducidas

Signed-off-by: Joao Fuentes <joao@localhost.localdomain>
adding back some click events
adding changes to apk
Remove Gemfile.lock file that looks stray.
Fix :display_as for texts including apostrophes (').

Since ' is used to identify the attribute's content, if it wasn't quoted
within it, it would end the attribute too soon causing both page validation
to go awry and any content following it to be dropped altogether.

Note that the ampersand (&) symbol has to be quoted or it could be
interpreted as the start of an XML entity.
Require sqlite3 gem rather than the old name (sqlite3-ruby).
Make tests more resilient to timing issues.

This tackles Issue #87 when running tests via X11 forwarding (or Xvfb).
Merge branch 'master' of https://github.com/Flameeyes/best_in_place into display_with-fix

Conflicts:
	test_app/Gemfile.lock
Build travis against rails 3.1
Revert "Build travis against rails 3.1"

This reverts commit a5cfa13088c04982b937175491642ffa6d43efbe.
Update rspec dependency to avoid deprecation warnings on rails 3.2
Update test_app rails version to 3.2
Use of respond_with in the controller is no longer supported, removing tests. Use respond_with_bip instead.
Bump version
Update README section for versions, now up to date
Convert $ to jQuery to avoid conflicts
Update version
Revert "Update version" per discussion on https://github.com/bernat/best_in_place/pull/95

This reverts commit c0fcadc3e12f34d5ab92d3bcf8ea9c8556a7f7cd.
Add failing test for content added to the DOM
Attach editor to newly matched elements

Through an event delegate we handle clicks on elements that have been
added to the DOM an match the original selector but still don't have the
editor attached.
Allow :display_with to accept a proc.
Merge pull request #108 from zubin/master

Allow :display_with to accept a proc
Show nil text when original value is blank

For example:
    best_in_place @user, :name,
      :display_with => :simple_format, :nil => "Fill me"
When the user name is nil then the output is <p></p> instead of Fill me.
Added that admins cannot delete themselves
Removed mod4j comment
Fixed issue where ast_generator can return an array of nodes

In the past, an array of strings was returned
Setting up for our mutation_fuzzer
Add basic mutation support for terminals
Merge branch 'mutation_fuzzer' of github.com:johngunderman/fuzzbuzz into mutation_fuzzer
needed this change too
Signed-off-by: Sean Cardello <seanmc602@gmail.com>
Merge branch 'master' of git@github.com:johnselker/Bazinga1186.git

* 'master' of git@github.com:johnselker/Bazinga1186.git:
  Added Grade, NextBlock and PreviousBlock to TrackBlock as well as TrackSignal property. Added BlockProgress to TrainState. Updated TrainController.
  Added SetBrake.

Conflicts:
	TrainLib/obj/Debug/GenerateResource.read.1.tlog
	TrainLib/obj/Debug/GenerateResource.write.1.tlog
Merge branch 'master' of git@github.com:johnselker/Bazinga1186.git

* 'master' of git@github.com:johnselker/Bazinga1186.git:
  Track Model Changes
disable user creation until it is done securely
return user information after successful federated login
[NativeTarget] Support .hh files as headers
Moving where we detect the noflash

since we can't trigger a noflash event before the actual event handler
has been registered.
Add some new tests, clean up some others.
Merge pull request #1736 from elinw/usertests

Add some new tests, clean up some others.
Merge commit 'e6a697ebee1854470cb15579f570989684b522dc' into HEAD
Fix code style in tests/suites/unit/joomla/access
(cherry-picked from 46596e8)
Fix code style in tests
(cherry-picked from 66e7e02)
Fix code style in tests/core
(cherry-picked from ec5fb3b)
Fix code style in tests/suites/database/driver
(cherry-picked from 9291223)
Fix code style in tests/suites/unit
(cherry-picked from 03e5338)
Fix code style in tests/suites/unit/stubs
(cherry-picked from ecec55b)
Fix code style in tests/suites/unit/joomla/application
(cherry-picked from a9320db)
Fix code style in tests/suites/unit/joomla/[a-d]
(cherry-picked from b46c6ed)
Fix code style in tests/suites/unit/joomla/[e-g]
(cherry-picked from 22df6ea)
Fix code style in tests/suites/unit/joomla/[h-u]
(cherry-picked from 6c4bf28)
Fix code style in tests/suites/unit/joomla/base
(cherry-picked from bf1b948)
Fix JApplicationWebTest after code style changes
(cherry-picked from 267233f)
Fix language tests after code style changes
(cherry-picked from 4169818)
Fix code style in tests/suites/unit/joomla/[l-u]
(cherry-picked from 9ec1ddc)
Skip some code due to faulty sniff
Change class names to comply to coding standards
Merge branch 'master' of git://github.com/joomla/joomla-platform into phpcs-tests-fix-n2

Conflicts:
	tests/core/case/case.php
	tests/core/mock/cache.php
	tests/core/mock/database/driver.php
	tests/core/mock/dispatcher.php
	tests/core/mock/rules.php
	tests/core/reflection/reflection.php
	tests/suites/database/driver/mysql/JDatabaseMySQLTest.php
	tests/suites/database/driver/mysql/iterator/JDatabaseIteratorMySQLTest.php
	tests/suites/database/driver/mysqli/JDatabaseMySQLiTest.php
	tests/suites/unit/JLoaderTest.php
	tests/suites/unit/joomla/access/JAccessTest.php
	tests/suites/unit/joomla/application/JApplicationWebTest.php
	tests/suites/unit/joomla/database/JDatabaseTest.php
	tests/suites/unit/joomla/object/JObjectTest.php
	tests/suites/unit/joomla/user/JUserTest.php
Fix code style in tests folder
Merge pull request #1581 from elkuku/phpcs-tests-fix-n2

Fix code style in tests folder
Allowing override of the xx-XX.localise.php 

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=28877

This patch let's override the settings in the localise.php file without touching at the original file in the core language folders.
For example the maximum number of characters allowed to search.
Implementing array at Sam's request. :)
correcting white spaces
Merge pull request #1417 from infograf768/patch-5

Allowing override of the xx-XX.localise.php
[#28210] onchange event does not fire at JFormFieldMedia (Regression)
Merge pull request #1012 from benjamin4ruby/media-field

[#28210] onchange event does not fire at JFormFieldMedia (Regression)
can now accept osc messages in c++
working on batching opengl calls...
notes are now in a pool.  nothing was won.  actually, the code is just worse now, I think.
removed crappy build stuff from git project
damn project files
ah, there was a slight delay in note down.
raise a PatternError when an undefined pattern is encountered
update changelog for pattern compilation fix
Merge pull request #4 from fetep/master

fix recursion error when defining unknown pattern
version bump
add class links to readme
Removed static instance SenderRepository in App
Extracted an interface from SenderRepository for compliance with the interface segregation principle
Refactor AppTest to use Mockito mocks
Added new Guice @provider for SenderRepository
icons font uit css gehaald. hex kleuren #fff en #000 door variabelen vervangen in de sass
remove bin and ignore it
Fixed form newsletter
Added several files for parsing the patents and getting word counts.
Add xml-stylesheet element to all entries for better browser preview
Added the ability to attach a link to the menu buttons.
ping nexus support in console server script
Date model fixed
Issue #3134:Problem with translation in authorizations/new.html.haml
Refactor AppConfig
refactor appconfig
Updated the Galician translation.
Improved the Galician translation and fixed a quoting error.
use rails admin gem, not the smaller git repo.  NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it
update readme [ci skip]
Merge pull request #3148 from DeadSuperHero/appconfiglove

Refactor application.yml.example [ci skip]
Merge pull request #3136 from movilla/Auto_fix

Issue #3134:Problem with translation in authorizations/new.html.haml
Merge pull request #3150 from Gallaecio/l10n-gl

Updated the Galician translation.
change new publisher to public by default to make testing easier
refactor stream fetching logic
Simplify instructions for setting up a test environment [ci skip]
refactored stream and Stream View

streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
Set single_process_mode to true by default [ci skip]
Image Redirect URL should be blank [ci skip]
include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770
update the iframe route, fix a small styleing thing in newspaper style for iframe view
Merge remote branch 'upstream/master'
Merge branch 'master' into serendipitous
update-gems
Merge pull request #3424 from justindthomas/update-fog

update-gems [ci skip]
Merge remote branch 'upstream/master'
Merge branch 'master' into serendipitous
added a password parameter to the PS3 controller driver
removed unused class
Added a check for whether the robot model supports seperate extend and retract force limits and rates
fujikawa coding commit
Site updated at 2012-12-01 13:24:44 UTC
bugfix: reflowed page should be at the top of the screen
when reflowed page has a height less than screen height. This bug was
initially found by @tigran123 in #452. I'm sorry that I didn't fix it
until now.
Merge pull request #564 from chrox/kopt-manbbox

bugfix: reflowed page should be at the top of the screen
Tidy up TTS
1. Describe the 'message_importance' parameter correctly in the comments
above :inform() function.
2. Use more appropriate menu titles for event notification dialog.
3. bugfix: save/restore configured event notifications methods in the
settings.
Bugfix: link with the static libjpeg.a
We should explicitly link with the libjpeg.a from mupdf/thirdparty and not with the
shared libjpeg.so that may happen to be installed on the system.
info_timeout2 - fixes issues reported by tigran123 in #560
DINFO_TIMEOUT_SLOW set to 1500
Merge pull request #567 from kai771/info_timeout2

info_timeout2 - fixes issues reported by tigran123 in #560
Merge pull request #565 from tigran123/tts

Tidy up TTS
Merge pull request #566 from tigran123/libjpeg

Bugfix: link with the static libjpeg.a from mupdf/thirdparty
[spec/controllers/api/v1] Created products_controller_spec (copied from spree_api), added test helpers for API testing
Remove some fields from field selector
Buttons für Tracking, Zurück ersetzt, Stern-Spielstein Icon geändert
README
Lot of changes
Changed Earth radius to float.
Implemented math.great_circle_distance.
5th element - time
Add swipe-enabled keyboard
proof of expectation upper bound
fast localization
analysis
test data
barriers
Loading screen added to the main table view.
Added 'IF NOT EXISTS' clause to table creation sql in migrations
gsur
add field group to dependency modules list
Resricted times and days tweeted
cleaned up paging js. cleaned up buttons. created messing. added messaging to profile, manage articles, manage sections, edit comments.
- make use of variable instead of hardcoding app directory
- add support for generating debian packages
# makes use of dpkg-deb command line utility
- use bulid.properties file to configure some settings
- add missing module directory in target path
- copy files into root-path configured in build.properties and directly replace
  some placeholders (BASEPATH & MODULENAME)
- remove generation of debian control files (they are now all in a separate
  "debian" directory and can be maintained there for each project)
- support some placeholders in debian control file
- update path property, which is now named "root"
- declare global filterset "copy.tokens" which is used when copying data
- add support for "copy" properties in build.properties to copy given files
  or directory to other location in the package (e.g. used for Apache
  configuration)
- set correct permissions for "postrm" file
- add support for relative and absolute copying of files
# still not fully working
- rewrite extra file copy task to support directories and files copy
- fix keyword for section
Merge pull request #4 from ohinckel/feature-dpkg

Feature dpkg
Test for cron send, manual send.Fixed two notice in class Oauth twitter.Start cleaning the code.
Some modification to prepair the module to be push into drupal org.Updating some css and js code and fixing some internal issues
Change the function name to resqueueable to avoid any possible conflicts with the name queueable
TASK KSP-660: Fixed custom tests after pull
Don't create duplicate accounts in seeds.
Add bootstrap custom CSS
Only link dataset in void case
Add last_etag attribute
Change the name of etag attribute to current_etag
create private attribute _voidmodel to cache it
use _voidmodel and etags to avoid needlessly regenerate it
New void non-psgi tests
use hexastore to test, etags work
testing for adding a statement
Changed the code that determines the .dmd file name. Didn't work with ../../ paths.
tidy notification
tidy notification
First Message
Second Message
Small visual tweak on a chunk.
Minor code cleanups and GA fix
Externalizing deployment validation to TestRunnerAdoptor, shared between junit and testng tests
Externalizing deployment and shutdown to TestRunnerAdaptor
evaluate nested configen expression
Wright brothers

Added newspaper image
new games coded and added
Merge pull request #2 from kumarshantanu/master

Let user optionally specify DIFFTOOL env var
adding contributors and upping version #
adding *'s to README
add examples, fix DIFFTOOL spelling
changed Tour model to use django-autoslug for AutoSlugField. this gives us unique slugs so we don't have any conflicts on accident, also ensures unique constraint
Added a pretty print string to the State.
Refactored forms
A few changes for the example app.
List results display WIP.
Using truncation database cleaning
Get spec working for value assertion
Moving javascript to the top of the tree for auto require
Moving application.js back to original location
Edits for example app.
A couple of changes to get select_attributes to work with hashes.
Some edits to the forms
Running lists before saving.
Merge branch '25750823_display_list_results' into 25750823_edit_lists

Conflicts:
	app/views/has_lists/lists/_form.html.erb
cleaned, left only posts
1.1 release. Better monitoring of gamemodes.
Changed some shit, wanted to remove zombiegame reference from animatedsprite but to no avail for now
major refactor. added game state
Imported Upstream version 2.5.0
Merge commit 'upstream/2.5.0'

* commit 'upstream/2.5.0':
  Imported Upstream version 2.5.0
New upstream release.
Add copy unviewed function
Add copy unviewed function
try to use default theme button highlight
on sdk.dir path
clear values

clears out registration values when registration successful and
redirect to main page
removed reference to common.  no longer linking as submodule.
removed .gitmodules
installing bluetooth librairies
action clona state
modifying tests for filtering
restart/ two finger debug check. i can take out debug buttons now!
LPS-27494
LPS-27494
SOS-894
SOS-894
Test Fixes - socialofficehome/contactscenter
sourceformatter - add language property existence check
sourceformatting - manual
sourceformatter - add LanguageUtil#format
SourceFormatter - source formatting
SourceFormatter - sort
SourceFormatter - fix language key
Lang keys
Site updated at 2012-05-22 03:45:10 UTC
Added configuration options.
1.- Notify messages in chat window.
2.- Include project name in messages.
3.- Only send new events.
Changed message.
Changed message.
Merge branch 'master' of github.com:rmurillo/sentry-hipchat
Fix
Merge branch 'master' of github.com:rmurillo/sentry-hipchat
Message changed.
Sending notify parameter as specified in Hipchat API.
Changed message
Fixed project name issue in message.
Merge pull request #4 from rmurillo/master

Added options in configuration form.
Create registry key if not exists
Just changing comments so it represent what need to be used to
properly set header on a WebSocket object.
Instead of a dict of key/value, it has to be an array of string for the
headers to be added using headers.extend(options["header"])
Merge pull request #15 from philrene/master

fix documentation. We need "header" argument, not "headers"
Version pin for django-app conf, as reported by buildout.
Chequeo cpplint
add getnameinfo
added basic coffeescript version
Update HN discussion link
added redtube plugin
added redtube plugin
New: Mustache
SDA-230: fixing oozie mkdistro.sh
WANING : Issued Build !! It crash at the end !

This build was to introduce the AutoReleaseDictionnariable type, a kind of shared pointer-like.
search页面的资源
update dailymotion provider
Added total_watches to models.
Updated example of alignment rules.
Include package FileDiffs
Update user settings and preferences
Include JavaC Build
Include IMG placeholder
Update HTML5 Snippet
Removed 'main.pyc' from TimeStamper package
database change
Skarpetuszka 1
Merge branch 'master' of https://github.com/magoswiat/Skarpetuszka
Adds view for malte debugging route.
Adds postgres and active-import.
Adds count script.

This is intended for analysis and not for production use.
Adds image data to gitignore.
First tests on uploading zip files.
really add mono now
form korean encoding
Merge branch 'master' of git@github.com:maninsoft/smartworksV3.git
forwardPwork
Merge branch 'master' of git@github.com:maninsoft/smartworksV3.git
getApprovalLineById, getApprovalLineList
To pull
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git
To pull
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git
Show Instance
Load preamble-org2blog from init.el.
Remove TODO entry.
Move line to better location.
Add *_ATTRIBUTES construction variables.

Add {AD,A2X}_ATTRIBUTES construction variables, through which you can specify
"-a attribute[=value]" (e.g., "theme=flask") command line options.
Handle include1 macro in source scanner.
Update comments.
Add support for specifying a2x resources.

Add support for specifying a2x resources passed via the -r and -m options by
adding two construction variables: A2X_RESOURCES, a list of resource specs, and
A2X_RESOURCEMANIFEST, a resource manifest that contains resource specs.
Handle overriding keywords as kwargs.
Correct A2X_KEEPARTIFACTS default.
Move TODOs/FIXMEs to top, rephrase some comments.

Move all TODOs and FIXMEs to the top of the file and rephrase some comments for
clarity.
Added manhattan distances.
Added GZip compression filter on all action output
working competitive analysis tab
validate username format
disable input while sending
Wireframe for the project dashboard
Wireframe update
Fixed bug with hourly buckets
Dynamically adding charts
Lots of visual polish.
cleaned up/removed old code
Wochenbericht aktualisiert
bug fix: tin occupied place even after being removed. no longer the case
boxy update
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from hsingh23/master

Created a better boxy annimation
added new animation spiral and added more frames to boxy
New animation: Rain
added loads of cool stuff
stabby arrows are fun =]
added a new annimation, fixed a few things in old annimations
Merge pull request #7 from hsingh23/master

Added a traffic light and arrows annimation
Lower falloff rate for rain animation
things that were worng on the server. remove virt_evn from git
add dependancy file
Merge branch 'master' of git://github.com/acm-uiuc/chroma-scripts
Remove special case in cylon
Tabellen uit textbestand werkt

* fix om tabellen uit textbestand te lezen maakt functie af
Form submit button disable
UI fix

Signed-off-by: Md. Latifur Rahman Maruf <marufbd@gmail.com>
Revise Option spec.
.functions: Rename `md` to `mkd` now that OS X 10.8 has an utility named `md`
Fix `script/newb` rake command
Merge pull request #95 from vjpr/fix-dev

Fixes #92 - `script/newb` rake command
changed icon and altered gestures
changed icon and gestures
now writes audio to stdout
Merge branch 'master' of github.com:mattjeffery/morsecloud
Deleted all but one file in settings. I kept the ParameterList.xml because that is referenced in ParameterList.cc. Though having the ParameterList.xml does not affect it anything, it is probably good to keep it.
Merge pull request #141 from jjhall89/rm_settings

settings directory
finally the only thing left is scaling images
you can see tags
compat-wireless: refresh patches for v3.2.13

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
adding 05 example
Cleaned up an edge-case view.
HowTo proxied verify no longer breaks formatting.
Fixed howto-proxied auth token form.
Removed submitter from the POC email list.
cname for meend.in
UV: 750mA, Downclocking to 84Mhz
add a testcase for copying of docs
Description edits in setup.py
Let's aim for a 1.9 release
Defining version in yainvite.__version__
Moving Invite key inside redeem form
Moving 'send email' functionality model->form
Making 'redeem' form url available without token
Support for setting a custom UserCreationForm
README updates
Using an 8-character 5-bit-per-char key
version # bump
Merge branch 'develop': release 1.9
fixed paths.php for composer path
Test Build cash flow leg
format
Merge pull request #4 from Neoracle/master

sync with jw
stupid error on sendcomemnt ^^
Implement template structure, Improvise leftToggle function
added deep dive project with 2 examples
added *.user to ignored files
remore bin dir
Removed theme settings.
Renamed default site files for status information
use more subtle sync
Update and wee refactor
added supervisor stuff
Create gh-pages branch via GitHub
Merge remote-tracking branch 'origin/gh-pages'
delete pages
adding django start
adding django project
adding thing local i guess
Adding some small functionality. started models and index view
add ignore .pyc file
Merge branch 'master' of https://github.com/minioreoinim/BeanTasks.git

Conflicts:
	beantasks/__init__.pyc
	beantasks/settings.py
	beantasks/settings.pyc
	beantasks/urls.py
	manage.py
	tasks/models.py
	tasks/views.py
adding ignore
version 0.0.1.9

look at changelof for changes
Check user.id not .name
Simplify skyscraper code
Add info on the hackathon
Simplify packages structure.
added draw island using poly via GridDrawMode
Bug #3913. Fix the bug as well some other minors with the classification
fixing bug #3813
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into clustering
Finished adding builtins, except for writeln/readln etc
Chnages to symbol table so that they ponit to symbols instead of type_desc instead
Added module load statements to protocols. Changed parameters.
Updated sampleworksheet and parameters. Small changes to protocols.
Revert "Added module load statements to protocols. Changed parameters."

This reverts commit fbfea7930519b020341023c9324822ae2fde773b.
to be reverted
Revert "to be reverted"

This reverts commit 8fcf75dc84b316c9e9084af2465fcf2e121fe5c3.
Imputation
Windows linebreaks are not cool.
Changed one template, updated parameters.csv
undo screw up
git sucks
&^%$&*%
Merge remote-tracking branch 'origin'
Could this be. Does it finaly work.
Everything fixed ..hopefully
Removed bugs from sampleworksheet.csv
Changed parameters.csv
Impute2 pipeline parameters update
temp commit
Merge branch 'master' of https://github.com/PatrickDeelen/molgenis_apps
prepareReferenceData
ajaxified day, week, month
modif
Merge branch 'master' of github.com:mopitz199/Proyecto-web
caca
csd
Windows release updates
Fix compile error by using std::size_t instead of size_t.
Thanks to Tomas Hudik for reporting that.
commented out ifdefs for now, various bugfixes
Changed owner of jingo minify
Fix jingo-minify to work with static files app
Testing with System properties
Changed CouchDAO.getMoves() to emit move#
Changed JUnit tests to expect Moves using lexicographic ordering
(CouchDB standard) and explicit move #s. JUnit tests pass against
Cloudant CouchDB service.
Changed JUnit test logic to do substring checks on response JSON arrays
Tidied up JUnit tests and CouchDAO connection logic
US3016
Automatic commit of package [openshift-origin-cartridge-jbossews-2.0] release [1.0.2-1].
ews2
ews2
ews2
Working around scl enable limitations with parameter passing
Merge pull request #965 from danmcp/master

Merged by openshift-bot
cleanup
exit code and usage cleanup
Merge pull request #968 from danmcp/master

Merged by openshift-bot
use /bin/env for cron
Changing same uid move to rsync
Merge pull request #969 from danmcp/master

Merged by openshift-bot
use /bin/env
use a more reasonable large disctimeout
avoid timeout on long running query in a safe way
removegear -> remove-gear for consistency
adding remove cartridge and various cleanup
fix desc
Bug 880108
addition bug fixes in relation to datacenter.java
The brainbulb now links to the home page.
ajout de repertoire du plugin
Removed javascript from html.
issue # 53 problem with localization and js
since this only runs after setup, we can remove a couple of more APKs
README + mailbox by default values
branch ok
completed layout
completed layout
layout is over
layout is over now
Merge branch 'feature/fdr/layoutbarre' into development
improving autocomplete
git rm --cached -r client/public/
icon in the autocomplete field
different icon for autocomplete
cleansed code
separation controller layout: over
separation controller layout: over
new filter
new filter
features ready for push
Merge branch 'development' into feature/fdr/autocomplete
Merge branch 'feature/fdr/autocomplete' into development
first commit here
non organized suggestion filter
Modif update_index and import
Make attachments properties NOT NULL
Fix Back link

Going Back from a response should take you to the request page.
Remove file_cache field for new attachments

We think you don’t need a file_cache field for attachments that
don’t really exist yet.
adding to classpath
working version with cat - v0.4
Fix the ip address where http-serve-dir will start a SimpleHTTPServer
Add jinja2-mode
Actor, fixed leaked clip Rectangle.
Cleanup for utility collection removeAll methods.
SnapshotArray, doesn't need to override removeAll after all.
find_venue_id_by_id for MenuItem
basic PWM is working
new email for existing external users
SmarterBucks content
added subscribe #s
add simple object tree example and attach objects in scope as properties
brackets on same line
Tidied up whitespace and indentation.
rip out libseaside dependency, use QtContacts directly
fix PageHeader to use UI constants
various de-crufting
more use of UiConstants
remove useless UIConstants relic
fix page header
fix editor
work around a bug
import delete action
Second commit!

Added
templates for: 404, admin site, index

Updated
paths to be server friendlier
external/ removed zombie directory
Merge remote-tracking branch 'upstream/master'
fixed bad comment
Merge remote-tracking branch 'upstream/master'
FQA-84: TC XWiki
Merge pull request #296 from niallkennedy/master

fix two require_once statements
Added TransitFlow to apps
function to list the ssh-keys
fix [#32602] Bevel operator's transform input is inverted
inset was inverted also


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50779 954f8c5b-7b00-dc11-b283-0030488c597c
A few minor UI message fixes...

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47111 954f8c5b-7b00-dc11-b283-0030488c597c
Collada: Added export Option 'sort by object name' to fix an issue with Second Life import

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47881 954f8c5b-7b00-dc11-b283-0030488c597c
fix for scons building with compositor


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48994 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #32844: cycles camera motion blur producing completely blurred frames sometimes.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51348 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for #32852: set uv unwrap default packing marging to 0.001.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51349 954f8c5b-7b00-dc11-b283-0030488c597c
Cycles: tweak progressive refine tooltip to make it more clear

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51350 954f8c5b-7b00-dc11-b283-0030488c597c
OSL/cmake: the non-intrusive parts, so other os-maintainers can take code over

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50861 954f8c5b-7b00-dc11-b283-0030488c597c
Removed some old cruft - commented out select_actionchannel_by_name() lines


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47405 954f8c5b-7b00-dc11-b283-0030488c597c
minor edit to type checking macro to avoid clangs static checker tagging the var as possibly NULL.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51153 954f8c5b-7b00-dc11-b283-0030488c597c
The shader id generated by the manager contains some special flags in high bits, leading to out-of-range index if used directly. This must use the SHADER_MASK to get actual array index.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50363 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for Cycles OSL: The RenderServices pointer in ShadingSystem is no longer accessible from the interface class (presumably because it is just the base class pointer anyway and would have to be casted). The OSLRenderServices pointer to our own implementation is now stored alongside the ShadingSystem in the kernel globals, so it can be accessed in thread_init.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50364 954f8c5b-7b00-dc11-b283-0030488c597c
Fixed packages due to new release of CreateJS
Added another way to grab CSS files
Fixed an incorrect class-name in the OAuth example.
Merge pull request #174 from shartte/doc-fix

Fixed an incorrect class-name in the OAuth example.
Add TAAG link.
Type-oh
Merge pull request #177 from collinvandyck/patch-1

Type-oh
Type-oh Optional.absent()

putting the 'al' in Optional
Merge pull request #178 from littleidea/optional-type-oh

Type-oh Optional.absent()
Add missing word
Merge pull request #179 from chids/patch-1

Docs - Add missing word
Update jerkson dependency.
Updated FreemarkerViewRenderer to load the default Freemarker encoding map.
Merge pull request #182 from ajordens/master

Freemarker + Encoding Mappings
Merge pull request #181 from ieure/new_jerkson

Update jerkson dependency.
Revert "Merge pull request #181 from ieure/new_jerkson"

This reverts commit df3bda0511f745aea609d0c1cf2c51243ef73593, reversing
changes made to 6b5f2665e40f6fcb11c9fad9364a30e824e720fd.
Fixed issue with test failing on windows because of \r\n vs \n
Fixed issue with missing directories in assets broadcasting jar file path info.
SSL improvements to allow Windows key stores.
Merge pull request #184 from christophercurrie/winkeystore

SSL improvements to allow Windows key stores.
Merge pull request #183 from Omega359/master

Fixed issue with missing directories in assets broadcasting jar file path info.
Simplify ResourceNotFoundException.
README: copyright and license
Adding range check node attributes from /enyo.js to /source/boot/enyo.js
Politics-500
subscription: add policy override for cancellation

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
minor cleanup of config
Show server trace
something rendering
Ben Franklin quote
fixing chronology of about page and making mckinley BLINGGG