labofsahil/github-event-dataset-2012 huggingface dataset:
updated example/inbox.js to not use 'resource' idea (thumbs down)
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
Merge branch 'PHP-5.4'

* PHP-5.4:
  - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails

Conflicts:
	ext/standard/tests/file/file_put_contents_variation8-win32.phpt
Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails

Conflicts:
	ext/standard/tests/file/glob_variation-win32.phpt
Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

Conflicts:
	ext/standard/tests/file/rename_variation13-win32.phpt
Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails

Conflicts:
	ext/standard/tests/file/rename_variation7-win32.phpt
Fixed bug #61605 (header_remove() does not remove all headers)
Merge branch 'PHP-5.3' into PHP-5.4
Fixed bug Fixed bug #61605 (header_remove() does not remove all headers)
Fixed relTime function, wrong format specifiers in DateInterval::format were used.
search5
search6
search7
search9
search10
search11
search12
search12
search13
search14
search 14
search 15
search15
compile
refs #3332

 * Transitions is not available on page title groups anymore
 * JS is slightly more efficient with row actions

git-svn-id: http://dev.piwik.org/svn/trunk@7125 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Fixes #3615 Suggested in: http://forum.piwik.org/read.php?2,94810

git-svn-id: http://dev.piwik.org/svn/trunk@7622 59fd770c-687e-43c8-a1e3-f5a4ff64c105


git-svn-id: http://dev.piwik.org/svn/trunk@7623 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Refs #1253, add integration test for PHP renderer w/ array value.


git-svn-id: http://dev.piwik.org/svn/trunk@7624 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Convert use bitmap for options passed to jobs (this will simplify some WIP on newsolver)
Finish conversion to hash
New pkg -C to specify a configuration other then ${LOCALBASE}/pkg.conf
*6725* use events for tracking form changes, fix in general.
*6434* Handle grid item deletion with paging
Delete non-existent tombstone shouldn't be an assert fail
api.js, index.html
first
test
Add some example
merge
Ajout des affiches, découpages, logos et autres
Improved twitter example.
Add Heroku settings
Merge branch 'dev'
Apprehend the fixes from lib
Add test file in start, update to latest library
Rename renter to owner to reduce confusion.
first push
Merge branch 'master' of https://github.com/psychebb/GA
[maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4.2-rsmart
[api] Move InventoryUnitsController to correct location
[api] Correct usage of already authenticated user in BaseController
Move capybara_ext and price_factory into correct testing_support directory
Move ResourceController spec from core into backend
Move current_order_ip_tracking_spec into frontend
Remove commented out factory from payment_factory
Add HBD for CalculatedAdjustments#compute_amount method
Move currency_spec into frontend
Mark order_updater tests for update_adjustments as pending for now
checkout_steps should always return a string
Don't cache state machine in checkout.rb
define_state_machine! needs to be called after to_prepare hooks have fired so that state machine overrides work
Update AR and AP changelogs [ci skip]
documents the contract for the argument of AD::Routing::RouteSet#url_for
revises requires of some AS deprecation files
#1 #7 #15 . Se empieza con la cancelacion de trabajos y se adaptan esteticamente el form implicado.
Updating .travis.yml for new primary repo
Fix bug in command line generation with multi-argument commands.
fixed encoding problems closes #6
Adiciona documentaçao ao binder.py
Don't remove an option if it is assigned.

Fixes #86
Clarified interpreter support.
See #56
fixed spelling mistakes
fixed spelling
now with parent pom to build them all.
Why using protocol ? Math.pp is on same dir as Evaluer.
splited translation strings
#5 solved and updated
General Job updates and Knight abilities added
[Bug 808151] Send review comments to reviewer too.

This sends two emails when a review goes out. One for the reviewer, and
one for the person who wrote the review. They are independent emails, so
this doesn't reveal email addresses, but also doesn't allow out-of-band
communication. This might also be confusing for the reviewer, if they
aren't expecting the email.
[bug 810437] Add sort for documents (advanced) search.

New parameter is sortby_documents={relevance, helpful}.
updated rakefile for rspec
Building - Plumbing
Одежда, обувь, аксессуары -> Женская обувь
Одежда, обувь, аксессуары -> Мужская обувь
README update re forking
Switched name and references from kyoto to cornernote
extraction of unassociated non-header fragments implemented
EventResourceIT made independent from other integration tests.
get rid of temp. PL_op->op_private & OPpASSIGN_CONSTINIT in aassign
正規表現を定数に
フォーマット選択部分修正．正規表現の置き換え忘れ修正
added sequence labels for kallikrein
Made jukebox working with null-sounds, also implemented some tiny parts of documentation for some of it's members.
Add feeds to demonstrate buggy 0compile
Change-Id: I0e08f5ae54cb153c310366f0a1036020c52acf76
Signed-off-by: Patryk Ziegert <patryk.ziegert@gmail.com>
Added titles for buttons
v 1.3.1
Working on rowAdd()
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of git://github.com/OCamlPro/opam
Update man pages
First round of changes after @dbuenzli useful remarks (see #157)
Merge branch 'master' of github.com:avsm/opam
Merge branch 'cmdliner' of git://github.com/OCamlPro/opam
various typos in cmdliner help
Merge pull request #327 from avsm/master

typos in help
Fix 'opam pin' (#328)
Be more explicit about environment variables.
Improve 'opam switch' help
Eliminated actors from partest.

The actors in partest were offering nothing but unnecessary
complication and an extra dependency.
Eliminated more logic.

Why hand out big blocks of tests to workers.  Just put them
all in a queue and let the threads consume them when they can.
This speeds up partest a fair bit in those not uncommon
situations where one worker would end up lagging well behind
the others, and drops another 150ish lines of code.

Test suite time on my 8-core machine goes from 28:21 to 22:34.
Merge pull request #870 from paulp/topic/partest-no-actors

faster partest
Merge branch '2.10.x'
make parent accessble in child node
Use rbconfig's RbConfig::CONFIG['host_os'] instead of RUBY_PLATFORM
Implement open command.
BUG: sparse.csgraph: fix issue in graph conversion routine.

This bug was introduced in 5e243220.
weekly release 1.9.17+
weekly release 1.9.17+
MDL-31745 blog: Fixed up encoding issue within blog
MDL-31746 calendar: insufficient parameter cleaning

Reviewed-by: Alastair Munro <alastair.munro@totaralms.com>
Signed-off-by: Dan Poltawski <dan@moodle.com>
Revert "MDL-31746 calendar: insufficient parameter cleaning"

Potential SQL injection with this solution

This reverts commit 47013fc0bb309319b1fd4af5cb4ce17d64109e9c.
MDL-31746 calendar: insufficient parameter cleaning
Revert "MDL-31746 calendar: insufficient parameter cleaning"

This reverts commit f253646408016b200f52707c0230db7f78f93048.
MDL-31746 calendar: insufficient parameter cleaning
Revert "MDL-31746 calendar: insufficient parameter cleaning"

This reverts commit b0b228f7b9f049044161de6547a9dffc1185cac5.
weekly release 1.9.17+
weekly release 1.9.17+
MDL-24403 Adding a missing error string
MDL-24403 Fixing the print_error() calls to use the existing string
MDL-31746 calendar: Fixed up validation inconsistencies when creating/editing an event
MDL-32388 SCORM: Fix chrome pop-ups
weekly release 1.9.17+
Merge branch 'm19_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE
weekly release 1.9.17+
weekly release 1.9.17+
MDL-18335 calendar event: fixed role capability checking to create new event
major rework 92% done
Tuned AntColony Algorithm, unit tests pass now
Modified SimulatedAnnealing, removed initial solution from the adapter's constructor
Changes towards reducing the number of warnings
added new log options (autosave / auto show log view)
resize table only on initial load
save log finished
messagebox when autosave is active an no log view opens
Nearby paths are detected automatically.
Yeap 
Merge branch 'master' of https://github.com/sergkh/amon.git
Introduced global matching position for all nodes

That means it could now precisely give a position and length both for
a whole matching part of a specific node.

It could be used for:
* A better matching result reporting
* Delimiter support
Dev Change: `reset` interface changed

In the old the `Node#reset`'s parameters are like:

1. rest_string  => the remaining string that wants the node to be
                   matched
2. position     => an non-practical(as far) property to a element for
                   just report the precise match report

And now the first has been changed to `string`, which means the whole
string will be passed in, and you'd slice manually and deal with that.

This could enable the possibility of EOS delimiter, it could just
check the position and the length of whole string. Also it is useful
for some other features such as look-around.

Have a nice dream.
Zero-width assertion `^` and `$` support
Tested `^` and `$`
Alternation support
alternation test: re-dev, for preparing optimization.
String & Optimizability support

I've thought of how to optionally optimize the syntax tree. And this
is a solution of that.

I added a method for all treenode elements. The method should return
`nil` in default, or if it is optimizable, return the optimized
object. This method is now named as `optimize`.

In passing I implemented a optimized object class - String. Which is a
grouped character list. That's it.
Test for/and further optimization

Bug fixes.

Interface change: `optimize` now return not changed itself for
non-optimizable condition, otherwise, return a new constructed node.

Further optimization for bunch: for one-element bunch node, the only
element will be accpet directly.

And some manual tests.
fix: greedy repetition can't match repetition with min times
New matching tests and fixes

It could now test matching in the unit test block.

For detailed info, check `test/test_match.rb` file.

I tested most features and left partial non-implemented (expected)
(remained) problems, and them will be done later.

After all of these work, it could say the next dev stage could be
started. Enjoy.

==
I worked for almost a whole day today. It is tiring but I feel
very content. That I think, coding is the best solution for me now to
disperse pessimistism.

I love you all earthling.
==
Add macros to make an SMT function and make lots of them
Get nqueens working
gh-pulls-req-to-update should work with stubs
Updated controller to fit changes in server
Using two IR sensors.
forms sdh
resolvendo problema em fechar prontuario
Merge branch 'master_devel' of https://github.com/sikora/acao into master_devel
form juventude
correcao conflito
etl habitafor
Merge branch 'master_devel'
add back top js
Asynchronous requests and debug info in fr_delay...
Merge branch 'master' of github.com:ska-sa/corr
Add Mach::Error::MissingConfigurationOptionError
some sexy test coverage
Added ability to compare date/time with infinity

Date, DateTime, Time and TimeWithZone can now be compared to infinity,
  so it's now possible to create ranges with one infinite bound and
  date/time object as another bound.

  Ex.: @range = Range.new(Date.today, Float::INFINITY)

Also it's possible to check inclusion of date/time in range with
  conversion.

  Ex.: @range.include?(Time.now + 1.year) # => true
       @range.include?(DateTime.now + 1.year) # => true

Ability to create date/time ranges with infinite bound is required
  for handling postgresql range types.
Add changelog entry and docs about class delegation using the symbol :class

See #7613. [ci skip]
queryable: made db session explicit
refactorings / implicit queryable filter & flatMap

- unifying refactorings for queryable and implicit queryable
- implicit queryable now supports flatMap and filter
replaces SLICK by Slick in docs
fixing current map displaying
0.0.5
Fix for issue #591 CActiveRecord::getRelated doesn't call afterFind() with `through` relation

It was only expecting joinTree only contain 1 child, if you use through relation, that might not be true. Therefore, use a loop to go though the children and call afterFind on them.
removed font duplication from gii css
Merge pull request #1147 from gregmolnar/issue_1143

[ci skip] removed font duplication from gii css
#1073 better docs for CDefaultValueValidator
#1101 better docs for CAssetManager::publish
Merge pull request #1151 from samdark/1073-docs-CDefaultValueValidator-update

[ci skip] #1073 better docs for CDefaultValueValidator
Merge pull request #1152 from samdark/1101-docs-CAssetManager-publish

[ci skip] #1101 better docs for CAssetManager::publish
#1109: Fixed "js:" encoding BC-break in CHtml::ajax() and related methods introduced in 1.1.11, added tests
Merge pull request #1154 from samdark/1109-CJavaScript-encode-bc

#1109: Fixed "js:" encoding BC-break in CHtml::ajax() and related methods introduced in 1.1.11, added tests
fixed grammar in CDefaultValueValidator doc
Merge pull request #741 from jamesmoey/fix-591

Fix for issue #591 CActiveRecord::getRelated doesn't call afterFind() wi...
[docs][guide][ja] improved translations (test)
Merge branch 'docs-ja' of github.com:softark/yii into docs-ja
Python3: Write file in binary mode

python3 complains about receiving bytes rather than the expected str
for file.write(). (as file is a Text file). We need therefore to check
for python2 and encode the file using utf-8, and do nothing on python3.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
added translated docs
Enough patches to make v 2.11
Fix wrong :class_name option inside Order model for bill_address and ship_address associations
Corrected constant name for CreditCard class
Remove unnecessary inclusion of Rack::Test::Methods in dash spec_helper
add index,login and kindeditor
Testing link to github

Signed-off-by: Chris Eskew <sqfett@yahoo.com>
Testing github

Signed-off-by: Chris Eskew <sqfett@yahoo.com>
Short list of instructions added.
Making the layout usable on the device.
+ contenteditable to keyboard test
add 'make marionette' test command
move git commit info and debug items to the 'About' pane
Merge remote-tracking branch 'upstream/master' into settings

Conflicts:
	Makefile
	apps/settings/index.html
	apps/settings/js/settings.js
fix gjslint error
Removing old and unused manifest.
Merge pull request #1154 from fabi1cazenave/settings

[settings] "git commit info" and "debug" on the same "About" panel
Browser title support, closes #1117
Merge pull request #1158 from krellian/browser-title

Browser title support, closes #1117
Fixing a small regression on the refresh button
Merge pull request #1159 from krellian/browser-title

Fixing a small regression on the refresh button
fix missing l10n strings in the 'Settings' app
Fix an issue generating the webapps.json on Fedora: remove the \n and use
line by line echo.
localize the 'Save' button in the Dialer app
Merge pull request #1161 from hfiguiere/master

Fix an issue generating the webapps.json on Fedora
Merge pull request #1160 from fabi1cazenave/settings

fix missing l10n strings in the 'Settings' app
Merge pull request #1156 from vingtetun/master

Prevent some warnings in httpd.js
Merge remote-tracking branch 'upstream/master' into l10n
js linting
add kill_running_test_files command to do `kill -9`
tork: use $0 instead of hard-coding program name
upstream master
First modification to setup to add in the crotate exension in sunpy/image
Merge remote-tracking branch 'upstream/master' into aiaprep
Merge remote-tracking branch 'upstream/master'
The C affline transform module from the original aiaprep port, no changes.
Update setup.py, bulids this time!
Added first draft of map.rotate
Modified Crotate extension so it works in the sunpy namespace
Map rotate updates
Add rotate using scipy.ndimage.interpolate.affline_transform
Fix map.rotate to only use scipy
Tidy up map.rotate documentation
Updated map.rotate with Florians suggestions

recentre logic re-written to use isinstane and no nested aff_args function.
Move sunpy/image/crotate to sunpy/image/src
Update docstring to Sunpy format
more comment tweaks
Docstring updates, made sunpy compatible
Changed array centre calculation
Changed kwarg from centroid to rotation_centre
Add sanity checks for recentre and rotation_centre as suggested by rhewett
first complete draft (added the REST chapter)
`gem install` with sudo is highly unrecommended for security.
Merge pull request #7 from ujihisa/patch-1

`gem install` with sudo is highly unrecommended for security.
Fix logic in sqrtdenest to not use the deprecated __contains__ method
Merge pull request #1195 from asmeurer/sqrtdenest_warning

Fix logic in sqrtdenest to not use the deprecated __contains__ method
test_sets: Fixes the test failure

The left hand side is equal to set([S(2), S(3)]),
and that is not equal to set([2, 3]). So this patch fixes the right hand side.
Merge pull request #1398 from certik/set_fix

test_sets: Fixes the test failure
Formatting and jshint
Add option --SPMR to save fragment pileup per million reads to
bedGraph files.
Merge branch 'master' of github.com:taoliu/MACS

Conflicts:
	MACS2/IO/cFixWidthTrack.c
	MACS2/cPeakDetect.c
	MACS2/cPeakDetect.pyx

Solved cPeakDetect.pyx; Regenerated .c files.
Syns & distance delimitation.
Created visual studio 2012 project for canvas library
added union and list error messages
- more config updates
easier implementation of CLinkColumn Enhancements

- like cebe said, we just need to extend from CDataColumn. Excellent
  idea and very OOP-ish!
- removed newlines
- for me everything works (sorting, filtering) - please test
store @country as an ISO-3166-Alpha2 code instead of name.
Added notice to top level dir for coho - also to be used for releases
Added new class titon\utility\Sanitize
Updated code to use new Sanitize class
Added new class for input filtering titon\libs\listeners\security\InputFilterListener
Added test cases for titon\utility\Sanitize
Added new class for output filtering titon\libs\listeners\security\OutputFilterListener
Added get() set() to titon\libs\engines\Engine
Added xss() to titon\utility\Sanitize
Started implementing methods for related HTTP response headers
Bug fix (taking care of issue where the get_an_ip call was returning a binary rather than a string value, prior to this change would see lines that looked like the following:

image_svc_host: !binary |-
  MTkyLjE2OC4zLjMy

at the start of the conf/razor_server.conf file (after regenerating it with a "razor config" command); without the string concatenation and the call to strip! the command returns a binary string similar to that shown above under Ruby v1.9.2 and Ruby v1.9.3 (but works without error under Ruby v1.8.7).  It has to do with the string encoding (which is UTF-8 under 1.8.7 but not under 1.9.x)
adding atlas-3.6.0
translate 35%
switched server to netty
[rt #1351] allow single siteuser edit/view to access a userId aas well as id
change note for 49cca15
fixed some ivalid characters in ticket template xml
version update
updated tt-duranduran and tt-pgabriel ticket templates
added tt-duranduran-invite and tt-pgabriel-invite ticket templates
changes made by idea
fixed format name
tt ticket formats accepts also default ticket template elements keys
Merge branch 'dev' of github.com:toxy/posnet into dev

Conflicts:
	systembiletowy/launcher/src/main/webapp/tt-tmp.xml
	systembiletowy/ticket/format/default-ticket-format/src/main/resources/tt-duranduran.xml
Fixed adv and list with us links to us js
FIX: renamed test dirs to Oldtest, writing completely new unit tests
FIX: updated comments
NEW: added CacheMonitor
* Eclipse: typo
* Eclipse plugin: Add basic properties viewer
* minor cleanup in the research code
rows json added
Start switching to Sencha builder.
Added lot files
123: Defined Settings as Sencha class
Added lost file for previous commit
123: Added Sencha SDK configuration file
123: Refactoring Filters
123: Refactoring Objects
123: Refactoring Map and related stuff
123: Setted external dependencies.
support for rack official commit afc9b0313c
moved offload functions to a dedicated file
do not check for died processes if diedpid is invalid
allows multiple loggers for the same instance
Zaklad verze
Issue #250. Implement web socket close frame status code and reason text.
Merge pull request #254 from veebs/3-wc-close

Issue #250. Implement web socket close frame status code and reason text
Add test case to show that issue #235 is due some incorrect usage
Take care of releasing the local channel when releaseExternalResources() is called. See #235
Make it compatible with java5. See #250
Tweak yank/put settings & add autocmd to cwd to current file
Signed-off-by: vimfans <lampxiongdi@gmail.com>
vim
Compile arithchk with NO_FPINIT.
Ignore files with trailing tilde
Add mactors/less.vim
Ignore cache/tags files
New set of changes
Rest syntax
Add new script to get all bundles I use in vim
Delete snippets/bundles since I'll get them from github
Fixes #37 and Fixes #41, be aware of default branches that are not master, and use volo.url name for local name instead of repo name.
Добавлен проект с тестами
Don't test array agains new array. Assert that elements exists instead because we can not be sure on order.
index: Remap ; bulk operations key to '.

I want the bulk operations key to have a shifted analogue.  The shifted
analogue for ';' would be ':' but that should be the key to bring up a
command prompt one day.  Also, I keep hitting 'l' instead of ';'.
index: Make ' clear selection after bulk operation; " to keep selection.
index: Add ' as bulk operation to mark read messages.

Now the most common bulk operation for me (marking read messages)
can be done by selecting threads then double tapping '.
Add more comments to sample config file.
Let editor be set in bower config file.
Allow the default search terms to be set using the ~default alias.
index: Poll for 'unread' instead of not 'sent' messages.
index: Fix out-of-sync standard tag when applying arbitrary tag changes.
bump version to 1.0.2

--HG--
branch : stable-1.0
fix unit test for python3

--HG--
branch : stable-1.0
add discuss
add discuss
added CULA abstract
Fixed - executeQuery() was failed through RemoteRegistry

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@134135 a5903396-d722-0410-b921-86c7d4935375
Add MIT license
0.1.2
auto commited at 2012-08-16 14:36
set higher fold level at start
Dashboard look complete. Next, going for the looks of the other screens!
rename
array access tests
Update sphinx/source/translations.rst

Just corrected a typo.
yehaa, how external project add works well with local content
- added undistort functionality to CameraSet::save
- added comandline progress bar to util.hpp and integrated it
OpenCVSingleCalibration::calibrate and CameraS
- fixed bug in cv2cimg, when checking for the number of channels: should
have used cv::Mat::channels and not cv::Mat::depth
removed UchiyamaFinder and RandomFeatureFinder from main branches
忽略目录
添加home，bbs，ucenter工程
writing buffer
Module manager fixed + list updated
Need submit, or change to bootstrap style
reassign responsibility, remove db operation from mapper; rename struct_name => struct_id
Pause button, volume and required dll.

The pause button change when the song is playing or not, the volume
(track bar and button) is now working, required dll have been added to
the Resources directory.
求购产品查询显示完成，按产品类目和名称查询完成。页面图片显示待完善，排序，翻页等待完成
stop calling complex waiting "multiwait". proper multiwait to come
added docs for shell
Add bulk controller support
Working except for close
Add MP3e2 scripts &c
Make MP3e2 script actually show up in list
100% (I think) functionally equivalent to old MP3e2 script.
Still doesn't exit though.
trying to debug segv at exit
Fix that hang at shutdown
fixed gain rotary scale, bug #1035438
Merge from trunk, import latest files
Add an option to reverse the crossfader (bug #829533) and fix crossfader config loading.
Imported Nintendo Wiimote changes
Peak indikator period extended, thank you Mattmik, fixes bug #1035224
- Corrected MSVC debug build. Note that there are currently two checks for the flag because detecting it in the features is too late for some uses of it. I need help correcting this.
- Updated .rc file. I need help automating this as well.
- Automated the bzr revno updates in mixxx.rc
- Made the VC redist extraction a bit smarter. This should fix it on the build server too.
Merging from lp:~hile/mixxx/hidscripts into lp:mixxx/1.11. Thanks hile!
Added default name of sndfile lib on Windows to the dep check
Merge from lp:mixxx/1.11
Merging from lp:~neale/mixxx/usbbulk
Minor cleanups and change bulk controller preset extension to .bulk.xml
Make bulk support Linux-only for the 1.11 release.
packaging: refactor, improve the python dependency resolver

Refactor the identical blocks into one common module. Then, improve it
to look for the '__init__.py' file if "rpm -q -f .." cannot find the
module directory in the RPM db.
openerp.spec: fix the 'ln -s server-check' for CentOS

Under CentOS, we cannot force-overwrite a broken symbolic link.
Clean it and re-install the symlink instead.
AUC specification was lost when roc.test, cov or var was passed an 'auc' object: applying on branch 1.5
pyjsbuild: fix option resolution
Some Xp.
function called is now statement, not instruction, so that expressions do not jump.
Merge branch 'master' of github.com:xyzzyz/sepl
Security fixes



git-svn-id: https://svn.openx.org/openx/trunk@81769 69d48449-a624-0410-ae76-85ddf3b22ea5
Release script commit.

git-svn-id: https://svn.openx.org/openx/trunk@81773 69d48449-a624-0410-ae76-85ddf3b22ea5
Release script commit.

git-svn-id: https://svn.openx.org/openx/trunk@81774 69d48449-a624-0410-ae76-85ddf3b22ea5
Release script commit.

git-svn-id: https://svn.openx.org/openx/trunk@81779 69d48449-a624-0410-ae76-85ddf3b22ea5
Release script commit.

git-svn-id: https://svn.openx.org/openx/trunk@81780 69d48449-a624-0410-ae76-85ddf3b22ea5
Security fixes

git-svn-id: https://svn.openx.org/openx/trunk@81809 69d48449-a624-0410-ae76-85ddf3b22ea5
Revert "removed unused field"

This reverts commit db88cb0d2b8c4671555c9a448ffb267e495fa5c3.
problem with incorrectly placed inputs should be fixed; fixes #6
Merge pull request #226 from jogaulupeau/master

(from : jogaulupeau) Add criticality filter in IT Problems view
Merge pull request #227 from yam/998e8ff0e24bff2ad96fd63d8d36d7f68eb7b3cb

(from : Laurent Ollagnier) Add a check_ldap3 service pack :)
Merge pull request #228 from yam/master

Fix : (from Laurent Ollagnier) typo on mysql pack
Fix HTML wicth not display all message on HTML mail client
Merge branch 'master' of github.com:naparuba/shinken
Fix HTML code of notification by mail
Fix a bug in livestatus attribute action_url_expanded. (Macroresolver needs to be initialized)
Put all attributs of hosts and services definition. This may be more simple to update plugin Monitoring than Shinken installation.
Fix HTML in sendmails
Merge branch 'master' of github.com:naparuba/shinken
Fix : allow } in commands if it's not alone in the line.
Fix issue #169
Fix send mail (service and host) and now works on Gmail and Exchange OWA for the colors.
Fix issue #230
Fix notified_contacts for host
Fix : the notified_contacts are now saved as string names instead of full objects, and are relink when we read the retention data with the current contacts objects.
add: prepare for 1.0.1 release
fix : changelog is now mroe clear about core and not core.
Remove Flask-Admin
cleaned old files, wrote scripts for and did sweeps for transmission rates and energy usages
plotted results of APenergy_steinert_NaSweep
handle return state and result in sysconfig
Changed HStore parser to use a from_hstore method provided by String - most of the code was taken from https://github.com/heeton/activerecord-postgres-hstore/blob/master/lib/activerecord-postgres-hstore/string.rb and then modified to fit the existing Sequel HStore code. I also rewrote and extended the specs for the parser to more closely match that library's. This is to accomplish several things:
* There are more specs testing more things, which should be a good thing.
* The output for those specs is a bit clearer when using the coloured and/or nested options of rspec.
* Since both libraries are trying to accomplish the same thing it may be useful to have a bit of cross polination.
* The parser can now parse unquoted key/hash pairs like 'k => v' successfully.
* It still caches results, unlike the ActiveRecord version, and it stores the regex in constants which should add a bit of extra performance over the AR code.
* It should help with the more complex hashes, like nested hashes, I hope to implement to have a more spec coverage and a similar parser to the AR one, where they've got nested hashes for HStore.
A bit of whitespace to help me read it easier.
Made the local memo string more local by moving it into the loop and changing the iterator.
Added a to_hstore as it describes what it does without needing reference to the docs (as much).
Added specs for literalising nested hashes too, and a few specs that check against hash-like structure too (in this instance Hashie::Mash is used).
Merge branch 'develop'
Added `@see` link to CHtml after #1468
Add Expm.Package.read/0,1
编程样式改进及JDK7新特性升级
编程样式改进及JDK7新特性升级
show difference between local system and Studio configuration
show hash of rpms which differ from appliance config
package submission works only for first package in a queue
Merge remote-tracking branch 'origin/master' into workshop_playground
package options should be optional
Fix to perform multiple times invocation
Clarification of workaround
code cleanup
Merge branch 'workshop_playground' of https://github.com/ytsarev/ssc into workshop_playground
Merge branch 'workshop_playground' into try_merge

Conflicts:
	lib/handlers/package.rb
Add callback support for walk.
Merge branch 'master' of git://github.com/ryanvanoss/shifter into ryanvanoss-master
Version Bump
Docs
Redirection client
Wasn't computing the normals correctly before

Also added append_transform method to ZNode
Add -fPIC to default CFLAGS to enable pos-independant code in static
library
- Improved libuuid support, blocks if nonpresent, enables specific
	location for cross builds
- Added Android support with notably a getifaddrs/freeifaddrs
	replacement
Changed an expression that failed to compile with arm-linux-*-gcc v4.4.3
Merge remote-tracking branch 'upstream/master' into victor
- Change of a function def to "static" to avoid double inclusion on link
- Corrected a parameter glitch --with-fmq -> --with-libfmq
Merge pull request #56 from vperron/victor

Victor
ajax haml view
adding JavaDocs for better readability
adding README
adding file that contains logic for adding a database that contains a table for ingredients
added back @Override lines because of previous error with javac 1.5; more comments in SQLite file
removing unnecessary text file resource
deleted two unused classes; inv.java and In..Db.java
removed old model for db and added new file reflecting db model more closely
updated to more closely reflect our databse
added query method for drinks
updated query methods
added content provider class
Merge pull request #1 from zherr/master

Improved documentation, cleaned up the code, and added "shake for random" feature
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	src/kevinpage/com/SqlDatabase.java
deleted the 2.csproj stuff
Code formatting.
re-organise files.
Update SQL
Reorganise files.
Path case fix

Bug fix: Yes
Feature addition: No
Backwards compatibility break: No
Tests pass: Yes
Fixes tickets: #529
References: none
License of the code: LGPLv3+
Documentation PR: [reference to any docs PR]
Todo:  -
Update Changelog

Updating ChangeLog for Mobile Theme Fix
Merge pull request #530 from halbrooktech/1.3

Path case fix
added fancy spinner example
added blackboard border
Merge branch 'master' of github.com:zot/Leisure

* 'master' of github.com:zot/Leisure:
  fixing build which was glitchy for me (cuz of windows?)
  made rand funcs into monads and made print nil not do anything
Added donation and license to readme
add realtive position
Initial commit for tic154a display stm32 f100 driver
WHISTLE-1277: provide API for quickly creating calls on behalf of a user or device, that can be implemented as a hyperlink
Fixed missing psexec detection.
add tmp
merge tmp
estilo notice home
New 'case' implementation, based on Clinger's "Rapid Case Dispatch in Scheme"
vea parandus
Merge branch 'master' of github.com:AFFA/Project
add 'New Xturtle Project' wizard
fixed profile load issue
add cheezeworld & ogg & tick classes
Completion du fichier ignore
made changes for IE browser compatibility
commit IMG
Am modificat moxa_clase.py

Acum ia specificatiile si de la produsele ce nu au categorii pentru specificatii
Schimbarile sunt acum trecute si intr-un raport text
Get FTP & API config from database
Merge pull request #38 from CalvertYang/master

Get FTP & API config from database
base of users change pass and fixtures + tags added in editing\creating post
Ordering problem
Koncern-IT: ønsk italiensk salat
dykker-dybber: ønsk større mængder af alt
Koncern-IT: afønsk jala
Working Favorite Servers Window
Question admin interface improved
Suche bearbeiten
Merge branch 'master' of https://github.com/Babsi/RaidMe
Slettet to backupfiler
Separated Windows and UNIX includes
Added Windows code for __libmod_module_gethandle()
__libmod_module_checkvalidity() updated, fingers crossed
__libmod_module_checkvalidity() and __libmod_module_closehandle() updated, fingers crossed
Updates for Windows (no warnings/errors, probably nonfunctional)
Included <windows.h>
Stability achieved
Merge branch 'WinSupport' into Experimental
Updated for Windows libraries
Stabilised Windows handle loading
Merge github.com:CJKay/libmod into Experimental
Merge remote-tracking branch 'origin/Experimental' into Experimental
Removed LIBMOD_EXPORT (wasn't needed after all)
Added libmod_error_free()
Removed libmod_error_free()
Added libmod_exit()
Windows error handling updates
Windows error handling updates
Windows error handling updates
Added Windows error strings and libmod_exit()
Add hostap for tethering
Use wpa_supplicant and ti_wlan from CyanogenDefy for compatability
Elegant match for beginning prelude.  Jealous?
version 2.23
merge
quelques corrections. Versions 2.23 et 2.24
You can clone sprite instances in the editor by dragging them while holding CRTL.
trade with jokeefe101
Full featured windows build! run script -> get everything
(currently only for v100)
remove sqlite deps from cctodo
headings
Make wtodo to show at least version :P
Better help interface, cosmetics, help in wtodo.
Repair linux build
version bump
make dest as global, todo_close to free global allocations calling in destructor in wrapper
improving C++ CLR wrapper
cctodo fix (solve warnings)
Upgraded SampleConverter to output 32bit ints, updated README.md
More recording fixes
new domain name being propogated
Fix CamelCase in places
TargetHelper: inicialize $logskipped
css ver 0.0.9
add missing theming
adding module - friends not loading
fixed bugs. need to add Bnet friend support and class colors
Added BNet support. No longer one large column, splits into multiple colums with 15 max names per column.
renaming V:CreatePanel -> V:CreateFrame
adding branching plan
branching info updated READ ME
fixing merge
The /rsvp HTTP path now toggles the RSVP status of a post
Backup version for safety only: work in progress, do not use.

- multiple file-level docblocks added
- AbstractElement::addChild() is now chainable.
- new app/grafizzi.php showing how to use Grafizzi to plot its own classes
- new DotFilter to build images from Grafizzi, and not just GV sources
- removed image() from Graph, moved to DotFilter, test now skipped
- AbstractFilter now implements the FilterInterface
- removed empty constructor in AbstractCommandFilter
fixed timestep, based on the solution presented on http://gafferongames.com/game-physics/fix-your-timestep
seperate out step function for more override possibilities (like clearing input, etc..)
Added #locale to retrieve current locale from the DSL
Modify some corelib functions and builtins
Add API documentation
xrdp: fix warnings
LugMap.it: aggiunto evento, workshop SpamAssassin a Cremona
Znovu zmenen README soubor
Raven update, runes bug fixes
converted to Android library project
Prepare release 0.5.7

git-svn-id: https://eclemma.svn.sourceforge.net/svnroot/eclemma/jacoco/trunk@1645 203a895f-6f59-0d47-8735-a2f280bbfc83
Prepare for next development iteration

git-svn-id: https://eclemma.svn.sourceforge.net/svnroot/eclemma/jacoco/trunk@1647 203a895f-6f59-0d47-8735-a2f280bbfc83
Update Tycho to 0.14.1

git-svn-id: https://eclemma.svn.sourceforge.net/svnroot/eclemma/jacoco/trunk@1628 203a895f-6f59-0d47-8735-a2f280bbfc83
Finished and working
changed the find path method to return a string
Changed to table.

- module(..., package.seeall) is deprecated, table is the new way.
Update to use table way instead.
some change on ewol
[DEV] Add vector 2D, 3D and 4D wrapper with statdard glsl vec[2-4] ivec[2-4] and std mat4
protection type can sometimes resolve to null, somehow?
Base SQL schema, probably will change
regenerate sql dump
Updated test files to renamed add methods
bjhgdfncljskdAB DYHAJS;CABSJHKscnb dm FVH

WnSJDah
fixing inheritance on all lu controls
Merge pull request #131 from Jimgskoop/master

Fixing inheritance on all Lu controls
Fix products size
updating container example with iframe config
Updated libcec to version 2.0.3
maven magic in pom.xml
Merge remote-tracking branch 'remotes/origin/koura' into Kivi
Fix css and template
Перешл на другую версию руби 1.9.3p194
Hide leave button
Product.cpp

Fixed issue with search by description
added command line interfaces for running individual bells and for master (along with running their correct processing UIs)
Fixed TrackPad file
moodropdown增加reveal选项
added comments for gangus and charus chnages
Minor maps fix
Moved Camera-Updates to renderer-thread

Moved Camera-Updates to renderer-thread to remove camera-spasm
iPad support for scrolling etc.
Command validation deleted
- Check if the literal is empty
- Fix bug with auto due to Change-Id: Ib5b926c2558d43e4da5b2b837b997ff439f0292a
- Fix tests
Bug 375226 - Code not indexed properly when changing active
configuration

Change-Id: I75b6eabac1cfde6e3e28a20be372925ef8a88fd8
Reviewed-on: https://git.eclipse.org/r/6143
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Reviewed-by: Marc-Andre Laperle <malaperle@gmail.com>
IP-Clean: Marc-Andre Laperle <malaperle@gmail.com>
Tested-by: Marc-Andre Laperle <malaperle@gmail.com>
Dist-Ordner wird beim commit ignoriert
Print the XML output of nix-instantiate if --debug is used
Add disk provisioning to the VirtualBox backend

You can now specify additional virtual disks like this:

  deployment.virtualbox.disks.big-disk =
    { port = 1; # SATA port/device to which we're attached
      device = 0;
      size = 2048; # size in megabytes
    };

A disk can also have a baseImage attribute, in which case it's created
as a clone of the specified disk image.  The boot disk of the
VirtualBox machine is defined in this way.
plop
Shnappi
Corrected the final JSON delivered by the WS
test commit
added debug output to test_platform
Fix Neumann sparsity diagnostic output

I'd forgotten to change the size of the vectors when I changed from
compressed column to compressed row storage.
Merge pull request #105 from adamreeve/neumann_conditions

Fix Neumann sparsity diagnostic output
minor changes for default options, closing properly all subscriptions in multirotor att control now on exit
Fixes #698: incorrect function call within for with named argument
Merge pull request #701 from tonistiigi/issue698

Fixes #698: incorrect function call within for with named argument
docs
Release 0.27.1
Fixes #435: Can't concat array inside url()
Fixes #425: Compiler hangs when the last property isn't followed by semicolon at the end of the document
Fix last rule being ignored if empty indents at the end of the file
Merge pull request #704 from tonistiigi/425-hangs-no-whitespace

Fixes #425: Compiler hangs when the last property isn't followed by semicolon at the end of the document
Merge pull request #705 from tonistiigi/indents-eos

Last rule is ignored when empty indents are at the end of the file.
Replace delete with assignment to false
Merge pull request #703 from tonistiigi/435-url-concat

Fixes #435: Can't concat array inside url()
remove a delete
Adding list of all css3 units

Units defined per the following specifications:
 - http://www.w3.org/TR/css3-values
 - http://www.w3.org/TR/css3-grid-layout/
Merge pull request #707 from pbouzakis/units

Adding list of all css3 units
Remove now.js as we dont use it atm
Fixed serialization warnings
ant zip creates zip archive for WIS submission
allow add status for doc_comments, fix #127
LplusLoginPage 변경, LplusType 추가

사용자가 LplusWidget을 사용할 경우
LplusLoginPage 같이 Layout이 필요한 경우 LplusLoginPage 자체가 하나의 Layout이 되고 그안에
wrapping 할 수 있는 layout을 두어 xml을 inflate해서 사용하는 방법으로 변경

LplusType(가칭)을 정의, 현재는 LPLUS_TYPE_FACEBOOK 만 사용
LplusLoginButton에 OnClickListener 추가
LplusFramework으로 추상화

LplusFacebook 상위 클래스로 LplusFramework으로 추상화 함
LplusFramework/Type 같은 것들은 com.lplus.common으로 이동
Debugging cont.
基础工作2
Left class as WebApp, renamed module to webapp
Update CrazySpawner/src/resource/lang/ru_ru.lang
Merge pull request #11 from SannyOK/patch-6

CrazySpawner: Updated ru_ru.lang (Thanks to SannyOK)
CrazyEnchanter: add TabSupport, use Permission Module
Update index.html

corrected small typo
1st try at Bowling Game.
[ticket/9896] header now again in XHTML
[#276] onClose parameter for Ok.sendFile

Implemented onClose parameter for Ok.sendFile. The proposed addition
propagated into Enumerator.fromFile and Enumerator.fromStream which are
called when Ok.sendFile is called.

Added a small spec which checks if onClose was called by mutating a
boolean variable and asserting that it changed afterwards.
[#276] Remove test for Ok.sendFile. (Didn't work)
[#321] Add Bad Gateway as a pre-built controller result.
Add more methods in the Form APIs to deal with errors
Merge branch 'master' into lighthouse-276-patch
Implement a Formatter[Float] and a Formatter[Double]
[#276] Use Enumeratee.onIterateeDone for onClose.

Play2 now provides Enumeratee.onIterateeDone which generalizes my
previous attempts to add onClose handler on Ok.sendFile. We now use it
to implement Ok.sendFile() with onClose handler.
[#276] Ok.sendFile() with onClose integration test.

An integration test based on FunctionalSpec. It creates a file, calls
the action (by url) with the canonical path of the file as parameter and
expects it to be deleted once the request is done.
remote address support
Fixed lost exception cause in Option.map
Fix WSRequestHolder#setQueryParameter
Merge branch 'fix/lighthouse-256' of https://github.com/julienrf/Play20 into julienrf-fix/lighthouse-256

Conflicts:
	framework/src/play/src/main/scala/play/core/server/netty/PlayDefaultUpstreamHandler.scala
Java Configuration add possibility to specify default value if key doesn't exist
It would be nice to have the deleteManyToManyAssociations in the Model Object. This makes it more intuitive to handle with ManyToMany.
fix Enumerator's flatMap to not stop on iteratee's Done
change pipeline right away
remove shadowing that was causing the server to hang
Merge branch 'master' of https://github.com/playframework/Play20
Added constructor to Java promise for creating a pure promise
Refactor Json serializers and deserializers
Clean up method code a bit.
Add "in" keyword to Sublime bundle.
Start getting functions working.

They fully parse, compile, and can be invoked. Missing stuff:

- Closures aren't supported.
- Parameters aren't supported.
Define tokens for '.', '..', and '...'.

Nothing is using them yet.
Add range operators.
Tests for operator associativity.
Clean up source position code in parser.
Fix pattern matching of record fields.

It was totally broken when a record field didn't match. :(
Implement record specialization.

Still needs to handle collisions and ambiguity. But for records
that *can* be sorted, it should do the right thing now.
Start updating README with VM instructions.
Remove hand-generated XCode project.
Make top-level shell script handle VM.
Update README.
"MethodCompiler" -> "ExprCompiler".
Remove old C# stuff.

It's in a separate repo now:

https://github.com/munificent/magpie-csharp
Merge branch 'master' of https://github.com/munificent/magpie
E summon / slave
moving Generator to a proper file
changed gem name on readme
add ? in querystring
InputManager can now use broadcast or bind.

Previously you had to subscribe to a specific key. Now you could also
subscribe to any key.
Console uses key broadcast; remove old Action based keybinds.
Implemented a very simple console piece.

	- ENTER/RETURN flushes and logs the command to be executed.

	- Only certain symbols are allowed. But since KeyEvent's don't
	  provide non symbolic data, support for lower case and
	  punctuation doesn't exist.  SPACE is expilicitly supported
	  however, so that it's kinda legible...
Just make a bloody isKeyUp()!
Console now supports repeating keys.
Flesh out console commands stuff
Implement a global configuration map for stuff.

See the big comment on core.C.
Begin with need-based allocation. Need to implement choosing next waypoint with new system
Remove the expand server file.
Fix humanity not decreasing
Merge pull request #1 from rajkosto/master

Update
configure mongoid, user model
开始搞了！
a commit ...
add many thing
time magic
a stop
添加头像
posts views and controller
Make nmod_poly_fread set the mod to the value from the file (re-init).
collors
collors again
.gitignore : added *.o
Adicionando arquivos de importação
Spork + Guard configured
renamed
changed makefile and dependancies in filename
Still embedding images..
Navigation button styles
Can now view other users' following/followers
inclure le prix total
rtf continued...
Исправлена ошибка при регистрации на 3-ем шаге инсталяции + небольшой
рефакторинг
Убран ненужный var_dump
Initial commit
Revert "Initial commit"

This reverts commit 74bc70457eec58536aaf4c4260d3120369f89f74.
Revert "Revert "Initial commit""

This reverts commit 64bd0b0aae0c49c9cb14a1699678f8044288615d.
Merge https://github.com/admirh/notes
topicPartitionMap store wrong partition number

topicPartitionMap should contain the partition Number which equals the partition number from the directory name plus one.
Nodejs stack1 files
Nuevas keywords