labofsahil/github-event-dataset-2012 huggingface dataset:
Make code statistics rake task handle new test locations properly

As of 2a68f68aead9fd65ecac8062ca8efc15f5bab418:

- Unit tests are now in test/models, instead of test/units
- Functional tests are now in test/controllers, instead of
  test/functional
- Helper tests are now in test/helpers, instead of test/units/helpers
- Mailer tests are now in test/mailers, instead of test/functional

Update the rake task for code statistics (`rake stats`) so that it
recognizes files in the above locations as tests, and accurately
calculates statistics such as "Test LOC" and "Code to Test Ratio."
Safely handle Rails apps that still have tests in the old locations.
Merge pull request #8466 from gclag/stats-handle-new-test-locations

Make rake task for code statistics handle new test locations properly
html_escape should escape single quotes

https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
Closes #7215

Conflicts:
	actionpack/test/controller/new_base/render_template_test.rb
	actionpack/test/template/asset_tag_helper_test.rb
	actionpack/test/template/erb_util_test.rb
	actionpack/test/template/javascript_helper_test.rb
	actionpack/test/template/template_test.rb
	activesupport/lib/active_support/core_ext/string/output_safety.rb
	activesupport/test/core_ext/string_ext_test.rb
	railties/test/application/assets_test.rb
learn ActiveRecord::QueryMethods#order work with hash arguments
Merge pull request #7765 from insside/clever-order

learn ActiveReccord::Querying#order work with hash arguments
Add missing CHANGELOG entry
Remove obfuscation support from mail_to helper

Removes support for :encode, :replace_at, and :replace_dot
options from the mail_to helper. Support for these options
has been extracted to the 'actionview-encoded_mail_to' gem.
Merge pull request #8523 from reednj77/remove-mail-to-encoding

Remove obfuscation support from mail_to helper
Update actionpack/CHANGELOG.md
Make the CHANGELOG consistent [ci skip]
Test for has_many bug on unsaved records

See issue #7950.
Remove AS::Concern extension from Testing::TaggedLogging
master branch
change on test
fixed a issue
fixed a issue
change on test
Merge branch 'test'

Conflicts:
	index.html
NodeJS trial
NodeJS trial
Test si ~/bin existe acvant de l'ajouter au path
Ajout fonction hosts
Ajout option pour passer d'une page a une autre
metodo gethashcode
fix postfix rb
Screwed up on virtual function definitions.

Signed-off-by: Peter Reiher <reiher@inktank.com>
mathsrv example accepts cap as arg
IV mandatory on CFB
preparing evloop renaming
evloop renaming / moving
pyevloop -> evloop
pwrtls has a new home
java changes pending for months
Fixes collision on temporary file name.

Fixes #51 by changing the test to use a temporary file name generated my mktemp(1) in order to avoid collisions with other invocations of the test plan.
Substitutes and alias for the rerun helper function.

Fixes #50 by replaces the rerun helper function with an alias since the former caused the test to fail on CentOS 5.
(Reverted pull #681) detection of one-to-one relations
(Fixes issue #690) added sender name and proper headers for UTF8 e-mail seding to SiteController->actionContact()
Merge pull request #735 from mdomba/690-mail-name-utf8

(Fixes issue #690) added sender name and proper headers for UTF8 e-mail sending
(Fixes issue #634) added missing return statement
(Fixes issue #238) prevent selecting empty row if there is no data in CGridView
Merge pull request #737 from mdomba/238-CGridView-empty-row

(Fixes issue #238) prevent selecting empty row if there is no data in CGridView
CGridView, only rows inside tbody should have hover effect
Merge branch 'master' of git://github.com/yiisoft/yii into fixes-666

Conflicts:
	CHANGELOG
Работа над видами
Работа над видами
Работа над видами
Merge branch 'master' of https://github.com/retuam/pnlx.git
three pulse
use the display title on the show build screen
Se crearan usuarios normales
Wrong number of arguments - fixed
Use GMT instead of local time
Авто и мото -> Коммерческий транспорт -> Грузовые прицепы - правильный тип прицепа
Возвращаем HEADLESS
Building - Materials - Lumber
updates for libvirt and network to port to osops_utils
同梱のjQueryをバージョン1.7.1に
Remove webfont, which slows down loading
Added Attendee exception
new [SA]ASSIGNOP OPf_SPECIAL verwrites readonly pads at first init of const vars

The optree is generated with sassign and aassign to set (=initialize) const variables.
The first such ASSIGNOP gets OPf_SPECIAL to overwrite left readonly pads. readonly pads
are free to be checked and optimized this way in early compiler passes, as well as in
further ck and peep passes.
regen_perly.pl: support latest bison-2.5.1

bison-2.5.1 adds less superfluous semicolons at the end of action blocks,
but works fine.
perly regenerated with latest bison-2.5.1 (optional)

bison-2.5.1 adds less superfluous semicolons at the end of action blocks,
but works fine.
merge changed generated perly files
Remove old Janus remnant
use gt alias in readme so it's a little clearer
Changed font (and antialiasing) for Adobe's awesome Source Code Pro font
Ditched SuperTab plugin (For proper use of neocomplcache)
NeoComplCache configuration
vimrc cleanup
Submodules updated to the latest versions
new directories, added 1st task in 3rd sem
Started rendering system

-Started work on SDL2D rendering system
-Rebuilt SDL libs on revision 6674
-Added some additional convenience methods to String
-Added Color class
-Fixed toggleFullscreen issues (would no longer render)
Workaround for "package is not a value".

Not actually a fix, but when we see a package where a module is
expected, it's not a great stretch to try the package object.
References SI-5604.
Correct whitespace in `ASMTransformer.java`.

Let's stick to 2 spaces for indentation (and no tabs).
Set `canRetransform` flag to `false` in instrumentation.

We do not need to retransform classes once they are loaded.
All instrumentation byte-code is pushed at loading time.

This fixes a problem with Java 7 that was failing to add
a transformer because we did not declare retransformation
capability in `MANIFEST.MF` file in Java agent jar.
Java 6 allowed to add transformer due to a bug.
Do not recompute stack frames when instrumenting bytecode.

It turns out that we do not need to do that. See comment in
`ProfilerVisitor.java`. Also, since recomputing stack frame
map was the only reason we needed to implement
`getCommonSuperClass` we can now remove its implementation
that was causing problems on Java 7 due to a cyclic dependency
involving class loader because we would try to load a class
we are currently transforming and transformer is triggered just
before classloading.

//cc @namin who worked on this code with me.
Merge pull request #1605 from gkossakowski/fix-instrumentation-java7

Fix instrumentation tests for Java 7
fixes a typo in macro classloaders

Primary should be here, because a test a few lines up checks whether
primary != "". Hence usage of fallback here is just a typo.

Primary and fallback classpaths were designed for situations when library
classpath are not enough (e.g. for bootstrapping libraries that don't get
onto tool classpaths). Originally I planned to use them to bootstrap
scala-library, however, there's always a starr/locker on a tool classpath,
so we don't need special treatment of this case. After I realized that, I
decided to keep advanced classpath switches, because others might not be as
lucky as we are.
Merge pull request #926 from scalamacros/topic/macro-classpaths

fixes a typo in macro classloaders
BUG: fix call syntax for qr in optimize.nonlin (ticket #1682)
RF: fix for squeezing 0d scalars from ticket 1230

With test.
Merge pull request #252 from matthew-brett/fix-1230

RF: fix for squeezing 0d scalars from ticket 1230
add a todo item
update readme
add todo items
Update TeamMaker/src/project/Start.java
Bump Gallery version for Loader.
Build Loader.
Merge remote-tracking branch 'sdesai/master'
Normalizing php vars for IO tests
Merge branch 'master' into build
Added IO tests (php based for now) to both unit and coverage lists
Merge branch 'master' into build
Removed IO from grover tests on Travis
Merge branch 'master' into build
The example test infrastructure now adds a poll method to Test.Case.prototype.

The method is only added by the example test infrastructure's test-runner.js
impl for now (that is, it's not part of the YUI test module), but it could
be moved to YUI test, with a little more effort to have it integrate more
tightly with wait/resume states and timeouts.

For now, if you're writing example tests, you can use it as follows:

    'my blackbox test which needs to poll' : function() {

       var interval = 10,
           timeout = 10000,
           condition = function() {
             // Return a truthy/falsey result.

             // For example:
             // return Y.one("#waitForMe") !== null
           },
           success = function() {
             Y.Assert.areEqual("StuffYouWantToAssertOnceConditionIsMet", ...);
           },
           failure = function() {
             Y.Assert.fail("#waitForMe never showed up in " + timeout + "ms");
           };

       // failure is optional. Will default to "wait() without resume()" error
       this.poll(condition, interval, timeout, success, failure);

    }

It uses wait/resume under the hood. So poll() starts a  wait(), and we pass
the success/failure callbacks to a resume().

See src/intl/docs/assets/intl-basic-tests.js for usage.
Updated sdsinfo script for substring matching

- Shifted to heroku config for the spreadsheet url
Add map-debug case
Fix iframe src bug in IE. close #450
use Buffer to concat chunck
typo fix
Fix a bug for multi load a same non-module file. fix #247
Improve circular calling detection in compiling
Make the total count of test cases is same in all browsers
Merge branch 'master' of github.com:seajs/seajs
Update the issue number
Change to sea.js
Tweak runtime test case
Improve the loader path deriving in combo case
Add no-request test case
Ordered all headers

The order is: same plugin, other plugins, RayPlatform, system
libraries.

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
Updated copyrights

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
Blatt 5: Lösung für Aufgabe 2, Blatt 6: ISIS-Material, Blätter 1-6: UNITUS-Material
intelligent activation of cofee-cos-mode
fix indentation of java annotations
Merge pull request #121 from fred-o/master

Minor fixes
allow the :converter Proc form composed_of to return nil

This makes it possible to filter invalid input values before they are passed
into the value-object (like empty strings). This behaviour is only relevant
if the :allow_nil options is set to true. Otherwise you will get
the resulting NoMethodError.
Critical cpu spike fix with CPU team roster

- Fixed data fetcher to retry a url attempt w/15 second delays on 500s.
The retry is untested as of yet however since the server is not failing
anymore during the subsequent testings.

- Did an HTML decoding on the team names for display purposes to look
nicer. This might cause problems later on where team name matching
might take place. Look for these and know it is linked to this change.

- Changed some regex around to be substring calls and splits. I was
trying to track down a cpu spike and this made it much more efficient
to do so. No reason to move it back into a pure regex setup anymore as
well. Makes the overall team roster parsing quicker and less resources.
Initial workings on the UI
Switched from lwrest to inigma-shared library.

Was better to use an infrastructure built around spring then a purely
homegrown one. Plus with automated deployments and such, the 5000% size
reduction didn't matter :)
Attempting to Save Statistics

Held up with the need for custom converters in order to store a complex
key structure.
Properly updates and stores data into mongo.

Many complex changes made but now everything works as before and it now
saves some weekly statistics to the system as well.
be able to pass additional context to the _edit_question view

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1254 0cfe37f9-358a-4d5e-be75-b63607b5c754
Site updated at 2012-10-27 00:05:51 UTC
重新整理 这个经典滑窗的文件夹结构. 归纳出3个版本
deleting cache files
Merge remote-tracking branch 'origin/master'
fix copyright
gh-orgs.el and associated tests
fix test

org's id is really an int...
reformatted version number text
Don't enforce schema rules for now
Fixed migrations. Now we can migrate up db without any prepopulated DATA.
Adding example config files
Initial bundler support
added all the initial files.
added a gitignore to not checkin build.
Encode Option conversions into the AST and remove deprecated methods.

The Option-related methods which are still supported after 1.0 are
encoded in the new OptionApply and GetOrElse node types. The new
liftClientOps compiler phase lifts them to the outer (client-side)
layer if possible.
Update to code block
Merge pull request #1100 from softark/docs-ja

[docs][blog][ja] translation revised
[ci skip]
can now compile the vision system, and run it, it has some trouble using my laptops camera though, but it works on the RSD system seperately, so not too worried.
class methods
class method / instance method
[api] Add product properties as child of Products

Merges #1568
Specify :group => :all so that spree.assets.precompile runs even when initialize_on_precompile is false

Improved formatting: the line was way too long and now we don't need quotes or commas

Merges #1576

No need for add_assets_to_precompile_list method in Core::Engine now
Use _url to disregard asset host for states.js.

Fixes #2113
Remove doubly-defined gateway_options from Payment::Processing
Manage currency whose subunit is not 100 (like JPY)

[Fixes #2030]
slight regrouping of functions.
Implemented all outstanding python functions.  Some names changes to be the same as C++.
Setting up Spring and Spring Data Neo4j
add markdown to requirements
add single pages, editable from admin (for ex. 'about' page)
forget to delete odd app
Now using Twitter Bootstrap as a basis for web-interface.
Added static directory to servers application.
add presence and length validations to account model
add i18n global initializer and set default local to en
update account labels and add en translations
fully qualify account association in lsw model

add account collection select to new lswlog form
Merge branch 'feature/model_associations' into develop
corrected email body for invites
moar fixes
merge
Version 18.2.3
Increment setup.py to 0.2 now the panda is KO'ed
Merge branch 'staging' of https://github.com/sunpy/sunpy into staging
Nur Vortragstitel speichern und diesen löschbar gemacht
Limit download threads. Fixes #83
Add minimum-possible taginfo powered help.
map items
move libs
Change bootstrap test procedure
vim was mover to its own repo
- added videos
Identification admin fonctionnelle
Identification admin fonctionnelle
wait for external processes to finish, then check exit status
Removing the podspecs dir
Add support for multiple configurations
fix forms function and simple demo.
fix forms
ALSA: Remove the last mention of SNDRV_MAIN_OBJECT_FILE

SNDRV_MAIN_OBJECT_FILE hasn't done anything since the pre-git days, and
the only remaining reference occurs as a #define in sound/last.c.  Drop
that last mention of it.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
ALSA: fix possible memory leak in snd_mixer_oss_build_input()

uinfo has been allocated in this function and should be
freed before leaving from the error handling cases.

spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
ALSA: USB: Support for (original) Xbox Communicator

Added support for Xbox Communicator to USB quirks.

Signed-off-by: Marko Friedemann <mfr@bmx-chemnitz.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'for-next'
ALSA: hda - Always call standard unsolicited event for Realtek codecs

With the model parsers out of the way, we have no custom unsol
events to worry about, we can therefore simplify the code.

In addition, this fixes a bug on the ASUS TC710, which has only
a headphone jack and a mic jack, but no internal mic or speakers.
Therefore the unsol_event pointer was not set, and as a result,
the jack kcontrols were not correctly updated.

BugLink: https://bugs.launchpad.net/bugs/1021192
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'topic/hda'
Ruby 1.8.7 support.

Fix project to support Ruby 1.8.7.
* Remove Dir.exists.
* Use ::Object instead of Object.
* Check is_a? Array.
* Other misc cleanup.
Fix Ubuntu 1.8.7 specific issues.
Fix ipaddress detection.
Updated IP address detection to add default
Merge pull request #43 from nanliu/tb/ruby187

Ruby 1.8.7 support.
Removed bluepill and redcarpet gems as Razor doesn't appear to use them
Merge pull request #47 from jamtur01/gemdeps

Removed bluepill and redcarpet gems as Razor doesn't appear to use them
Merge pull request #45 from puppetlabs/3ab5451bbd58d5740ca5f72647c48961e7d03fa8

Fixes IP default in config
Updated bin/razor to use optparse rather than manual option handling

It needs further refactoring to create a proper class structure for
bin/razor, initialize it properly and move most of the methods into the
library instead of in the binary.
Merge pull request #51 from jamtur01/optparse

Updated bin/razor to use optparse rather than manual option handling
Merge branch 'master' of github.com:puppetlabs/Razor

Conflicts:
	lib/project_razor/config/server.rb
adding mutt-1.4.2.3
adding ExtUtils-PkgConfig-1.12
adding gtkwave-3.2.3
update list
add procuring_entities page
gitmarks install
direct output
chmod +x
Incorporate node info into connectome.
Initial commit
Added tag list
Update README for 0.0.1
Merge branch 'release/0.0.1'
Merge branch 'release/0.0.1' into develop
Change DB for production
Update README for 0.0.2
Merge branch 'release/0.0.2'
Merge branch 'release/0.0.2' into develop
Added
Fixed Gemfile.lock
Merge branch 'release/0.0.3'
bugfix for Postgresql
Fixed tag cloud bug for postgresql
Merge branch 'release/0.0.5'

Conflicts:
	app/models/item.rb
fullscreen
Merge branch 'release/0.0.6'
Fixed fullscreen mode
Merge branch 'release/0.0.7'
add exe4j
cq stuff
Update per move to github
Set version to 2.3.3
Update URLs
Added a libclang transform module.
Added an SDL transform module.
Merge branch 'master' of https://github.com/tritao/cxxi
add screenrc
Merge branch 'testrc'
s/DGroup/Group; s/Group/_Group
FIX: improved docstring
FIX: JobsClient returning S_OK / S_ERROR objects
FIX: removed silly implementation
FIX: returned S_OK / S_ERROR, and refactored a bit 
FIX: refactored code, removing obsolete calls
FIX: totally refactored AccountingCacheCommands
FIX: new methods to get Resources and nodes ( empty now )
FIX: refactored ClientsCacheCommand
sts/entities: fix subtle bug that affects controller cleanup

when controller could not be started
procutils.popen_filtered: catch OSError, provide more descriptive error message
tweaked network shares

added the group id to display in the network shares
responsive layout undergoing
* Options: Fixed tooltip descriptions
* removed server side routing_t pointer from game imports
* added some comments to industrial.ump
* map [+industrial] added assembly that doesn´t show a UFO
* fixed long titles for the mission briefing window
* Hybrid missile should require alien launcher be researched (still not implemented)
* add Q_strcaseeq
* Ecplise: fix aircraft and craftitem
* clean up events.ufo
* Eclipse: fix tech validator
* rework up_chapters into single up_chapter

* this way makes more sense accrding to current game data structure
* Eclipse: fix the validator
Use generic line-line intersection to calculate hits to player wall
Don't move paddle if target is within its height
home typo start
Merge branch 'master' of github.com:ulfryk/typo

Conflicts:
	.project
	css/lib.less
	css/main.css
	css/main.less
	css/reset.less
	images/typo_bg.jpg
	index.php
	js/html5shiv.min.js
	js/jquery.min.js
	js/main.js
	js/main.js.php
slight js fix
fix
re-implemented http expect/continue
Fixed bug (blame Ilya)
Created DB in GDProfileViewController, inserting friend in GDSelectFriendViewController
Start dealing with escaping times, timezones.
[minor] old file
Nearly complete context tests.
Fix and add refresh test.
Don't stop on failure.
Transactions are working. However, we are dropping MyISAM support.
Lifting limit on composite primary key length.

Also adjusting the INSTALL file for current system.
mongovis: correctly account for all records crossing chunk boundary, better accounting of count and characteristic field
readded parameter only used in verify(), it makes for better separation of concerns
add an option to specify a string used to build a xenstore path

it can be used to avoid overwriting the existing "vnc-port" entry created
by qemu-dm for its embedded vnc server.
Added project data, changed some tables, added some minor copy
Documentation and Cleaning Up Project and Code
Improve printing of gshared methods in mono_print_method_from_ip ().
Use the non-gsharedvt call info to compute argument sizes.
Fix some failures on the mcs tests.
Disable gsharedvt for signatures with nullable types, some tests still fail.
Emit gsharedvt in/out trampolines normally and not as methods, since the latter doesn't work.
Retain type information in the element tree
Add interface for obtaining raw EBML elements
Matroska -> XML converter (first early revision)
fixup! Table of all Matroska EBML elements, not just some of them.
Filter out Gstreamer's trailing \0 in UTF-8 texts also
Handle more "top-level" element types.
Some work in progress on mkv2xml
Ability to read dates and floats
Factor reading simple EBML elements into procedure
More complete mkv2xml: should work in most cases
Implement banning of [useless] elements
Nicer names for unknown elements
More conditional filtering of elements.
s/ident/indent/; fix breaking Cluster on sub-elements
Rename mkv2xml.py to mkv2xml
Change comment about xml2mkv
Fix mkvuser.py for updated internal tree format
Special support for text subtitles (preserve them as text, not hexify)
Unpacking of 8-byte floats
Don't mess with newlines in subtitle blocks
Deleted js dir
Use the configured name method, not #name
Update Misc
Misc update
Populate index.
Do not blow up on a parse error for detecting dependencies, just keep going.
allow custom messages for most errors
Merge pull request #187 from bflyblue/master

Optional message for HTTP Errors
添加注释 修改物流表单 数据库创建
prepare stmt update
Adds image resizing with device size.
Move marginalia docs
Updated the feature so that Webmaster also had all of the permissions as the FAQ Admin.

Signed-off-by: Staris <Staris@69008.no-reply.drupal.org>
Had a system update to views so kept the changes incase it would be necessary has updates to modules happen.

Signed-off-by: Staris <Staris@69008.no-reply.drupal.org>
remove admin check to fix the tenant creation and bring checks in to user.mgt component

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@132057 a5903396-d722-0410-b921-86c7d4935375
instructions to enable CarbonDeploymentSchedulerExtenders

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@130601 a5903396-d722-0410-b921-86c7d4935375
Removed redundant modifiers, as pointed out by Sonar. 

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@124900 a5903396-d722-0410-b921-86c7d4935375
delete the swp files.
Ignore the vim temporary files.
more fun with rdflib
global parameters removed and check whether TO address has been configured
note about smtp configuration added
title fixed
save messages containing cookie value as XML
log whole message
work on back link started
make messages available via query string
message view added
XSLT added to generate XHTML
message XSLT started
message namespace added
show rest of message and provide link to user profile
note about back link base url added
back link base url configured
back link base URL made configurable
log message improved
filter disabled because there seems to be something still wrong
null pointer caught
logging improved
logging improved
logging improved
security lib updated
copyright year updated
license header added
commons lib updated
Merge branch 'target-env-realm'

Conflicts:
	src/core/java/org/wyona/yanel/core/map/RealmDefaultImpl.java
improved example
Merge branch 'master' of https://github.com/x3dom/x3dom
rename a class to specify its purpose
add access modifier
move autoloader to /main from /test

because the autoload.php is expected to be public, which all clients of
the Plater is required to use this.
fix invisible text in F17 by explicit font selection
make README a little more friendly
test
Merge branch 'master' of https://github.com/xavortm2/TP
Adds nvm as a submodule
Added base structure for modules
Added ignored var keyword at assignment
[maven-release-plugin] prepare release v3.3.2
[maven-release-plugin] prepare for next development iteration
第一版, 只有 init backup restore 三个命令
first version, only three commands init, backup and restore
do not call hwclock on s390
Created gh-pages branch via GitHub
Updating to yeoman/docs
Adding my initial take on the holding page
adding package management
Addressing input from paul and sindre
Merge branch 'gh-pages' of https://github.com/yeoman/docs
Adding integration with Google forms, validation and other tweaks.
Turn off debug in prod
Closes #51 Validate user input in newscan
render() should end the response
fix bug #44: [plugin]启动时崩溃
修复HookMgr线程锁问题。
fix: ./configure --without-cache --disable-cache --disable-debug CXXFLAGS="-Werror"
hint: ./configure --without-cache --disable-cache --disable-debug CXXFLAGS="-Wno-variadic-macros -Wno-unused-function -Wno-unused-but-set-variable -Wall -Weffc++ -Werror"
fix: err
front page changes
front change, added comment
Give possibility to set timezone_adjust default value global.
Merge remote-tracking branch 'phaidon/tzadjust' into 1.3
Fix travis build
Merge branch '1.3' into 1.4
Fixes issue #2: "undefined reference to `g_thread_init'"
add META file and install via ocamlfind (thanks to Gabriel Scherer)
committed .dia uml diagram (unfinished)
Freaky Tricks and Tweaks
Merge https://github.com/zvir/ZvrGUI

Conflicts:
	src/tgr.as
	src/zvr/zvrBehaviors/MultiTouchTransform.as
	src/zvr/zvrComps/zvrTool/ZvrTool.as
	src/zvr/zvrGUI/behaviors/ZvrTouchMouseBehavior.as
	src/zvr/zvrGUI/components/minimalDark/SliderMD.as
	src/zvr/zvrGUI/core/ZvrApplication.as
	src/zvr/zvrGUI/layouts/ZvrBitmapAutoSize.as
	src/zvr/zvrGUI/skins/base/ZvrBitmapSkin.as
	src/zvr/zvrGUI/skins/zvrMinimalDark/TouchMouseMDSkin.as
beta-1

第一次上传版本，为网站项目的基本架构
Working...
Damn templates...
sORRY
Added a lot of templates
Made some more class, made a temp array to hold data in the gui
0000914: Too large default distance between eyes for Stereo mode
0000916: Easy bug to fix (win installer)
Disable Placement editing for part design transformation features
0000910: Circles Extrude Only Surfaces
Updated with latest crowdin translations
0000907: Draft snap icons
0000901: Draft Edit mode
New Draft Snap toolbar

A new toolbar will now appear when using the Draft Snap system (can
be disabled in preferences) allowing to turn snaps on/off globally
or invidually
Fixed bug 625 in Draft importers
Return a NotImplemented exception when comparing Matrix or Vector with other types
Fixed bug 625 in Arch module too
Finished implementing RFE 510 - Arch Axes

Arch axes are now printable on a Drawing sheet with the Draft tool
Removed redundant LineStyle prop from Draft DrawingView objects

The printed linestyle now uses the linestyle of the source object
Added RFE 583 - remove coin3d image loading from Draft
Better icons for Draft Snap
Fix bug with identifying SWIG version
Normalize Line Endings [MAINTENINCE COMMIT, NO VERSION UPDATE]
add escenas backend
fixed enemy movement field
added animation to powerups

moved setup/init to own file
Added base64 to dependencies, created a better start script.
test tiradas validas
please work

screenhot
Pushing incompleted files
Add 'ask' to Clex small

because this word is in the AceWiki test set.
Improve README of ACE->OWL/SWRL
Add API Caching
A little cleanup
initial commit for git 101
use cdnjs in example.jquery.html
Allow moar attributes in ExtNetwork objects
update spec
Windows dll compiler
cleanup
Implemented the JagePen graphics tool, which provides easier methods for drawing with Canvas's 2D context.
gravel web template added
Added support for parenthesis.
Style changes.
tags restyled
trade with Greg
ลอก
ICBM!

14"9'
add ZooKeeper timeout parameter to consumer and producer
Merge pull request #18 from strongh/master

ZK timeout
Minor fixes to play and gamble
* Added FuzzyFinder & L9
Added FSSwitch
Add tentative support for Citizens2 to prevent removing NPC created as
monsters.
Found this in bunch of older files, not sure if useful.
Method for measuring password strength added.
Still tracking down a serial bug
Add Player class. Start adding collision detection and delay to player object
dior scroll text does not auto shrink anymore
Move kernel_symbol function to .zshrc
Change tmux's initialization
Fix stderr redirection with zathura
tweaked instructor order
Replaced PNG code with Xenos code. Code compiles, graphics need to be tested.
Client side HUGE optimisation through index.php template
update
Merge branch 'auto-batch' of github.com:JHUISI/charm into auto-batch
more for charm -> .bv
Adds temporary field builder helper
Automatically login administrator user after installation
Followers for 2012-12-23 08:00:11 +0100
updated .gitignore to bump log files; updated node version in package.json; set port to 1337 in server.js; fixed hardcoded port in url in test-server.js
Importing the second iteration of my CV but this time with the Node.js generator and LESS.
Merge branch 'master' of github.com:Jmaharman/CV
After creating the GitHub repo I've done a pull and prepared to push everything
rename Locale-class
improved axis for country graph
Added palette.pl
Changed mvn repo to the public group
!MIGRATE! Teams BackEnd
- Teams tables on DB
- Teams controller
- Team model
- Team list frontend (rough)
- Team view frontend (rough)
- Match list fix
- Matches invite owner grammer fix
- Matches permissions fix (auth on edit)

Signed-off-by: Ed Hanton <edh649@gmail.com>
New mobile menu, RSS links, compressed css a bit
[osx] - sync xcode project
[fix] - correcting the usage of std::string when handling device names
demo finetuning, movement of rabbit adjusted.
wheels of the tractor are spinning.
fixed #169: moving output files instead of copying them
Merge remote-tracking branch 'origin/master' into master-publish
Fix help and add subcommands.
default to use use 127.0.0.1 instead of localhost for mongo [issue #1]
Fix kill_obsolete flag for deploy, broken by earlier commit.
Add goroutine functionality to GetAttribute.
Replace valueChan channel with variable.
Add goroutines for GetTermcapName
Add README, LICENSE, TODO and copyright notice.
Lighting complete
Use more fine grained HAVE macros instead of HAVE_PROCFS.
Fast memory test on Redis crash.
Make bio.c threads killable ASAP if needed.

We use this new bio.c feature in order to stop our I/O threads if there
is a memory test to do on crash. In this case we don't want anything
else than the main thread to run, otherwise the other threads may mess
with the heap and the memory test will report a false positive.
Safer handling of MULTI/EXEC on errors.

After the transcation starts with a MULIT, the previous behavior was to
return an error on problems such as maxmemory limit reached. But still
to execute the transaction with the subset of queued commands on EXEC.

While it is true that the client was able to check for errors
distinguish QUEUED by an error reply, MULTI/EXEC in most client
implementations uses pipelining for speed, so all the commands and EXEC
are sent without caring about replies.

With this change:

1) EXEC fails if at least one command was not queued because of an
error. The EXECABORT error is used.
2) A generic error is always reported on EXEC.
3) The client DISCARDs the MULTI state after a failed EXEC, otherwise
pipelining multiple transactions would be basically impossible:
After a failed EXEC the next transaction would be simply queued as
the tail of the previous transaction.
Test: MULTI/EXEC tests moved into multi.tcl.
Test: make sure EXEC fails after previous transaction errors.
Test: MULTI state is cleared after EXECABORT error.
Fix integer overflow in zunionInterGenericCommand().

This fixes issue #761.
EVALSHA is now case insensitive.

EVALSHA used to crash if the SHA1 was not lowercase (Issue #783).
Fixed using a case insensitive dictionary type for the sha -> script
map used for replication of scripts.
Removed TODOs. #69
VK Like only in domain serelex.it-claim.ru #13
Companies and Services view
Autoload items on frontpage fix
Invitations controller coding fix
Hide notice when not logged, limit movies index json
More activities feed refinements
Implemented thread detection/link
Pre-F31 merge
Closed #31 - Implemented images/processes/threads

Conflicts:
	noCheat/noCheatDriverV2/mj_device_control.cpp
첨부파일을 응답에서 가지고 오는 버그수정.
Correctif sur le nom de salle affiché.
Correctif: Ré-initialisation des dates de clotures de périodes de notes lors de l'initialisation.
Correctif sur la modification du mode d'accès resp aux appréciations.
Merge branch 'release-1.6.0' into release-1.6.1

Conflicts:
	gestion/param_gen.php
Correctif js.
Merge branch 'release-1.6.0' into release-1.6.1

Conflicts:
	gestion/param_gen.php
Merge branch 'release-1.6.1'

Conflicts:
	gestion/changement_d_annee.php
Modification de variables.
Retouche de présentation des notes de bas de page.
Correction d'un bug d'affichage.
Correctif: On ne propose pas certains choix aux CPE.
Merge branch 'release-1.6.0' into release-1.6.1
Merge branch 'release-1.6.1'
Possibilité de réinitialiser les mots de passe resp en compte scolarité.
Correctif sur le test accès cpe aux fiches élèves.
Ajout d'un lien vers les fiches élèves
Dernières modifs en date.
Possibilité de mettre en observation, réinitialiser le cumul, réinitialiser le mot de passe (avec ouverture dans un autre onglet).
Ajout de tests pour détecter un pb avec suhosin
Ajout de précautions pour l'accès aux choix sensibles 'Effacer la base' et 'Données de test'.
made a windows zip
length for title
forEveryPair and forEveryPairD
Avancement du reseau + apparition d'un bug
removed data selector from futures page
Update: Resolve the conflictions

Signed-off-by: ayamada <ayamada0614@yahoo.co.jp>
Skulk movement
dffdsdf
Merge remote-tracking branch 'origin/master'
Changes to the format of the duration sent to removeLong. Numerous small changes.
Fix endless loop logic in `salt.payload.SQRE.send()`
`test_issue_2731_masterless()` should clean-up after.
Merge pull request #2813 from s0undt3ch/develop

`test_issue_2731_masterless()` should clean-up after.
Deal with tuples and dicts appropriately.
remove deprecated output flags
Merge pull request #2814 from UtahDave/develop

Deal with tuples and dicts appropriately. Fixes #2657
esimine commit
esimene commit 14:55
tegin midagi vähe
ok
implemented adding tasks
Добавил UPushAuth как провадйера UOAuth
Sinking Data to Pail working.
Add deets on uconv for BOM.
show/hide new features with new 'advanced' options
If router error, return callback function with error code.
Model system
Loading model into controller
Don't need to check file exists for remove
Added ieprob
Mixed line endings
Delteted som shit
Backend changes & some templates' translation
Commented collision detection better
Made level 101 more playable

Added some comments to the provided user code and changed the
default cursor location to below the "/* Insert your ... */"
Made level 100 more playable

Added some comments to the user provided code and changed the help
text. Changed the default cursor position to within the main().
Prettify size in bytes
Sea actualiza codigo
Se agrega llamada al archivo includes/data.ini.php y se agregan variables para el uso de las llave publica/privada de recaptcha.
Update omniauth github config
Restart omniauth-github setup without devise
Add expires_in value to test cache expiration
Logging: use obvious exc_info= syntax

As per the documentation, logging exc_info just needs to evaluate to
True. This change makes it obvious that the passed in value is not
actually used in any other way
Full exception logging for basic connection failures
Provide full headers & response to logging handlers

This allows handlers such as Raven / Sentry to do something smart
with the full HTTP headers and/or response body. Among other things
this should provide more insight in situations when pysolr currently
logs "Response: None"
Fall back to HTML title when scraping error messages

Solr 3.6 + Jetty is not reliably detected by the existing approach but it does
return a reasonably useful message in the title which is a lot more informative
than "None"
Updated back to use TEST checkout facilities 3
Merge pull request #226 from adminnu/master

Ошибки
в модуль feedback добавлено поле phone + правки установщика #227
Merge branch 'master' of github.com:yupe/yupe
bin/psu: remove some awking trickery
quick fix to ensure that name of the user is displayed correctly
Merge pull request #25 from ajy/hotfix_css_username

quick fix to ensure that name of the user is displayed correctly
Merge branch 'master' of https://github.com/Arun-UB/Readless into refactor
Update cont1.php
fax: bug en mailman con @campaign
Fixed missing line before list
Main updates and p3 proposal
removed all prev files
user registration html
Revert "user registration html"

This reverts commit 8e3a5558b577a357b63fccb8ce962dd0ca9222df.
start of login module
data-api little improvement
fix style
login_action2 added again
Display loan count in loan alerts listing
Update loan alerts to 60 week days.

Does not support public holidays.
Display full loan alert description
Do not auto-remove lender demand legacy loans
Update not closed loan alerts / auto removal

EFG loans in a state of incomplete -> offered are
not included in not closed loans as not progressed
covers this
Change not closed guaranteed start date to 3 months
Change comments from 183 days to 6 months
Not drawn loan alert date comment
Allow for merging of loan alert groups with different lengths
Merge branch 'master' into loan_alerts_working_days

Conflicts:
	spec/requests/dashboard_spec.rb
Allow for long business names.
Zebras‽
More explicit.
Merge branch 'allow-long-business-names-in-information-declaration'
Use data attributes.
Ensure forms can't be submitted more than once (when JavaScript is enabled that is).
Merge branch 'prevent-double-submitting'
Do not show breadcrumbs when printing
Merge branch 'loan_alerts_working_days'
Add Google Analytics tracking code for preview and production environments.
Add Site Speed tracking.
Use Plek to detect preview environment
Merge pull request #36 from alphagov/google-analytics

Add Google Analytics tracking code for preview and production environments
Sort jobs
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/schedule.rb
fixed index.php
added pagination
modified sorting functionality (no longer using javascript)
Check if object data it's Array to use or not obsolete to_a function
- Moved export->image to File menu
- Add feature font zoom.
- Added View to menu.
Hopefully fixed the coloring of degenerate lines.
reserve update
Ship combat

Start of ship combat
Simplify getReachableTarget
working towards b3
fail option on predicates work.
Lexer uses strictly-ordered alternatives within a rule. Simplifies code, increases performance when non-terminal (lexer rules) depth is limited, and actually fixes non-greedy behavior
Simplify FailedPredicateException constructors, encapsulate fields
Encapsulate fields in NoViableAltException and LexerNoViableAltException
Remove redundant casts, encapsulate fields in RecognitionException
Create a new ParseCancellationException for BailErrorStrategy. Derived from RuntimeException so existing handlers will still work.
Update pom.xml
Merge branch 'get-reachable-target' of git://github.com/sharwell/antlr4
Merge branch 'ordered-configs' of git://github.com/sharwell/antlr4
Merge branch 'parsecancellationexception' of git://github.com/sharwell/antlr4
Merge branch 'maven-update' of git://github.com/sharwell/antlr4
Merge branch 'encapsulation' of git://github.com/sharwell/antlr4
Add regression test for antlr/antlr4#6 (NullPointerException in getMissingSymbol)
Add regression test for antlr/antlr4#19 (getter for context is not a list when it should be)
CIRCULAR_DEPENDENCY error number changed to 200 to make room for expanding the set of grammar errors
Add unit test for antlr/antlr4#25 (currently fails because the underlying problem hasn't been fixed)
Add regression test for antlr/antlr4#26 (an exception upon simple rule with double recursion in an alternative)
Add non-greedy quantifier syntax: greedy forms are *, +, ?, and non-greedy forms are *?, +?, ??

"greedy" is no longer a block option, and all loops are greedy unless the non-greedy quantifier is explicitly used
Add warning 131 when .* is used, because they probably intended to use the non-greedy form .*?
* hash() encapsulates path hashing.
* mkdir is now recursive.
* mkdir sets permission instead of chmod.
* indent fixed.
* control flow logic consolidation.
* BC for hash().
* docblock
* copyDirectory creates dstDir recursively.
* recursive dst creation at copyDirectory.
* dir access mode is set by chmod, again (note: if dst is created recursively, then only last dir will have newDirMode access).
* CSC
- umask removed.
- @ silence operator removed.
* CHANGELOG updated
Merge branch 'CFileHelper_recursive_copy_fix' of git://github.com/innsand/yii into innsand-CFileHelper_recursive_copy_fix
+ CFileHelperTest
* newDirMode correctly setted on recursive creation of dst dir.
Merge remote-tracking branch 'upstream/master' into asset_manager_hash_refactoring

Conflicts:
	CHANGELOG
	framework/web/CAssetManager.php
Merge remote-tracking branch 'upstream/master' into CFileHelper_recursive_copy_fix

Conflicts:
	tests/framework/utils/CFileHelperTest.php
Fix issue #162, eventhandlers attached twice

when enabling a behavior after attach, eventhandlers got attached twice.
issue #162
added assertations about CBehavior::$enabled

issue #162
Updated spanish messages (messages/es)
Updated zii spanish messages (messages/es)
Finnish translation of Yii.
Merge branch 'master' of git://github.com/yiisoft/yii into messages_fi
HEAPS OF WIN!
Architecture spec saved from Gdocs.
[maven-release-plugin] prepare release org.apache.sling.jcr.resource-2.2.2

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1422263 13f79535-47bb-0310-9956-ffa450edef68
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1422265 13f79535-47bb-0310-9956-ffa450edef68
Reduced memory allocations and copying count during base64 encoding/decoding
 and string narrowing/widening.
.up is different now, so WrapUp.toString() isn't correct anymore, so is removed
34374837843
34374837843
Merge branch 'master' of github.com:arkson/tesis
Most functionality done.  Moving on to tests after this.
Minor comment changes.
Changed listener generation style
Cambiado el estilo de generación de listeners. Agregado un listener para crear una Task en base a un TaskPanel vacio
Creado un dialog para crear tasks
Agregado el método parseHour para obtener una Hour a partir de una String
Modificada la interfaz de ScheduleUI para agregar un método que agrega nuevas tasks. Implementado el nuevo método de la interfaz en el DailyScheduleUI
Change chart colour
Ignore generated .css files
xdba

xdba
updated atom vendors
通信测试
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/test/game/packages/packs/LoginPackageTest.java
[ticket/11043] Allow call_hook() to be called from more than one location.

Allow the helper function call_hook() of class phpbb_template to be called
from more than once location and thus for more than one hook (although there is
only one) by adding the method name as a parameter.

PHPBB3-11043
[ticket/11043] Change hook name back to display, since that's where we hook in.

PHPBB3-11043
[ticket/11265] Add assertions for board installation success.

PHPBB3-11265
Merge remote-tracking branch 'p/ticket/11265' into develop-olympus

* p/ticket/11265:
  [ticket/11265] Add assertions for board installation success.
dispersion improvements
Fixed lsqnonneg: if fails, returns pseudo-inverse with neg components set to zero. Special case when only 1 transcript in a gene
Merge branch 'master' of github.com:bbcf/bbcflib
adapt to new sqlite field names
Allow negating bool cli options by using '--no-foo' or '--nofoo'
Set CLI option type to 'string' for all options allowing ratio inputs
Merge pull request #463 from henrikbrixandersen/negatable-options

Allow negating bool cli options by using '--no-foo' or '--nofoo'
- Add Slic3r::Config::get_raw() for getting the raw, uncalculated values.
- Use get_raw() for saving and displaying options in GUI
Merge pull request #467 from henrikbrixandersen/ratio-options

Two small ratio option improvements/bug fixes
polling data.
Added execute() utility function.
Merge branch 'semantics' of https://github.com/benruijl/spl into semantics
Panners
Merge branch 'develop'

* develop:
  added connectionsformview to handle forms
  had to move file, handlebars compiler on windows doesnt recursively search
  Added empty pubsub.js and added mediator functionality proxyall
  added proper form
  added demo models to server side code
  temporarily expose jquery $ to global scope for testing
  made save button color to match kendo ui default orange
  removed jqueryui from require paths
Merge branch 'develop'

* develop:
  fixed wrong namespace
added pubsub to refs
Merge branch 'master' into develop

* master:
  added pubsub to refs
added compiled custom.css
updated app.build.js
using main-build file
added new refs to csproj
removed less dev compiler
Revert "docs love: make generate_meta"

This reverts commit 2f02e1a8516c8ebc1c9a5beb6f0607d956e4f3f1.
Revert "docs love: attachment_prefix added"

This reverts commit 530e873b4b7ad8ada618e4b4166a25907424997a.
docs love: attachment_prefix added
Change window size parameters to accept and return uint values
Remoe wrong symbolic link
Remove log examples from this repo.
Remove deprecated tests.
Delegate Tuple() and Relation() calls properly.
Engine::Compiler.new has no args
removed close links (from bootstrap)
add @Documented annotations to bnd package/class annotations so they will show up in javadoc
Merge pull request #214 from djencks/doc-anno

add @Documented annotations to bnd package/class annotations
grammar label_ipatt fix
fix
add forall antiquotation support
Ekran logowania i rejestracji użytkownika + template
vga: disable default VGA if appropriate -device is used

This is a partial revert of commits a369da5 (vga: improve VGA logic,
committed 2012-01-22) and c5bd4f3 (vga: fix -nodefaults -device VGA,
2012-01-24) which broke command-line option parsing in different ways.

Since commit a369da5 it has become impossible to specify a VGA device
entirely with QemuOpts-enabled options, i.e. without needing an explicit
"-vga none".

In addition, until commit c5bd4f3 -nodefaults would not disable the device
you specified with the legacy "-vga" option, independent of the order.
Since commit c5bd4f3 QEMU -nodefaults will override a previous -vga
option.

I did not reintroduce machine->no_vga.  Boards can simply ignore the
vga_interface_type variable, and most will indeed do so.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Add Emacs Base Config
new version package

Signed-off-by: Vito Utro <vito.utro@gmail.com>
active progressbar
Allow install.sh for node with only .node_version
Add a NO_WARP mode for node client
Modifes Z.ArrayController to invoke the compareFn and filterFn in the
context of the array controller.
Änderung über Friedrich
Merge branch 'Freiedrich'

Conflicts:
	foobar.md
Process object synchronisation.
SwingTerminal shutdown initialization implemented.
Mkdir implemented.
Added all current files from previous project folder /TAPP.
Stream response if the content is not textual
Fixup previous commit
Changes
custom files should be loaded after everything so that we can override anything in the custom files
安装过程中加入单位框体样式设置.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>