labofsahil/github-event-dataset-2012 huggingface dataset:
Finalize GT
Merge master
Merge master
Rename saved file
Merge branch 'feature/guidedtour' of github.com:ajaxorg/cloud9 into feature/guidedtour
Update GT...again
Merge branch 'master' of github.com:ajaxorg/cloud9 into feature/guidedtour
Merge branch 'master' into feature/guidedtour
Update GT...again^2
Merge branch 'feature/guidedtour' of github.com:ajaxorg/cloud9 into feature/guidedtour
GT updates
Merge branch 'master' into feature/guidedtour
Some more UI tweaks
Fix exit out of zen; block input
Make settings save
Optimizations on auto-save setting checking in Revisions as suggested by @javruben
Changes:

- Instead of checking the settings model every time, now there is a variable `this.isAutoSaveEnabled` permanently set that gets set upon `settings.load` event
- `this.isAutoSaveEnabled` changes in case the settings changes, through `settings.save` event
Extra-check for revisions for when switching to a new revision, where there is no revision model.
Fix inserting key in middle of variable has weird interaction
Merge pull request #1519 from ajaxorg/revisions_optimization

Optimizations on auto-save setting checking in Revisions as suggested by...
Merge pull request #1515 from ajaxorg/ui/test_panel

Make test panel settings save
Fix select UI bugs
Textual fix
Undo default runner fix
BytecodeCompiler processing file outs, tests
Migrate project code to follow Dart SDK version 13851.
First Batch of survey groups scrolling feature
add DeviceGroup object plus rest service
remove isOpen from questionGroup model
remove latlong from device
add deviceDAO to webapp-context.xml
Add LuaJIT tip
Created a dedicated function to run (on|in)-file operations so that it can be called by capez:settings:deploy(_locally)
Use -p when creating shared/var so that the process is not interrupted if the folder already exists (when it has been directly created on the server to avoid permissions issues"
Closes #3 by doing in-file replacement client-side (download=>replace=>upload)
Better looking CLI output
Remove gh-pages starter data
Add initial layout
Add initial css
Add initial JS
Add .gitignore file
Modify index.html to use layout file
Add 2003 route map image
Add Photo pages for 2003 and 2004
Add route map to 2003 page
Bug 808724 - Move the keyboard iframe above the application iframe and use the new property to ignore transparent background while resolving clicks
[Bug 802908] [Settings] Update help links and add button to submit feedback to Mozilla
[Bug 814183] User Guide link doesn't load support page
Bug 804544 - [Clock] Alarm should respect time zone and time change r=timdream
Bug 806052 - Upon bootup, once we swipe left to Everything.me, we should be able to swipe back right to the homescreen while it is loading [r=vingtetun]
Bug 814345 [Browser] What does a brother have to do to get a low framerate load indicator?
Bug810095_Delete_Icon_Update
Bug 802362 - Switch to common fromNow() date function for relative dates (fixes handling of future dates); r=asuth, a=vingtetun
Merge pull request #6522 from mozsquib/email-pretty-date

Bug 802362 - [email] Switch to common fromNow() date function for relative dates
Bug 802383: dynamically build the list of available locales
typo
fix linter errors (STK)
typo in icc.js (STK)
Bug 814076 - disable prompt aniamtion when unlock and vice versa
Bug 813902 - remove the workaround for 791920 to blur and refocus the
inputfield. r=Evelyn, a=Vivien
Merge pull request #6568 from RudyLu/settings/remove_workaround_simPin

Bug 813902 - remove the workaround for 791920 to blur and refocus the inputfield
Bug 813490 - FB Import needs to support edit mode [r=jmcanterafonseca]
Bug 813925 - Add missing plural cases to all apps. r=kaze a=vingtetun
Merge pull request #6549 from stasm/813925-plurals

Bug 813925 - Add missing plural cases to all apps. r=kaze a=vingtetun
Bug 813898: use 'top up' and 'top-up' appropriately. r=kaze a=vingtetun
Another fix for tag moving.
fixed stuff
refactored. good spot to start scripting events
sliderz
Fix to keyboard update in fullscreen mode
Merge pull request #1 from borjasalguero/alivedise_fullscreen_fix_v2

[Fullscreen] Small fix to keep keyboard working properly
Bug 818401 - Remove secure camera when screen goes off, r=timdream,
    a=blocking-basecamp
Deploy script: better branch discovery method
Core-Js now integrates autodetection of polyfills to old browsers
Now the polyfiller get the path from statics
crash: packet_id_debug_print: sl may be null

Program received signal SIGSEGV, Segmentation fault.
packet_id_debug_print (msglevel=1174405255, p=0xa36bd0718,
pin=0x3de5feec1b0,
message=0xa330dde80 "PID_TEST", value=0) at
../../../src/openvpn/packet_id.c:504
504       for (i = 0; i < sl->x_size; ++i)

(gdb) print sl
$2 = (const struct seq_list *) 0x0

Reported in the past[1].

[1] http://thread.gmane.org/gmane.network.openvpn.devel/5466

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
cleanup: tun: no reason to condition private type
cleanup: tun: tun_engine interface

Platform independent interface for tun provider.

Split the long tun.c into platform specific files using
tun_engine interface.

There is more to be done in order to clean up the code,
however this is a good starting point.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
supporting only option when telling Rails to use database resolver
added build status from Travis-CI to README
committing broken implemention with more precise targetting of instrumentation (expectClick functionality)
Fix hint string for DPI setting

Separate DPI for X and Y can't be set in <DPI_X,DPI_Y> format, only in
<DPI_XxDPI_Y> format.
Comments, refactoring, change of structure.

Added some comments. The code is still a mess though hopefully
not as much as before.

Separated the global parameters used in the global_parameters.py
file, so that one can control all the parameters used across
the code from one place.

Some minor improvements on equivalence class clustering (which
from now on will be called nearest neighbor(s) clustering since
that seems to be a better name).
fixing bug with content-type headers on firefox
renamed gates.properties to gatResourceBundle.properties
Added design prinsiples to README files.
wiki: Clarify more permissions language.
Switched DefaultSR detection to be more pythonic
trying to fix concurrent issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/org/animotron/games/web/CurrentWebFrameworkTest.java
new current web framework
refactor BinaryExpression
replace the # with ^
replace the # with ^
replace the # with ^
rollback
rollback
rollback
Added Four Images to Gallery page
Working, leaky C++ interpreter.
Cleanup.
A bit more cleanup.
Change void * to a union.

Still unsafe but the compiler pays more attention and we avoid a malloc.
Remove C++ version.

This reverts commit 7372bd69ccf0b2fa2f1d8981fd414a9091e5b274.
Initial tests suggest this works and does not leak memory.
Check malloc
** Added listByMaterial method into MaterialSettingDAO
IDI-62: First draft of "Workshops" page (child of About, no direct nav)
IDI-63: Adding Blackbox Theater; fix address of Pervasive lab.
IDI-55: Reverting the focus styling in IE6 to the default.
Merge branch 'development' into IDI-55
IDI-63: Add the participatory inclusive design lab to the 49 McCaul listing
IDI-59: Fix the unreadable font with Chrome and firefox on windows.
IDI-63: Clean up the markup
Merge remote-tracking branch 'cli/IDI-59' into development

* cli/IDI-59:
  IDI-59: Fix the unreadable font with Chrome and firefox on windows.
Merge remote-tracking branch 'michelled/IDI-55' into development

* michelled/IDI-55:
  IDI-55: Reverting the focus styling in IE6 to the default.
Merge remote-tracking branch 'acheetham/IDI-62' into development

* acheetham/IDI-62:
  IDI-62: First draft of "Workshops" page (child of About, no direct nav)
Merge remote-tracking branch 'acheetham/IDI-63' into development

* acheetham/IDI-63:
  IDI-63: Clean up the markup
  IDI-63: Add the participatory inclusive design lab to the 49 McCaul listing
  IDI-63: Adding Blackbox Theater; fix address of Pervasive lab.
IDI-63: Fix a spelling mistake on infrastructure page
Merge branch 'development' into IDI-33
Pasted key correctly
WW-3929 adds new errorPosition attribute

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1423607 13f79535-47bb-0310-9956-ffa450edef68
rounded f factors to 2 decimal
Fixes for TestStoredProcedureInvocation
Working on motivation exp script
Stupid typo fix in CatalogUtil.getWriteWriteConflicts()
Fixed up the conflict graph in the CatalogViewer. Set window dimension to modern default values
Added ThreadGroups in the HStoreThreadManager. Not really necessary, but it makes the jprofiler stuff look nicer...
The PartitionExecutor is using our magical ThrottlingQueue wrapper. This prevents one partition from getting its queue backed up and thereby starving all the other PartitionExecutors. The ClientInterface now calculates its incoming txn limit based on HStoreConf parameters and the number of partitions at the HStoreSite.
Cleaned up HStoreConf a bit and the default.properties file to work with H-Store's new internal architecture for incoming requests. Added the ability to automatically set new parameters if the user sets a value for a deprecated parameter. This ensures that all of our old scripts will still work.
HStoreConf will now also automatically populate the value of any parameter if its defaultString references another parameter
Fix support for populating dependent parameters.
Finally resolved issues with overriding HStoreConf parameters from either the command-line or the input file
Updated binding to libgit2/libgit2@7382551ff75fd7890752d3c64de85dc99115449e
Fix APSTUD-4944 JSLint inside Aptana runs far slower than on the command line
  - upgrade Rhino to 1.7R4 (our old 1.7R2 version was the major culprit behind teh performance issues)
  - Move jslint into com.aptana.editor.js where it's used so the rhino plugin is just rhino
  - Update to use lint invocation similar to jslint4java
improved
added css style for *
remove Gemfile.lock
improved
improved
freeze 0.0.1
Merge branches 'master' and '0.0.1'
freeze 0.0.1
fixed a time delay issue when pressing escape
order
Merge branch 'master' of github.com:aseba/TariqAPP
[future] changed: .Continue returns target future
Updated for Modular loader
Added README
(0.1.7) ["almost vanilla"]
- (add) step-physics option, which currently removes blocks without
applying physics on explosions [inoperable, just does not apply any
physics]
- (add) randomized tnt ignition (min-prime, max-prime) [currently only
if hit by explosion]
- (add) max-items setting to spawn multiple but not arbitrarily many if
an item stack has more...
- (add) Projectiles hit by explosion get affected.
- (add) Arrow effect possible (for items) 
- (add) Option to destroy items, boats, falling sand: item-yield [To be
more fine grained later on, probably]
- (add) Option to let burned tnt items explode (fire and lava, possibly
other: item-tnt, later maybe burning tnt). 
- (add) Option to let TNT-Items be changed to primed tnt if hit by the
explosion (item-tnt).
- (add) Velocity cap (not applied if <= 0).
update comments
mixed up order.
fix: else if
spare-primed configurable.
moving things around
changing the enum converter scope, using resolve to get the bean and trying to check the request
AS7-4776 Error during (re) adding connection factory using CLI
AS7-4919 Add scroller to operation dialog and make it resizable
JBQA-6277 -IronJacamar deployments subsystem test case
Added commons httpclient-cache
Upgraded infinispan to 5.1.5.CR1
Set MAX_FD_LIMIT correctly for mac os x lion
Added mime pull for handling large attachments with SAAJ

Conflicts:
	pom.xml
Added mysql driver
add Cakefile
dates as Date objects; helper module
KYRA: (LOL/FM-TOWNS) - add detection entry
KYRA: (LOL/FM-TOWNS) - adapt static resources
add configuration
Merge branch 'master' of github.com:atizo/epicwall
Fixed topics namespace.
Merge pull request #95 from atlasapi/mbst-1065-pa-schedule-day-interval

Use interval from PA file to define period for which schedule is provide...
Simplify audit fields into Audit block
Merge branch 'mbst-3659-audit-annotation' into stage

* mbst-3659-audit-annotation:
  Simplify audit fields into Audit block
Reset the form after adding a route
Merge branch 'master' into gh-pages
Fixed the new animastions.

Sound wont travel trough doors now.
Locks player in menu and when he uses pulse ability

Cooldown added to pulse.
Map primary contributors to author. Update xml.
Another todo item
Merge branch 'master' into development
almost -> most
Better error handling
Will throw errors when attempt to write to a deleted document using optimistic concurrency = true
Fixing typo
Fixing test
Remove not used xaml namespace imports which caused an R# errors
minor
Re-format code
minor
Clean code
Include database name in the request authorizer
RavenDB-583 Linq support for contains on arrays:
1. string ("".Contains(...)) should throw.
2. any other IEnumerable should be work exactly as Any works. (Implementation is different from any, but they should behave the same).
Add a failing test which fails due to a race condition. (Failed on iteration #2)
Add a nicer error when Windows Auth is not enabled
 RavenDB-638 Update the logs file suggested by the studio
RavenDB-571 Allow to edit allowed windows users & windows groups in the studio
Merge branch 'master' of github.com:fitzchak/ravendb
Merge branch '1.2' of git://github.com/DanielDar/ravendb
Fixing tests
Fixing NRE
Better UI for replication behaviors
Fixing text when creating new replication setup
Adding passing test
Protect against Request is not available in this context
Adding passing test

Signed-off-by: Ayende Rahien <ayende@ayende.com>
Making sure that cut off etag will work for dynamic indexes
Fixing an issue with includes on dynamic queries using embedded
- added string extensions for invariant string of int, float, decimal types
- [Async]ServerClient is now using invariant string for int and float types in the generated url
- added some resharper cleanups
Merge branch 'master' of https://github.com/ryanheath/ravendb into 1.2

Conflicts:
	Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
	Raven.Client.Lightweight/Connection/ServerClient.cs
	Raven.Client.Lightweight/Raven.Client.Lightweight.csproj
white space
ARC

Signed-off-by: hirofumi kaneko <kaneko120@gmail.com>
ARC

Signed-off-by: hirofumi kaneko <kaneko120@gmail.com>
arc

Signed-off-by: hirofumi kaneko <kaneko120@gmail.com>
arc

Signed-off-by: hirofumi kaneko <kaneko120@gmail.com>
aaa

Signed-off-by: hirofumi kaneko <kaneko120@gmail.com>
proyecto a futuro
Installation of 32bit lib*faker.so
forward unary methods in MatchData and Regexp#match:
Ping-pong commands added to protocol
ignoring the failing test, needs more understanding
Use https for the rose repo.
Fix Capybara deprecation warning
implemented cmsketch struct
More GIFs for Deal With It script
yorumlayici davranislarini belirleyen ayarlar, ayarlar.javada
atlama ozniteligi kes oldu
atlama ozniteligi ile ilgili metodlar kes ile degistirildi
kes ve devam isimleri eklendi
kes ve devam metodlariyla beraber tekrar() metoduna dongu kirmayla
ilgili parca eklendi
kes ozniteligi ile ilgili metotlar guncellendi
Refactored engine structure, refactored build system, added a new
sample(not working yet)
Fix let-subst bug; fibonacci works
Fixed a bug when clicking right and typing crashed the program
some changes for linux
Rename virtual field 'id' to '_id' to prevent conflicts
refactored InetAddress
Updated Spanish translation
Updated Czech translation
windows: upgraded to gtk+-bundle_2.24.10-20120208

This fixes an issue in which users on Windows XP with a 16 bits
display color depth could not start GCompris.
core windows: changed the demo activation code.
minor: no more automake warnings
slab: Added a counter for the required pages

The counter function calculates the number of pages required for the slab with
a certain number of pages of a certain size. It also takes into account the
alignment of the objects.
slab: Fixed a minor compile issue
stdio: Added an sprintf function

The sprintf currently seems to have a bug, so that after the first formatted
element it thinks it has to terminate the string or something similar.
So do not use yet!
Added initial (validation) of the new interface/iptables module
Make estub an own app as extension to eunit to be used as rebar dependency.
Make tests compile with rebar.
Using parse_transform to transform eunit test functions so that they clean the mocks and stubs before execution and checks the mocking/stubbing assertions at the end.
add tests of gpiofoxg20 library
remove test in src/main.cpp
layout ... again
add/fix torrent fields
list of names not on wiki, with err. Test the temp.rb for char replace
Use converter attached to radio:selectOneRadio during rendering radio:radio.
first pass at permissions on tag creation
[tweak] make combatrestore functions clearer on what they do since the two inputs were ignored anyway.
added default_cmds
retirando o extern C
Implementando follow como parametro de <particle> além de poder ser declarado no <parameters>
fix ErrNoDate
change for detail
add flymake for ruby-mode
Mac Version compiling in XCode
update base url for github pages
SAKIII-5904 fixed missing i18n key
SAKIII-5899 - Cannot view My Sakai 2 site with release build
https://jira.sakaiproject.org/browse/SAKIII-5899
SAKIII-5887 fixed ui performance issues around adding content
Merge pull request #2263 from jsloane/SAKIII-5904

SAKIII-5904 fixed missing i18n key
SAKIII-5903 fixed topnav message count
SAKIII-5382 fix collection count
Merge pull request #2095 from jsloane/SAKIII-5382

SAKIII-5382 fix collection count
SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group
SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared

Squashed commit of the following:

commit 066fac09b6aec2e726c443c7b8f516a439b73c27
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed May 9 12:23:21 2012 +0100

    SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared

commit 8bd3c3319ec8f2e4872b91bc295b0db2140a2d8a
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue May 8 16:15:48 2012 -0700

    SAKIII-5587 - User feedback for can't share content - Add to
    https://jira.sakaiproject.org/browse/SAKIII-5587
Merge pull request #2101 from bp323/SAKIII-5587

SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared
Merge pull request #2102 from bp323/SAKIII-5583

SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group

* bp323/SAKIII-5583:
  SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group
SAKIII-5600 - fix to make .versions.json work
https://jira.sakaiproject.org/browse/SAKIII-5600
SAKIII-5599 - Fix label for search - manage
https://jira.sakaiproject.org/browse/SAKIII-5599
Merge pull request #2106 from christianv/SAKIII-5599

SAKIII-5599 - Fix label for search - manage
Merge pull request #2105 from christianv/SAKIII-5600

SAKIII-5600 - fix to make .versions.json work
SAKIII-5604 - Fix the more widgets layout
https://jira.sakaiproject.org/browse/SAKIII-5604
Merge pull request #2109 from christianv/SAKIII-5604

SAKIII-5604 - Fix the more widgets layout
Fixing fact ordering
code in examples/pbd/first-world.rkt works -- big_bang needs all clauses, and we need all test cases
fix LKASSERT in 2dpclip
Rename __weak to weak for property
Rename __unsafe_unretained to unsafe_unretained for property
Adds more sending modes and effective unsubscrip
Specs and Fixtures for Paragraph Renderer
Initial hacky Windows support.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Use a different test image set

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>
Push backlog to 32
Add 'Untitled Category' to i18n-js
Added CanCan Authentication for Option controller
I18n'd mark as complete
Add Jquery UI library.

Forgot to git add . in the last commit.
removed poltergeist 'require'
UI: Build/picker_pane
improving changelog
Linked the freeid tracker to the repository, just need methods for creating and saving an object. barebones of a player object and the utilities for password support
Esto fue desde ubuntu
deleted files
Merge pull request #1 from carlsjr/th3rdi

deleted files
UI refresh by Carly, Cody, Braeden
factored out check_booking from booking view/template/url

by Cody, Braeden, Cheng
Merge branch 'cheng-dev'
添加手机版网站文章详情页
modified:   .irssi/config
remove Crack::JSON parsing, and use native JSON parsing
Merge pull request #1 from sghael/master

remove need for Crack gem
Version and readme for master.
04-03-2012 stable
Merge
Add Patches
Change changelog
Move .cfg file
Change changelog
Change hpfeeds.cfg to hpfeeds.cfg.dist
Merge
Set patches
Change makefile
Change makefile
Remove tmp files
deal app w/django-taggit
Include Lrzip.h in sources.
Changing the value of general.useragent.vendor no longer affects navigator.useragent
Use redirected URL for http://www.example.com/
Update index.html

test fix on site
SEAMMAIL-34 - Send velocity logging to null chute
use `respondsToSelector` instead of respond_to?, and better `setter` and `assign` methods
Probando el GitHub notifier…
Changed the layout of encounters
Documentation skeleton.
Documentation.
More doc refinement.
Fix disconnect, improve coverage, enable file value specifier.
Separated h1 in posts from pagetitle
Joinbox now takes text from the 'reasons-for-joining' post
Template now =  Reasons for Joining Section + Speechbubble
switch from os+platform ohai plugins to linux/lsb
Move y positioning to dagre.layout.position
return true / false if object has been modified
request io pages in c code
cccc
adsf
I added the presentation for 3rd release
Make Patrols attack Pirates and Pirate Escorts
Add Killed callback when AI are destroyed

Before an AI is killed, it gets one last chance to do stuff before it is forgotten and deleted.

Currently, this includes cursing the player and reducing their Favor with the AI's Alliance.
Merge branch 'master' of git://github.com/cthielen/Epiar
enforser upgrade
call rspec_reset on Tempfile mock to ensure multiple instances can be created
mark Chef::CookbookVersionSelector specs 'pending' on
platforms that can't install dep_selector gem (and Gecode!)
Merge branch 'make-specs-run-on-windows'
ensure Chef::Config[:cache_type] is set to Memory before attempting
to create a ChecksumCache instance.  cache_type is File by default
which can cause permission issues.
add missing require for chef/platform
add links to MSDN documentation on determining Windows version to comments.
create Helpers module so other clases can easily leverage the logic
create Chef::Win32::File::Info class...acts a whole lot like File::Stat
update Chef::Provider::Link to leverage Chef::Win32::File::Info on Windows platform
Merge branch 'windows-file-info'
remove unimplemented Chef::Win32::Service class
move shared winapi macro methods to main Chef::Win32::API module
move macros to main API module; improved comments
level up commenting move ruby-ish helper methods into Chef::Win32::API::File
reorganize file and level up commenting
refactor constants from Chef::Win32::Version into Chef::Win32::API::System; level up commenting
move unicode helper functions into Chef::Win32::API::Unicode
use proper self.* class methods vs confusing metaclass class << self syntax
move make_uint64 to global API module
check for existence of files before calling win32 apis; use less suprising self.* class method syntax
Adding new mail capability!
Fix another issue with 'make dist' target, improved help
escape content before pygments
ORION2 default parameters
取り敢えずコミット
add gitignore
modify mechanism for output
complete modify schema
Update pymysql/converters.py

Re-introduce Thing2Literal() to make PyMySQL compatible with Django 1.4
png grösse korrigiert
Widgets parsers

+ Basic logic added, to handle different type of widgets.
* Moved demo widget to tom.js separated file
+ Event binding on $(document) to check for Google API
Cleanup taxonomy

Deleted /app.js (moved to js)
Moved tom.js to js/ folder
my vigor is dead...
Add a check to JSON code

Addressing Anton's review comment. Also removing a leftover
debugging printf.

TBR=antonm
Review URL: https://chromiumcodereview.appspot.com//10391139

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7659 260f80e4-7a28-3924-810f-c04153c831b5
Improve the handling of the connection header

* The connection header can now have multiple values
* The persistent connection state can be controlled

R=ajohnsen@google.com

BUG=dart:1995
TEST=tests/standalone/io/http_connection_header_test.dart

Review URL: https://chromiumcodereview.appspot.com//10315002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7267 260f80e4-7a28-3924-810f-c04153c831b5
add rewind for consistency
attempt to fix up some quoting
Adicionada a opção de ordenar ascendente ou descendentemente
Merge branch 'development' of https://github.com/dcastro/myWine into development
Remover Vinho fixed
Merge remote-tracking branch 'origin/development' into Sync-test
added canonical url to header

--HG--
branch : 3.1.x
added outdatedness warning to 3.2 documentation
updated links to latest documentation

--HG--
branch : 3.1.x
fixed link to updated documentation

--HG--
branch : 3.1.x
fixed link to updated documentation
fixed canonical url in documentation

--HG--
branch : 3.1.x
fixed canonical url in documentation
updated canonical api docs url to point to the current one

--HG--
branch : 3.1.x
updated canonical api docs url to point to the current one
added outdatedness warning to api documentation
merged release-3.1.x branch (closed, hopefully forever)
merged release-3.2.x branch (closed, hopefully forever)
merged release-3.3.x branch (closed, hopefully forever)
closed branch

--HG--
branch : 3.1.x
extra : close : 1
merged release-3.1.x branch (properly closed)
removed unused CleaningStreams
fix #297: Added FormsDict.decode() to better support WTForms.
fix: py3k bug in test case.
fix: Subtile bug in stpl parser. '.%' was recognized as code line.
Fix: Missing response.environ on router errors.

Thanks yjost from IRC
Removing an useless \escaping in -*- coding -*- regex.
Stressing encoding definition. I swear I found these bugs by accident.
Merge pull request #286 from iurisilvio/master

Encoding definition improved in SimpleTemplate
Simplified some code.
Replaced some code with a touni() call in SimpleTemplate.
docs: Fix deprecated API use in tutorial.
docs: Added some plugins to plugin list.
docs: Added Macaron to list of plugins.
fix: The 'path' wildcard filter should not match empty strings.
fix #300: Added WaitressServer adapter.

Waitress is a very promising pure-python no-dependencies 2.6 + 3.x WSGI server. Thanks fdev31 for the idea+patch.
Moved the resource stuff into a separate class.
enhanced example using @error(404)
Merge pull request #302 from paullik/improve_tutorial

Enhanced example using @error(404)
Renamed some methods on ResourceManager and cleaned up documentation.
Merge branch 'master' into resource-management
Adding Inspiration room. Attaching UrlFeed and gallery preview
Fix memleak + refcount issues
finally I got the dependencies to work.
KT-927 source — use full path
Add rows colored by velocity in more views.
Add finished exercise
Add checked-profit
Add checked-is-between-5-and-6?
Add checked-reply
Add checked-distance-to-0
Add checked-perimeter
Add finished exercise
rroot regExp removed from offset module: checking offsetParent.nodeName === 'html' directly
Change adjacency list to csr format. TODO: rename adjacency list to csr.
Use CSR instead of AL for preprocessed graphs.
Read in other formats
Rename prpack_adjacency_list to prpack_base_graph
Store and output read time.
Forgot to add base_graph files.
Have schur complement approach skip over vertices with no inlinks.
Have all methods compare error to tol, not iteration differences or residuals.
Stop computing residual separately.
Make scc preprocessing slightly faster by not creating heads/tails.
updated makefile
Merge branch 'master' of https://github.com/DavidKurokawa/prpack into davemerge

Conflicts:
	makefile
	prpack_adjacency_list.cpp
	prpack_adjacency_list.h
Add composer to installation in README
Merge pull request #175 from benjaminlazarecki/patch-1

Add composer to installation in README
significant bug fixes and changes to use function, added use_method
Modified readme to provide any useful information
wish i could work on this more
better state hash error loggging
cleaned up urls and added paginate_releases view for later; to be continued
set up basic knockout scaffolding for async releases (interim commit)
add back most of the functionality in an async compatible way
interim commit
Adds smsforms validation to other question types
almost done with async releases
Adds support for survey incentives
Adds support for wave end dates
Merge branch 'master' into gc-dev
Add ability to choose order of reports in a scheduled report (Case:47420)

Added a jQuery UI multiselect plugin, and a custom jQuery UI bundle of its
dependencies.  This doesn't interfere with the one other place we are currently
using jQuery UI, for datepickers.

Used the custom jQuery UI theme created for datepickers, it works well enough
for this multiselect too.
Disallow multiple saved reports with the same name (Case:47397)

This form processing code that I wrote isn't very robust and should probably be
switched to a django form at some point.
remove unused sms_autocomplete partial and jqUI autocomplete plugin it depended on
remove support for the public domain license
Merge pull request #305 from dimagi/remove-pd

remove support for the public domain license
sort groups when downloading users/groups
Merge pull request #306 from dimagi/download-users

sort groups when downloading users/groups
i18n
add button for previewing an app
change full_applications() so that it can filter out application builds. Fix bug in the project_info page and import_app where it was displaying/copying application builds.
Merge pull request #307 from dimagi/download-users

i18n
Making approve button visible only to superusers
Merge pull request #210 from dimagi/ui-changes

Ui changes
change how descriptions are displayed
force users to select a license for their project that is more restrictive than it's multimedia
set cloudcare default language to the default language of the first app

(if not specified by the user)

The best plan would actually be able to allow each app's default to be
used just in time if the user doesn't specify a language, but this was
a little hairy, so using a workaround that should cover 90% of cases
where there's only 1 app.
Merge pull request #104 from dimagi/cz-dev

set cloudcare default language to the default language of the first app
clarified some wording
adding a partial response option to reports
Merge pull request #374 from dimagi/mvp-qa-response

Async indicators...
fix a 500 that only happens during deploy
merged with master
Merge pull request #375 from dimagi/resource-version

fix a 500 that only happens during deploy
Merge branch 'master' of github.com:dimagi/core-hq into email-response
Added fix for display inline-block on floated lists
Renamed test pages to something more ambiguous
Fresh import of playground.
throw helpful error message if StormSubmitter used without storm client script
update changelog
Merge branch '0.7.2'
remove unecessary nohup
remove unecessary nohup
update changelog
Merge branch '0.7.2'
added Values as a default serialization
update changelog
Merge branch '0.7.2'
optimize worker heartbeats, remove heartbeat thread from tasks workers pull stats from tasks instead
fix heartbeating to only grab valid heartbeats
remove unneeded taskbeats state in worker
Merge branch 'master' of https://github.com/nathanmarz/storm
Merge pull request #464 from dleung/2.2.1-custom

Added option in views to expand the description past the limit
Modified web UI to add a delete button to cancel jobs in queue
encrypted return value of /check/
chapter 6 and LD50
Instance Summary info
Merge branch 'master' of git://github.com/mysociety/popit
Added route for About page
About module
Added View page and refactored code
API Integration
Fixed typo in instance selector
Added instance name, person count and organisation count to about API call
Instances directory
Uncommented mailing code
Image proxy integration
Added Proxy support for local images
Merge branch 'master' of git://github.com/mysociety/popit

Conflicts:
	hosting-app/app.js
	instance-app/app.js
Merge branch 'master' of git://github.com/mysociety/popit
Instance Info changes
Fixed layout path in view file
Fixed layout path in view file
Fix for saving instance info embedded doc
Merge branch 'master' of git://github.com/mysociety/popit
Fix for upserting the embedded instance info doc
Add mappings for commonly needed fugitive functions
Don't use ft-settings for indentation

Unfortunately, it conflicts with per-project settings :-/
added settings for neocomplcache
Fixes #6825, adds tests covering cases and error possibilities, also changes SQLite3 driver to correctly generate a time column instead of datetime
Merge pull request #6873 from mauricio/fix-for-6825

Fixes #6825, adds tests covering cases and error possibilities
fix: limit of enum columns of mysql
Merge pull request #6878 from masarakki/master

fix bug in limit of enum columns of mysql

Closes #6432
Mention effect of accepts_nested_attributes_for on association autosave option [ci skip]
Speed up Hash#transform_keys using Hash#each_key

See https://gist.github.com/3007749 for justification
Merge pull request #6886 from nertzy/faster_stringify_and_symbolize_keys

Speed up Hash#transform_keys using Hash#each_key
Skip test_setting_time_attribute because Oracle database
does not have TIME data type.
Merge pull request #6890 from yahonda/address_test_setting_time_attribute_oracle

Skip test_setting_time_attribute for Oracle database
Bump minitest to 3.2.0
Move newly added multiparameter tests to base_test file

All other multiparameter assignment tests are in the same file, so it
makes sense to have all of them here.
Remove some aggregation tests related to composed_of

Since composed_of was removed in 051747449e7afc817c599e4135bc629d4de064eb,
these tests were working "by mistake", due to the matching "address"
string in the error message, but with a different error message than the
expected multiparameter assignment error.

Since "address" is not an attribute from Customer anymore, the error was
"undefined method klass for nil", where nil was supposed to be the
column object.
fixing typo in from documentation
Merge pull request #6894 from subbarao/master

fixing typo in active record from method
Support collate and ctype on the PostgreSQL.
Merge pull request #6895 from kennyj/support_collate_for_postgresql

Support collate for postgresql
Require URI
Merge pull request #6900 from cbandy/issue-6898

Require URI in ConnectionSpecification
fix ActionMailer::Async docs and update to follow coding conventions
Merge pull request #6902 from frodsan/mailer_async_doc

fix ActionMailer::Async docs and update to follow coding conventions
Refactor and add separate Product Tree class.
Further refactor ProductTree and MainDisplay.
Colour and Date changes.
Merge branch 'master' of https://github.com/dpschramm/pimp
Added more comments and removed unused methods
Typo fix in Readme
Exceptions must extend FuelException rather than Fuel_Exception to work with the latest fuel core
Merge pull request #22 from craighooghiem/1.2/dev

1.2/dev
configure vim ctrlp to use c-p/c-n to select file
Fix wrong field name in README
Rename c++/binary_operator -> c++/infix_operator
t68
Merge remote-tracking branch 'upstream/master'
fixed loading from jar file, URI.getPath() returns null for jar urls so SimpleJavaFileObject can't be used.
allow worker verticles to share same classloader for all instances
Merge pull request #294 from dsklyut/master

fix in installApp gradle task.
logging.properties and conf
Merge branch 'master' of github.com:vert-x/vert.x
fixed issue with local handlers in cluster
allow through replies to client for messages sent from client
removed erroneous check
Merge pull request #290 from jannehietamaki/master

Fixed ad-hoc Java compilation
delete build dir on clean
fixed examples, changed java examples to run as source, various bits and pieces
updated readme
upped version
lower case headers
a few fixes
Adding notes from fall 2012
clear bug at the menu
Merge remote-tracking branch 'origin/master'
arrumando path sem www
Arrumando objeto nulo no SHOW
.DS_Store files ignored.
Project upgraded for Xcode 4.5.x
Certificates files ignored.
Add support for Provider Certificate passphrase.
Make magit-save-buffers on magit-status use the directory we are
opening, not the default directory of the buffer we are visiting when
called.
Correct documentation for creating branch

It is b c instead of b n
Update copyright in magit.texi
Fix typos in CONTRIBUTING.md
Merge pull request #478 into maint
Updated the documentation for the branch manager.
Rewrote the branching section of the documentation.

Merged the branching section with the branch manager and added information about managing remotes.
Adds missing double spaces after period ending sentence.
Changes to showing betting and schema for odds
Breaking API change: trying to unbreak functional updates
Added captions to images, but did not fix submitting empty content.
Added captions to images, but did not fix submitting empty content. Added captions to comments index, reply, and user show page,
store api finished [1]
vimrc: Removed vim-endwise plugin due to strange typing behavior
Ignore invalid/null dates
Merge pull request #20 from wordpress-mobile/invalid-dates

Ignore invalid/null dates
mxsup-1360: Added phi, kappa and wavelength to be written to ISPyB
tmux
Merge branch 'master' of https://github.com/edrex/Dotfiles
Update src/Mcms/DashboardBundle/Controller/DefaultController.php
fix keychain check where it doesn't exist
Making previews work better when screen is very small- site should be responsive now
Add enumrate_modules (copied over from old jenni)
improving concept to auto state naming, developing basics
Merge branch 'master' of github.com:elchbenny/nice
+ image-item
+ splitter for context menu
Yay for static typing (converted char to string)
moved class reports css into own sass file
For the student reports now guarding against no misconceptions defined
Added an error signal in vm-th-build-thread-lists.
Ignore stale messages in vm-delete-duplicate messages.  (Fix for Bug 1004837).
Merged into a branch at another site.
Modulo installazione
Add optional magnetar server
Add on_url event
Replace hasattr()s by default methods
Add on_kick event
extract kevin computing code
Kevinade on kick
Forgot to remove the extra JOIN
Add tinyurl.com as a minifier
Remove on-join self-tofade
modifs mineures sur les tofades
Merge branch 'master' of ssh://ec2-46-137-139-98.eu-west-1.compute.amazonaws.com/tofbot

* 'master' of ssh://ec2-46-137-139-98.eu-west-1.compute.amazonaws.com/tofbot:
  modifs mineures sur les tofades

Conflicts:
	plugins/jokes.py
TG and GG tofbot fixed
Merge branch 'master' of ssh://ec2-46-137-139-98.eu-west-1.compute.amazonaws.com/tofbot
Add bit.ly to url shorteners
Merge branch 'master' of ssh://ec2-46-137-139-98.eu-west-1.compute.amazonaws.com/tofbot

* 'master' of ssh://ec2-46-137-139-98.eu-west-1.compute.amazonaws.com/tofbot:
  TG and GG tofbot fixed
Allow several consecutive s///
add trace message on PING
refresh irc.py from sbp/phenny
Print traceback on ERROR message
remove : jokes, contrepeteries
(partially) Revert "remove : jokes, contrepeteries"

This reverts commit 89226a082144f6b049acbf5e40aff5e9987804df.
active_admin things
dont use scss
Merge branch 'master' of github.com:danielweinmann/catarse
Back to thin. Unicorn in heroku blows the memory quota and generate some errors
wti pull
fixed activerecord error messages in pt file
Receive a notification of payment confirmation (issues #58)
Merge branch 'master' of github.com:danielweinmann/catarse
rename_backer_totals_to_user_totals
Merge branch 'master' of github.com:danielweinmann/catarse into rename_backer_total
added translation for notification of payment confirmation (closes #58)
new admin translation
fixing weird bug with views lacking set_primary_key
Merge branch 'master' of github.com:danielweinmann/catarse
now we can filter by credits difference (between calculated credits and the credits field)
 put github back as source
Receive notifications of new updates in projects I've backed (closes #57)
Merge branch 'master' of github.com:danielweinmann/catarse
wti pull
Payment Adjustments
Add license
Document affected methods
Always proxy the object
Fix hoisting mistake in the example
Update README.md
Update README.md
No need to use deepEqual
Pass method to logWrite
Rename WARNING to WARN
Clean up
Document new logWrite
README md'd and updated
add static
finish
Updating some command lines in the translation tools
Adding the copyright of the cmake files from Wesnoth
Starting to have some strings translated for tests
Adding a standard gettext.h for the translation, and using it
Forgot to add gettext.h in the build system
Working a bit on the build system (Cmake is not that simple!)
commit
Merge branch 'master' of https://github.com/ershor/PlayBox.git

Conflicts:
	PlayBox/dev/prj/PlayBox/PlayBox.cpp
Added support for XIB loading, maximum font size, fixed drawing issue on null CGContextRefs, fixed hit testing on links and event forwarding, inherited naming conflicts, added a new delegate method for link taps.
Merge pull request #4 from jacobrelkin/master

A bunch of changes that fix a bunch of bugs.
Fix Android build in espes/develop3d
Fix PSS, Win, Win8, iOS projects...
??.
COMMONS-173 - Upgrade to GateIn 3.4.0.M01: RequireJS
COMMONS-173 - Upgrade version GateIn to 3.4.0.Final
COMMONS-173 - Fix bug in Cometd
Remove file pom.xml~
COMMONS-173 : RequireJS - Add alias for SHARED modules: commons-doc, commons-editor, commons-fck, commons-cometd
COMMONS-173 : RequireJS - Fix bug in cometd
Merge branch 'feature/gatein-upgrade-3.4.0.Final'
dwm, Xresources and vim modifications
Start working on carla-bridges
More work for future bridge support
Make carla-discovery buildable with wine
Add carla qtcreator projects, misc fixes
More work
Carla: Fix force-stereo logic check
Re-organized navigation
update
- controler CFCs script formatted
- ORM uniqueidentifier issue fixed
- added Pick entity
添加获取价格单信息函数
添加数据写入和文件输出操作
cleaned + built
Perlito5 - parser: add "do EXPR"
Removing start-upload button on queue completion
add comments
add few items to the TODO list
VroniUtils.hpp: make all the functions static in order to avoid conflicts

Need to avoid conflicts when including VroniUtils.hpp from multiple *.cpp
files.

I am pretty sure, there is some standard and better solution. What is it?
Should I only declare those functions in VroniUtils.hpp and define them
in VroniUtils.cpp? Could I do something to have all the definitions and
declarations in one place?
use a namespace (poly2vd) for the Poly2VdConverter and its friends

and define Color constants in separate Color.cpp file
define new VdPublisher::RVIZ_EDGES_WIDTH constant and use it

it defines width of line Markers (types LINE_LIST, LINE_STRIP)
published to Rviz
poly2vd: publish frontier nodes that are "sources" of "backtracking"
Working menuconfig settings for drinkmixer added to repository
Added isPaused to physics world
Added Opacity property to background layers (and set it to 0 by default)
Wait for combat-message-area to be present before attempting to log to it when entering a game with state.
[test] Remove isolate from vows testing
out_exec_filter: show more error messages when child process unexpectedly exited
BufferedOutput: reset @flush_now flag
BasicBuffer: fixed a delicate race condition of flush trigger
> ferme balise html
LIESMICH
修改例子"SelectDialogBox"的一个文件名
Updated gtk2-engines-murrine

Signed-off-by: Francesc Gordillo i Cortínez <frangor@frangor.info>
repaired randomization, still a problem with forbidden regions
eager load lib
New k-means: Removed argument point id from argument list

Jira: MADLIB-522

Now that we have a function to sample vectors directly, it is unnecessary to
supply a point id argument to k-means (it was only used for weighted sampling
in k-means++). This should improve performance and usability.

Other changes:
- Added return type to closest_column. On Greenplum, we would otherwise see an
  error of the form "cannot serialize transient record type".
- Adapted k-means unit tests.
- New unit test for kmeans with initial centroids provided in table
- Fixed oversight that squaredDistNorm1 did not return the square of the
  1-norm.
- C++ AL: Fixed bug in NativeArrayToMappedMatrix() and
  NativeArrayToMappedVector()
modular arithmetics
publish web url
tweak setCookie signature
Druid T8 Feral 2P Bonus
Moved filesystem-independant code from zfs.py to tardis/shared.py
Up code (org.xmonpp.command)
Implement Paste action in file-menu
Show Paste only for folders. Show Rename only for single files.
ac-mode: Remove ropemacs source
switching to rspec
Inserção de Caminho para leitura de Arquivo e Exibição em sala do IRC caso encontre a String Desejada
Inserção de Caminho para leitura de Arquivo e Exibição em sala do IRC caso encontre a String Desejada
Correção de Bugs e Otimização de Busca
Adicionado suporte a servico no IRC Bot
add more requires
ENYO-933: Supress browser scroll events

Enyo-DCO-1.0-Signed-off-by: Jeremy Thomas <jeremy.thomas@palm.com>

This is a partial fix for ENYO-933, which itself is an umbrella for
multiple related bugs. This fix addresses the bug variant that is
present in panels. This appears to fix the following JIRA issues:
ENYO-725, ENYO-983, ENYO-1147
Console jsdoc small fixes
Some tests for Console; #1
Console tests wthout http server
Comment for future modification
fixed update.sh bugs
Provide an overall tests report.

Previously we have to go through the scroll history to see which tests failed, which were skipped, etc. Now, besides test failures, errors and skips being reported like they always were, we also provide a nice overall report and the end.
Allow disabling the tests report.
Remove the tests added to explicitly fail.
Allow certain tests to marked as destructive.

* Some tests might be considered destructive, such as adding or removing users from the system. This change allows those tests to be skipped unless stated otherwise.

```python

from saltunittest import destructiveTest

class ATestCase(TestCase):

    @destructiveTest
    def test_some_destructive_code(self):
        """Some destructive code."""

```

On the console we get something like:
```
test_destructive (unit.config_test.ConfigTestCase) ... skipped 'Destructive tests are disabled'
```
Allow passing options to `tests/runtests.py` from `python setup.py test`.
Travis should run the destructive tests.
Merge pull request #2135 from s0undt3ch/features/overall-tests-resume

Provide an overall tests report.
Travis-CI should run the tests as root.
Preserve environ when sudo'ing on Travis-CI
Mark destructive tests with the `destructiveTest` decorator.
Added retina icons and some minor changes

- Replaced toolbar icons with retina @2x icons
- Included Instafari.safariextz in repository
- Removed .DS_Store and added to .gitignore
- Updated README.mdown with new version features
kill rakefile, update subdomains
Adds empty rule page.
Adds better page headers.
Removed Packages.
Added ConversationService to TweetLoader.

NOT DEBUGGED.
updated w/ plot
clarification on why axuielements are worse
improvements + map / quick march link + quick march target status + reports module start
Adds static docs
Language file updated with clarification on merge exclude/include files lists syntax
Reference with self instead of class name
tweak commands

commands right now send int32 args (takeoff and emerg).
Modify postioning mechanism
Follow-up tweak for positioning
Optimize dialog positioning
Option for FreeBSD on progress
UDP: FreeBSD option done
Polish for FreeBSD
Good UNIX approach for config files