labofsahil/github-event-dataset-2012 huggingface dataset:
[TestCase] 变成老接口的测试用例
Merge pull request #455 from linlingyu/dev

[TestCase] 变成老接口的测试用例
by dron
Merge pull request #456 from ChineseDron/dev

by dron
[TestCase] 修改用例为老接口
Merge pull request #457 from linlingyu/dev

[TestCase] 修改用例为老接口
[Feature] 发布release文件
[Change]添加测试用例，修改baidu.createClass.js的BUG
Merge pull request #458 from linlingyu/dev

[Feature] 发布release文件
Merge branch 'dev' of https://github.com/BaiduFE/Tangram2 into dev
[Change]合版本
Merge pull request #459 from huangfangrong/dev

Dev
增加plugin，_util_，draggable

for codereview
remove local.properties file from git tracking
Remove CorrectHomopolymerGapOrder; fix the seg fault; add VERBOSE_DEBUG
Version 2.1.73
More development work
More work
Change capitalization of WUI and introducer welcome page headings; add test for introducer welcome page. Also fix a typo in a CSS class name. fixes #1708
AnnouncementDescriptor: clarify what "empty" means, make more consistent
Fixed non latex quotes in specification.tex
Added EBSCO OneSearch
Fork
Merge pull request #1 from cloudAi/master

Fork test
Added check of file sizes
Added sound handling.
Merge branch 'master' of E:\websites\RobbieWilliamsFace
Second official release.
Expand discussion
Corrected French typos
Fixes #755 and #671. Also add .display-block, .display-inline, .display-inline-block.
Rebuilt files to resolve merge conflicts.
Deferred enhancing of mobile view menu until it is first opened to reduce initial page load time.
Model and urls for content pages added
doh, remove the debug string
employee list/add/edit
more guard code
changed provision directory layout and rsynced everything in again for allowing remote running for debugging
Initial commit
added Author and Source objects
updated the schema.rb file from dump
finished adding Author and Source
finished adding search functionality
Finished adding column sort
Finished adding column sort
finished adding Reporters Comments section
Added fluid960 grid
finished adding author link
code cleaning new bunny
Adds refreshIdle flag, defaulting to true
remove cruft from auto page generator
a start...
pushing collect bug to wayne
fix #3 missing header file in previous commit
*the NOOP really only takes one cycle;
+addressed labels; !corrected order of A and B; *use DCPU 1.7 specification; !error only if a advopcode don't has a next word but need one (or other way around); *allow label parameters for b (if it is an addressing label);
Update, home system
zsh hss (history search)
start coding frontend template
make the system js driven
jojojojo
jojojojojojojo
Gioco "agricoltore"
Header
update things
Merge branch 'master' of https://github.com/xinbenlv/dotfiles
paas do_CONNECT bugfix
add Activity module
bg changed
add text parser
Merge branch 'master' of https://github.com/AlloVince/eva-engine into epic

Conflicts:
	vendor/Zend
bg fix
Allow reloadData if previous animation ongoing.

Before this a slice could be missed if it was added during a previous animation.
Merge pull request #16 from nschum/feature/reloadData

Allow reloadData if previous animation ongoing.
Add help files for 9.1/9.2 docs
update tablespace support to handle 9.2 changes
Validacion de formularios
Merge remote-tracking branch 'origin/Victor'
taking in v1.42 changes
Changes to ensure test succeeds if you cannot connect to Oracle -

as mostly people installing via CPAN shell cannot.
Typo in skip msg

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15210 50811bd7-b8ce-0310-adc1-d9db26280581

Conflicts:

	t/rt74753-utf8-encoded.t
taking in v1.42 changes

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15215 50811bd7-b8ce-0310-adc1-d9db26280581
RT69350: make 31lob.t resistant to 11.2

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15216 50811bd7-b8ce-0310-adc1-d9db26280581
tidying code

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15217 50811bd7-b8ce-0310-adc1-d9db26280581
Fix rt 75163 - cannot fetch bfile lobs when ora_auto_lobs is off


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15218 50811bd7-b8ce-0310-adc1-d9db26280581
Examples of changes to get rid of DBIS usage.
I'll try and do more when I have time.
Ideally, I'd like the calls to DBIS->debug to move to DBIc_TRACE which is more
flexible and could introduce DBD tracing (which would allow us to throw away
ora_verbose)


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15219 50811bd7-b8ce-0310-adc1-d9db26280581
start removing DBIS usage


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15220 50811bd7-b8ce-0310-adc1-d9db26280581
more removing DBIS usage
  some cannot be done without restructuring as some functions don't have a handle


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15221 50811bd7-b8ce-0310-adc1-d9db26280581
more removing DBIS usage
  some cannot be done without restructuring as some functions don't have a handle


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15222 50811bd7-b8ce-0310-adc1-d9db26280581
more removing DBIS usage
  some cannot be done without restructuring as some functions don't have a handle
  most of these would be better as DBIc_TRACE


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15223 50811bd7-b8ce-0310-adc1-d9db26280581
More changes to remove DBIS usage


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15225 50811bd7-b8ce-0310-adc1-d9db26280581
Merge branch 'my-trunk'
Merge commit '48401d2378e8'
Merge remote-tracking branch 'trunk'
DBIS usage - change entry - it is done except 2 entries I'm not sure how to fix right now

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15247 50811bd7-b8ce-0310-adc1-d9db26280581
rewrite placeholder pod and document the 3rd placeholder variation


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15249 50811bd7-b8ce-0310-adc1-d9db26280581
$dbh->err was being tested when it may not have been set


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15250 50811bd7-b8ce-0310-adc1-d9db26280581
remove last remaining DBIS usage:
  comment out 2 uses in dbd_phs_in/dbd_phs_out as they are oracle callbacks
    and we cannot pass anything in to identify the state struct.
  remove the last DBIS I can find


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15251 50811bd7-b8ce-0310-adc1-d9db26280581
DBIS is now completely removed


git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15252 50811bd7-b8ce-0310-adc1-d9db26280581
update quest_core.tpl and fix admin panel error
restore nm_remote_connection inherit from nmconnection
update query failed
modified:   ex/file_sort/file_sort.cc
new file:   utils/list_merge_sort.cc
Initial commit.

	modified:   README.md
在非ARC的gc环境下使用的修改
data?
Merge branch 'master' of https://github.com/zahanm/pool-karma
fix assignment
Merge branch 'master' of https://github.com/zahanm/pool-karma
coffee-script added as dep, version bump
Se agrego pagina del menu drop down in jquery/css
Changed location of netrw_home
Update docs content.
[Yahoo] Remove Yahoo service

Yahoo service is bases in the old search api of Yahoo.

Since April 2011 that service is not longer provided and has been replaced by a new different product called BOSS.

BOSS is totally different to the old searchapi so the actual code for Yahoo service can't be used.
Merge branch 'remove-service-yahoo' of https://github.com/Maks3w/zf2 into feature/yahoo-removal
[#1740] Removed Zend\Service\Yahoo docs
Use virtualenv in snmposter instructions.
Site lisp is for local customization, I'm thinking, so lock it out.
Added a idlestate handler to handler long-staying idle connections
完成前台学生
people应该好了
vim 增加了一些扩展：easymotion powerline mark ack
xmonad 中指定了一些程序在那个工作区运行
Add a new manual incomplete account creation page for organizers

This will speed up the workflow for admins wanting to give someone
an account with a particular role.

For example:

1- organizer creates new account for a sponsor's email address
2- organizer gives role of sponsor to that new account
3- organizer tells sponsor to register for conf
4- sponsor logs into zookeepr using Persona (or asks for a
   password reset via email)
5- sponsor register for the conference
6- sponsor is overwhelmed by the awesomeness of this process
Merge pull request #129 from fmarier/partial_account_creation

Add a new manual incomplete account creation page for organizers
* Correct path to URL validator
Merge pull request #189 from iseppi/fix-url-validation

Fix URL validation in event
Add: delete tocs(paragraphs) function, and add reserve tag in paragraph, but clean the parent tags class
Lots of fine tuning.
fixtures for location data
Add a parallel BFS search.
debug getRoles
Fix: tcphub usage: port is not facultative
Add marker option when getting file list

Prevents race condition
Added source info to public layers as per issue https://github.com/AIFDR/inasafe/issues/350
Chapter 10. Delete Rows
move alter sequences to the bottom - was errors while import
Merge pull request #1173 from Abi79/master

Added a var to a obj/effect/decal/cleanable/crayon storing the client who drew it
Minor optimizations
print number of image displayed/missing
Remove accidental DS_Store. Encapsulated some display logic.
Added proprietary algorithm!!!
Attempt number 3 to fix travis-ci setup
Filter duplicate tags
Tests on initialization of ModelProvider from extension point
Finished tests on ProviderContextImpl
Removed Factories for Providers, NodeProperties and Services
Cleanin up code
added periodStatisticModel. some refactoring made. Added new methods in
services and models. work on tests
added more tests for statisticsModel
added more tests for statistics service
All of the necessary integration tests.

And... I'm done.
Config for ernie.
Merge branch 'master' of github.com:AndyA/Test-Harness
code snapshot 2012.03.23
added project Acl
Fixed examples
added gitignore, added EventManager
improved display of README.md
GS-803 Build version advanced to 2494-45
Merge git://github.com/CloudifySource/cloudify
It's ok when quiting client, no bugs!
TODO: we still need to make code clean
Several bug fixes. Changed way things are type casted in some areas. Added in a pointer to building in the database. Got draw linking code to properly occur, but doesn't change coloring yet.
Pages Plugin: New shortcodes added - page_content
Dajaxice
Merge branch 'master' of github.com:BaksVenture/suitup
Buildsystem patches:
- allow symlink for sources and .work
- add missing char in printf statements in scripts directory
Merge pull request #990 from susisstrolch/PullRequest

Buildsystem patches:
bcm2835-bootloader: update to bcm2835-bootloader-05bb1ec

Signed-off-by: Stephan Raue <stephan@openelec.tv>
bcm2835-driver: update to bcm2835-driver-05bb1ec

Signed-off-by: Stephan Raue <stephan@openelec.tv>
libcec: update to libcec-1.9.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: update RPi patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/RPi/xbmc: add default cputemp/gputemp script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: add RPi support to cputemp script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: add PR1414 sysinfo patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Now using the new FlyAPI for /fly. Addresses #39
Added /search command. Addresses #24
Moving to last version of bukkit dev.
JavaScripts are ressoureces now

Now, JavaScripts handled like views as a ressource, so you can send
PHP-variables to a JavaScript by using the method
assignVar("nameOfVariableInsideTheScript", $theVariable);

Use it inside the script like:
$(element).text("<?=$this->theVariable;?>");
added versionator to linuxtycoon
Clean up the code and add some docblocks.

Bitches love docblocks.
a comment there...
Removed old App.java
Lots more updates! There is so much to do, but it will all be done with time. More stuff on the way in the coming days!
Added CraftBukkit reference
add rule for running examples
Stop program when all windows have closed.
Updates for Personal Use
Deleted some unused variables.
Adding comments for #defines
downloaded Murach files
TitleScreen Completed!

	->Enter to select
	-> W & S to scroll through the options
In Game
-----------
ESCAPE Now to exit
Added dummy functions to prevent pickling a singleton.
Configuration options which contain only 'True' or 'False' are retrieved as boolean.
fishtank
Implemented the first basic version of the generic web application base class.
更改分类器设计。

Signed-off-by: CyberZHG <443442708@qq.com>
Fixes for update method.
Fixed BBox constructor to accept string positions
0.2.3
Fixed the problem that no images are stored when the selection matches the loaded image
some global reorganization; added LF types to the LF context, which used to be called the lookup order
Sonofabitch.
made jade pretty option to false
Added Leds ON when sending
Removed "vertical only"
temp action
add ansi2html.pl
[vim] :Q forcibly quits
[unball] improve error reporting
Update check_sidekiq_queue

Add support for Redis with a password configured
Fix 'zon' and merge 'zon' and 'regen'.

Because both 'zon' and 'regen' use the same wrapper code for their
respective Botsma::Common functions, place them under a common wrapper
function within botsma.pl.
新增Home场景；
新增Main场景；
新增对应素材；
修正场景初始化时，未调用父类初始化函数问题。
Merge pull request #1 from DemoGames/ThunderSword

新增Home场景；
项目属性变更
关卡选择场景，单位展示场景
修正文件路径
Merge branch 'master' of https://github.com/DemoGames/GameDemo into ThunderSword
Merge branch 'Jack'

Conflicts:
	proj.win32/CodeTank.win32.vcxproj.filters
完善场景切换逻辑
新增素材，在HomeScene增加demo
新增DemoScene；
新增图片文件名规范化py脚本；
新增素材
关卡 改用skillpanel, 模拟popScene pushScene
修正android项目文件
将CGameUnit重命名为CUnit；
新增CGameUnit : public CUnit；
新增CGameManager，支持带过度效果的push/pop场景切换；
新增patch目录，用于存放引擎中的修改部分；
新增M_DEF_系列宏；
在MainScene中增加Demo逻辑
彻底修正项目名为GameDemo，包括修正win32和android项目文件
新增CGameUnit的attack动作，有待于完善
修正一处attack逻辑bug；
新增一个demo unit。
修改demo逻辑
新增SomeScene、技能树、兵种选取。
场景逻辑连通

Merge branch 'ThunderSword' into wangbr

Conflicts:
	Classes/AppDelegate.cpp
	proj.win32/GameDemo.vcxproj
	proj.win32/GameDemo.vcxproj.filters
修正Demo逻辑
Update ignore to exclude .orig files generated by kdiff
Fix: New Repo
Merge pull request #38 from DominikTo/master

Added README.md and fixed issue 219
Included link to Pure64's project on install instructions.
Commit
Test version of project.
Merge branch 'master' of https://github.com/DrunkDroid/Updater
fontage...again
Rehaciendo la escuelita drupal
change registration confirmation message
add simple_form, refactor sign in view to use it
Prevent selection of parent equal to the project itself, or any of its children.
STufffffufu
Merge branch 'master' of github.com:Eckankar/pcsd-2012
Almost there, need graphs!
Merge branch 'master' of github.com:Eckankar/pcsd-2012
DON?FES
Site updated at 2012-05-11 02:42:32 UTC
Menage du code inutile (en commentaire)
Hide a Component by Default

When data-display is set to "hidden", then hide() the element in the
layout and set the component list entry state to "hidden".
add elementary validation
msgcat magicks.
Delete strsep_trim(). Add more tests.
support for parsing numbers with decimals
added DBHandler::connect()
blogspam sites
These should actully go away
remove a superfluous 'blur'
Site updated at 2012-07-20 06:07:28 UTC
array sizes match now
testcase for masked datasets
Masked registration test.
Fixed the issue raised by Satra on FIR models
Added a test to check the behaviour of the FIR models in block designs
Merge pull request #146 from GaelVaroquaux/master

BUG fix for labs.viz_tools.test.test_cm.test_replace_inside

Old MPL do not have function-defined colormaps, so the corresponding
code path cannot be tested.
BF: update image spaces doctest for new nibabel

Newest nibabel converts affine to floating point when creating images.
Change doctests to use floats as input, so that new or old nibabel
versions pass tests. Closes gh-145
change default realignment parameters for much faster computation
change behavior of interleaved keyword in Image4d class
test Image4d with both even and odd number of slices
adding comments on the realigment4d class and putting them in the right place
deprecating interleaved keyword argument in realign4d
interleaved defaults to None
clean code for useless instructions
Merge branch 'fix/masked_registration' of https://github.com/chrisfilo/nipy
ENH: use lower case for dmtx/glm parameters (but still compatible with previous conventions)
MISC: design_matrix.py -- use warn(), misc doc adjustments, more descriptive exception msg
Merge pull request #2 from yarikoptic/block-fir

MISC: design_matrix.py -- use warn(), misc doc adjustments, more descriptive exception msg
"Releasing" 0.2.0rc1 -- version update
Back to moving development target version
fixed some bugs in fastaRewrite
bug fix
fix invalid key name in cfg
Fixing cooldown timers so that they display the proper cooldown for players with perks.
new cw
Removed admin pack stuff. That'll be a different project someday.
Use gmake by default if found, to avoid non-GNU make issues with binutils/gcc.
Allow to modify and restore XGPolygonMode
watch the result  of  vote
random filters added
added UsersCollection::getUsersAndPermissions -- ref #94
using UsersCollection::getUsersAndPermissions to add permission data to the results -- ref #94
closes #94: visually displays group/permission data with tr background-color
getArticleContents parameter 'article' takes
getArticleContents takes a pageid or a title now.
After the User scaffolding
add basic pip class to ensure pip is installed
Moving settings back to the settings panel.
Adding button for account portability
Showing and hiding the email registration UI
Incremental UI flow for register device
If directeve lic server is unavailable directeve.dll should throw an exception and cause program.cs to schedule a restart of questor, 3 min later it'll relogin and try again. 9and repeat as many times as necessary until the lic server is working again)
Expanding Pull Out Menu functionality
Correct IndModel
Trying banana
virtualenvwrapper moved to ::shadow.

Closes #579.
Manual edit of virtualenvwrapper removal entry.
Merge branch 'feat/removals'

* feat/removals:
  Manual edit of virtualenvwrapper removal entry.
  virtualenvwrapper moved to ::shadow.
Merge branch 'feat/amd64_keywording'

* feat/amd64_keywording:
  Pushed amd64 rstctl stabilisation back 60 days.
Merge branch 'feat/removals'

* feat/removals:
  Manual edit of sphinxcontrib-issuetracker removal entry.
  Removed sphinxcontrib-issuetracker.

Conflicts:
	metadata/md5-cache/app-text/sphinxcontrib-issuetracker-0.9
Finaly, it's working. I need fix the code, it has unnecessary structures
add my mail address
Added VLW statement, modified ZDA parsing to support decimal conversion.
Updated VTG statement with decimal parsing instruction.
Minor fix of DPT sentence (decimal parsing)
Small fix in S86 statement
Implementing Code Generation

It assembles Notch's code perfectly.
EJC: Trying out html.
20120321--jwd UPDATED package24 via el-get
Added test file, corrected minor bugs

Added unit tests for the prox functions
move bash_profile to bashrc for non-interactive shells
developing the checking....
FINAL 2.0
Bidouillage Fenêtre
uploading Facebook and twitter icons
Server side archive retrieval with filters implemented for datatables.
Removed useless files

Haven't looked at this project in a while. Went back to check out what
I had originally put in here. Realized that is was full of garbage with
the exception of the rss-fetch (I still use that one). So I cleaned things
up a bit and got rid of the junk.

+ Removed abs_dir.rb
+ Removed git_commit_prepare.rb
+ Removed svn_production_prepare.rb
+ Updated README with a simple description
+ Added hash-bang to top of rss-previewer script
Added some new scripts

As part of my clean-up process. I'm adding scripts that are actually useful
to this project.

+ Added auto-whois: DNS search tool
+ Added battery: Tmux batter level output
+ Added colors: Show available terminal colors
+ Added mac_memory: Output memory stats on Mac OS X 10.6
Fix cpanel -> unpublished tab
Removed twitter folder and its contents
fixed pushing multiple values
gps nmea try
Changed dates and email address
Update README.md
Merge pull request #25 from julien-c/patch-1

Update README.md
Add units statistics for service, change db strusture
Use http 302 for click redirection
Merge branch 'master' of github.com:Aulust/adshow

Conflicts:
	config/config.ex
	db/install.sql
WIP on sprites
Added more demo options
Implemented option for changing transition speed (beta)
Content uploaded
finished user registration styles
config project and reorg imports
Added rate of fire
Added Gametools Project to Scarpwars3
no closer on the zip
Removed the endianness detection macros (were not used)
Woops, had unneeded stuff in there.
add more op
Implement reset_model, update_model, and helpers
Fix non-obvious pointer refs in Raspi::GLES
Finish hello_triangle.rb - tested working on Pi ;-)
Icon size of 48 pixels for dock items
adding screenshot location and file format
Merge pull request #61 from ekinertac/master

.osx: Screenshot location and file format settings
.osx: Clean up after commit 5b36bee8676dc8e800f68e3a559e102dcefcae36
Merge pull request #57 from nurtext/patch-1

.osx: Set Dock icon size
.osx: Set the icon size of Dock items to 36 pixels
Comment out change of "Open windows on startup", OSX 10.7.4 introduces this by default
Merge pull request #62 from richo/patch-1

.osx: Disable the “disable reopen windows when logging back in” option by default now that OS X 10.7.4 fixes it
.osx: Remove the “disable reopen windows when logging back in” command

This behavior was fixed in OS X 10.7.4, and the previous solution was a hack anyway.
Maximum set volume is 7, not 10

See:
http://docs.info.apple.com/article.html?path=AppleScript/2.1/en/as213.ht
ml
Merge pull request #63 from Alex-Humphreys/master

.aliases: Make `pumpitup` set the volume to `7`, not `10`
.aliases: Make `ips` show IPv6 addresses as well
.gitconfig: Add `credit` alias to quickly change the author of the latest commit

Inspired by @holman’s https://github.com/holman/dotfiles/blob/master/bin/git-credit.
Update .inputrc
Merge pull request #67 from nikolavp/patch-1

Remove one of the configs
.functions: Add `gz` function to get gzipped file size
.gitconfig: Add `tags`, `branches` and `remotes` aliases
.gitconfig: Show the diff when writing a commit message

Thanks to @miketaylr: http://twitter.com/miketaylr/status/209688450868326400
.gitconfig: Tweak `ca` alias

Thanks to @necolas! https://github.com/mathiasbynens/dotfiles/commit/15d4c9583d66be40a497706134b637e8c1f10ae6#commitcomment-1416521
.vimrc: Use the OS clipboard by default
Part one of the new Shibboleth implementation
Merge branch 'master' of github.com:LitusProject/Litus

Conflicts:
	module/CommonBundle/src/Controller/Admin/InstallController.php
Create gh-pages for '9cc1233 Add configuration docs'
ffff
Merge branch 'luka'
hhh
0.6.1 only release acquired wakelocks, do not start new application from notification
fix bugs, convert project to JPA
delete unwork file
javaのパッケージ名変更
Work ProgressBar for current file
implemented http cache control
refactoring
Use /dev/cd0 device; trim header; use bsd.port.options.mk
Suppression de la fonction de filtre des fichiers
Documented everything in SteamUser

Changed README a little bit.
Added support for any() argument matcher (for pointers and scalars)
winter action
RNApyro
Generated Account entity
When player has already the mailbox swap it with current item in hand
instead of an error

Signed-off-by: Meldanor <Bhaals@gmx.de>
Use a constant instead of multiple strings to indentify the mailbox item

Signed-off-by: Meldanor <Bhaals@gmx.de>
styles fer search form
Fix StyleCop issues
Add MvcExtensions.FluentMetadata assembly to build script
Metadata conventions
TT2P Bugfixes
TT2 funktionsfähig
deadlocks möglich
add: TTP2 viewer
Merge remote-tracking branch 'nemesis/seek_volume' into seek

Conflicts:
	static/images/player_buttons/mute.png
	templates/currently_playing.html
initial volume bar implementation
Fix volumes over 100 and less than 0
Volume tooltip now works as expected
changed episode naming
activate setting mode with touch devices (two finger tap)
Added volume icon
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/seek'
Merge branch 'episode_title' of https://github.com/N3MIS15/maraschino into names
Merge branch 'touch_settings' of https://github.com/N3MIS15/maraschino into N3MIS15-touch_settings
Merge branch 'master' of https://github.com/mrkipling/maraschino.git into lib_control
fixed conflicts
fixes
Fixes _data never getting initialized in SoundEffect constructor.
Add guest user access. (fixes #35)
Ajout : Mediawiki
update gems
remove some things when in mobile mode
Версия 3.0.9.1
[+] В компонент "тэги" добавлена кнопка "добавить тэг"
Change brand colors again
Commit inicial

Armada versión inicial del widget
Initial commit
Merge branch 'master' of github.com:OLEGator30/NewServ
CssImage.href setter: Don't lose the !important suffix.
css fix fixes #1
modified action to use statements node
add a title helper
finished layouts and routes
more weaving
now all existing pod should be woven
fix no tab issue
Merge branch 'review/mokko/devel/weaving-pod'
First commit for the ShiftBrite Lib
Add a menu where add-ins can register menu items.

Also moved the Add-in Manager there from the Edit menu.
Parallel version of OnFillRegionComputed. This reduces the computation time for the paintbucket on a large image by a couple of seconds.
Run the FloodTool's FillStencilByColor main loop in parallel.

Additionally, extracting surface.Width to a constant outside the loop removed a huge bottleneck.
Improved flood fill performance by extracting surface.Width outside the loop.

Reduced duplicated code in the floodfill method for examining north/south rows.
!create Auction

- Auction works as a timer task,
- usp socket should send a packet when finished
Lock down npm version to avaoid bug in later version
Merge pull request #774 from jhollinger/develop

Fix npm version
Initial commit
Merge branch 'master' of https://github.com/Pleun/symfony-demo

Conflicts:
	README.md
Added about box.
Merge branch 'master' of git@github.com:PoliM/bbvfsmEditor.git
Fix friend request icons
Merge branch 'master' into buddypress
add -r option to pq-rip.py
cec: validate the input in CCECProcessor::IsActiveSource(). fixes potential crash when the active source isn't known. bugzid: 671
간단한 CBR 테스트.
Code cleanups
Add "#undef NDEBUG" to all tests.

This change makes sure that even if the tests are built in a
"release" configuration (with optimizations and NDEBUG turned on),
the assertions won't get compiled out of the tests themselves.

The C standard guarantees that the most recent inclusion of
<assert.h> is the one that counts, so it's important that the
"#undef NDEBUG/#include <assert.h>" come as the last thing in
the block of header files.

"testutil.hpp" includes <assert.h>, so I've left <assert.h> out
of any test that #includes "testutil.hpp", just for the sake of
brevity.
Merge pull request #412 from Quuxplusone/test-release-builds-too

Add "#undef NDEBUG" to all tests.
Removed 'device' concept and introduced proxies
* zmq_device is now a wrapper that calls zmq_proxy
* zmq_proxy adds capture socket
Merge pull request #422 from hintjens/master

Replaced device concept with proxy concept
added position calculation
refactored selection calculation
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/form_magic.js
Added exception handling
Error handling added, as well as cleaner Exception handling
Removed refeences to the domain and insted use a config file. Also add
an output buffer for cleaner error handling.
opendir set to not throw warning when no log directory found (as on the
dev server)
Competition page updated to use hardcoded timestamps to make the code
more efficient
An Ajax message giving a user details on the competition is shown in the
footer of every page.
Built and tested admin code to show competition results. Also added
smaller image for competition footer box
Merge pull request #20 from RDTOM/development

Development
Create a bash_profile that sources the bashrc
Merge changes from xine-lib-1.2
gatface 상대경로 주석 추가
뷰 import 함수 추가
tpl 폴더 분리
moved logic back into controller
new feature
test collision
collision master
Merge branch 'test'

Conflicts:
	test01
Even more markdown!
Removing log lines during dist build
Removing log lines during dist build
Removing log lines during dist build
Cleanup Was Needed
add pad commands / fix reco multiple urls successives / limit query new pages on icerocket
Added content to example.xml and renamed to example.ruleml

Content for file copied from
ruleml.org/1.0/exa/.../bindatagroundlog.ruleml
Merge branch 'Issue#4' of https://github.com/greenTara/Test-Rebase into greenTara-Issue#4
[Issue #60] Completed AuthenticationError module
Adding Music Files.
Change Vim colorschema
remove superflous export
DRYed up some of the Surveyor.
0.3.0
Django Projekt erstellt. -_-
Editing author URL for Jaques Laquardt 2
change floatfield to decimal field
Changed shVector to shVectorC when appropriate
Merge
Fully converted to using shDS (shStack added too)
simulaton for Vivado
Fixed chunk removal and updating
Emulating the UI
fix misnaming in register
slapformat: Add deprecation  warnings
Fixed forgotten code
Switch software releases for already instantiated instances.
Person should always be defined on Hosting Subscription.
Prepare for submodulization
Submodulize Download++
Fixed wrong url bug and "null" data bug in angular notes controller
Add featuretext for Matrix text
Fix for parallel_image
Update README
Merge pull request #2 from Witgelm/patch-2

Update README
checks if xml file exists before trying to load it.
now clears the drawing area before drawing the new image. Still keeps the old points though so we need to clear them.  also added an ignore file so we don't fill up with .class files
ehitame torne kah
fix upload problem when file exists
removed the last couple old tests
EMACrossover should work without stop
log compression progress for each file
Ajout de la caserne texturée
Ajout d'un archer en cours de réalisation
Update du journal de bord
Background du Main menu
Merge branch 'master' of https://github.com/TheConnMan/Website.git
Removed not needed "sys_main.cpp" file
Application needs to pass settings into Template.
[MapEditor] Fixed typo
Disabled infix constructors.
Null commit.

* Rank2Types is silently deprecated in favour of RankNTypes in GHC.
* Didn't use Data.Functor.Compose.
Flipped changed signature of para.

The correspondence between fold/foldM and para/paraM is now much clearer.
Update A4 quest step for core
working on clean exit
Accept either uf or uf_ibge code for state
Added missing files for tests
Remove double weaponAnim definition in msg.c
Removing old directory rinari-pack.
remove toolchains and use custom toolchain
remove vendor cm
update manifest to android-4.1.1_r1
cleanup manifest
filter missing companion list by current zone
Products csv and rake task to import is added
Merge branch 'master' of https://github.com/UDProducts/BillApp
Erased collective.panels from infrastructure.
Add .mo to ignore.
Get rid of the .mo
Bring back the override as it will be needed during the migration inpass.
Few small updates

Signed-off-by: Jack Huey <kitskub@gmail.com>
Merge pull request #431 from kitskub/update

Add HealthChangeReason.PLUGIN
Do not write unchanged files
Test fix
more curl testing
More testing
Testing config details
Use tinc-1.0.19-android-1 binary.
List tinc configuration files in preferences, allowing edition with
external text editor.
Add file picker in preferences to choose configuration directory.
Add COPYING file with GPLv3.
Add GPLv3 headers.
Merge.
Add README file.
Lockable and Trackable

Initial specs for the Devise Lockable and Trackable modules.
Datepicker for datetime fields + script to set default datetime not working in FF11
close #88
movimento e prefeitura fixed
Merge pull request #19 from renatoaware/master

fix
Corrige largura do select da categoria

Para não ficar escondido atrás do mapa.
Updated the insert method to return the correct id
Fix smooth rotation.

No more knock on camera when passing through Z axis.
( also fixed on X and Y axis, but it couldn't be seen in vanilla due
to restrictions on camera's rotations )

Signed-off-by: Alkaelis <AlkaelisFenaro@gmail.com>
Fixed issue with class loading for inter plugin references
- An instance of the main plugin class is created before the plugin's loader is fully setup
- This means that it can't handle dependency information correctly
- This passes the depend lists to the loader directly, rather than requiring them to be obtained via the plugin
Merge pull request #480 from Alkaelis/master

Fix smooth camera rotation.
Okay so keeping the map BGM works, but it also crashes the game after victory.
Auto refresh with AJAJ, Javascript handles rendering
Added functions for GLES2 and GL1 rendering (not implemented)
Complete student manage system.

Signed-off-by: Yunchao Chen <chenyc@marvell.com>
Update for Bukkit 1.3.2 and Vault 1.2.18 snapshots.

- Restructured perms to accessorize.accessorynamefromconfig (request from
  @dunem666)
- Removed scheduling to apply accessories, it appears fixed in Spoutcraft
  now
- Fixed bug in applyAccessories where applying would ignore existing, its
  an overwrite now

Signed-off-by: Chris Sanders <zidane@outlook.com>
- Add Vietnamese language
removed an unnecessary print call
baidu.dom._styleFixer.size
[Bugfix] 解决再不设置width和height的情况下ie浏览器获取不到值的bug
baidu.dom._styleFixer.size 再取不到值的时候进入fixer，获取正确的值
baidu.dom.drag
[Bugfix] 会将元素的margin设置为0
baidu.dom.drag 增加了参数判断，可以保留margin
Rikottu merge korjattu
add border to Expert Wall photos
Merge remote branch 'origin/lila'

add border to expert wall
get rid of returning to log message
trying again...
Just use ours, we're going to overwrite any way
Add WRITE_BOM option to CSV driver to write UTF8 BOM for improved Excel/unicode compatibility. Fixes #4844.

git-svn-id: https://svn.osgeo.org/gdal/branches/1.9/gdal@25039 f0d54148-0727-0410-94bb-9a71ac55c965
Revert "phonegap"

This reverts commit 0bed66824b3a6c22eed05b08ee358b0ee22452d7.
[views] students/_form fis
added cob_voltage_control to bringup
dengue commit
Add missing file googleanalyticsua.m4
Updates to website.
Add gitignore
Modify .gitignore.
Catch more exceptions.

Remove some stack traces to prepare for release.
Remove reliance on System time.
Add in starts towards mod pack editing and filter of mod packs.
Fixed event test on platforms without regions. Refactored tests to use proper setup/teardown
Cleaned up event test - now taking into account global QUnit settings
removed incomplete sample
Working morning calculation
added 3 optimizations
Modified gemfile to include correct version of sqlite
New clean Gemfile
Checking
Removed files
[FIX] fix error in datetime
Fixed #13,12,10
Fixed #13,12,10
test animation
Merge branch 'master' of github.com:alanchen/FattyCola
Add missing localized string
added title screen and server
Alex saved the report.
another bug fixed
first version of debt calculator. Needs some more love ... (i.e. refactoring)
the code of the first uploader prototype
Remove blank fields from submitted registration

Remove blank fields from submitted registration params before creating a Participant model. 
Use haml template for email in html format
unicorn
returns sources and branches in Nodes#show action
better seeds, with more branchings and components
change database.yml to use postgres user for travis-ci
Deleted .bashrc.user
Add paper viewer to web UI.
fixed error js

deleted duplicate functions
clickme is hidden until login.
modified css v0.4
added canvas

KNOWN ERROS : NOT FILLING THE SCREEN THE RIGHT WAY
fixed error css
Merge pull request #9 from alexstoick/vladBrach

Vlad brach
Not using DVB
Not using DVB
3.6.2-1
Added database and refactored code to simplify db access for future timeline activity
Fix typo :)
Merge pull request #1 from leematos/patch-1

Fix typo :)
debian/changelog: Sync with GCS

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
Include the systemd control files on every architecture.

Fixes the FTBFS on non-linux platforms, as seen on the Debian buildds.

Closes: #672457
Signed-off-by: Gergely Nagy <algernon@balabit.hu>
Implement Hybrid Index page V1
Merge branch 'master' of github.com:codesharp/cooper
add hybrid jqmobile sample
Modify Hybrid Index page and cooper.js
Merge branch 'master' of github.com:codesharp/cooper
fix #7,fix #9
update mobi download page
fix #12, fix #11
fix #13
update background-img, update notsupport page
fix #16, fix #15
update webproj
Merge pull request #6 from codesharp/master

merge bugfix and ui
added how to use commithash more usefull
add function DMA_set_return and DMA_set_channel_async in dma.c

Prepare for introducing asynchronous I/O in floppy disks by adding
support for asynchronous DMA operations.

We won't need idle bottom halves (or bottom halves in general) anymore.
QEMU works just fine without them with synchronous I/O (though the floppy
drive will stall the guest and be "impolite"), so remove all that code
for that now for simplicity.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Li Zhi Hui <zhihuili@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Replace bdrv_* to bdrv_aio_* functions in DMA mode in fdc.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
fdc.c: add tracing

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Use Wheezy for testing 5.2
Generate packages and repository for Wheezy
correct space
check if file is really stored and return nice error message
almost fix inject tree feature
display max upload size
display max upload size
fix indent
add plugin description : a small text which explains what plugin offers as function
new plugin offering capability to add links right to login/logout menu
Include new headermenu plugin in .spec as declared as valid
final touches & blog
final files
Executor calling facility improved
Don't try and load the calendar.css now it doesn't exist
Adding LicenceEdition from Panopticon.
Add scheduled state and scheduled_publication date to edition

This includes the addition of a new state and state transition rules in
the state machine, and rules about publishing/scheduling in the
publishing mixin.

A submitted publication can be scheduled if it has scheduled_publication
date. A scheduled publication can be published once its
scheduled_publication date has passed.
Move scheduled publishing behaviour to separate mixin
Add scheduled publishing date picker
Toggle the scheduled publication date box based on the checkbox.
These are class methods, not instance methods.
The logic in this method seems to have been inverted.

Also, there was a minor grammar issue in the message.
Ensure that scheduled_publication dates are in the future.

This revealed a bug in the scheduled publication form, which can be
replicated prior to this commit by submitting an invalid
publication; in the form showing the errors, the scheduled
publication check box will be checked. This is because the
condition was checking for the presence of *any* value in the
`scheduled_publication_active` parameter, rather than the "active"
value (`1`).
Add schedule/force schedule buttons
Add schedule action to workflow controller

also allow edition index to filter for editions in the 'scheduled'
state.
Prevent scheduling if already scheduled
Allow scheduled publications to be unscheduled
Refactor unmodifiable validation

The name is no longer applicable since it is unmodifiable in other
states than 'published'.

I've moved methods only applicable to the validation into the validator
class rather than letting them pollute the edition class itself.
Add 'Publish scheduled editions' permission

also refactor permissions to use constants for the strings
Add rake tasks for publishing scheduled editions

Had to tweak #reason_to_prevent_publication_by to explicitly address the
rules around publishing scheduled editions.

Only require scheduled_publication to be in the future in the 'draft'
and 'submitted' state. I allow it to be in the past in 'rejected' state
because you may reject an edition and we don't want to nag people about
the scheduled_publication date in that case, it's up to the author or
departmental editor to set the correct scheduled_publication when
submitting it and scheduling it.
These assets no longer exist so no point in pre-compiling them.
Defend preview against possible XSS "exploits".

This is technically contrived, but it's worth a clean bill of health
to fix it.

I've chosen to return a 403 because that seems to be the best
error code description to match this situation: "The server
understood the request, but is refusing to fulfill it."
Split publication subtypes into {Common, Less Common, Discouraged, Migration}
Merge commit 'c701d4a075f521ca07dc9355a3a287a046dee7fb' into HEAD
Always allow publication date to be up to 5 years from now.

Presently it's set to 5 years from whatever the publication date
currently is, so editing a publication with the date set to 2006
would only then allow updating it upto 2011.

An interim way to cope would be to set it to 2011, save, and then
set it to a higher year, but this commit will always set the end
year to 5 years from now.
Design and copy changes

- copy changed to how gov works
- page title design for roles index
Remove min-height js nonsense
Sync schema.rb with the production db

The replaces_businesslink column jumps around whenever in different
versions of schema db.  This commit moves it to the position it
occupies within a dump of the production db.  We should try and
keep it like this, to reduce churn.
Naively add all missing foreign key indexes.

Until (or indeed if) we ever do proper db performance testing and
analysis to work out what indexes we require, adding indexes to all
foreign keys is a sensible stop-gap.
TAChart: Fix inverted Y axis on TChartNavPanel's minimap. Issue #22978

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38841 4005530d-fff6-0310-9dd1-cebe43e6787f
cocoa: cocoa does not support BGR(A) bitmaps

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38807 4005530d-fff6-0310-9dd1-cebe43e6787f
lcl: use CreateCompatibleBitmaps() instead of dirrect RawImage_CreateBitmaps for internal imagelist bitmaps

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38808 4005530d-fff6-0310-9dd1-cebe43e6787f
fix .gitignore
fix issue4
fix issue4
fix indent bug
fix issue6
pentadactyl config to dot prefix
Update on Armadillo_Movement Algorithm. General Algorithm Ended. Missing: Concrete Movement Calculation.
test with 1.04 instead of 1.03
git ignore
Merge branch 'master' of https://github.com/amorawski/Workshop
Changed u to z and r to y
Use new version of neo4j-core (needed to get it running from rails)
mutt; new messages on top
vim: bloaty menus no more
whatdoesthisdo?
now handles default targets and install() command
View Next Bus
Enabled compiler warnings in GCC
Park North Edit About

Added portrait and set name settings in css
CEFCore
Draft post on Octopress performance
fixed netty distro addition and jnp-client
removed hornetq-logging from distro assemmbly
updated gitignore
fixed client jars to include correct jars and added hornetq-commons and hornetq-journal to assembly
ISPN-2215 Put back the ping on startup check on getCache()

Added a test that specifically addresses the situation where single node
in the server list is not available and ping on startup is disabled.
Modified test.html
added new file
Fix detection of a svn directory for SVN >= 1.7
Subversion 1.7 and above uses a centralized metadata storage.
Floats removed
Add support for this.expect in tests.

Almost all non-trivial JavaScript programs use callbacks heavily.
This means that sometimes you want to make sure that all your
assertions executed, even those inside the callback functions.

this.expect allows developers to explicitly specify how many
assertions need to be executed for the code to pass.

This patch closes GH-16 and GH-11.
Revert "Commiting new dojo1.8 library dependency"

This reverts commit 41314460518b8e6547057aa1bc9bd05633e750f0.
evert "Revert "Commiting new dojo1.8 library dependency""

This reverts commit 4797c382e1f95b87ccac67d35c2507134aaa7af4.
Merge branch 'ServiceInvocator' of github.com:antunonline/azfcms into ServiceInvocator
Pulling build.xml from Deployable
out commented code to shade the non selected part
tests: _version_ isn't comparable with control

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1423182 13f79535-47bb-0310-9956-ffa450edef68
added observer and persistence
APSTUD-5018 - (re-fix) Show documentations for inner parameters when they exist in a MethodDeclaration.
APSTUD-7160 - Fix the PHP interpreters dialog to display the added interpreters after restart.
Multiple fixes to the executables engine, and icons references.
APSTUD-7160 - externalization files.
APSTUD-7160 - Apply review comments. Make sure that the PHP we are executing is the one selected, and not the system's default one.
Added vim-historic
Update aliasses.
MAP: add additional debug info
add current v0.3 version of the update system script
Initial commit on MistyForms. Still under heavy development.
Replace all generic Exceptions with more specific ones
Updated Vagrantfile for ALM 2.0
vim: updated tab lines
vim: <c-n> now opens a new tab, not a new scratch window
fixed escaping in tree bash alias
Twonky Server 7.x Starter
removes a line that was causing problem loading js3-mode
update by co
Merge branch 'master' of github.com:arumotech/dotfiles
Fixed indentation in composer.json.
added migration to increase size of the phone number field in events.;
added migration to increase size of the phone number field in events.
fixed rendering glitch
WSAD time!
added in the first email sign up on page with icontact
adding in the idea form
text changes on forms
[FIX] sdparm's value (in key-value pair) always has index 2
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
[LUCI] Example date and time format in output

Signed-off-by: Vladimir Petukhov <vladimir.petukhov@etegro.com>
[LUCI] Better code reading

Signed-off-by: Vladimir Petukhov <vladimir.petukhov@etegro.com>
[LUCI] Datatype for input validation

Signed-off-by: Vladimir Petukhov <vladimir.petukhov@etegro.com>
Datatype "date"

Signed-off-by: Vladimir Petukhov <vladimir.petukhov@etegro.com>
Added html name spaces for wicket tags
Adding initial folder structure
fake change to initiate a push to heroku
Added OData/Jersey bindings under /DataHub.svc
Added odata4j dependency and servlet instantiation
Added local run script
Fixed class names for servlet holder to resolve factories correctly
Factory names corrected
add Unit model
* not tested
* no powerup support
* no turn radius support
can cal num of question 
can check num of question
create questionNotEnoughException
check and query question answer
insert to examresult
cal timelimit
can do exam,autosave,select exam
but cant see result
run: fallback to qemu-img in /usr/bin

In case there is no qemu-img next to the qemu binary try /usr/bin/qemu-img (and
qemu-io) as fallback.  Makes "run --qemu-bin=/usr/libexec/qemu-kvm" work.  Likewise
"run --qemu-bin=/home/kraxel/rhel6/qemu-kvm/x86_64-softmmu/qemu-system-x86_64".

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
done with customers api test
Removed typeLanguage warning who everybody hates anyway.
Merge branch 'master' of github.com:Activiti/Activiti
Refactoring DeploymentCache: introducing DeploymentEntityManager and DeploymentManager. Made DeploymentCache an interface for pluggability
Fix createAttachmentCmd
Also did the same for knowledgeBaseCache'
Added a line of logging to see if it actually works
IN PROGRESS - issue ACT-1445: Improve documentation for creating
Designer Extensions 
https://jira.codehaus.org/browse/ACT-1445

Added documentation to emphasize the extension must be outside the
Eclipse workspace of Designer.
Merge remote-tracking branch 'origin/master' into etl2
Moved AbstractFormProperty to non-impl package (see http://forums.activiti.org/en/viewtopic.php?f=6&t=5725)
Merge remote-tracking branch 'origin/master' into etl2
Added Alfresco elements + added defaults MySQL scripts
Merge branch 'master' of https://github.com/Activiti/Activiti
Added logging of removal to correct place
Added support for expressions in custom properties
ACT-1479: fix for symbolic name of engine module
Proof that ACT-821 works
ACT-1040: applied patch
ACT-1031: renamed and deprecated older methods
ACT-1493: make deploymentcache pluggable + introduce cache limit
ACT-1493: made some classes Serializable, as otherwise the process definitions are not storable in a distributed cache