labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of github.com:ayende/ravendb
Add a failing test: MulityGetShouldBehaveTheSameForLazyAndNotLazy.

MulityGetShouldBehaveTheSameForLazyAndNotLazy : FailedXunit.Sdk.EqualException: Assert.Equal() Failure
Position: First difference is at position 0
Expected: User[] { (null), (null) }
Actual:   User[] {  }
Add some tests, 3 of them are failing:

LazyLoadOperationWillHandleIncludes : FailedXunit.Sdk.TrueException: Assert.True() Failure

LazyLoadShouldReturnArrayWithNullItems : FailedXunit.Sdk.EqualException: Assert.Equal() Failure
Position: First difference is at position 0
Expected: User[] { (null), (null) }
Actual:   User[] {  }

WithLazyQuery : FailedSystem.NullReferenceException: Object reference not set to an instance of an object.
at Raven.Client.Document.AbstractDocumentQuery`2.Lazily(Action`1 onEval) in AbstractDocumentQuery.cs: line 459
at Raven.Client.Linq.RavenQueryProvider`1.Lazily(Expression expression, Action`1 onEval) in RavenQueryProvider.cs: line 244
at Raven.Client.Linq.LinqExtensions.Lazily(IQueryable`1 source, Action`1 onEval) in LinqExtensions.cs: line 169
at Raven.Client.Linq.LinqExtensions.Lazily(IQueryable`1 source) in LinqExtensions.cs: line 155
at Raven.Tests.Shard.BlogModel.SupportLazyOperations.WithLazyQuery() in SupportLazyOperations.cs: line 44
Fixing test
Fix test to not throw a NRE by correctly implementing Lazily on the ShardedDocumentQuery.
ShardedDocumentQuery should override the DatabaseCommands and the AsyncDatabaseCommands in order to throw NotImplementedException instead of NRE, for feature like Suggest().
Add race case
Add race case:

WithLazyQuery : FailedXunit.Sdk.EqualException: Assert.Equal() Failure on Line #35
Expected: 1
Actual:   2
Add "HEAD" for attachments
Minor
Search control will now expend if text is longer then the control
Add recognizing id's with "-"
Fix typo
Fix RavenDB-159: will now return null item for a not exist document
Merge branch 'master' of https://github.com/ayende/ravendb.git

Conflicts:
	Raven.Tests/Raven.Tests.csproj
Merge branch 'master' of https://github.com/fitzchak/ravendb
Proper error handling for async scenarios
Fix typo
Fix typo
Make project to compile on .NET 3.5
Adding required users docs
revert test.pattern change
Changed bashrc to be more modular and added work module for dev machine setup
Added autoload/pathogen.vim path to git ignore as path changes, also removed link from git
Added file_line plugin to open files with line number appended
adding some native builds
Use module const_defined? because Kernel doesn't seem to work in jruby.
make stack trace actually get logged in production
Adding new exlibris-primo gem as a dependency for Primo Service.
Merge branch 'umlaut3dev' of github.com:team-umlaut/umlaut into umlaut3dev
Image cache and 304 response
[maven-release-plugin] prepare release glimpse-1.1.1
Revert "Again"

This reverts commit 7d09ade1b740113be512b95cce9a4ed958ae7a27.
Revert "Restoring info"

This reverts commit 4b92e87d0e33800ceb2b8c2de2b3ddab35512dc5.
Committing
pull select.select at import time, before hilarity ensues
resolve None correctly to localhost
use the proper default values for stdout/err fds
clean up select poller droppings
mhialairigh configs
Added code to warn the user if the 'sequence content' is 'protein' or 'sequence alignment'
Changed $file_seq_type to return 'sequence content' because 'seqeunce type' was being overloaded.  Also, added check to see if input file contains 5% or more of dashes as its content.  This could indicate that the file contains a sequence alignment.
Edited so that sequence files of type 'protein' or 'sequence alignment' will not be displayed in the list of sequence files available for submission.
Added code to check for files before deleting to reduce error logs.
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Added call to Analysis.pm to delete job from analysis database when a job is deleted thru the website.
Merge pull request #179 from teharrison/develop

code fixes for new db
Added code to fix DOS line returns in uploaded files before computing on them.  Moved sequence content guess and md5sum to compute_sequence_statistics.pl script.  Removed a few subroutines that were no longer needed.
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge pull request #180 from jaredbischof/develop

More updates to Upload page and deleting job from analysis db when user deletes a job.
Fixed bug, added escape characters to command string.
Merge pull request #181 from jaredbischof/develop

Fixed bug, added escape characters to command string.
Missing semicolon.
Merge pull request #182 from jaredbischof/develop

Missing semicolon.
Moving file format checks to an earlier stage to improve error handling.
Merge pull request #183 from jaredbischof/develop

Moving file format checks to an earlier stage to improve error handling.
Merge pull request #184 from teharrison/develop

more updates / optimizations to analysis module, fixed search with new db
Code changes to try and reduce text on the Upload page and improve functionality in some cases.
Added exception for code to work with the current version of the file command that is running on our web server.  Also, deleted another unneccary subroutine.
Merge pull request #186 from jaredbischof/develop

More updates to Upload page and upload.cgi
restructure, part of an api
restructure, part of an api
* index.html: Updated lede wording
Document whitespace issue with ScrollView
Update getting-started/using-kendo-with/aspnet-mvc/migration/widgets/tabstrip.md
add commit-pdf target
copy the PDF back to the master branch
mudando fluxo de trabalho para antes de Git
Better commit-pdf
added "div." as a toplevel element, without enclosing <p>

It is possible to say "div.", "div(classname).", "div{style}.", just as with,
say "bc", "p" etc. As opposed to "bc", it does not use an enclosing <p>
element for its content, so that it's possible to obtain something like
<div class="xyz"><img src="..." alt="..." /></div>
added <div> as a toplevel element (that may contain a list of paragraphs)

Basically, <div> is another alternative for the "paragraph" parser. A <div>
can contain other paragraphs, i.e. within a <div>, all rules from the
"outside world" apply. In particular, to end a "p" paragraph within a <div>,
a blank line before the closing </div> is needed (!); I tried hard, but couldn't
find a way around this.
Added page for saved posts.
Stuff
Nearly done...
Fix borked previous commit.
Update gemfile to rails 3.0.15, for mysql users, per https://github.com/rails/rails/issues/6717
fixes #1525 - add ancestry (parent group) in json output for hostgroup

Signed-off-by: Corey Osman <corey@logicminds.biz>
Signed-off-by: Alexander Chuzhoy <sashac88@hotmail.com>

This is to overcome the following messages when executing "puppetd -t" on a client.
warning: You have configuration parameter $environment specified in [puppetd], which is a deprecated section. I'm assuming you meant [agent]
fixes #1452 use fog for libvirt management

This patch introduces a few new features:

* console support
* multiple disks
* multiple nics
enabling debug drawing.
- Prefix all variables with `$` to avoid naming conflicts with methods & JS keywords
bugfix: do not save the default page
sched/nohz: Fix rq->cpu_load[] calculations
added timestamps in view
Merge branch 'master' of https://github.com/thinchat/thin_core
change site title to thinchat
Merge branch 'master' of https://github.com/thinchat/thin_core
Remove interval
update test for escape short tag
fix Java warnings
Merge branch 'master' of git://github.com/korpling/ANNIS
check if '~/.annis' directory exists

Only create '~/.annis' directory if it does not
exist. Log creation of the directory. Complain if 
a file with the same name exists.
fixed Java warnings

One warning remains about call to deprecated code.
added Shell command benchmarkFile
Merge branch 'master' of git://github.com/korpling/ANNIS
renamed `Count` object and functions

The old names suggested that actual matches
and/or documents were returned
separate query function for frontend count code

The frontend counts the number of query matches
and the number of matched documents. The shell
client uses the old query function which simply
counts matches.
fixed Java warnings
fixed copyright header
Merge branch 'master' into newbenchmarking
use old COUNT query function and close reader
Merge pull request #61 from he-sk/countCodeAndDocuments

Separate count query functions for frontend and shell client
Merge pull request #60 from he-sk/fixbug59

Fix for issue 59
Merge pull request #62 from he-sk/newbenchmarking

New shell command to benchmark queries in a file
adding GripDragComponent that only activates drag operations on a specific sub-component
links instead of buttons
make the icons bigger and update tutorial
Merge branch 'querybuilderfixes'
terminology
added test function for seeking in video
changes to switch video test
adding video files
adding video files
added DS_Store to gitignore
2 markers on the map + opening a window closes the one thats open
added custom markers and changing marker image on click
added custom markers and changing marker image on click
nouveaux tests - 2 vidéos jouent en alternance
fixed video being added twice when re-displaying a previously visited place
display multiple markers and added a hashmap + creator function
deleted some files
deleted videos
Merge branch 'bgd-map'
added missing files
many data and interface improvements + save tests
Added sources links to each mixin in the docs. Other tweaks and changes to the style and additions and mixins
OOOBoxed
Run experiments with dct.py.
Clear step occurances to use correct step idxs
Added MySQL database in tests
PORT-106: Updated the model merger to work directly on the provided
ObjectModel when merging, rather than making a clone and merging onto
that. Unfortunately making a clone broke all the references that various
components had to the OCMetadata and ICMetadata instances from the
previous model (so when a new federate joined and registered a new
object, it got an OCMetadata for the same class, but which was a
different instance). Now the merging literally extends the existing
model object, meaing all the existing references stay the same.
Basic CakePHP app with Todos Model.
Revert "Basic CakePHP app with Todos Model."

This reverts commit 81196ddf0e55127bc77a415be9aeafe62a3846a1.
Basic CakePHP app with Todos model.
Added IGlobalSetup, renamed Trappings to FixtureManager

Global setup is for setting up Mongo mappings. Renaming was necessary
because there was namespace conflicts in actual usage. I also added some
convenience methods to more quickly get setup.
[jslibrary] tksocrataview
Set heap size specifically to 24MB.

This should make the malloc test work but also give us thread
stack space and etc. for other tests.
Make the malloc/malloc test output clearer.

Was hard to tell how to tweak the heap size to make the test work.
Write a __testfinish.txt file at end of test.

This way we know the test finished cleanly.  So much faster.

I guess a test for sceKernelExitGame() might have to write it manually?
Add gentest.py from PPSSPP, plus tweaks.

This version waits for __testfinish and has other better delays.
Automatically make tests when running gentest.py.

This way it does everything for me.
Normalize expected line endings on Windows.

Just to stop it from saying the file is modified in git.
Merge pull request #14 from unknownbrackets/new-common

Fix heap size, include gentest.py
more rtc tests
more rtc tests
fix some output on rtc tests
Still had a few output issues
Merge branch 'master' of https://github.com/tmaul/pspautotests
Remove option to constrain by FA.

Instead of using this option we will incorporate an FA threshold in the brain mask used to constrain the entire model.
Initial spec passing!
Something's fishy with 5.18.X, start debugging.
delete init.el
vimrc
vimrc: statusline
[#30462515 #30462543] シナリオテスト追加
rename find_module_path to find_module
Update total displayable label to 50 characters. This is required for using the git-pulls gem in bash scripts, getting a list of the labels to use in pulling down git requests
mergeworthy
Merge branch 'master' of github.com:tomoconnor/musikov
updated the template
More source stamp attributes.
Initial documentation of IRenderables.
Don't accept empty changes in PBChangeSource.

twisted currently depends on empty changes being dropped.
Few more files with unnecessary executable permissions
Executable permission missing on script
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendica/friendica
Limiting .directory-photo-wrapper styles to <section> so as not to
interfere with .directory-photo-wrapper in <aside>
Merge pull request #372 from rdc/master

Resolved CSS error in sidebar profile thumbs
add link to shares
Merge https://github.com/friendica/friendica into pull
Diabook directory wide variants.
punycode hostname
Merge https://github.com/friendica/friendica into pull
add smarty engine, remove some obsolete zot1 stuff
fix !@#$ tinymce linebreaks for the thousandth time
first release of LeafArea
added a parenthetical note about debuggers
ignore global leaks in browser-side tests, b/c jQuery keeps exploding them.
convert links to thumbnails.
Update version.php

change test
Django 1.4 fix (media_url => static_url)
Fix :Glog on Windows

Closes #199.
moved values to other header
Уточнен f.extend
Working on hiding plugins from datasheet event call
working on broadcasting to other plugins
modified:   070_item_form.sh
coequlizer
coequalizer congruence
Update the gunicorn test to handle long-polling realistically.
Update the tornado test to handle long-polling realistically.
xmonad: Initial commit.
Merge branch 'master' of github.com:tstein/ted-configs
modified:   linux/zshrc
Add ip alias to get the IP addresses of a host.
Add function to clear the prompt.

This is useful for presentations and screencasts.
Update output to show module names with errors.
Remove Rails module.

It really isn't needed any more with Pow.
Remove Capistrano module.

It really isn't needed any more with platforms like Heroku.
Remove Rails and Rspec aliases.

They really aren't needed any more between Rails 3 and Bundler.
Simplify has-ruby-gem function.
Allow modules to be disabled by returning -1.
add signup page
Finished sign in
Spaces in place of tabs…
Add path attribute for introduction package to make it easy to configure
Add attributes and recipe for 'web'
Introduce umbrella role 'database'
Improve typo3::web cookbook
Change IP-Address to local IP schema
Add typo3::web recipe to run_list
Add fix for directory permissions.
[BUGFIX] Unnecessary warning in css_styled_content (division by zero)

If tt_content.image.20.maxW is not set, PHP throws a warning about
division by zero. This is not necessary. After that the variable
$scale is not set. This patch checks if $netW is greater zero and
otherwise the else condition will set $scale to 1.

Change-Id: Icd876b33d543080e486e0184c8af34c9a3831738
Fixes: #36777
Releases: 6.0, 4.7, 4.6
Reviewed-on: http://review.typo3.org/12076
Reviewed-by: Thomas Layh
Tested-by: Thomas Layh
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
[BUGFIX] Element Browser uses non-namespaced code

Followup to #36817, where an old patch was moved to
the new namespaced code, but without refactoring the
code itself (my fault). The change fixes this.

Change-Id: I9e25a86af68dace1f605d6dfd6bf917350939f31
Releases: 6.0
Resolves: #41834
Reviewed-on: http://review.typo3.org/15482
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
[BUGFIX] Tree view in admin panel is broken with PHP 5.4

The double ['0.'] in $arr['0.']['0.'] is wrong.
Fun fact: This is "broken" since the initial commit.

Fixes: #41213
Releases: 6.0, 4.7, 4.6, 4.5

Change-Id: I7e92a23f2efe405d14265168fa228844cb66a2fb
Reviewed-on: http://review.typo3.org/14923
Reviewed-by: Susanne Moog
Tested-by: Susanne Moog
Update notes for submitted changes

* [TASK] Clean up phpDoc comments in t3lib_flexformtools
Update notes for submitted changes

* [TASK] Clean up phpDoc comments in t3lib_foldertree
Fix json links
Clean up PlaceTileOnBoard
added some dependencies to get more built
add version
remove obsolete imports
Add gunicorn
Ignore *.~ files
Merge branch 'feature-gunicorn' into develop
updated soft skills section
Jenkins Job Processor
Icinga Processor
remote repository info for git documentation
fixed notice links
Final commit of regionV code for 2012 (May it rest in peace)
Merge branch 'master' of github.com:ut-ras/Rasware2009
something that basically works
Merge branch 'master' of ssh://github.com/utunga/barsaidwhat
anuv scatter
label text fixed
merged scatter
final version?
Fixing imagemagick maintain ratio not implemented
Fix field escaping with brackets
Fix MSSQL & SQLSRV db_connect()
Update changelog with changes from 2.1.2
Clean up regexes in Security->xss_clean()

Removed some unneeded capturing groups (or made them non-capturing)
and some unneeded escape characters
Update Array Helper documentation

default value of the "default value" parameter has changed
in element() and elements() methods
Merge pull request #1561 from vlakoff/doc

Update Array Helper documentation
Fix issue #1551
Merge pull request #1556 from valioz/develop

Added proxy to XML/RPC client
Add changelog entry for pull #1556
Fix standard_date() tests
Merge pull request #1560 from vlakoff/regex

Clean up regexes in Security->xss_clean()
Fixed code styling
Added changelog entry
Merge pull request #1550 from krynble/develop

Fixing imagemagick maintain ratio not implemented
Document in the 3.0.0 upgrade guide a breaking change in Array Helper

The default return value of Array Helper's element() and elements()
functions, when the required elements don't exist, has been changed
from FALSE to NULL.
Fix an error in Loader code documentation

That's not $this->load_vars(), but $this->load->vars()
Merge pull request #1564 from vlakoff/doc-2

Fix an error in Loader code documentation
Merge pull request #1563 from vlakoff/doc

Document in the 3.0.0 upgrade guide a breaking change in Array Helper
checked in the project burndown chart.
refctoring and automated entities generation
just added some alias
Less 3
Added to Open Source Section

Fleshing out connection of open-source and collaborative writing.
Pushing towards Github and other sources, moving back to main point of
the paper.
remove C++11 variadic template usages
Transitioning to Looper. Moved some track management from SSPictureFrame to a new MusicalPictureFrame class. Added support for one track in the simulator.
add legend to dash graph
Better initialisation of user models
Komit na bekendot, seushte nema prezentaciona logika
Logopfad verändert
Eliminar andando en todos lados..
Fotos por default
Fotos por default
Fotos por default
Fotos por default
Fotos por default
Fotos default y todo andando !
Utility to generate cover image
quantal reupload
Affiche le contenu transformé en html
Debug--
Supprime la prévisu nécessaire pour poster
Ajoute un script pour dump le schéma SQL
Ajoute le schéma SQL
Utilise le filtre clean-css
Ajoute une commande pour construire les assets
Ajoute une commande upload_assets pour uploader les ressources
Désactive l'auto building de webassets en production
Ignore le fichier manifest de webassets
Upload aussi le manifest
Debug--
Gère le cas où il n'y a aucun posts
Tot funciona.
Add back a moz-todo annotation for 2d.gradient.interpolate.zerosize.
Add a moz-todo annotation and remove a reference to an unused image in 2d.pattern.repeat.null.
Remove moz-todo annotations for restricted floats.
Fix an off-by-one error in a comment in 2d.missingargs.
contact , contact entreprise et sujet par entreprise

contact , contact entreprise et sujet par entreprise
allow {{view 'Nested.Obj'}}
fix constants error
new Task Servlet class structure
persist features;simple register page
Styling touches on lab view, added urgency fields in db
refactoring
Merge pull request #26 from pap-x/master

fdsfsdfc
ignored eclipse file
Trying to implement running function
CSS3-3D-Transformの画像操作のエリアを限定的にする
iOS用touch対応3D CSS
patch 1.01.04
[01] E-mail validation on header and append
     bug has been fixed.
Backed up the original static html designs.
CRUD: Read
-[DONE]Added a ghost view remover in mainjs
utf8 encoding diff
Fixed problem test case; implemented updateROAnnotationInt; test fails (last one)
ROSRS test cases all pass
Aggregate annnotation bodies rather than annotation stubs; fix up test cases
Merge remote-tracking branch 'origin/master' into rosr6

Conflicts:
	src/rocommand/test/TestAll.py
Fixes error when pushing to an empty remote

If this is the very first push to the remote, then "git push" doesn't
know which remote branch to push to.
Change the behavior of .syncignore

Per our discussion on Issue #1, change the behavior of .syncignore to
not exclude files from rsync'ing. Items listed in .syncignore are still
appended to .gitignore, so they don't get pushed to the remote
repository.
add branch pushing
Pull from origin before any other operations

Ensures that the working copy is synced with the remote before we apply
local changes. Fixes an issue where the local repo will get out of sync
with the remote if multiple people are pushing updates (or if one person
pushes updates from multiple locations).
Merge pull request #4 from wfscheper/fix-git-sync-fails-on-empty-remote

Fixes error when pushing to an empty remote
Merge pull request #3 from wfscheper/change-syncignore-behavior

Change the behavior of .syncignore
Merge branch 'master' of github.com:ianb/git-sync
resolve conflict
Created 2012-06-25-your-filename.md
TOP登録のを増やしてみた
Convert empty email addresses to nil (for validation)
Revert "emoved excess whitespace from all .ty files"

This reverts commit 2676d459518bca65bbfc7ece0ba00b671e95affd.
Removed excess whitespace from all .ty files, and no .typ files
`QM.submit` now partially completed (still lacks `env` script tag loading)
The `QM.submit` function is now fair game for bug-hunting :-)
update from server at Tue Nov 13 14:38:47 MST 2012
changed project page choice to list box
Update Mobileorg.zip.asc

1213
RejectPassed
v1.6
always gps
change menu  if ac off
version 1.7
Export
Version 1.8
RecordPoints
Save+Export
Always continuous Mode
add point only 1 per second
added logging
version 1.9
Merge branch 'master' of https://github.com/wimverdamme/MyInfo
Now retrieving headers with XOVER. Also had to make changes with how articles are stored. Also changed Unicode field declarations... they are now Strings
Merge branch 'retrieve_headers' into develop
Bug Fix, 1, unit.test.cpp does not compile in C++03 mode

https://github.com/wo3kie/AssocVector/issues/1

unit.test.cpp:592:27: error: default template arguments may not be used in function templates without -std=c++0x or...
unit.test.cpp:647:35: error: default template arguments may not be used in function templates without -std=c++0x or...
...
changes file created
Merge branch 'b1.0.1' into b1.1.0

Conflicts:
	changes
CSRF tokens.
Purely organizational merging.
20120910
plots works with ubuntu and windows
updated to point to downloads
removed dist folder
versão 1.1.0
versão 1.1.0
Update Configscommon to build AoCP.apk

Also took out the call for the prebuilt
исправил гребанный мд5. Рабочий клиент.
Create 3.6.0
Thu Dec 20 21:01:02 CST 2012
Thu Dec 20 09:01:02 CST 2012
Fri Dec  7 20:01:02 CST 2012
Tue Oct 30 04:01:01 CST 2012
Added Sweep Sound (playing in wrong direction)
added woocommerce_rate_label filter in order to allow for third party tax lookup to replace the rate with synced values instead of adding to the $rates array as the state may change and it is not reasonable to request a full array, by address and ZIP+4 for all nexus.  This allows a single call to the remote API.
add menu

rt
remove the icon

RT
配置数据构建开关
作業ログ専用エディターの追加
为Solution类添加了"类型"的框架
需要用的Solution类的类型功能
fixbug
bugfix
添加了历史路径的存储，以及打印路径
Correction TLD sur le code de Sylvain
add variadic version of run called result
java_code_generator: removed final modifier from getters
Bare bones support for INA3221
Merge pull request #2 from patrickyeon/inalib

Bare bones support for INA3221
型を変えてみたけど...
整理してみた
不要部分を削除
speed up
Fixed build for arm processors.
code simplify

code simplify
miredo: use lower-case for dependencies
miredo: move caveats after install
modify: compatible with JSON implementation
Fix a bug in display page.
modify install documentation ( apache conf )
google webmaster tool meta tag 를 header에 추가.
google analytics tag를 layout에 추가.
.project를 .gitignore 파일에 추가.
Merged from kiseok7/PerlKr-Web
Move language_tag() up to core class, shared by model and library
Fix for PHP 5.2
Update Travis CI config
Update Composer config
Update LICENSE
Update README
Add file to ignore
s/Evenement/Edps/g
Rename
Fix Composr config
Fix not to use Composer for testing
Fix
Add guard-phpunit config
Add file to ignore
Make PHP 5.3 available
Replace Closure with basic object
Fix Guardfile
Make available for PHP 5.2
Fix
Make PHP 5.2 available
Fix
Add callable validation
Add punctuators parsing [closes #9]
switch fallbacks to use exceptions with errorCodes
Routes cleaning
Annotated models
Ordering of users and projects on home screen is consistent.
Route fix
sqlite to pg in local & some update in the look
Circle grows on beat
Merge branch 'master' of github.com:zenpoy/dancejockey
beainstorming
Merge branch 'master' of github.com:zenpoy/dancejockey

Conflicts:
	Instrument.cpp
Modify "Run As" feature

- Modify "run As" feature for teacher only activities
  in browse material page
测试git同步
We're now clearing out the sprite cache after drawing the levels in the level manager.
We're now clearing the sprite cache when we get a low memory error.
socket and arithmetic dir maked
2012/03/15
3.4.0 release
Add flashcache.spec for rpm builds

Pass in kernel_version, modversion, and pkgrelease, or let it use the
defaults.
2012/11/03/Twitter
2012/12/05/IRC
2012/12/05/Twitter
Update browserSupport
fix NZZ after site re-design. Significant parts re-written, pls. have a quick look if I did sth. dumb
don't lose compatibility
Fix NZZ commit per Simon; Update Worldcat regex so it includes University Libraries running Worldcat
Merge pull request #381 from adam3smith/more-fixes

fix NZZ after site re-design. Significant parts re-written, pls. have a quick look if I did something dumb
adding initial pom for acceptance tests
Set tabstop=4.
BUGFIX: time in milliseconds
修改主页分页ajax提交BUG
remove term from IA form
Chenged view
now balmin should return minimal balancing
Aaron, add twitter bootstrap, this is amazing
deploy: tweak the staging gunicorn conf.
index: made a slightly more welcoming landing page.
Fixed paths in .cbp
Solution has bee converted from VS.2012 to monodevelop
Project has been split onto engine (PlywoodStone project) and multiple frontends in separate projects
RenderSystem refactored to support multiple render backends (Graphics, Canvas etc.)
Added PlywoodStone.GTK empty project
Adede PlywoodStone.Droid project, implemented CanvasRenderer RenderSystem
more coins #2
autopano-sift-c: Исправление ошибок
autopano-sift-c: Исправление ошибок
blender: Обновление правил
bmpanel2: Обновление правил
bmpanel2cfg: перенесено в old
bmpanel2: Обновление правил
clementine-player: Обновление правил
Reflector v1.0
refactoring project structure
refactoring projects structure
refactoring projects structure #2
refactoring projects structure #3
refactoring projects structure #4
refactoring projects structure #5
refactoring projects structure #6
added buildscript, little fix to load allways newest settings
Fixed: after a round call, the minimum bet should be 0 again
Fixed multiple rounds
Merge branch 'master' of https://github.com/AmbientTalk/wePoker into Client
Fixed that calling does not add money to the bet/reduce money from the player chips
Merge branch 'master' of https://github.com/AmbientTalk/wePoker into andoni
Improved QRCode: shorter URL, removed 'wifi-direct', added 'is_dedicated'
Initial addition of QRCode in client activity
Fixed bug: betting rounds ended even when last player did a raise.
downgrade to 2.3
Remove dead animation code
Shield animations from Gingerbread devices
QRjoiner: Avoid NullPointerException
ServerActivity: Hide annotations from Gingerbread clients
Move Honeycomb code into separate classes
Merge branch 'master' of https://github.com/AmbientTalk/wePoker into Client
Show the previous nickname when asking
Working on blinds: done: cycling player order after each round, todo: blinds themselves
Merge branch 'master' of https://github.com/AmbientTalk/wePoker into andoni
Added Immersion's Haptic SDK
Added argmax pictures
Egy warning fix a template URL-ekben.

A mostani URL dispathing rendszer a template-ekben deprecated, igy le lesz
majd cserelve, valoszinuleg az 1.5-ben majd.
Ez modositva ugy, hogy mar az uj rendszer hasznalja a future-bol.

DeprecationWarning: The syntax for the url template tag is changing. Load
the `url` tag from the `future` tag library to start using the new behavior.

Signed-off-by: Anubisss <anubisss210@gmail.com>
syn with FTP
完全不知道是什么情况了
Update documentation about new users::clean recipe
Added Terrain Generation and Menus to the Map Editor, Added Numbers only mutator to the TextEntry to allow for only number fields.
adopting for minc-toolkit
* Cleaned up makefile.
* Removed tabs.
downtime for group maps
Translated by Alex
Homepage view logic to show view/views
Próftafla kominn í Skipulag, + for ConceptGls viðbætur
descrip en minuscula.
Added ability to override filter processing sizes for thumbnail use. Started adding hooks for audio support.
Added subtract blend filter
Merge with upstream master
Added Mask filter
Merge pull request #73 from chwilliam/master

Added Subtract Blend Filter and Mask Filter
Live audio recording now has correct sample timings, thanks to Alaric Cole.
Removed some development tools that don't need to be in the final distro
(like Subversion and sqlitebrowser).

Signed-off-by: The Doctor <drwho@virtadpt.net>
fixed service directory issue where the links don't work due to missing trailing slash
Nest roles menu inside the users menu
Add User#admin?, User#instructor?, and User#customer? methods
Add cancan gem and generate the Ability model
Modify Admin::BaseController#authorize_user to allow admins and
instructors to view the admin area
Add some default permissions
Abstract the page header buttons out to it's own partial in hopes we can
use it this way so if you don't have permission to create a resource you
can't see the button
Add Admin::Users#show view
Generate UsersController to handle registration
Delete Users#create view since it doesn't need a view
Add breadcrumbs_on_rails gem
Add UsersController for registration logic
Add registration form
Add sign up and login links to public nav
Add flash messages to public layout
Modify address validations to validate only on update

This allows us to create a profile when the user is created, with only
the first and last name
Add stripe gem
Add stripe_customer_id to the users table
Change user.stripe_customer_id from integer to string
Add User#create_stripe_customer as a before_create callback
Add temp dashboard styling
Much better temperature integrity.
Added xilinx test project: fpga_tempviewer_xilinx
changed FAQ title to be correct, was SDK before
first
89
[#188] cleanup
Configured Kicker to ignore git repo and vim tags files
[#188] Refactoring of SpecPresent module
[#188] Added tests
[Dependency] indent fetching messages.
[UI] General improvements.
Pushing Final Changes
More aggressive namespacing of SBJson to avoid duplicate symbol warnings when another project is using SBJson as well
Rofl changes to Rakefile to make sure app builds in correct directory
Renamed files, closes #3
Renamed files, closes #3
Adding example back to the home page.
- kernel config android improved: added cmdline options for the fastboot{_init}
- make_initrd_arm.sh: only the modules we have needs loading
Removed unnecessary @property in UrlLabel, and removed unused Build Phase for Credits.rtf
- README.md updated.
- LICENSE added.
Corrected number of reservations.
Car test class
Shift one less
try to fix IE7
pkg-plist 要刪除 gtkrc
checking in wip
wip
added a better eratosthenes
Added a solution for problem 4
Add sample links and redirect
pixel info: fixed to work also with non-MX images
Added tool for comparing images similar to functionality in Joachims
image compare table. First version.

Also reordered tools into sub-folders, there were too many for one
package.
Fix to: http://jira.diamond.ac.uk/browse/DAWNSCI-179
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git
Small modifications to use the palette update listener
1.0.0DL
.
.
Merge branch 'master' of https://github.com/DerLeader/NKVoterPy

Conflicts:
	update
bugfix filtering
Changes in WalkToCastle

added support for opening the door if it is closed, also forced it to
stop walking when you reach the destination
update gallery
test
test
test
bags check
test
test
update
update
coffeScript and SCSS migration
Vote button in Webview checks for login.

Not really sure what else.
fixed users index on controller
fix and map edit
fixed some minor number formatting in market views
changed quicklook to sort by region and system name
Provide a faster way to get a location. Adds BUKKIT-3120

Currently when a plugin wants to get the location of something it calls
getLocation() which returns a new Location object. In some scenarios this
can cause enough object creation/destruction churn to be a significant
overhead. For this cases we add a method that updates a provided Location
object so there is no object creation done. This allows well written code
to work on several locations with only a single Location object getting
created.

Providing a more efficient way to set a location was also looked at but
the current solution is the fastest we can provide. You are not required
to create a new Location object every time you want to set something's
location so, with proper design, you can set locations with only a single
Location object being created.
Update entity state correctly when marked as persistent. Fixes BUKKIT-3123

When a mob is marked with the persistent flag (animal or anything with
setRemoveWhenFarAway(false)) the entire block of code for checking if they
should be despawned is skipped. However, one part of this code updates the
mob state if a player is close enough to them. It turns out this state is
used by the AI system to decide if the mob should move around randomly or
not. To stop mobs from being frozen in place we now update this state if
the persistent flag is set as well.
Spigot changes for 1.4.5. There should not be any breakages here.
Use a new non conflicting set of fast arrays. HAS NOT BEEN TESTED.
Put the thread to sleep for as long as we possible can. This should stop burning of the cpu when we don't actually need it.
Reduce item rotation by a factor of 2
Close enough
Nerf maps in item frames.
Maps in item frames do nothing but hurt the server, lets keep them there but only update them once per chunk load.
Fix per world settings, oops
commit message goes here, async executor thing
Add RegionFile from mc-dev for diff visibility
load chunks async sometimes, needs detailed description and thanks to ammar2
ensure we don't load a chunk twice
proper imports
don't wait for chunk load, causes loads to go out of order and take longer
use a proper spiral for sorting chunks for loading
Spigot fixes for async
Implement periodic chunk garbage collector - unload leaked chunks
More async fixes
database requirements
inialize vagrant for sf2 server
ignore .vagrant file
deleted .vagrant from repo and add ignore
deleted file
ignore .idea
fixed a bug in the index-assignment
fixed the debug-"decompressor"
reduced set-search complexity from O(16^2/2) to O(16*unique/2)
added more constructors
split "optimizable" off of "unweighted" (can use unweighted covariance-code)
added piecewise float-compare
code-cleanup
improved set-finder to O(16*count/2), taken out cluster-fit specific conditions, added single-channel identifier code
more coherent file-naming convention
split "optimizable" off of "unweighted" (can use unweighted covariance-code), more coherent file-naming convention
more coherent file-naming convention
added two-point index-fit, more coherent file-naming convention, more coherent preprocessor def.
more coherent preprocessor def.
added two-point index-fit, more coherent file-naming convention
more coherent file-naming convention
added two-point index-fit, more statistics, more coherent file-naming convention, more coherent preprocessor def.
moved a few files around
AccountDetailsViewController is now pushed programatically, and is going to be replaced by specific view controllers of different SNS sites
created accountViewController for Renren, work in progress..
added .gitignores and modified DemoServlet
Edit readme

Signed-off-by: Fatchoco <erico.i.am@gmail.com>
defining some stuff
sqlite con
start/stop/status/etc
Bump compat level 9, bump standards 3.9.4
Added README.source explaining how to build the package
dsdsdfsdf
Merge remote-tracking branch 'origin/master'
dsadwdesa
Updated to v5.0.2 (B:20)

Version 3.0.1 (B:19)
* Fixed the permissions
* Fixed messages.yml
* Fixed a potential database issue

Version 3.0 (B:15)
* Updated to CB 1.2.5!!! (In a hackish sort of way)
* Switched to Bukkit API permissions.
* Better country ban / unban code. (Can accept names, and displays name & code!)
* Added anonymous statistic reporting to http://mcstats.org/plugin/EasyBan
** Country banning and country statistics require GeoIPTools 5.0.1+ http://dev.bukkit.org/server-mods/geoiptools/files/
Updated to v3.0.2 (B:20)

Version 3.0.2 (B:20
* Fixes some minor odds and ends

Version 3.0.1 (B:19)
* Fixed the permissions
* Fixed messages.yml
* Fixed a potential database issue

Version 3.0 (B:15)
* Updated to CB 1.2.5!!! (In a hackish sort of way)
* Switched to Bukkit API permissions.
* Better country ban / unban code. (Can accept names, and displays name & code!)
* Added anonymous statistic reporting to http://mcstats.org/plugin/EasyBan
** Country banning and country statistics require GeoIPTools 5.0.1+ http://dev.bukkit.org/server-mods/geoiptools/files/
Fixed mapbox
Add version notation.
Fix for holiday timing bug when holiday not set.
Cleanup

;
Keep email verification enabled by default.
Fixed build problems on Windows
refactor key commands for UMenuBar

Scores -> New : option-cmd-N
Scores -> Open : option-cmd-O
Scores -> Save : option-cmd-S
Scores -> Save as... : option-shift-cmd-S
merge branch 'release/v0.1.1' into develop
dev environment fixes
updated host app
maven-fix
fixed logger messages
removed schema files, they are part of rs
now works with latest rs server
fixed map/login shard to support dev environment, successful login/instance-load
release version update
merge branch 'release/v0.1.2'
maj sidebar mail
Merge http://github.com/GeekPress/Weave-Air
fixing regression in balance
first commit
Merge branch 'master' of github.com:GoogleVRgbsk/system
use text data type for text fields again, fixed #161
Uppsnyggning och synkning med föreningsmallen.

Signed-off-by: Gunnar Winqvist <gunnar.winqvist.tjader@hotmail.com>
Closes #25

Signed-off-by: Gunnar Winqvist <gunnar.winqvist.tjader@hotmail.com>
Add Rubinius build directory to .gitignore
Add a step to make sure shell is running as well
add print examples
Minor bug fix + right click for build rights.
Texture Sheet
DWP-211
DWP-230, DWP-231, DWP-229, ...

DWP-230, DWP-231, DWP-229, DWP-224, DWP-228, DWP-225, DWP-227, DWP-221
Updates:

- Write to the correct sockets, damnit!
- Don't try to decode the JSON, just pass it along.
Added a post-receive parser in case people want to publish changes that way.
FIX: Typo in previously committed feature.
FIX: Uploaded pictures are assigned to the current corpus.
Added code to fill the gaps
Analyzing contrast score
Added full set analysis
Using ByteBuffer more often and optimizing Code
Forgot to include the updates files...
more teacher names, show names only once per update
Had to force add new Sass file?
Trailing .
Alter hook calls and update documentation to reflect it.
Expand hook documentation and rename hook.
Minor documentation expansion.
Squash hook_islandora_type_info(), in favour of cmodel-prefixed hooks.

Many of the Islandora hooks are now invoked once with each content model
pid prefixed (after being escaped), in addition to the base hook call.
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x-alter-hook-defs

Conflicts:
	islandora.module
Merge pull request #193 from adam-vessey/7.x-alter-hook-defs

Alter hook calls and update documentation to reflect it.
Bug fix for collection management when no collection_policy datastream exists
added initial files with demo and doc
HAP-343 - Wrong build retention date is sent in some cases. The roll method doesn't update higher fields.
Temporary solution to fix Iron Golems being butchered.
Added keytool for generating self singed server certificates
Added initial impl for client server
Fix event whell
fix broken hyperlink in docs
dashboard javascript duplication refactoring
Set new screen resolution which I think I'll use for desktop computer screens
Condensed code.
A name entity without a valid color provided will throw an error instead of just killing itself.
Added missing bracket causing syntax error.
Added comment.
Added path in url.

Page#dir was returning the wrong dir ('/') for pages in directories.
Merge remote-tracking branch 'fotos/fix_page_dir'
Beta[v1.5] Now with pressure plates!
Display hierarchical facets properly in advanced search screen.
Tweaked hierarchical facets to be more compact and not show spinner if javascript is disabled.
Changed RSI error messages from dialog to a simple string added to the results.
BTJ description added.

Signed-off-by: Bjarne Beckmann <bjarne.beckmann@helsinki.fi>
adding newer version of tipsy featuring ajax loading
Adding trunk8 for easier text ellipsis
alphabatizing javascript list in docs and adding trunk8
Merge pull request #33 from jlsherrill/plugin-update

Plugin update(s)
fix(jqLite): make next() ignore text nodes

next() is supposed to return the next sibling element and it should ignore text nodes. To achieve this, nextElementSibling() should be used instead of nextSibling().
Showing the picture of the person who posted.
pilsen trial
test new combo box UI
Merge branch 'master' of github.com:Korbeil/RiotControl

Conflicts:
	Website/include/page/footer.php
test433
航班动态 增加短信功能
ok9
解决冲突
UPD: build - UTF8
Fix fatal error in News module
fixes #57
Merge pull request #58 from gh1234/news_pkg

Fix fatal error in News module
Fix "missing string" warning

Don't add apps to home if they don't have a title defined.

Change-Id: Iee86f412dacaff086812b9cd1cdec705ca348cea

Conflicts:
	Slim/Buttons/Home.pm
added flint tool, first working build
[IMPROVEMENT] mobile style on resetpassword
Archivo de inicio por defecto de la aplicacinion web
Formattage de l'ensemble du code : test et source, ajout d'accolades, identations...
dl for haskell, slow
Fixed wrong FMA4 intrinsics and added a call for FMA4 version
Quelques améliorations dans la gestion de la blacklist
Trouver une solution pour l'erreur 421
Labels pour la v0.1
Added code of game.
Latest build!
warnings: restore Ubuntu compatibility
First version, able to load and save project names, timesheets, to display a project and its timesheet, to increase a time count for a day, to go to next or previous week.
Css changes both to index and admin
add discuss.
grammar: Finish relative/chord work.

Ugh. Disgusting. :T
Hack together, in a very disgusting way, voice support.
Split out Visitor.
grammar: A few cleanups.

Unused rules, bad imports.
visitor: Handle Times nodes.

Also flatten Music nodes.
grammar, visitor: Finish converting transformations to AST.
added set operators + html test runner
apwidgets fix

apwidgets was missing the s on the end in the program.
Version bump to 0.3.1
Expanded a couple of comments, bumped the gem patch level
Fix potential bug and add possibility to specify output dir
Updated formatting of command outputs.
Signed-off-by: Steven Downer <grinch@outlook.com>
Use our emerging script/bootstrap standard
Merge remote-tracking branch 'upstream/bootstrap'
Add console handling
Bugfix in client form when no scopes are configured.
structure for club 4 saisons
Update src/shared/revision_nr.h
Change structure of requests and ability to add requests via admin and edit them
Fix update network prefixes
Fix crud logs
Merge branch 'feature/as_lists_to_binary_18191' of github.com:PowerMeMobile/kelly into feature/as_lists_to_binary_18191
typo fix
know obstruction sensor output to be active high
merge cams frequency measurement
Aggiunto Timer per la creazione della maschera di ImmagineCliccabile

Aggiunto script per la rimozione degli IP che non rispondono dalla lista server
Aggiunto Menu Principale e Selezione del Client con animazioni
bgpd: fix peer setup for option-less OPEN

The new AF/capabilities peer setup logic implemented in commit 53ef1d4
assumed a peer without MP capability a unicast IPv4 peer. However,
respective code branch was only executed when the OPEN message had any
options in it (e.g. non-MP capabilities such as AS4). This resulted in
no address family negotiated (and respectively no prefixes advertised)
for a peer that sent OPEN without options.

This change fixes this edge case by making the call to
bgp_open_option_parse() unconditional. The latter handles a zero-length
options block without a problem.
Implementa el player de video
DB Stuff, need to figure out how to make it load after the config.

Signed-off-by: Ollie <dzineit@live.co.uk>
First Commit
Merge branch 'master' of https://github.com/Rakito/shoppinglist
added number textures and did some documentation
added a simple navigation for channels and groups
changed 'function import_cscope_config()' to make it easy to read
added some models and such...
A index form validation up and running.
Add the CodeIgniter MX Modules directory. Closes GH-39.
bezig met attributentypes field, moet method getInput nog uitwerken, zie docs.joomla
Fix and test zone rules builder compare method (cherry-picking from commit b956dba2273949e471dc38216e6af7dca2e3c887)
Enhance performance test
Adding results from the method names survey that was posted to the community
Reorder methods within class
Start to implement non-standard field using new field approach
Merge remote-tracking branch 'origin/pirateplus'

Conflicts:
	src-standard/main/java/javax/time/extended/package.html
	src-standard/test/java/javax/time/AllTCK.java
	src-standard/test/java/javax/time/ClassLoaderTest.java
	src-standard/test/java/javax/time/Performance.java
	src-standard/test/java/javax/time/PerformanceZone.java
	src-standard/test/java/javax/time/TestFluentAPI.java
	src/main/java/javax/time/zone/ZoneRulesBuilder.java
Replaced ChronoDateField with DateTimeField/LocalDateTimeField
Changed getDayOfWeek to be enum DayOfWeek to be consistent across the API;  all weeks are 7 days
Fix javadoc link issues and references to DateTimeField in Usability
Merge branch 'piratecalobj-rr' of https://github.com/RogerRiggs/threeten into piratecalobj-rr
Added images that can help with the app mock up.
remove unnecessary quote
[WIP] The comment parses great now, but ...

... it still needs more refinement! I'm still not really happy with it.
Sankore-861 Only standard created annotations change their color
Loading image added.