labofsahil/github-event-dataset-2012 huggingface dataset:
Address an error for test_has_many_through_polymorphic_has_one
with Oracle for the 3-0-stable branch
Merge pull request #5655 from yahonda/address_ora_00918_with_oracle_for_3_0

Address an error for test_has_many_through_polymorphic_has_one with Oracle
eliminating a branch we do not need. thanks @jeremy
remove extra new line from generated Gemfile
Merge pull request #5846 from nashby/patch-1

remove extra new line from generated Gemfile
Modifying the Index.php file
Maintain a result count in the Quote class, accessible via $quote->count after running a query
Terrible mess.
Remove data files.
Script for getting ENSEMBL gene xrefs, protein domains, etc.
Added filterBed.pl script.
add +/- sur position
~~~~ wrong~
transfomation
Merge branch 'master' of github.com:rht/jlab12s
fixed param typo
Merge pull request #1 from marc303/patch-1

fixed param typo
Create URL objects
Added event view filters in event admin view
implement data statement

Fixes #1
Make Firefox 16 the default.
fix step1b bugs
Недвижимость -> Коммерческая. Продажа -> Офисы
Полная проверка параметров в полнотекстовом поиске
producer and consumer threads implemented
test-program finished (but not ported to windows yet)
Adding First File :: test.cpp
added an attend button/decline button.
Filled in method addProperty for VenueDao.
发现直接扎到源码上，实现想要的内容，同时又要那种知道整个流程的感觉，目前有点难实现，决定跟着hello world进行
filelist2content: Fix serious bug in symlink handling

Use image directory files to get symlinkdestination via readlink
and not the fiules currently installe din the system.

all CONTENT files generated so far containing symlinks are broken.

8(
filelist2content: Die on unknown option

Change

filelist2content --help
stat: cannot stat `Usage:': No such file or directory
stat: cannot stat `cat': No such file or directory
stat: cannot stat `[OPTION]...': No such file or directory
stat: cannot stat `[FILE]...': No such file or directory
**ERROR** stat failed

to

filelist2content --help
filelist2content: unrecognized option '--help'.
**ERROR** beegetopt failed
Fixes found by Igor Hrazdil.
Added filesystem controls. Did some minor cleanup.
clean up directories.cpp a bit

git-svn-id: https://svn.salilab.org/imp/trunk@15362 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Remove unnecessary code.


git-svn-id: https://svn.salilab.org/imp/trunk@15363 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Remove broken test of IMP.em functionality that duplicates a (working) test
in IMP.em anyway.


git-svn-id: https://svn.salilab.org/imp/trunk@15364 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Remaining test runs quite quickly, so no need to mark as expensive.


git-svn-id: https://svn.salilab.org/imp/trunk@15365 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Fix spelling.


git-svn-id: https://svn.salilab.org/imp/trunk@15367 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Fix compiler signed/unsigned warnings.


git-svn-id: https://svn.salilab.org/imp/trunk@15371 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Don't bundle Protobuf on 32-bit builds.


git-svn-id: https://svn.salilab.org/imp/trunk@15375 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Only check if we have protobuf support.


git-svn-id: https://svn.salilab.org/imp/trunk@15376 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
fix off by one error in MinimRestraintScoreSubsetFilter.

git-svn-id: https://svn.salilab.org/imp/trunk@15377 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Fix typos.


git-svn-id: https://svn.salilab.org/imp/trunk@15379 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Fix typos.


git-svn-id: https://svn.salilab.org/imp/trunk@15380 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
make newer version of boost/clang++ happy

git-svn-id: https://svn.salilab.org/imp/trunk@15381 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
test commit new file on new branch
Merge remote-tracking branch 'kenny/is_this_a_new_branch'
Test case closes SI-5165.

Also fixed by annotation/enum commit.
Remove BoxingConversions from the scala package.

And add it to two test cases that rely on it.

It is a remnant of the now-removed FlatArray (8cc7de74d).
Merge pull request #1379 from retronym/topic/boxing-conversions

Remove BoxingConversions from the scala package.
Solved 756.
添加发布脚本
添加tool/auto_restart.py
添加tool/rename.py
添加tool/reset_port.py
improve build script
update version to 1.2.0
build for v1.2.0
tweak npm ignore
Update the license
Change to seajs.org
Add *.xml to npm ignore
Remove some unnecesary rules
Improve build script
Remove favicon.ico from repos
Update version to 1.2.0
Update README file
Add "Question?" section for users
Begin writing documentation for 1.2.0
Make the file overview more suitable for combo plugin
Update the title for bootstrap test page
Add template for issue test cases
Update the version test case
Change packages directory to runtime
Add alias version shortcut test case
still implementing client-side prediction
Merge pull request #11 from shianai/master

whew.. resolved na
changes and added css, javascript to send page.
Merge pull request #12 from magnum2013/master

changes and added css, javascript to send page.
Clean up
Edited Send page for multiple recipeints
Document Tracker major changeset
SQL update
Latest update on the Send document
Updated SQL
Latest update
mao ni
added test for context with columns
Fix tests & code for --column + -C.

The tests and the code for the --column and -C context case from the
previous commits were broken. This commit fixes both the code (to not
emit the warnings) and the tests (so the right behaviour will be
exhibited).

See:

https://github.com/petdance/ack/issues/240 .
splice service
ship sink
shyul - Initial version 0.32-tabby
Removed externalizable from PolylineShape (it's immutable- d'oh)
Added SerialVersionUID to PolylineArcShape and PolylineLineShape
deleted wsd site folder
Email is now an integration test.
Merge pull request #7 from sjl/master

Minor tweaks
Remove :metric_f from user-facing event representation

Before this change, the event maps the user would be working with contained both
:metric and :metric_f.

This is confusing when using something like (default ...) because it's not clear
which one you need to set (or even if you need to set *both*).

:metric_f serves no real purpose at this point, because it's overwritten with
the value of :metric in pre-dump-event anyway.

This change removes :metric_f from the user-facing events, so users always work
with :metric in their riemann.config files.  The fact that "metric_f" is a thing
becomes an implementation detail.
Prefer (.method obj args) over (. obj method args)

When possible, it's more Clojuresque to use the sugary (.method ...) form,
because instead of

    (verb noun verb nouns)

which is weird, you have

    (verb noun nouns)

which is normal Lispy syntax.
bug fix to line 1397. Thanks Mark!

missing a "."!
fixed warnings for arc bridge when using library in non-arc projects.
Update requirements/views/pt_br/index.php
Merge pull request #597 from rubao/patch-1

Update requirements/views/pt_br/index.php
doc fix- missing quote
fixed typo on CPagination commentary
Merge pull request #602 from luislobo/patch-1

fixed typo on CPagination commentary
Fixes issue #601 added loginRequired() to the IWebUser interface
added default value to CConsoleCommand::confirm()
Updated CHANGELOG
Added @since doc
Merge pull request #607 from musterknabe/feature/console-confirm

Added default value to CConsoleCommand::confirm
better MonadIO instance
first fail labeling
Deleted faulty file
Merge branch 'master' of https://github.com/span/Team05
Add: Test for ShowResultsActivity
Change: The list view now displays human readable time #65
Change: layout improved, also added calories
Add: Test result handling. Made by Markus Schutzer and Gustaf Werlinder
Merge branch '65-ShowResultsForARoute' of https://github.com/span/Team05 into 65-ShowResultsForARoute
Change: Minor refactoring in ListExistingResultsActivityand ShowResultsActivity
Fix: Resolved merge conflicts
Merge pull request #120 from span/65-ShowResultsForARoute

65 show results for a route. Test added.
Fix: Date in chartview now shows correctly
big rect matrix multiply bug fix
http: fix erroneous non-private access to the URI and queryParams members of the HttpRequest through the 'copy' method
routing: fix broken 'complete(Future[HttpResponse])' overload
Soft-delete shipping methods when they are deleted through admin backend

Fixes #1240
Reorganized C++ libs so the thrift headers are in the export plow folder.
Got a list of job names to show up in a QtreeWidget!  Baby steps.
Remove ANY instead of deprecating.
Merge pull request #34 from square/jw/none

Remove ANY instead of deprecating.
source tarball update
Use a theme from Bootswatch for docs.
[minor] attempt to fix travis
[minor] attempt to fix travis
[minor] fix travis
Merge remote-tracking branch 'upstream/master'
Debug API. bare bones getinfo support. More constructs.lua support
dfasdfdasdf pictures added ting
Mdf red orge branch 'master' of https://github.com/styu/PackIt

Conflicts:
	PackIt/bin/classes/edu/mit/packit/R$attr.class
	PackIt/bin/classes/edu/mit/packit/R$color.class
	PackIt/bin/classes/edu/mit/packit/R$drawable.class
	PackIt/bin/classes/edu/mit/packit/R$id.class
	PackIt/bin/classes/edu/mit/packit/R$layout.class
	PackIt/bin/classes/edu/mit/packit/R$raw.class
	PackIt/bin/classes/edu/mit/packit/R$string.class
	PackIt/bin/classes/edu/mit/packit/R$style.class
	PackIt/bin/classes/edu/mit/packit/R.class
M build/notepad2/notepad2-w64-build.sh
NullPointer @ LoginControl, adden eines Players in den GamePlayerPool
fixed cancelled bookings
add fugafuga
add release task.
Document the new fields
Be a bit more like fLoader
Fix passing parameter in constructor function for sTimestamp
Remove all reliance upon cache, settings, and database; simple extension now
No longer using
No longer using
Add response helper class
Move sNumber to stable classes; update version and description
Update loader class; add sAuthorization to stable classes
テストの準備をそれぞれのcontextごとに実施するように変更
2番目のユーザ登録でstatusが一般ユーザになっているテストを追加
USer.statusを定数化し、アクセサメソッドを追加
nl: Improve API doc of nl_connect() and nl_close()

Signed-off-by: Thomas Graf <tgraf@redhat.com>
removed cursorline, ruler, cursorcolumn and colorcolumn.
splitright feels more natural.
automatically place the cursor between "" for Ack.
create swapfile and undofile folders automatically with git
refactor + rename to cymunk
added graphs, going to add resources
getting json with button
js and json to show data in graphs
adding trac-0.11.5
adding docbook-utils-1.0
Added example topics
Added assembly attribute for Company.
image elements ft=rom ticket designer takes images relative to TicketPrinter class
image elements from ticket designer takes images relative to TicketDesigner class
added tt-duranduran i tt-pgabriel ticket formats
added images used in ticket templates
added feature different kond of places to tt-pgabriel ticket format
added osl.png to directory osl
On OSX, native OpenGl header should never be called, but only the X11 GL headers: OCE only supports X11, not Cocoa
add fred to authors
[maven-release-plugin] prepare release stamdata-parent-3.4.19
update 2 file eng_endhost.py and sci_endhost.py 8dec2012
Commit on 8dec2012
commit eng_endhost.py 8dec2012
commit sci_endhost.py 8dec2012
Merge branch 'master' of github.com:tritm/ChuTo

Conflicts:
	TA/eng_endhost.py
	TA/sci_endhost.py
Refactored @throws documentation tags
Declare method register(Context,DspaceObject, String) of
org.dspace.identifier.IdentifierProvider to throw an
IdentifierException. Fixes DS-1424.
added yahoo copyrights
Give credit to @dkubb
FIX: reverted few methods that are still needed on LHCbDIRAC ( will
dissapear on v6r6 )
Don't assume that sync_callback is created once at initialization
Remove unused flush() method
Factor Simulation into SimulationConfig and one-shot Simulation
* moved function
* this might fix some LE not found errors
* added missing newline for PRINT_HUD broadcast
* removed animname buffer from mAliasModel_t
* fixed a few memory leaks in the error handling for mdx file loading
* disabled characater precache by default
* cleanup: removed G_ReactionFireSearchTarget
* map [+ice] general improvement

Signed-off-by: ShipIt <shipit@users.sourceforge.net>
* final rename of var 'map'
Render ball waypoints
circular require fix!
37: Added the first version of Priorbank fixtures generator.
support for zeromq3 in emperor_zeromq
fallback to REMOTE_ADDR if HTTP_X_FORWARDED_FOR is missing but --log-x-forwarded-for was used
Merge pull request #77 from prymitive/x_forwarded_for

use client address if X-Forwarded-For is missing
Fixes #1485 CSort does not quote table alias when using CDbCriteria
fixed removal of event listeners in widget disposal process by calling removeAllListeners before removing the required dom element reference
Merge pull request #125 from dominikg/master

fixed removal of event listeners in widget disposal process
[test] starting to work
2012-04-05T03:20+0900
changed from emptyRatio to fillRatio
mapProfile() to help mapping user profile to auth response

without having to keep doing if (!empty()) at strategy
Minor error message updated
OAuth strategy
inicializando controles, falta a lógica para os branches mas o resto deve funcionar
preserve 3d
fixed a bug of require_
erts: Implement erlang:halt/2
erts: Document erlang:halt/2 and update erlang:halt/0,1
erts: Basic test of erlang:halt/0..2
Merge branch 'maint'
Merge branch 'bmk/inets/inets59_integration2' into maint
Merge branch 'maint'
Implement support for user controlled timetraps

OTP-9988
Fix dialyzer reported errors
Merge branch 'lukas/common_test/add_surefire_hook/OTP-9995' into maint

* lukas/common_test/add_surefire_hook/OTP-9995:
  Add the surefire ct hook
Merge branch 'maint'

* maint:
  Add the surefire ct hook
Disable built in hooks for emulator

This fixes a problem with node_container_SUITE:iter_max_procs/1
not working with redirect_log hook.
Change default of enable builtin hooks to undefined
[eldap] Remove broken functionality

eldap_fsm is broken so we have decided not support that at the moment.
Which makes eldap_sup and eldap_app unused and thus they are removed to.
Update ct_master to use the Common Test CSS file for the logs

OTP-9973
Repair is_release_available/1

OTP-9633
Document the create_priv_dir option for ct:run_test/1
Merge branch 'siri/reltool/fresh-up' into maint

OTP-9792
OTP-9794
OTP-9967
OTP-9968
OTP-9980
OTP-9984

* siri/reltool/fresh-up: (27 commits)
  [reltool] Improve title of dependency colum
  [reltool] Update status bar for all config changes and for generate target
  [reltool] Fix GUI problems on Windows
  [reltool] Remove skip statement for test that failed due to stdlib error
  [sasl] Sort applications used by other applications correctly in .script
  [sasl] Doc that included applications in .rel defaults to same as in .app
  [reltool] Fix problems with sorting of applications
  [reltool] Just warn if same module occurs twice in .app file
  [reltool] Always return warnings as flat strings
  [reltool] Fix type spec and doc for app() and mod()
  [reltool] Move tables out of common record
  [reltool] Display warnings continously in GUI
  [reltool] Cleanup test code
  [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE
  [reltool] Improve error handling
  [reltool] Fix rollback and undo
  [reltool] Link together escript with inlined application
  [reltool] Fix badmatch when starting GUI
  [reltool] Update state and tables consistently for all types of config changes
  [reltool] Add test cases for handling of escripts
  ...
Merge branch 'maint'
[reltool] Add configuration parameter lib_dir on application level

As a way of specifying one specific version of an application, the
following configuration parameter is added on application level:

{lib_dir,Dir}, Dir = string()

This can be useful if the parent directory of the application
directory is not suitable to use as a lib dir on system level.
Merge branch 'ia/ssl/prepare-for-release' into maint

* ia/ssl/prepare-for-release:
  Prepare for release
Add monk
Refactor expressions and ilogcp driver
Add wrappers for gsl_expm1 and gsl_hypot.
Fix deletion of the OPVARSUBVAR expression.
notes on texton calculations
adds hilbert transform
hilbert transform now works correctly
implements silly textons instead of real ones
removed: template.pdn
power aura icons
Worked on the image processing of the phone model
Multiqueue ToDev
升级版本到3.0.8。
添加方法：navigator.redirectTo(name).withParameter(..).end();
通过end()方法可以明确结束语句，并发出重定向请求。
为navgator.end()添加单元测试
将所有代码，部分配置和文件转换成UTF-8字符集编码。
默认不生成gpg签名，以方便build。
但deploy时需要加参数：mvn clean deploy -Dgpg.skip=false
改进pom以确保maven 2下javadoc生成不会出错。
* 改进pom，在开发时使用较高版本的java，发布时使用保守的Java 1.5。
* 除去eclipse警告
改进form/velocity service测试，使之可以在非(locale=CHINA, charset=GBK)的情况下测试通过。
bugfix: number-validator设置限定范围以后，当用户输入非法数字时，validator抛出异常。
添加<form fieldKeyFormat="compressed">参数
改进form，对于field.getKey()，同时支持压缩格式（_fm.g._0.f）和非压缩格式（_fm.group._0.field），大小写不敏感。这样可以方便测试。
  如果<form
fieldKeyFormat="uncompressed">参数被明确指定，那么所有输出的字段名全为非压缩的，并且不支持压缩格式。 
小改进：注解和toString方法
删除暂时没用的asm/codegen子项目，将少量依赖到的类移到generictype子项目中。
添加changes更改记录。
Added IntelliJ IDEA project files
Updated Intellij IDEA project files
Updated copyright information for 3rd party classes
Updated Intellij IDEA project files
Updated copyright informations
Remove unused license files
Reformat java files using IntelliJ styles.
Update .gitmodules

Updated link to whami_source_adapter
Ok, another attempt. Testing on cocoon_simple_form_demo project
fixed ci install
added 6,7,8,9 keys for heli modification
Fixed the issues on CascadeButton layering and at same run changed rendering system fully to sprites
replace errorneous decorator usage w/ a method
typo
improve debug info
update highlight search and powerline
experimental selector tooling
fixed issue #20, hard coded path invoking calabash
pyjsbuild: all_compile_options is now a Mappings.Defaults()
renaming a script
轻量级js模板

**  author zengOhm@gmail.com
initial backbone commit. Some models, collections and templates.
email to mr, some model edits
changed models to use backbone-relational. Worked on node and child views. Created child.html template
modified main.js to start testing functionality. Edited config.js and other files to fix require.js issues. added text.js (template plugin) and backbone-localstorage (from addy's tutorial)
playing around with require.js-related stuff
for tbranyen
for sunky #documentcloud
for efdee on irc
slide-display.js now manages the entire slide display (list of nodes and thier children). added functionality for displaying nodes, for animating node moves(including adding and removing nodes), and for keeping a history of the branch path.
Added functionality for displaying branches when they're clicked on a node. Only display branches that are already saved locally
require issues
rels/items issue
rels/items issue
made app able to fetch items/rels from the server in conjunction with rendering/slide functionality
added pushstate functionality for browsing.
added custom url functionality for different states in the app. Can now use back and forward to traverse through app's browsing history.
showing irc problem
Finally fixed bug where slide-display eventListeners would dissapear when using history.popState(). Fixed by calling sd.delegateEvents again after the main routing funciton. Still not sure why those eventListeners were dissapearing
added reply functionality. Begun work on the more info actions by setting up it's div and the ability to toggle it. Started using namespace.app as a global event queue, mostly for datastore related functionality.
functionality for displaying a node's item id
remove xss from search.js
docs/guide/ja updated
Merge branch 'master' of github.com:softark/yii
Merge branch 'master' of github.com:yiisoft/yii
Merge branch 'master' of github.com:yiisoft/yii
[docs][blog][ja], [docs][guide][ja] revising now
[docs][blog][ja], [docs][guide][ja] improved translations
Merge branch 'docs-ja' of github.com:softark/yii into docs-ja

Conflicts:
	docs/guide/ja/form.action.txt
	docs/guide/ja/form.builder.txt
	docs/guide/ja/form.model.txt
Merge pull request #1139 from softark/docs-ja

[docs][guide][ja] , [docs][blog][ja] fixed the links to section hashes, improved translations
doc fix in CButtonColumn
Fixes #1310 Improved API docs for CModel::rules and CModel::getScenario
Fixes #827 - removed rendering of name attribute for the slider container
space
Merge pull request #1035 from mdomba/827-CJuiSliderInput-div-name

Fixes #827 - removed rendering of name attribute for the slider container
[ci skip]
add_tmp
Minor defhandler improvement
Improvement #21: missed some results in repeating patterns of the
document.
Error corrected. But to send messsage it's enough to provide just xxx@gmail.com. As for file transfer it is necessary tro provide something like xxx@gmail.com/QXmpp2343423 which is available after receiving text message.
Started PeerQxmpp.
adding file that contains logic for adding a database that contains a table for ingredients
before adding columns to invitation
Invitation model: info columns added | invite form modal ready
layouts updated, before add scroll
layouts updated 2
layouts updated: tables, scrolls and buttons
layouts: table border added
Refactor of legacy event calls.
added fix for #69
Merge pull request #487 from espaan/patch-21

Added fix for #69 in the CHANGELOG
added simple implementation of a module system

Modules == Symfony bundles
Custom kernel loads active modules from DB. This custom kernel add bundles to the bundle list *before* symfony's bundle loading starts.
A custom routing loader automatically add modules routes (controllers of modules have to use annotations).
stop module loading in command line mode
added missing file
improved module system, added themes support
switch to new bundle loading approach

Zikula kernel loads all bundles (modules and themes) every time.
A custom event dispatcher skipps service listeners of inactive modules.
A custom controller resolver skipps controllers of inactive modules.
A container builder sandbox forbidds taggs other than 'kernel.event_listener'.
Relocate files
Apply naming conventions.
Frontend files added
buff_changes
fix
change default solr key
attempt to force class resolution at loading - to verify symbols linkage
update ingest dev docs
Merge branch 'master' of https://github.com/0xNF/autopsy
Report panel resizes more properly. Courtesy of Devin.
Strings inside XLS reports are now properly encoded
Removed StringEscapeUtils - not needed.
UTF characters should now display properly in XML reporting
fix merge
minor doc update
fix netbeans plat build - update URL
update disable modules for the platform we are currently pulling (backwards compatible)
update platform to 7.2.1
updated news
cleanup propertyChange() method use if-else
A now plotter has been created, and it is awesome!
Removed some comments
Added a better legend
Merge branch 'master' of github.com:12gr710/core
not quite finished yet, but getting there..
tmpcommit
comiles and runs
cleanup
removed redundant files
Merge pull request #4 from 12gr710/add-dynamic-structure-functionality

Add dynamic structure functionality
Merged from master
remove more junks
- Sent notification to admin if new caution.
- Added sendgrid.
- Added workflow to Caution.
Source switching with pseudoStreaming
WHISTLE-42: fix the logic for callback
Tests suites was added.
Added yorik's Render Icons to the Workbench
Updated a python command when adding materials
Sketcher, 0000466: improve visualization of constraints
mejoras notice home
[Fix] Scrolling is now done.
Merge branch 'master' of github.com:Allanis/LibD
Adding mobile sample
GWTP mobile sample
Mobile sample changes
Form factor fix for gwtp samples mobile
Fix deployment of mobile sample
Mobile sample chnages
EOF formatting samples
eof formatting samples
fix for tab, from tab refractor
Merge pull request #59 from ArcBees/brandon_samples5

Brandon samples5
røvpianisten: ønsk mayonnaise (fuldfed)
instruktorløjtnant: Eggs i dag klokken 12:00, med Ωhm, zerrez, dreggsl, dolle, ThordenM, snowgoon, atlas, oleks og pr0n_maker
Fix single quotes in json
Created mechanism for property changed native and js.
Removed duplicate ScrollBar.fayde.
Implemented Thumb.
redesigned the form page
fix #32: old/unchanged local variable detection when using more than 255
local variables
Merge branch 'master' of git://github.com/opensim/opensim
Merge remote-tracking branch 'upstream/master'
url'ler oluşturuldu.
a.ml
Modify the framework and add tracker.

Change to a 3-level wizard pages. Use TaskManager as the kernel
controller.
Better support for sending messages with accompanying JUnit test classes
Make compatible with sbt 0.12.0 and Scala 2.9.2.
Restructure build script.
Added gambling. Changed woncards to store ints instead of full cards.
Entire Rules table is now a form, individual 'update'
buttons will send data for a single row to the server.
Also added a new field for the mapping.
fix api version in init template
added remaining licenses
Merge github.com:FOSSEE/aloha

Conflicts:
	aloha/allotter/views.py
maus + todos
Merge branch 'master' of git@github.com:FlaShG/SEP12.git
separate pam authentication for gateways
pamusername and pampassword are now readable on login screen
timeout added for the reply to come from sesman
Clear state required when relogin is performed
Improved logging
fix merge conflics
Merge pull request #29 from ArvidNorr/authenticate

Authenticate
added pagenav jumper modified main style.css to handle it, dropped $content_width to 500
Revert "Added KN smoothing, but it doesn't work perfectly yet"

This reverts commit 055b85984742ed30bed9dfdd8fcbef186d21b639.
Revert "Revert "Added KN smoothing, but it doesn't work perfectly yet""

This reverts commit ef59578f3bdd01f6e8f2178bf7fcc1aee09d2164.
Revert "Added KN smoothing, but it doesn't work perfectly yet"

This reverts commit 055b85984742ed30bed9dfdd8fcbef186d21b639.
Wordnet similarity now works, albeit quite slowly
almost there for metrics computing, now using django signals... so sweet!!
[ru] chapter 3: Reread and improve translation.

The changeset contains miscelaneous rewordings, corrections, adds some
missing quotes, extends 'ё' usage, and unifies terminology a bit.
[ru] chapter 9: Incorporate changes from 483a4e4fc2 and 6f68925573.

"Fix broken url."
"Fix mixed up sizes of blobs and sizes of their contents."
[ru] Incorporate changes from cfdce8587e and 085a4966b9.

"Chapter 2 improvements and corrections"
"Chapter 4 improvements and corrections"
[ru] "Глава" should not be capitalized.
[ru] "Рисунок" should not be capitalized.
[ru] Unify translations of the "hook" term.
[ru] chapter 2: Fix grammar: s/увидете/увидите/.

And prettify a sentence a bit while at it.
[ru] Add \frenchspacing to LaTeX config and translate 'thanks' part.
clip title if too long
skip rendering a facet selector for the trackmeta store's label attribute (key right now)
remove some stray debugging statements
make the text search find-as-you-type instead of onchange (need to press enter)
added usb automount, cached first startx, updated ALSA driver from official git repo
2.4.2 beta
linux/kernel.h: define SYMBOL_PREFIX

Define SYMBOL_PREFIX to be the same as CONFIG_SYMBOL_PREFIX if set by
the architecture, or "" otherwise. This avoids the need for ugly #ifdefs
whenever symbols are referenced in asm blocks.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
modsign: add symbol prefix to certificate list

Add the arch symbol prefix (if applicable) to the asm definition of
modsign_certificate_list and modsign_certificate_list_end. This uses the
recently defined SYMBOL_PREFIX which is derived from
CONFIG_SYMBOL_PREFIX.

This fixes the build of module signing on the blackfin and metag
architectures.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: David Howells <dhowells@redhat.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
gpiolib: introduce descriptor-based GPIO interface

With the current API, GPIOs are manipulated through an integer which
represents their unique number across the system. This poses problems in
terms of portability, scalability and flexibility: for instance, the
number of valid GPIOs for a given system is fixed at system time, and a
large array of that size is statically allocated to hold the GPIO
descriptors.

In order to improve the situation, the integer namespace must first get
away. This patch introduces an alternative GPIO API that uses opaque
handlers and refactor gpiolib's internals to work with these handlers
instead of GPIO numbers. The former integer-based API is still available
as a light wrapper around this new API.

This first step will then us to build more improvements for gpiolib,
like proper GPIO lookup functions per device and provider, and getting
rid of the static GPIO array and the ARCH_NR_GPIO configuration option.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Fix unreleased mutex
Fixes suggested by Guenter Roeck
Add missing consumer header
Add chip list
Check validity of gpios before converting to descriptors
Rename gpio_chip_offset to gpio_chip_hwgpio
get_gpio function
Do not use dev-master in composer.json, it breaks aliasing
Merge pull request #6 from igorw/patch-2

Do not use dev-master in composer.json, it breaks aliasing
关闭远程加载login图片
关闭资源加载
Merge branch 'hec_branch' of github.com:HAND-MAS/HIS into hec_branch
Said 'fuck atom feeder'
fixed word break
store oauth token and secret
Edit travis config to support starting a server
Now with updated readme
swap readmes
Changes on modules bundle
Added project-specific settings for Java 1.6 compiler and Android 4.1 build targets (Google API 4.1 build target for "astrid" project)
Remove sample project file since it doesn't build
Merge branch 'master' of github.com:JoelB/astrid
initial. with rtx-51 tiny.
document added.
CodeIgniter had the wrong version.
Merge pull request #39 from Kasoki/latest

Fixed bug with TOUCH_END.
Merge pull request #40 from Kasoki/latest

Added documentation to Touch and TouchEvent.
Added the first UI element, a label (See #34). Also added a fix for numpad controls with the C++ target. Besides that, a small hotfix for the Touch-class for flash 10.0 or lower.
A small hotfix for the fillRect()-method of Canvas. (It didn't add the x- and y-translation)
Made that if you set an attribute of a label that has the same value as before, it won't refresh itself.
Changed BasicGameObject to be an event dispatcher.
Added buttons, see #34.
tested linux support and added target to README, closed #42
some code and docs
Itt ott kozmetikázás és Mukodo MESSAGE send
minor fix
Добавил селы и декораторы
Updated submodules.
Removed vim-fugitive.

I tend to use git most of the time so fugitive is useless to me.
Changed maps to noremaps in .vimrc.

Because someone on the internet said that I should do it.
Aliased `co` to `checkout` in .gitconfig.
Merge branch 'master' of github.com:L-P/dotfiles
<Leader>Q to decode quoted-printable mails.
fuck
adasd
InputModes deleted

Correct class is InputMode.
Synchronize log writing.

[FIXED]     Output of log messages could sometimes get desynced.
Merge branch 'master' of github.com:Lyndir/Pearl
removed wrong readme
Added Readme
Updated Readme
Fixed readme name
add AddEnum() to CJSONServiceDescription

can be used to add JSON schema types during runtime (e.g. a list of setting names etc)
Devs should simply install build-essential for packages like make, gcc, and g++.
jpeg: fix build for jpeg8
no-gui-scan: don't depend on the GUI to scan music/video
no-gui-scan: add a few more Scanning functions to CApp
no-gui-scan: switch all scanning functions to use the CApp implementation
no-gui-scan: fixup whitespace after last commit
no-gui-scan: remove unused functions
no-gui-scan: remove unneeded headers after refactor
Merge pull request #916 from theuni/no-gui-scan

No GUI dependency for library scans
[osx/ios] bump cmake from 2.8.4 to 2.8.8
[osx/ios/atv2] use tarballs from our mirrors
[WIN32] fixed macro redefinition (we had this discussed in the pr as well).
fixed nullpointer access in CJpegIO::CreateThumbnailFromSurface
changed keyboard log. on systems without sdl usage it is confusing.
ensure ClampToEdge is done when loading jpeg's via CJpegIO
no need for a .tbn check in CreateThumbnailFromSurface - we'll never get called with anything other than a .jpg or .png
ensure writerlinkepisode table is cleared when deleting episodes. fixes #11398
add seasons table to the video database so we have a unique id per season
use the unique id for the season in m_iDbId
cc hmwk5 finished
Invert colour gradients by clicking the gradient in the colour key
Fixed admin template bugs for events
last fix for the base url, also deleted the diplicated posts.
hidden side bar, first version
when asset description contain html tags, this tags needs to be removed when we put 75(ch) length summary in asset table, otherwise would be interface errors
first version of mark aaset as modified
added search tag by modified asset and changed > in to: and < in from:
check if asset.modified has key equal to current user
possibility to upload moltipli files faster an pissibility to upload big files using form data
create thumbnail for assets with extension writen with uper case leters
updated condition for open asset for supervisord
	- if user is supervisor an asset is submited then show open button
unpdated function to create notifications when when asset was modified
	- merget functions modifier_to_artist and modifier_to_supervisors
correct error
	when create a new comment notify tasksender abbout comment but not notify creator of comment
same error as previous patch
send notifications via email

and other small bug fix
fixed bug in config declaration
Widget - Firewall Logs - Filtering

all.css for each/most of the following themes

/usr/local/www/themes/_corporate/all.css
/usr/local/www/themes/code-red/all.css
/usr/local/www/themes/metallic/all.css
/usr/local/www/themes/nervecenter/all.css
/usr/local/www/themes/pfsense/all.css   **
/usr/local/www/themes/pfsense_ng/all.css
/usr/local/www/themes/pfsense-dropdown/all.css   **
/usr/local/www/themes/the_wall/all.css


Themes all.css Additions / Changes


div#log div.log-entry span,   **
div#log div.log-header span {
   padding: 3px 2px 3px 2px;
   padding-left: 6px;
}

div#log div.log-entry-mini span {
   padding: 2px 2px 2px 2px;
   padding-left: 6px;
}

div#log span.log-time-mini-header,   *

div#log span.log-time-mini,
div#log span.log-time-mini-header {
   width: 18%;
}

ddiv#log span.log-source-mini,
div#log span.log-source-mini-header {
   width: 24%;
}

*  Added to All Themes
** Does Not Exist.
Widget - Firewall Logs - Filtering - /etc/inc/filter_log.inc

Prefer to see only accepted connections in the dashboard firewall logs widget.  Accepted connections are the ones of concern.
Widget - Firewall Logs - Filtering - /usr/local/www/javascript/filter_log.js

Prefer to see only accepted connections in the dashboard firewall logs widget.  Accepted connections are the ones of concern.
Widget - Firewall Logs - Filtering - /usr/local/www/widgets/widgets/log.widgets.php

Prefer to see only accepted connections in the dashboard firewall logs widget.  Accepted connections are the ones of concern.
Added missing grsec-dir
-a

Added missing grsec-stuff
added room and sofa
Erweiterung messages
Update logs/eggdrop.log
Minor fix to import_rewrite when rewrite is run in current directory.
Merge pull request #88 from joakim-hove/IMPORT

Minor fix to import_rewrite when rewrite is run in current directory.
#GT-678: commented useless packages
new shop url
adding page for chp2 page1
Cambio de color gris
Small change to make it easier to change tick print speeds.
You can select solid now in GUI now. It will be improved later to be able to select in scene
Use Prisms
Updates Formatter, add standard camelCase formatter.
Set CamelCase standard formatter as default in the mapper generation.
Add abstraction on generation process
Merge pull request #14 from Plemi/master

Add abstraction on generation process 
Fix unit tests following last atoum updates
Merge pull request #15 from Plemi/master

Fix unit tests following last atoum updates
Refactor annotation parsing algorithm in order to allow different aggregation type
Merge pull request #16 from Plemi/parser-refactoring

Refactor annotation parsing algorithm
Change MapBuilder methods visibility
Merge pull request #17 from Plemi/patch-mapbuilder

Change MapBuilder methods visibility
Inject Map and Definition classnames into the Builder
Merge pull request #18 from Plemi/mapbuilder-di

Inject Map and Definition classnames into the Builder
Fix the most possible Sonar violations
Merge pull request #19 from Plemi/patch-violations

Fix the most possible Sonar violations
Typo in README file.
Merge pull request #20 from j0k3r/patch-1

Typo in README file.
typo again, my mistake
Merge pull request #21 from j0k3r/patch-1

Typo again..
Mention Symfony2 integration with PlemiBoomgoBundle
Update Composer new policy on suggest and require-dev
[268] so

Signed-off-by: Chiruclan <administrator@chiruclan.de>
change filetype of README.
.gitignore: updated to ignore binaries
Added end-to-end distance sampler & used in hairpin
added rake task to clear empty cfcs
corrected gemspecs
Named the module WebApp
CrazyCore: improved message listener
CrazyLogin: added message listener support (untested)
CrazyCore: changed fail behaviour of permission groups
creacion de formulario cargos por nelly
Preferences, ConvesationManager: Now escape_hotkey session.config is applied instantly
Merge branch 'master' of github.com:emesene/emesene
ConversationManager, Preferences: Close tab button hiding, is now instantly applied
gui.qt4ui: Fix maximize the window. Closes #1153
Login preferences: Fix checkbox Use Proxy problem
Login preferences: Use authentication checkbox depend of Use Proxy checkbox.
gui.qt4ui: Import logging. Closes #1154
gui.qt4ui: removing the dialog parameter. Closes #1156, Thanks lfottaviano
Preferences, MainWindow: email button, and user panel, now correctly reflect session.config variables from emesene startup.
MainWindow: Fixes this use case:
1) Open preferences
2) Disable Show email inbox
3) disable show user panel
4) active user panel
5)and the result, appear email inbox icon

thanks zipatei for the testing.
Merge pull request #1157 from zipatei/master

Fixes errors and problems in Login preferences and gui.qt4ui
gui.qt4ui: Fixes #1155
Merge pull request #1159 from zipatei/master

gui.qt4ui: Fixes #1155
Papyon: remove duplicated function call
gui.base: Add some debug output to the ConversationManager
Addon tags, tag pae

- finalized display and dynamic generation of tags
- Created tag controller and tag view
- finished styling the category page and tag page
Starting new version of dashboard
Classes from previous site
Merge branch 'master' into player
Merge master
Merge branch 'master' into player
Merge branch 'master' into player
Cleanup
Merge branch 'master' into player
Audio working (no visual)
Prevented a minor potential memory leak.
Added statusPath, refactored screenshotsPath.

The screenshotsPath is used to store screenshots (when they are not provided via -baker-page-screenshots) and it points to a folder such as:
/.../Caches/screenshots/<Book ID>/

The statusPath is used to store a JSON object representing the status of the book (e.g. its last viewed page, its last scroll index and so on) and it points to a file such as:
/.../Caches/statuses/<Book ID>.json
iterators
Merge branch 'master' of https://github.com/Strucker/DBO
preformator partition
preformator partition
Додав TSV reader
SO and AlgC study notes
Merge branch 'master' of github.com:Surtr04/misc
+ GPLv2
* version match
* version match
Appropriate color parameter to the last GlobWeb architecture
Add point selection layout
Modify click duration
Fixed output of scoped errors
fix tpl paths
Merge pull request #10 from dmkuznetsov/master

fix tpl paths
Merge remote-tracking branch 'origin/master' into unstable
Miao - ustable Auth
Merge pull request #82 from Timo6/my_changes

Clean .gitignore
Merge pull request #83 from Timo6/master

Update premake Xcode build
Static Const int instead of #define for axis alignment variables
Merge SVN up to revision 1136 (9/28/2012 by Graham)
+Asian region.
* added lighting and surface normal generation (shader compilations takes long now)
Fixed a link in Readme
sphinx configuration
Fixed lexer crash
Merge branches 'lex_fix' and 'master'
[Fix #24] percent rgba? support, also match 1.0 in alpha channel
[Resolver] Created ufcs completion list stub
translations needed on blog
Modified bashrc.prompt to show number of jobs in prompt.
Changed how RMSD is logged by matchAlign method.
Changed how align method logs RMSD.
Colaboracion inicial.
fix #47
fix #45
fix #40
Start using the bool type

Since we are compiling under C99 we can use the 'bool' type.

- Include the stdbool.h header file required to make use of this.
- Make use of it in void input_events_cb() for the cursor toggle
  indicator.

Signed-off-by: Andrew Clayton <andrew@digital-domain.net>
Use bool for the animation indicator

Signed-off-by: Andrew Clayton <andrew@digital-domain.net>
Swithed to boost serialization
Work on Contraption started.
FieldType is up and ready
archive library added
archive library added
Major update to support proper mutable-type variable implementation (VarMutable and VarMutableArray)
* new: introduced Var.type field (contains the Class object handled by the variable)
* Var.type must be explicitly specified at construction time
* Var.isAssignableFrom() now relies on the Var.type field
* new Mutable interface for mutable types
* VarMutable and VarMutableArray implementation greatly improved (stable?)
removed class Scope (not needed for now)
Marking slf4j as provided scope suppresses surplus logging from dependencies. Couldn't find another way to achieve this...
and some pictures
Clarify that user must be running Bash.
added jirm version
Connection leak in the tests

Signed-off-by: Alfred Hall <ahall@ahall.org>
Merged r25064 from trunk

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25065 44c647ce-9c0f-0410-b52a-842ac1e357ba
added new HibernateUtil project
add "bio" to user

protect the other attributes
update to the latest twitter bootstrap version
resolution systeme complet
Update Epitech shit.
Use bash as a shell.
Always show guarantee rate / premium rate on loan details page

Display loan's value if present, falling back to
lending limit's value. When loan has no lending 
limit, display 'Not Set'.
Allow CfeUser to view loan changes
Adding the codes for the multimapped files
fix a typo

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* dln.c: Simplify and make consistent an ifdef for Mac OS X.
* ext/socket/rubysocket.h: ditto.
* ext/tk/stubs.c: ditto.
* io.c: ditto.
* process.c: ditto.
* signal.c: ditto.
* vm_dump.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2012-07-10

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* include/ruby/ruby.h: Removed RUBY_GLOBAL_SETUP complely. It is
  no meaning definition since r24894.
* main.c: ditto.
* nacl/pepper_main.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/zlib/zlib.c:  Added streaming support to inflate processing.
  This allows zlib streams to be processed without huge memory growth.
  [Feature #6612]
* NEWS:  ditto
* ext/zlib/zlib.c (zstream_expand_buffer):  Uses rb_yield when a block
  is given for streaming support.  Refactored to use
  zstream_expand_buffer_into to remove duplicate code.
* ext/zlib/zlib.c (zstream_expand_buffer_protect):  Added wrapper
  function to pass jump state back through GVL-free section to allow
  zstream clean-up before terminating the ruby call.
* ext/zlib/zlib.c (zstream_expand_buffer_without_gvl):  Acquire GVL to
  yield processed chunk of output stream.
* ext/zlib/zlib.c (zstream_detach_buffer):  When a block is given,
  returns Qnil mid-stream and yields the output buffer at the end of
  the stream.
* ext/zlib/extconf.rb:  Update INCFLAGS to find internal.h for
  rb_thread_call_with_gvl
* test/zlib/test_zlib.rb:  Updated tests


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: removed --enable/disable-win95 options. (see r36432)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* include/ruby/win32.h (NT, NtInitialize): removed unused old macros.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
sample/test.rb: newline

* sample/test.rb (PROGRESS.finish): newline after each tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
sample/test.rb: Progress::Rotator

* sample/test.rb (Progress): refactor to separate Rotator.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/zlib/zlib.c:  Revert r36349.  Added streaming support to inflate
  processing.  rb_block_given_p() is not callable without the GVL.
* ext/zlib/extconf.rb:  ditto
* NEWS:  ditto
* test/zlib/test_zlib.rb:  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge branch 'trunk' of git://github.com/ruby/ruby into trunk
removed redundant redis method
no idea what is going on here...
cleaning up the github app MESS
More refactorings. Move GuardModel to DAO package
Remove unnecessary casts
TestSetInline uses bitwise operators for testing blocks of 64 input values at a time
Restrict bitwise comparisons to sets with at least 3 elements (direct equality is cheaper for 1-2 elements)
No need to offset the shift value when the offset is 0
Use a zero offset for the first bitset as long as it doesn't force the creation of additional sets
fix hashtags regex pattern
refine example post schema.
fix readme
Added renewId-field to Book, which is needed for renewing individual books.
Added fetchUserUrl() to Session, which retrieves the URL to the individual user's profile page.
Minor changes, added a new error to Error.
Implemented RenewJob, which renews all the user's current books or all books in a supplied list. Still a lot to do - success/failure of the job isn't reported.
presense of email forced for user creation
temporarily hard code the JAVA_HOME
Default quickly template
Merge branch 'master' of https://github.com/arayaq/scila
Remove useless use of POSIX.
Nächste Ladung, Beispiel+Integration
tworzenie kolejek urzadzen juz dziala
tworzenie kolejek urzadzen juz dziala
tworzenie kolejek urzadzen juz dziala
MuistiDb
no need for workaround, static analyzer decided to quiet down, fix clock@2x path
fixes to measure-throughput
Actually deleted jekyll generated sites.
Split up some of the test cases into separate files, create `test` directory for all test cases.
remove right mouse click notify. lib handles it automaticaly. (it also
solves multithread issues with windows objects)
review of interface NodeBrowser
ignore runtime folder on git
adding cities and Hotels model-controller-view files
experimenting with lens constructor
Product and Order Development

Basic Product and Order management models, controllers and views. Migrations cover the initial database changes. Also revisions to indexes.