labofsahil/github-event-dataset-2012 huggingface dataset:
Navigation.py: Introduce getCurrentlyPlayingServiceOrGroup

Instead of introducing a 'selected' argument keep the original
'getCurrentlyPlayingServiceReference', which always returns just
what is says, the currently playing service reference. This also
allows backwards compatability with possibly some plugins.

Introduce a new function, 'getCurrentlyPlayingServiceOrGroup', which
returns the current alternatives group (alternatives) in case the
current service belongs to a group, or the service itself in case the
service is not a member of such a group (alternatives)
InfoBarGenerics: Solve a code of conduct typo
Merge remote-tracking branch 'openpli/master' into last
Revert "oRefCount: use __gnu_cxx::__exchange_and_add"

This reverts commit 54f637b3d7877b0fe49a36f9f2a21a33e9bff4d1.
script/test: give more time to server to respond

Trying to fix rbx random timeout errors via trial-and-error.
disable Excon timeout test in rbx + SSL mode due to bug
try fixing OpenSSL::OPENSSL_VERSION JRuby bug on Travis

The error is:

    NameError: uninitialized constant OpenSSL::OPENSSL_VERSION
be explicit that SSL verify is off on WEBrick server
work around Excon problem with JRuby + SSL
add `jruby?`, `ssl_mode?` test helpers
skip EM tests in JRuby + SSL
script/test: increase test server check interval

Trying to fix rbx random timeout errors via trial-and-error.
disable Excon timeout test in rbx + SSL mode due to bug
some organizational changes, lol
Added sale total
q4wine and psi-plus-i18n submodules were updated.
deb-packages.html was updated.
polymorphic model/schema bugfix
Modified README to reflect new package availability
Added --with-profiling option
Add analysis.py
Add segment
add all xsl filed into xsd
@test1 @test2 message2
Using replace method error to decode dicom fields and avoid crashes.

Some dicom files have the encoding setted wrongly, so when decoding a
dicom field from string to unicode some errors may happen. Python string.decode
have some methods to handle those cases. We are using the "replace" one,
the characters it cannot decode to unicode it replaces with a character
showing the character was not decoded.
Carry patch to fix showstopper repl bug
Restructure in git-boots
Updated configure, removed unnecessary acloacl.m4 file
masse godmods :S
start of API error handling. work on provider subscriptions.
When calling a function and providing a native object as 'this', set the wrapped JSObject for the native object to be whatever object the suite name resolves to. This allows the functions in the suite to refer to both properties in the native object plus any properties in the suite, such as ITS prototype.
Ignore Sublime package backups
移动数据库文件
minor fixes in notes
fixed compdef
Let user control case
Handle disabled javascript
404
ImageList for Cube image Textures 
- ImageList Class;
 - WebGLImageList 
Class WebGLImageList for webgl renderer;

Bugfixes
-  replaced splice for removeRange
- userRefract value should be int (not bool)
added cube shadding
Added lights to shader material;
BoundingBox constructor clean up;
Remove incomplete List interface in ImageList
Cleanup white space
Add ZeroOnePack
alter preview content length
index; router; server
new version of process_tree(), fails 1/2 tests
Merge branch 'master' of github.com:tjunier/newick_utils
comment
rnode_iterator_next_sibling() passes all tests
Merge branch 'prune_iterator' into prune_segv
Merge branch 'prune_segv' of github.com:tjunier/newick_utils into prune_segv
skips nodes with empty labels
unlink() is now idempotent
Merge branch 'unlink_idemp' into prune_segv
TODO
+ local mods
unlink_rnode() checks for linkedness
formatting for show point page
=print tickets
Disable DECLARE and LOCALLY

Type declarations can be dangerous.
Optimize compilation for (safety 3)
mean sum & swap
Update icon anchor
morphalyze: output word type hint on demand
dictlookup: use word type hint if given
ajax request now uses ifModified: true, cache:true
Little contribution
use HSV color space
Support PUT requests and make Job.cancel() use PUT instead of GET

As per Zencoder v2 API docs here: https://app.zencoder.com/docs/api/jobs/cancel
Make Job.resubmit() use PUT not GET
Job.delete does not appear to be a valid API method with the v2 API - support old method by rewiring it to Job.cancel

See: https://app.zencoder.com/docs/api/jobs
Change 'CASE' statement to 'COALESCE' to avoid evaluation of div-by-zero.

(Solves iss3816)
Merge pull request #8 from timstaley/div-by-zero-fix

Change 'CASE' statement to 'COALESCE' to avoid evaluation of div-by-zero...
Fix Customer class a little.
YesNo variabel gestaltet. Del angepasst.
Expand all jobs from queue on one click
update for shadow build hopefully still not working
fix how asynch task resume works
Minor cleanup
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Minor fix for objectMap

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Minor cleanup

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Merge branch 'master' of https://github.com/Eyescale/Equalizer
fix wrong arg access
updating commandLineTemplate.py to use argparse instead of optparse.
adding description of the sample code
clean up my broken ttyn
changed deployment return
Solved Euler Problem 75
added log options for make_client_wsgi

added http_capture_filter and http_log_filter for capturing request
and response and doing something with a copy of them like logging or
something

decode_filter specifies accept_encoding="gzip" but for some reason app
engine ignores it. WTF?

put in a stab at a nicely formatted request/response for logging and
assertion failures

added a testing module with asserts for every status code so you can
build a client much like WebTest
added assert_ parameter to Client constructor which will be run every
time unless an assert_is passed into the method
default assert_ should be None to be more clear
xhtml!?
modeline
Add section for unreleased 1.0.4 to CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1361046 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3652. FSEditLog failure removes the wrong edit stream when storage dirs have same name. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1361048 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1411289 FIXES: YARN-219. NM should aggregate logs when application finishes. (bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1411299 13f79535-47bb-0310-9956-ffa450edef68
corrected Jira reference for HADOOP-6527

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1365461 13f79535-47bb-0310-9956-ffa450edef68
corrected Jira reference for HADOOP-8417

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1365463 13f79535-47bb-0310-9956-ffa450edef68
release notes for Hadoop-1.1.0-rc1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1365470 13f79535-47bb-0310-9956-ffa450edef68
Make $SRCARCH, $srctree, and the config filename queryable.

Thanks to fpemud for spotting this.
updated ldap gem
completed tasks are now hidden from the dashboard
Log exception when executing a handler
solve an issue that aspectj can't be found in dependencies
webapp initial setup support
enhance webapp wizard, add project wizard
added C2DM support
show all projects on front page
fix home popup styling
MethodMatcher#match? is string/symbol indifferent

To more closely mimic ruby's `#respond_to?` behaviour,
MethodMatcher#match? will now return true for either a matching string
or symbol.
Revert "Fix wrong catch exceptions"

This reverts commit 8a6ef9b6abfaa49284f4f9c45737dccf079e52e4.
Revert first fix and fix again
Update PluginTab (import from UMS)
Updated JRE auto-download to 7u7 (latest)
Warn about administrator permissions (import from UMS)
Add refresh button on PluginTab (import from UMS)
cleanup 2.1.2 readme
Second commit. Created display.java not working properly.
Another Caliper Jar Update
S3 WEB: INtegrate in MVC controllers the SocialPrincipal
Corrigiendo manera de invitar al usuario a registrarse para iniciar una conversacion
creating simple inverted index, adding tests
travis: change to `tests/` directory to load installed snimpy module

If tests are run from the root directory, `snimpy` package does not
contain `mib` and `snmp` modules.
2012年 10月 10日 星期三 17:47:17 CST auto upload.
add "fale conosco" button
jason is awesome
Merge branch 'master' of https://github.com/xevlin/multi-libs
working on making things on the web front end nicer loooking
working through new ui
game mostly working
only thing left is game win conditions
added bootstrap-collapse.js for dropdown toggle to work
Added brief description to the README.
ImageMagick support
using custom module index
copy file mode
rm somechange
Refs #13 #7
Fixed project Guid.
added write script handlining to the Ftl
Limit zoom depth until deeper problem is solved
Added Excel writer and a couple of markup parsers
Added reST and Creole parsing
Removed pgmagick import; PIL is mandatory
Removed IMAGE_API import (PIL is now mandatory)
Merged pyramid_simpleform into project

Instead of extending pyramid_simpleform with yet more elaborate
sub-classing hacks, the original has now simply been merged into the
project as the forms module. All extensions have been merged into the
merged code which considerably cleans up the API, and all forms have
been updated to get rid of the "col_" prefixes.

The new API basically adds cols, inner_cols and errors parameters to the
various renderer methods. If cols is non-zero the element is output
within a Foundation column of the specified width. inner_cols and errors
operate as before.
Make mod support parse block IDs from configuration files (automatic block ID mapping)
Add TubeCraft block rendering support
change second param,give it default value
loading trick implemented
Merge branch 'dev' of github.com:webnotes/wnframework into dev
Ability to use constructor params
added RunLog class to add run map information
Added generalization of OPRA, added OrientedPoints.
Implemented AngleConsistency for OrientedPoints using Yices and a
translation from OPRA to OrientedPoints.
Updated "compareAndAdjust" for these new representations.
Added a better way to use temporary directories.
Changed Benchmark.hs to use atomic networks.
cache speed and overall stability fixes
Updated plugin example
added sample modules
New test testCity for MouvementDeMasse experiments. Bug corrected for argc passed in reference in scaena::Application. Some tweakings in CellarUtils.
started authors / changelog changes
version bump
Fixed overflow:auto issue with IE7 in IME menu

- Changed DOM structure of the menu to make the HTML standards compliant
- Changes in CSS accordingly
Modify TransitionStyle Constructor.prototype.delta()
add WeightedPath
use PathFinderOptions to simplify findPath
inherit from IBasePathFinder
throw NegativeStepCostException
Adding pyMOOS
Initial commit with version 0.1 files
Installed a REALLY basic template to start working from
adding resque basic auth hope no one looks at my github and sees the password
blur
fixed type casing for primitives
tree demonstration
added dump + fixed requirement comment
Add translated section 1.2.
描画オブジェクト生成のための雛形
horari-personal: fer amb taula -> afegit a qfer.textile
iterating documentation
Deleted redundant .svn files
Refactoring .pro files
add more javascript friendly settings.
add .crx file
modify README.md
XWIKI-7571: Rewrite the IRC Bot Application to Improve its maintenance and stability
* Added back Translation support which had somehow been dropped...
[misc] Trying to fix the release
(cherry picked from commit f835e940044dcb59efdb35cce6149d4c8b83d6c5)
modified:   README.md
	new file:   chenhao/1.c
	new file:   chenhao/2.c
	chenhao/chenhuo-blog.pdf
Updated Gemfile
Complete rewrite
SQL WIP.
added /djs reset
Moved toggle behavior to touchstart event
Add RenderMessage instance for SomeMessage
modified .gitignore node_modules added
deleted extraenous newlines in Gemfile
indent the haiku to preserve line breaks
name and cache the persp chunk
migrate the minimal Rhtml example
migrate examples from the knitr package
example of optipng
. is \\.
ignore tikz dictionary files
add gridExtra to deps
move examples from gists to this repos for better management
完成通用数据类型封装。
changed current date color and updated readme
added url and license
updated join behavior and rewrote reminder emails
Merge branch 'clean'

thin split bars
rewrite ChatWindow / TabBar
plain main view (not textured)
Add possibility to specify custom MAC address
Merge pull request #1 from k0da/master

custom MAC address
add escalation 8
polling change 6
use hpp for c++ headers, add eclipse source dirs.
use relative paths for "" headers.
added exceptions to the configuration function.
Moved DB gems to environment-specific gemsets.
Rename goals to separate words with hyphens (list-remote, put-project, put-user, put-version)
add try err handling from github repo
Update README and use function! to declare Js2Coffee.
Added VGMPlay
Ensure manual and apidoc archives end in .tgz for versions >=2.0.0
add tcp udp classes

Signed-off-by: yayanyang <yayanyang@gmail.com>
first commit
Merge branch 'master' of github.com:zhaoloving/linuxtest
Add home link on show page
Slightly cleaner implementation (will continue to use strict_encode64 from ruby going forward)
Updated twitter bootstrap and added responsive
Added page showing all rpms a maintainer owns and fixed issues with dots in URIs
	modified:   app/controllers/fedorarpms_controller.rb
	new file:   app/views/fedorarpms/by_owner.html.haml
	modified:   app/views/fedorarpms/index.html.haml
	modified:   app/views/fedorarpms/show.html.haml
	modified:   config/routes.rb
Merge remote-tracking branch 'upstream/master'
Updating about page, thanks kendhia!
Update app/controllers/static_pages_controller.rb
Adding databases to sync w/openshift
	new file:   development.sqlite3
	new file:   production.sqlite3
	modified:   test.sqlite3
Added config.assets.compile = true for openshift
	modified:   production.rb
Added "about" link
Added "about" link
Merge pull request #1 from nicolassatragno/patch-3

Patch 3
Rolling back production.rb
	modified:   production.rb
	Rolled back to original file
Fixed about link
	modified:   _footer.html.haml
Merge pull request #13 from nicolassatragno/master

OK this will leave the git code exactly as the code running in openshift, so we can focus on adding git hooks and so.
Alter FedoraRpm table to capture more info from git
added the input data files to repo
added exception handling for data validation
changed printing behavior
什么都没有改
This is an Test Commit
1. Change 'news.js' to 'wall.js'
2. Remove 'news' command, add 'wall' command.
3. Use wall to show use's own wall, use post to show feed.

Show feed:

    $ 0xfb post

Show user's own wall:

    $ 0xfb wall

Show other user's wall:

    $ 0xfb wall p1234
Added writefile test case
Exposed rename
Exposed rmFile and copy API
Change stategy to use authorization info

Previously it was using authentication info, which, per service
guidelines, isn't supposed to be done using the API.

A more practical rationale to this change is the fact that the URL used
to fetch user info in the cadun gem seems to be of internal use of the
GloboCom company only.
Bump version
Extra Sanity Checks to prevent console errors.
Random select roughly works.
Basic shuffle and expire done
Matching done (without area)
Updated pragma snippet completion scope
Disable notification on build start
Dont' symbolise fixnums
Basic functionality complete

I think
Add level 6
Merge branch 'master' of github.com:ACM-Game-Jam-2012/STZ
Merge pull request #77 from ameade/master

Add level 6
Rudimentary setup of article component

- if you are in resources list, open a certain resource and see the
new tab, named Article (to create or edit an article for the given
resource)
added a tag to the initial version
Merge 'version2' into 'master'

Conflicts:
	README
Merge branch 'version2'
Merge branch 'version2'
Merge branch 'version2'
adding assets to the develop repository
solving height problem of chart

disable navigation correctly
nice up of cubeviz : module headings and height adaptions of component
Add new chart types: Column1, Column2, BarStacked1, BarStacked2, ColumnStacked1, ColumnStacked2
Add AreaSpline2 chart, repair Bar1 and Bar2
adding new chart icons
Merge branch 'develop' of github.com:AKSW/cubeviz.ontowiki into develop
Set areaspline.fillOpacity to 50% (means set transparency of overlapping areas to 50%)
Merge branch 'develop' of github.com:AKSW/cubeviz.ontowiki into develop
adding pie chart icon
Integrate chart icons from Micha into existing system / user interface

Attention: renaming bar into column and vice versa!

From now on, Bar looks like

==============
==========
=====================

and a Column like

    ||
||  ||
||||||
||||||
||||||
Delete obsolete chart images
Merge branch 'develop' of github.com:AKSW/cubeviz.ontowiki into develop
Replace existing pie.png
Interchange bar and column.png's
vendor_aokp: add TF101 (1/4)

Change-Id: Ibfc47a7d5743705995b2f3b2002c9d6abe586304
Add d2usc to the game

PatchSet 2: Clean up and update

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
Change-Id: Ib4053ed0ade0b96b0e0cf2266033c190cb75c84f
Add evita (HTC One XL)

Add the AT&T HTC One X (a.k.a. HTC One XL) to the AOKP vendor tree.

PS2: Enable 7 Navbar Buttons
Signed-off-by: rohan <rohanmathur34@gmail.com>

Change-Id: Ibf888556a2b00c6f49e488dc7e331c4e8446da22
Merge branch 'jb' of https://github.com/AOKP/vendor_aokp into jb
tabs
merge
added test/dummy
Personal de Hospital agregado
Nothing really

Just some java work without significant results.
Initial readme added.
broken link management
Added fixtures files for unit tests database populating.
query and tables methods implemented in SQLiteConnection class.
Database is emptied when executing a DatabaseTest based class.
queryForTables SQLiteConnection fixed : when the database have no schema the returned value is an ampety Array.
DatabaseLoader for uni tests loads sql script from file to initialise the test database.
Added QuizFields to User Migration
Rendering out API calls in a view
Merge branch 'master' of https://github.com/AlwaysBCoding/pinjobs
[add] Package to the summary table
Separating out runtime archive building from actual use.
version 2.0[1.7]
Fixed Shownote

Submitted shownote had incorrect filename. Also switched to use
pre-formatting.
Core/Vehicles: Correct usage of npc_spellclick_spells instead of blat…
Mejoras en el datatable
El scaffold puede usar filtros
Helper para filtros y formularios mejorados
Update samples/gwt-conn-share/src/main/java/org/atmosphere/samples/client/GWTDemo.java
Fix for #712
Improve docs & disconnect handling
Merge branch 'master' of github.com:Atmosphere/atmosphere
xinit adjustments
Convert java files to maven project
Changed permissions
pagination changes to patient_level_data
pagination changes
pagination changes
pagination changes
pagination changes
pagination changes
pagination changes
pagination changes
Messaging via binary structures
* Added item 40.
* Added link to webpage.
* Added file with references to rvalue references articles.
* Added example using final, but doesn't compile yet...
* Added example on regular expressions that doesn't compile yet.
* Added an exampe on returning references.
* Added shared_ptr example from Wikipedia.
first real blag post & index change
Added at()
Updated docblocks
Updated example files
Added combination()
Updated docblocks
Some method names two double underscores are being parsed as markdown.
little stuff
Merge branch 'master' of github.com:Blankwonder/4dot5-api
fix background
Merge branch 'master' of https://github.com/BlobRising/BlobRising
created registerBB and made som changes to address and customer to make them usable with registerBB
Merge branch 'master' of github.com:Braaf/SuperShopGrupp4
Added empty web app project
[maven-release-plugin] prepare release master-pom-1.0.1
reupload fixed version
Adding in PHPDocumentor generated docs for PHP
Update for v1.2
Update to v1.3
Removed
update from upstream version 1.3
update from upstream version 1.3
finetuning update from upstream
changed notifymods to contain a hint for files and board mod functionality
Adding colour change based on instance state for Quick view
Applied patch https://reviews.apache.org/r/5522/diff/
Removing hardcode of config file path
networkId is None by default
CS-16038 : add guest os type in upgrade
CS-16040
3.0.1 to 3.0.5 Upgrade: ovs_tunnel_account table should be removed from the Upgraded Setup.

fixed
CS-16041. Not able to deploy Vms using base64 encoded userdata.
Relaxed the validation applied on userdata.
Reviewed by: Prachi
CS-15778: Fetching thumbnail modified with review comments
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
CS-15734 KVM Snapshots show incorrect disk usage
Replaced size by virtualsize
Reviewed by : Nitin
CS-16052. Adding indices to the create-schema and upgrade schema in the autoscale tables.

reviewed by. Vijay V.
    CS-15927 : Able to add autoscale VMs to static LB rule
    First Part: AutoScale Vms are named as "AutoScale-LB-<lbname>"
    This could be used by UI and have filter mechanism to not display
    autoscale vms during the "Add Vms" dialog for a non autoscaled
    lb rule.
bug CS-16035: Added traffic sentinel config params to 305 upgrade
status CS-16035: resolved fixed
CS-15617. Changed CounterResponse to a List as queryAsyncJob expects it.

reviewed by: Nitin
CS-16039 : Enabling/Disabling of Zone results in localstorageenabled flag to be reset to false.
Updated get method to retuen null if no value specified for localstorageenabled in UpdateZone command.
Reviewed-by: Abhi
Fixing error in commit 4eb88fc6862cfe939dadbb2dacadfba3223aea76.
Changes in 4eb88fc6862cfe939dadbb2dacadfba3223aea76 are not complete
the upgrade-schema schema-304to305.sql and create-schema.sql is not
consistent, will be fixed in a subsequent checkin.
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
CS-15830. If autoscale vm group creation is attempted on a unimplemented
network an error is thrown.
Enhancing the check to make sure AutoScaleVmGroup should have atleast 1
min member.
Adding the indexing of load_balancer_id to the create schema file to keep it consistent with the upgrade schema file.
CS-16066. Autoscale ServiceGroup is updated to use Uuid
NetScaler jar version updated to 10.0 74.152
Merge branch '3.0.x' into wip-cs-16044-zoneWizard
Add API parameter to add zone for local storage
S2S VPN: Add check for router status before apply vpn
CS-16493: cloudstack UI - IP Address page - hide VLAN for regular-user/domain-admin.
Cucumber feature file for creating tickets
Adds i18n labels across the whole app

+ Adds translation files for english, spanish and portuguese
updated: CHANGES.txt
added: missing views for cleanup
Merge branch 'master' of ssh://git@github.com/ColdTrick/group_tools.git
Merge pull request #229 from andresmoschini/my-menu-employee-order

My menu employee order
Added technical skills into employee edition screen
Added technical skills to Applicant edition screen
Added technical skills as relevant in employee search
Added technical skills as relevant in applicant search
Improved visibility of blocks related to each file
Numeric values for each TechnicalSkillLevel
Merge pull request #232 from AlphaGit/skills

Technical Skills
Merge pull request #231 from AlphaGit/file-listing-ui

Improved visibility of blocks related to each file
Merge pull request #233 from andresmoschini/menu-order

Menu order
Increment version
Show default place when the employee cancel the menu
Add migration generate employee menus

based on external file and employees data
Hide "Procesar ahora" button to avoid accidental clicks
Add default values to technical skills new item

in order to avoid errors and mark unknown as default
Merge pull request #235 from andresmoschini/fix-technical-skills-error

Add default values to technical skills new item
Merge pull request #234 from andresmoschini/menu-order

Menu order
Add employee name to MyMenu page
Remove redundant title in Admin Menu page
Merge pull request #236 from andresmoschini/name-in-employee-menu

Name in employee menu
bumped compass version and fixed tests
updating to debian 6.0.6 , adding support for MIRROR override
Adding Basic Structure of the Bundle
converted mapping
updated documentation
Updated filename for the new jQuery version.

Signed-off-by: Moxxie <moxxiecms@gmail.com>
Updated jQuery.

Signed-off-by: Moxxie <moxxiecms@gmail.com>
Issue 2948: static error 500 page should have look and feel of the Archive

Have copied the layout from the static 502 and the error message from
the dynamic 500.
Issues 1883 and 2847: robots.txt: disallow indexing downloads and search results
Issue 2949: disallow indexing of external works
Mark for Later only appears when work is not already marked for later
Split Mark for Later and Mark as Read buttons
Mark for Later only appears when work is not already marked for later
Issue 2310 - reading major_version_read can be nil, which causes error 500 on the user's reading page

This is a bit of a hot fix, but reading the code, major_version_read
should never be nil, so it doesn't seem to make sense to add a special
if case for nil. Only checking if it's different than the work's major
version seems sufficient - the work's major_version will only go up,
not down, so the reading's major version can either be the same, or
lower. Or nil.
Merge pull request #477 from elzj/issue-1404-edit-drafts

Issue 1404: Allow users to save changes to work and chapter drafts
Shorten fix for issue 2940 and make strings translatable
Fix merge conflicts
Issue 2960 restructuring series edit form
Fix issue 2905 with chapter text escaping draft box
Merge pull request #520 from CristinaRO/Issue_2946_profile_no_user

Issue 2946: loading profile of a non-existent user
Merge pull request #521 from CristinaRO/Issue_2947_show_fandom

Issue 2947: show fandom when fandom doesn't exist
Merge pull request #522 from CristinaRO/Issue_2948_static_error500

Issue 2948: static error 500 page should have look and feel of the Archive
Merge pull request #523 from CristinaRO/Issues_1883_2847_robots

Issues 1883 and 2847: robots.txt: disallow indexing downloads and search results
Merge pull request #524 from sarken/issue_2940

Issue 2940 changing Mark as Read button position
Merge pull request #525 from CristinaRO/Issue_2310_nil_reading_major_version

Issue 2310 - reading major_version_read can be nil, which causes error 500
Merge pull request #526 from sarken/issue_2960

Issue 2960 restructuring series edit form
Merge pull request #527 from sarken/issue_2905

Fix issue 2905 with chapter text escaping draft box
last journal for workshop and all journals to memory-stick directory
Merge branch 'master' of github.com:DIKKA/Brew-Master-Pro
Merge branch 'master' of github.com:DIKKA/Brew-Master-Pro
Revert "Update arch/arm/mach-msm/pm2.c"

This reverts commit f648df59c18b9aa6fadac45f1d73460fae466a43.
add: sfb (Stochastic Fair Blue)
DAOs em andamento: Processo e todos os objetos que são seus atributos
query changes
trying to get the native SQL to work
Merge branch 'symfony2upgrade' of github.com:DannyMardini/wishlist into symfony2upgrade
Fixing some mysql glitches
menu->setWidth()
255 done
Object and Sprite added

Absent from the last commit for some reason.

I chose not to include the player class, as I have editied it a lot and
it seems all hacky. Also, marks movement code leaves something to be
desired, I want to make it work off of forces and friction and max
speeds, no insult to mark though, he wrote it in like 5 minutes.
added statistics - bug fix
Add process in background options to doSequentially

Do sequentially can now be used to process a list of tasks in time
slices so long-running processes don't block up the UI.
Refactor and add doSequentiallyInBackground

Restore doSequentially to process the list in a blocking fashion and
add doSequentiallyInBackground that does processing in configurable
time slices.
Public Product Backlog - Move Line Up/Down on Key
Move Line Up/Down on Key - Bug Fix and Tests
factored out HTML code hinting fro CodeHintManager to make CodeHintManager more general
Add some tag-specific attributes to HTML tag JSON file.
Read those attributes in from JSON file and filter them with the user input.
Create a new attribute code hints JSON file.
Read global attributes from the new JSON file and combine with other tag-specific attributes before filtering with user input.
Replace Array.prototype forEach with $.map as suggested by Ty.
Merge branch 'master' of github.com:adobe/brackets
Move Line Up/Down on Key - Updating code and tests after review
Add a new HTML5 tag (bdi) and remove 4 more deprecated tags (acronym, frame, frameset and noframe).
Add some missing attributes to td and th tags.
Add "type" property to attributes that do not require any value and rename attribtype property to type in attribute JSON.
Add comments to the attrbute hints APIs.
Implement the insertion of ="" with the attribute name for those non-empty attributes. Empty attributes are indicated with "type: flag" in JSON file.
Fix all JSLint errors and replace all tab characters with spaces.
Replace some remaining tab characters with spaces.
disabled dev tools in brackets-shell
code review comments
Merge pull request #1307 from adobe/jason-sanjose/shell-dev-tools

Looks good
Merge pull request #1009 from jhatwich/jhatwich/asyncAsync

Add Async utility for background processing
Merge branch 'master' of https://github.com/adobe/brackets
Move Line Up/Down on Key - Updating menu shortcuts, using batchOperation, lint fixes in tests
Add event handlers attributes in JSON files.
Rename attriboption property to attribOption for readability.
Parse tag hints JSON file once only and store the object in local var in the module.
Update getQueryInfo and handleSelect to take another parameter -- cursor.
Update the reture value of getQueryInfo api to be an object with a string member that will be used for filtering the code hints in search api.
Update comments to provide details of the query object.
primeiro filtro funcionando
Task
Task English
Add points in comments
Renamed report api to comparator
Version 3.1
Merge branch 'master' of https://github.com/EasyWebCom/EasyWebCom
Updated BootStrap file Data
Moved EurysMods core into correct packages.
Fixed EurysMods core references in MT Mods
Added getBlockStrength to Pressure plates
Added player isCreative check to dropping pressure plates
 - (TODO for others)
Merge branch 'master' of ssh://git@github.com/Eurymachus/Eury-s-FMs.git
storeimages
Crude signup is now working
Added T.38 fax support to mod_opal
Fixed VS2010 issues building mod_opal
More T.38 fax support changes for mod_opal. Not quite there yet.
Fixed outbound H.323 calls correctly marking call as answered when fast connect used.

Fixed correct media "frames/packet" for G.711, default to 20ms worth.
Allow SVN trunk to be used in buildopal.sh script.
Fix direction flag for outbound H.323 calls, all sorts of consequences there.
Added XML config for H.323 User Input Indication (DTMF) mode
Fixed numerous issues with T.38 support on mod_opal, now WORKS!
Added tracing for error conditions in mod_spandsp
Small tweak for media I/O in proxy mode, don't silence frame just because no codec. Needed for H.323 fax.
Fixed mod_opal shut down of media streams (in particular UDPTL) on KILL from fs core.
trivial compiler warning
freetdm: Fix for DL re-establishment on NFAS
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
Fix for compile warning
revert 19d3e646368ee5fa1fc8f88c475d3063c4ae740a
FS-4016 --resolve
FS-4025 --resolve
release mutex after iterating over channel vars
应用 color，添加 fixme,infixme,todo 宏
Did some work on this.

Did a little bit of work on the arguments.
Help tekst verbeterd
Merge branch 'master' of https://github.com/Geonovum/pdok_wizzard
Add URL generation method and update to Symfony 2.1 standards
Add key parameter to URL generation method.
Optimize formatting for Symfony coding standards
Update documentation
Add "valid_keys" documentation
Remove caching of form name for key
Merge remote-tracking branch 'remotes/jeremy/urlgeneration'

Conflicts:
	DependencyInjection/GregwarCaptchaExtension.php
[Controller] Setting Content-type to image/jpeg
Fixing session key, removing valid_keys which was painful to transport
the whitelist in the session (see #36)
Fixing the exception throwing and message
[composer.json] Adding Jeremy Livingston to authors list
+version 1.1

changed what i could remember...
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE-Docs
Unescaping names
完善了Time类下的GetNowTime()和GetRemainingTime()方法

这两个方法从旧项目移植过来，修改了一点点
完成了com.haoest.Utils.IO.FileBackup类和com.haoest.Utils.Text.ReplaceText类
Added a Ruby solution for problem 12
Merge pull request #4 from tommylommykins/master

ohai, solution for P12
Substituted the weak md5 encryption with a custom implementation of bcrypt(that I found in stack Overflow) seems more impresive when stored in the db at least

Signed-off-by: Spyros Gasteratos <morfeas3000@gmail.com>
Initial README
Initial TODO
DuckDuckGo: Added more error output (perhaps spammy? Might remove later) and outputs URL on redirect.
Import Properties only set once
chart styling and comment lines
Update with version with RabbitMQ deliverMode changes
allow config[:css] to be passed as array or string
add get_practicing_ruby_vol_2.rb
update get_ruby_core_docs.rb
fixes/improvements to main code; add acknowledgements to README
bump version to 0.0.6
Oops, left a message from 0.4 in the 0.5 readme. Fixed.
Added sort order to tiddler div attributes

So that file comparisons work better
Docs updates
Build TW5 to the github repo for publication
introduced wb.log() and added some debug info

EditableValue.startEditing() now outputs the time it takes into the console. This is interesting for us in some cases since it seems to take quite some time for aliases if there are many.

Change-Id: I0ccd5340a0958feee2aab1aa82933dddb08a9829
don't need WebRequest for token check

Change-Id: If57b6ade17817258159a26530df52f0631ef1c0e
EntityContent::isValid() requires an entity ID

Change-Id: If64595eda2b1e62bc3b3f28d25fda9c69c2fa185
kill dead code

Change-Id: I23ea78ce3f77fbe3f20b9c08c39556b9c925fc58
(Bug 39966) Adding a sitelink to a non existing article won't fail anymore

Change-Id: I08470d008c2536a40b52163b971b3283bf334f9a
Merge "kill dead code"
Merge "don't need WebRequest for token check"
Merge "(Bug 39966) Adding a sitelink to a non existing article won't fail anymore"
Solves bug 39938, to have 50+/500+ (user/bot) aliases.

Before, having more than 50 aliases (as normal user) or 500 (as bot or admin) was not possible because we were using the 'set' parameter of the aliases API. The API was cutting the list of aliases after 50/500 aliases and ignored all others. Now we use the 'add'/'remove' parameters, which sets the limit to adding/removing 50/500 aliases in one edit.

Change-Id: I457adea0c991c0a744a4d367f78aa9398f26cf21
Merge "Solves bug 39938, to have 50+/500+ (user/bot) aliases."
(Bug 40017) Normalization at external wikis and non-normalized utf8

Change-Id: Ib22e943a49fdf6967bda06678cde5787e005d1d4
Merge "(Bug 40017) Normalization at external wikis and non-normalized utf8"
Merge "EntityContent::isValid() requires an entity ID"
mark empty tests as incomplete

Change-Id: I264ab085196b6c424a00381febd360d99041459a
Merge "mark empty tests as incomplete"
fix: JS was not loaded for action=edit

Change-Id: Ief8397c628b5bcd3c9d3953cb13e400dae50d535
fix onLinkBegin for tests in which $wgTitle is null

don't ask me why $wgTitle would ever be null. Some times, it is.

Change-Id: I7e63ae3d9667eecb2de3d32253e5a2fa2d6df70d
Tests for entity content

Change-Id: I2c8079debc904b07865678812f22f41798e91f03
Killed dead method

Change-Id: Ic83c9c6208fb57b457a5e99bf556a41a1bc1d793
Use EditEntity to save changes in ApiLinkTitles

Change-Id: Id2d9eecfcec8be5786994080acd59a859215e6c6
reset crop selection
update email to be unique
Add some config for folding and Prod/Test file switching/running, add new plugins
User
- Correctif au niveau du requesteur
User
- Correctif au niveau du requesteur

Plusieurs correctifs
Finished adding functionality for distributed health pack generation and
health pack collision handling.
NOTE: If two ships hit the same health pack at approximately the same
time, then they both get it
Many fewer ambiguity warnings
Refactored thread work in a more stable way.
Resolved suspend/resume problems
Add comment to Gemfile on activeadmin dependencies.
Update all the gems (except devise).
[Scripting] Wrap the class 'Visual::Object' in JavaScript
Automatic commit of package [foreman] minor release [1.0.1-4.0604237].
Merge branch 'release/0.5.5' into develop
Treat any request whose Content-Type starts with 'application/json' as
JSON rather than look for an exact match.
Merge branch 'release/0.5.6'
Implemented pager identification guide
double pragma test
added equation editor page, links between home/equation/var editor pages
Merge branch 'master' of github.com:Kurt-von-Laven/lembic

Conflicts:
	log/development.log
minor codechanges inside class.database. mostly remove get_db_handle() call.
Divide a slide into two.
Oikoluettu ja korjattu radix sortin loppuun.
UPD: main -> text
ADD: library
手机客户端第一版
各种更新……

1.将Master移动到了Styles文件夹下，并修改各个页面对它的引用。
2.统一了数据库里表中数据项的命名（均以小写开头，如dataField）。
3.补充了优惠信息逻辑层的函数。
4.完成了商品分类页。
Fixed issue #6178: es-CL is listed as Spanish (Mexico) instead of Spanish (Chile)
Dev added countifop() and sumifop() functions
Dev added survey demonstrating them.
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii
Updated translation: Danish  - kindly provided by Søren O'Neill
Fixed issue #06451: Missing array filter edit boxes in Ranking Question
Dev confirmed works with IE, Chrome, and Mozilla
Fixed a bug in the autoloader
Removed command /ostern
Created the boss. Also fixed a few OOP things.
Agregada paleta de colores de ideclara, sacada de color-scheme
Boceto de prueba de carga de Hechos en formato json desde un archivo
2.0d4 Release.
MAS: Remove obsolete WebItemCount class
deleting submodule
haus-start is now template.json based, this ensures files will always be freshly fetched from their sources
NetStoreManager GoogleDrive: create items trees
NetStoreManager: use Trash item
This will preserve user input across form validation while preventing
XSS
This adds builtin settings link to /admin/addons/plugins
A warning in the readme is the best we can do for a dependency
Tested and signed off
Allows for restoring the default icon but also...
Fixes some bugs with how new decayimages are managed.  This commit also
enabled delete and satisfies as a fix for issue #4 providing a means to
add decayimages from existing images
Merge pull request #22 from March-hare/16-forgets-decay-on-page-error-reload

This will preserve user input across form validation while preventing XSS
Merge pull request #23 from March-hare/8-Prevent-decayimage-from-installing-unless-endtime-is-installed

A warning in the readme is the best we can do for a dependency
Merge pull request #24 from March-hare/5-Create-default-decayimage-when-category-is-added

Tested and signed off
Merge branch '7-restore-default-icon' into beta

Conflicts:
	i18n/en_US/decayimage.php
Merge branch '11-Add-settings-link-in-the-plugins-listing' into beta
Adding some additional error handling for image uploads
Switch to mvn install as the build script instead of default gradle
class 6 work
finally mapped Relation(1.7) and Rel(1.6) correctly
as FactionsAny.Relation
this means, compared to before, less plugin-author headache trying to
map each of those flags by writing more code for each in different
places
FFlag is next
fixed to properly shutdown async tasks (ie. metrics)

this error would sometimes be seen: (now not anymore)
This plugin is not properly shutting down its async tasks when it is
being reloaded.  This may cause conflicts with the newly loaded version
of the plugin
Merge pull request #12 from basicsensei/pullreq4

fix async tasks/metrics properly shutting down + Relation being bridged
Change-Id: Ia7eaaf9a88198ae883ee15b4ff605d5d8c4a8e82
New cases


Change-Id: I377508d96e1991bd367cd33bf7eef2faeaffd96c
few fixes

Change-Id: Ifefdf3b6c7ea34849246edc727426adb979380d3


Change-Id: I7f5cf2d6c1fc948e8636525d843caa16fa3092cb


Change-Id: I62fd0f33087941c1fb60415a659b5b841d237315
vragenlijst
tess
Merge remote-tracking branch 'origin/master' into admin

Conflicts:
	application/modules/school/controllers/AdminController.php
	public/js/mylibs/vragenlijst.js
Tons of weapon fixes - taser, grapples, wafflegun, sawgun, re-added required entities.
Silenced sniper confirmed working, re-added to traitor menu
trying to change folder names
ElvUI 3.33-22
Updates the spellchecker dictionary
Adds syntax highlighting for Clojure
Adds syntax highlighting for Coffeescript
Treats .html.erb files like .html files
removing useless object type mapping

... as we are testing the baseTypeId and not the objectTypeId which
might vary a lot.
Improved thead handling
Report T2 Viktar Volha
Locale Fix.
Converted project to maven.
Added libraries for maven to use.
Committing for Andrew's review.
Route and Plugin work
BUG FIX: Don't choke when a model doesn't have a PK.
Tightening up .gitignore a bit to be more specific.
Fixing how we load classes to ensure we always get the latest version,
even over big migrations.  Also making the code smarter about how it
identifies ActiveRecord classes -- this is done by eager-loading the
application code.

The freshness guarantee comes from shelling out instead of using the models
loaded in the rake task which could be quite stale after a long-running migration.

While I'm at it -- splitting up annotate (ambiguous with RMagick) into
annotate_models and annotate_routes.  And y'know, might as well make
routes support before/after/removal.

... and oh yes, better code loading behavior (partially via Bundler).

I'll have to make a fallback path at some point, but since this is a
Rails-dependent project anyway, this shouldn't be a big deal for now.
More improvements to code loading behavior/consistency.
Improve output a bit (particularly under certain errors).
Much better options handling wrt fallback paths, lots of bug fixes around defaults and fallbacks.
Adding tests to cover lots of the route-related functionality changes.
Whitespace/formatting cleanups.
Configure rspec to have nice default behavior.
Documentation/usability improvements.
Expose finer-grained controls in the CLI help screen.
Overhauling integration test system to be easier to use, more reliable, and create less system clutter.

Drawback:  It DOES require RVM now.
BUG FIX: Compensate for variation in behavior between Rake versions.
Updating changelog.
Migrating from mg => Jeweler, and from rdoc => yard.

The switch to Jeweler is because I've seen far too many things that get twitchy
if you try to be cute and actually run code from your gemspec (I.E. to get the
version, or file lists, or...).
Support new FactoryGirl file naming convention.
Rubinius cleanup.
Making Rakefile ever so slightly tidier.
Fix Visual Studio 2010 project upgrade
You just keep on testing 'till you run out of Cake
Fixed possible cookie bug.
Add Sleepinterruption
detailanpassungen
Bugfix Minuten umrechnen
Export implementiert.
Forgot to instantiate BiMap.
meteorite api collections
Tested Grenades
Implemented CameraPosition
Numbered issues.
Added name to template.
_underscore removed
корректировка "+доставка" (jQuery Modal)
корректировка стилей "+доставка"
Nahral jsem projekt s vytvorenym grafickym prostredim
toolchain: define glamo and omap useflags
libdrm: no need to force by machine here
toolchain: spin apply_series function from scripts/unpack
omap4: pull libdrm from git and simplify
xorg-server: drop TI patch and use apply_series
omap4: pull xorg-server from git
xorg-server: remove debugging leftover
xf86-video-omap: upgrade to 0.3.0+ce46bb1f32 and rework
[PLAT-2809] Cell data always sent as a JSON object in preparation for logging metadata
Remove unnecessary values from dependency graph after construction.
Allow a less restrictive merge of dependency node outputs.
Only generate requested greeks from ForexLocalVolatilityGreekFunction.
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Try to harden test
Fix examples tests

Create user database needed by tests
Graph pruning should be performed external to the building algorithm.
Try to harden JobDispatcherTest
small changes to partial so that it is the same version referenced in blog post
Merge branch 'master' of github.com:OpenGamma/OG-Platform into ui/dev
Merge branch 'ui/dev' of github.com:OpenGamma/OG-Platform into ui/dev
Try to speed up tests

Separate read-only tests and don't reset the database each time for them
Fix examples tests
adding og.api.rest to analytics2, adding default resolution rule transform, changing default view definition name
Merge branch 'master' of github.com:OpenGamma/OG-Platform
Report exceptions from graph building by addTargetImpl.
Match all currencies when injecting default curve names.
Propogate curve names to inputs for YCNS function.
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Merge branch 'master' of https://github.com/OpenGamma/OG-Platform into dev/stable
Changed to make git pull not assume master
adding console.$ when og.dev.warn is used, changing selector initialization to not touch the DOM, fixing select/drag + nearest_cell bug
Arrays.asList cannot have elements removed from its iterator.
Restart computation job when resuming a running view process.
Add AbstractToolWithoutContext for tools that do not require access to a ToolContext but want to take advantage of the
AbstractTool logback set-up and any other facilities that may be available.
Rename OG-Production to OG-Integration.
[PLAT-2526] Suppress merge module references when features are disabled.
Set build number before altering feature states
[PLAT-2270] Reference ivysettings relative to a project that is less likely to be in the workspace root (cherry-picking from commit 610accc0a828e57ed0c4a9b0d43d0ffca9953309)
Update instructions based on current wiki page. (cherry-picking from commit 2d4310871afddeb86238cd7b799a7c1db62396c0)
Prefer bundled JVM to system default (cherry-picking from commit 86bcda650ec217b5339d5a34f2fe98601fb98c67)
Conditional execution on configure custom action (cherry-picking from commit bda901e66662abd6ccf42563832325b354a8d65f)
Set the capacity of the buffer between the fire-hose receiver thread and the active mq sender thread to 100 instead
of MAXINT which was causing OOM and subsequent thread termination. This should probably be a circular overwriting
buffer instead of a blocking linked queue.
GS-10196
Fixed equals.
Reviewer: Eitan


git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@120396 eb64e737-3616-4df0-8941-5ee2ae88103d
Implementation initiale Patch Conversion
added .gitignore
A bigger bunch of fixing
Additional type changes
now using packet for parsing
Default help for asset types
Pre revert commit
Revert "Resolved Merge 002 21:13 21.11.12"

This reverts commit e061f94b43f0977d426acd9813d901bbc2848936.
Fixed the LuaJava issue (the program could not find the lua files) ... i decided to temporarly create a directory for scripts in the main project directory as they are not part of the source code
bug fix -- backup script
work in android
Use the logging module for displaying errors.
Decrease memory consumption and exit if no more memory is available.
changes in schedule & settings layout
[FIX #68188] Redirection vers une ancre -> caractère '#' reste encodé
IP addresses inherit tags from their parent networks (#375)

fixContext: use ip network's tagchain on ipaddress page
added bcmath release note