labofsahil/github-event-dataset-2012 huggingface dataset:
Bug 738762 - Pass redirect and error information to global history.
r=bz
Bug 737437 - Destroy the compositor's layer manager before the CompositorChild gets destroyed. r=cjones
Bug 739488 - Fennec Native nightly crashes in mozilla::AndroidBridge::EnableLocationHighAccuracy when page requests GPS location. r=dougt
Bug 736278 - (1/2) Add support for checkbox in doorhanger message. r=mfinkle
Bug 736278 - (2/2) Add always/never permissions for click-to-play plugins. r=mfinkle
Back out 3e6a7f9fb34e (bug 739488) for Android XUL bustage
Back out 7bffc102114e (bug 737437) for Android native talos bustage
Merge central to inbound
Bug 736738 Make it easier for applications and extensions to overlay the customize toolbar window r=gavin.
Bug 739557 Set focus to editing host and use document.getSelection().collapse() for setting caret to edit target; r=ehsan
Bug 730209: Parse spellchecker dictionary names as BCP 47 language tags. r=gavin
Bug 738645: Add a pause to GeckoEventExpecter to allow GeckoApp to process the event. r=kats,jmaher
Add comment explaining the difference between CSS_PROPERTY_PARSE_FUNCTION and CSS_PROPERTY_VALUE_PARSER_FUNCTION (prompted by question from jdaggett).  No bug.
Bug 740252 - EventListenerManager disables various things in RemoveEventListener even if there can be still listeners. r=smaug
Bug 737433 - Send the referer for embedded src="" streams for plugins (and make them part of the correct load group while we're at it!), r=josh

--HG--
extra : rebase_source : 1d3f255cfd861fb136d54cef63f327a77f76c931
Bug 740389 - Clean up openTopWin and mark it as deprecated. r=gavin
Bug 738662 - Add tracing/warning information to help debug XUL overlay problems. r=bz,enn
Bug 739659 - Try duck typing in js_ReportUncaughtException. r=luke
Bug 728284 - Main container layer has siblings that are drawn in the background. r=bgirard
Fix for bug 740397 (Make tests that try to get XHR.channel use SpecialPowers). r=bholley.

--HG--
extra : rebase_source : 0bd78094debfea9d179f17396626c3802a6b5a21
ads;sdf;llas;hdd;lkhasskjjhadjfhasivva
Imported TRUNK/been from the SVN repo.
* project version without third-party sources
* removed CSV and SVN meta info
Added readme.

Merge branch 'master' of github.com:radek-macha/everBeen
Including hiragana-Translator sample android project.
syntax error corrected
dictofdicts is being generated
added vim-swp to gitignore
new approach for plugins
GUI Skizze für Iteration 2
Added configuration class
Added configuration class
support multiple packages in moveAppEx
move apps to trash
1. Added the Wonga logic to the game page
updating screenshots
updating demo
jfa;oweijf;lasdkjf
Merge branch 'master' of github.com:ras123/24HoursOfGood
HTML file's location now saved to filename column in Sites
Update downloads and events
Commit prior to providing copy to David
added XMPPFramework.h for iOS
Whoops. Make README markdown.
Site updated at 2012-03-20 11:59:24 UTC
As a user, when I deliver my branch, it prompts me to create a pull request if I do not provide one

Fixes #23673345
Closes #6

Conflicts:
	Gemfile.lock
	bin/git-reflow
	features/support/env.rb
	git_reflow.gemspec
	lib/git_reflow.rb
	spec/git_reflow_spec.rb
	spec/spec_helper.rb
As a user, when I run the review command, it should tell me if I still need lgtm's

Closes #28

LGTM given by: @nhance

Squashed commit of the following:

commit 8413ec05e0f262893f64470a93adcc9fa0fd1044
Author: Valentino <valentino@reenhanced.com>
Date:   Thu Aug 30 09:53:43 2012 -0400

    [fix] lgtm authors removed if given in previous comment

commit 439b01a846a46e3fcac3cba4b8b1ade3a7274016
Author: Valentino <valentino@reenhanced.com>
Date:   Thu Aug 30 09:27:40 2012 -0400

    Simplified nil check for lgtm comment lookup

commit 29b6cdf95667c0e00b73464f4ae7be258d8c02a1
Author: Valentino <valentino@reenhanced.com>
Date:   Thu Aug 30 09:15:51 2012 -0400

    Fixed lgtm check for review command

commit 9b3a842eac30861b3ee9346b91d299b55981179e
Author: Valentino <valentino@reenhanced.com>
Date:   Thu Aug 30 09:06:27 2012 -0400

    Added output of existing lgtms in review command

commit 34c3f1490ba1f4154b2e79f82724e76442de47f9
Author: Valentino <valentino@reenhanced.com>
Date:   Wed Aug 29 15:23:49 2012 -0400

    [fix] local branch deletion uses non-existing alias 'br'

commit 13a7d7536d6fa69177905d0e82db1ceafd0d0695
Author: Valentino <valentino@reenhanced.com>
Date:   Wed Aug 29 10:23:17 2012 -0400

    Bumbed version number

commit 56bd6d078cfbb2a39739327bb96909f25a2952c5
Author: Valentino <valentino@reenhanced.com>
Date:   Wed Aug 29 10:22:49 2012 -0400

    Removed unused constant

commit e9421f1ebdbc0e36013bce41b02578d434e1e062
Author: Valentino <valentino@reenhanced.com>
Date:   Wed Aug 29 10:21:13 2012 -0400

    As a user, when I run the review command, it should tell me if I still need lgtm's
+ ‘bin/rubmat’
/ ‘rubmat.gemspec’
- ‘bin/rubmat.rb’
Added boostrap to repo
added my profile for Ruby Fall2012
Adds Strand McCutchen to the roster
Add nikky to roster
adding myself
Update week1/exercises/roster.txt

Added my contact info
Adding my information to the roster
Added my contact info to the roster.
added my info to the roster
Added my contact information
added my info
updated my info for hipchat
Santy Added
updated my info
modified Strand's info on roster
updated my info for class
updated my info for hipchat
Updated info for hipchat
my updates to my email for account info
added contact info
Update roster
Add a custom method to the Repository and add comments
Add more extensive responses in contact response, with better error handling for #11
added uploads.rake for deleting old uploads after db reset
added rake db:reset_all_test_data, which removes all old uploads, and resets/populates the database with test data
Merge remote-tracking branch 'upstream/master'
Merge pull request #43 from doktorj/master

added rake db:reset_all_test_data and also a sub rake task to remove all uploads

eph: you'll want to run this command after you merge with upstream (for now, this shortens/replaces the rake db:drop; rake db:setup; rake: db:migrate, rake: db:populate rake uploads:delete_all sequence
Fixed bugs related to dragging and timeline extension

1. Collapsed markers now return to their original positions correctly
during a drag
2. Markers are no longer clipped to the current maximum time limit.
Newline, fix $config_file path in Bootstrap.
kaminari bootstrap
pagination tweaks
Initial implementation of preferences with comments and navigation bar show/hide options.
Vertical alignment in verse numbers
Fix
Merge remote-tracking branch 'remotes/marcel/master'
Forgot phpunit/DbUnit!
untracked some class files
First Round complete on Sample App.  Home Controller now has authentication on About Action.  About action shows Shop Name and all the Custom Collections
Added a submodule update line to my update script
addming files for chp5
Merge branch 'master' of https://github.com/robertrv/prekrasting
Updated changelog for v3.22
change qemu build targets

USER-space only target is not interesting

Signed-off-by: Michal Demin <michaldemin@gmail.com>
Adding bin configuration and removing duplicated engines.
Added backup host for rsync
Open method in vim.
testing again
added a few extra lines
Added a main class and a cs class for git testing
Added write to log function
added a fix - creating the DoSomething method.
Merge branch 'myTestBranch'

Conflicts:
	myClass.cs
SynonymFilter was using a different format, so because of one character difference, I had to write hudred lines of code - but now the author parsing uses the same format as synonymfilter parsing
Fixed wrong io encoding usage when tests ran with US-ASCII
Add clear_logger in each test which set_logger executed
to address ArgumentError: wrong number of arguments (1 for 2)
Merge pull request #193 from yahonda/add_clear_logger_rails4

Add clear_logger  to address ArgumentError: wrong number of arguments (1 for 2)
properly using a Singleton base class
rusrails
Added orderSerial to Order.
Fixed the method 'save'.
Added DocumentManagerCell.
Fixed permissions problem and cleaned up output
add basecamp script
[1115]
Fix overflow bug in 'timeval2us'
(fix variable name; no functional change)
SERVER PORT GENERIC
little modifications to custom.js
Merge branch 'master' of https://github.com/samuelbran/Blank-Theme
Renamed the project from Blank-Theme to Semillero
Added script to update grub config. Updated Readme files
wrong sizes
Selectedimagesnames color change in the label singleton creation
2nd edit of file proba.txt
Added missing comma in stop_times.sql befor KEYs.
Added missing steps: placing gtfs files in the gtfs/ dir and modifying settings.py
Merge pull request #10 from oct82/master

Fixed typo in sql/stop_times.sql and added missing parts to README
Features #1915 and  #1931: CSV import and export of global dictionary
close #12 - user can provide own delimiter for output
Start the games!
Editor suite working with grunt, errors.
fixes TL tape gap
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
Amend: httplib PUT doesn't allow for a data payload, so put the API key as a querystring; also provide the Content-Length header, else the request gets a 411 Length Required
add warning to `Job.delete` docstring
add content_length method on HTTPBackend
make headers a property method on HTTPBackend
add PUT support to HTTPBackend

now correctly sets the content-length header

`resubmit` and `cancel` use these methods
implement resubmit and cancel as PUT

if version is set to v1, then use a GET for cancel
pass the api version to HTTPBackend
Update documentation and init args and kwargs
Merge pull request #13 from schworer/put-support

Implement Put support
Saving the original prototype flat HTML file
Merge branch 'master' of https://github.com/scotticus/RE-VIEWING
Settled on Google fonts; updated placeholder index file to use them.
Adjusting stub size
Added Procfile.dev to .slugignore
Bumped version to 4.03
slim checker: remove a stray debugging echo call
Add support for code tags
Switch to unicode for buttons
Add rule for full screen flash
Using localStorage. Option page.
Added Shader Loader

ShaderLoader, like all content loaders, loads the shaders from a path,
caching and taking ownership of the loaded object. It will be kept until
the ShaderLoader is destroyed.

The get methods return a reference or a raw pointer, donating that ownership
*does not* pass from the content loader to the client code.
Made a couple of improvements.
Added some robustness; checking for null pointers and bad file data. Fixed one segmentation fault that was caused by running with a bad or non-existent inout file.
Typo in 'goUp' logic
Rename test module to prep for test refactor
fix #4: support sequences of itemsets

Previously, temporal_join() only supported sequences of individual
items. Sequences with multiple items (itemsets) at a single time index
could lead to unexpected behavior. To add support for sequences of
itemsets, the following changes were made:

- Modified sequence input format so that the second column identifies
  the Event ID (EID). The EID was previously implicitly identified by
  the item's index within the sequence.

- Modified temporal_join() to concatenate coincident items into a
  lexicographically sorted itemset at a single EID.

- Split tests into functional tests (test_miner.py) and lower-level
  unit tests (test_subset_to_support.py, test_temporal_join.py).
Fix include_javascript()

Remove a buttload of echoes and use heredoc syntax instead.
add the initial readme file
Merge pull request #2 from shanezheng/add_readme

add the initial readme file
kendo grid + kendoComboBox etc...
cile-9: added possibility to add custom company
post about emacs thing under cursor
tweak style
abs path for img
lots of changes; details view spec displays nested structure correclty; Array doesn ot yet auto update
just stashing everything for now
details view correctly displays hover
Complete the <li> tags with </li> in code.
greedy matching finished
Install Doctrine Fixtures & Migrations bundles and Behat
fixed en submit knapp her
Merge branch 'master' of https://github.com/sindremb/progsik-lut
Merge branch 'master' of https://github.com/sindremb/progsik-lut
Merge branch 'master' of https://github.com/sindremb/progsik-lut
Merge branch 'master' of https://github.com/sindremb/progsik-lut
fixet nullpointer exception melding
testing md sintax 2
add faded background image
set background image
adding placeholder for the ProjectApp
use newsapp.
Ability to perform google searches.
addcom concerns popup fixing
Octopress init
Site updated at 2012-05-15 14:52:44 UTC
Fix #57 - Opera adds iframe navigation to history

So we shouldn't use "about:blank" addresses during iframe cleanup. Semantically, empty string "" should be exactly the same as "about:blank", so we can just use that.
updating ignoring rules
Adds additional test case and fixes bug where a quorum accidentally resets its own id to nil.
minor cleanup
some changes to get this to work in IE
Do not Terminal.app window, tab titles to $PWD
added custom domain support for colorpaths.com
colorpaths.com -> colorpaths.org
Added missind Bootstrap CSS (bootstrap_custom.css)
CC-4475: Register form button doesn't have any styling

-fixed
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Merge branch 'CC-3174' into devel
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-3622: When changing location of the stor directory, the "organize"
ubfolder is not being created.

- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer

-play/pause removed
-remove reference to deleted meio mask jquery library
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section

-done
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
-check if exec function is available before using it
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show

-fixed
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section

-cleanup
CC-3634: Media Folder: if file was deleted from file system, and the file was
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-3498: Calendar -> Show Content better representation of duration needed

-fixed
CC-3416, style changes
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show

-fixed
CC-3625: "Now Playing->delete the current playing items" will stop output of pypo-liquidsoap

-fixed
--added comment
NR-501 : Media Archive user interface implementation version 1.0

fix for sync params on gizmo
Merge branch '35-media-archive-ui' of dev.sourcefabric.org:ally-py into 35-media-archive-ui
Missed a string.
rd.me.md
Deleting the broken stuff...
single page before all hidden
update gitignore exclude executables
Makes 1 TUtilsBucketTest look better. #18
testit.sh does an ivy-resolve before the clean and test. #18

To avoid any weird bugs, this makes it
so that ant has all the libraries all
the time.
Changing the default ports, to avoid hardcoded defaults in tests. #18
built a hash that contains the page elements for easy ordering into either single column or 3 column. added js to change class on a div that contains all elements. intended side effect is that this changes their style while keeping all styles in css and not having to change all their classes to achieve the minor differences between single and 3column.
Fix for an Issue #218
Basic rule lookup works.
Removed lowercase duplicate files
Main: remove unnecessary call to helpUsage()
Main: the new parameter patghFormat was not correctly included, and error message ws unclear
There was a part in PopulateDayFolder which was intentionally left to be completed once the tools are ready; done now.
RelevantInformations: soften a method so that no photographer is allowed (UNK is then dispatched as abbreviation)
The photodirectory was missing in generated output directories
Negation missing
Print methods for debug
Ordering of relevant informations was buggy concerning photographer pointers: case in which one is null was not coinsidered properly
Remove debug lines
Delete input files again
Formatted Code.  Added scheme for PhpStorm

Mostly formatting code
Update example_spec.rb
Decreased margins to have more space for tables
at last i have a working and fast algo to find paths \o/
gitingnore for config, updated cfg sample
add gitignore to repo
fix \u parsing
backup
Support for response object on upgrade request.
Updated jQuery (+UI) and Dojo versions
break app
break app
修正readme里的格式
added Spring MVC Sample project
adding Spring MVC sample project
retry code for artisanal ints
request_rewrite: wait() will block until the request is finished executing its workload AND its callbacks.
request_rewrite: Simplified callback subscribe functions.
(There's no need for the different variations now that the catch-all _sig_execution_complete member exists.)
request_rewrite: Split up wait() function for readability.
tests: request_rewrite: Added a test to check the guarantee that wait() blocks for all callbacks that were added before submit() was called.
Merge branch 'deployment' into development
fix
Merge branch 'matching' into deployment
Added string functions, more parser tests, implemented array, function call chaining
added some google analytics
Merge branch 'refs/heads/master' into gh-pages
allow to look into webinf/lib/*.jar for Atmosphere annotations
added logger when log leve
update with tacky logger
Missing translation
Merge pull request #236 from Soarez/patch-1

Missing translation (pt-PT)
Remove extra debug line.
fixes for column header right click menu index conversion to model.

git-svn-id: http://chianti.ucsd.edu/svn@30175 0ecc0d97-ab19-0410-9704-bfe1a75892f5
fixes for column header tooltip text


git-svn-id: http://chianti.ucsd.edu/svn@30176 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Change group/ungroup/collapse/expand so that actions apply to all selected nodes or groups


git-svn-id: http://chianti.ucsd.edu/svn@30049 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Hard-coded string moved to public static string.

git-svn-id: http://chianti.ucsd.edu/svn@30368 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Add some scala recursion practices
[IMP] Allow to use ~ for home directory
Minor
Removing unused earth circumference
File rename
Fixing test compilation
Fixing assert
Fixing nasty issue caused by equality check
More tests
updated readmes to my preferences
增加gpuimage
Url e views
Merge branch 'master' of github.com:systembrasil/quality
Fixed calculator! I was making it needlessly complicated.
Now detects NICK messages from the server
Let's see if it will play nicely with MRI 1.8.7
add moar hashers
fixed jumpan tilesheet. animations for walking, jumping, and climbing
are getting better.
generated random string for images
1. translation of ngx_http_geo_module.xml
2. bugfix: some content was not translated in ngx_http_rewrite_module.xml
some expressions has been changed so that they will be more specific.
added translation of  ngx_http_geoip_module.xml
some small fixes
Merge pull request #14 from cfsego/master

translation of ngx_http_geo_module.xml
add all files of EN version
[schema] remigration
[wip] key value store for Preset
sono andato avanti :)
Merge branch 'master' of https://github.com/tapione/lab-reti2012

Conflicts:
	proxysender.c
Updated README with some examples
Added default responses feature
Added example about default responses
Changed Ground
Changed Ground
v1.0 implementation of earth and body
now remembers position in line
only save file details if have closed folds or markers set
only save file details if have closed folds or markers set
reworked so use variable markers for better compatibility with other plugins.
Enable user to save file settings in a file alongside the file itself so can more easily synchronise settings across different machines
Implemented saving non-numbered bookmarks and updated help text box, also updated version to 1.0
updated README and ABOUT files
updated README and ABOUT files
GeniusPaste: first commit
GeniusPaste: first commit
Adding waf build support
Adding GeniusPAste to list of translateable files
Make usage of PLUGIN_SET_TRANSLATABLE_INFO makro.

As well as remove some trelling space
Merge pull request #1 from frlan/geniuspaste_small_improvments

Geniuspaste small improvments
changed how markers are tracked to avoid compiler warnings in 64 bits
numberedbookmarks overhaul: markers play nicer with other plugins, line positions, and normal bookmarks now also remembered, local settings saving for cross platform ease of use
Adding GeniusPaste plugin to master branch
added handling of errors, overall clean of the code, removed uneeded code
added handling of errors, overall clean of the code, removed uneeded code
fix: fixed misidentations
fix play will restore the position libeplayer3
Conflicts:

	lib/service/servicemp3.cpp
don't test with Typhoeus v0.4.x

Typhoeus 0.4.0 broke the ability to send PATCH requests with body.

See https://github.com/typhoeus/typhoeus/pull/171#issuecomment-6327082
Bugfix: needed to key on tile, not op. Added: toStrings. Looks like it works.
Added images directory & basic image slider

Also added slider functionality to page 2 of the site.
Embolden some of the boilerplate
Update signals to latest (0.8.1 at this time)

This use github to serve the file. I really need to submit a pull
requrest to cdnjs with the latest js-signals
Remove some console.log noise
Show networks correctly on page load
Add connect button to network view
Add connection status icon to left bar.
Serialization of Money objects for Mongoid 2.X
Refactors out composed_of
Merge pull request #19 from Katen/mongoid

Mongoid 2 Support
Big refactoring to enable testing of Mongoid

- It will be refined gradually.
- From now on we must check for the ORM/ODM at the beginning of each
ORM/ODM specific spec file.
- TODO: Simplify Dummy rails application.
Disable jruby exec on travis due to random failures
Updated README regarding mongoid 2.X support
Merge pull request #21 from Katen/mongoid

Updated README regarding mongoid 2.X support
Fix issue with missing method for Rails 3.0.x

Replace attribute_names (which added in Rails 3.1) with column_names.
Merge 'remove_composed' feature
Remove whitespaces
Ensure that currency_for returns Currency object
Use correct currency column
Provide memoization for reader method
Add dependency status image
Role.to_json
Add new UML Tool
errorhandling improoved
Removed autom4te.cache/
More leniency for Java filetypes.
Add menu option to DetailForm to display map, disable the menu entry if no location has been set
Update manifest to use Maps library
Respond to menu item to show map, add map layout
Add latitude, longitude, and name to the intent that launches RestaurantMap
Set up the map in RestaurantMap with the location passed in the intent
Add overlay to map
Done with APT18, but map tiles do not display
bind : Add support for source_base
Scripts/Magister's Terrace: Fix Translocation Orb Activation and correct some codestyle
Merge pull request #5717 from mweinelt/master

Scripts/Magister's Terrace: Fix Translocation Orb Activation and corr…

…ect some codestyle
Core/Movement: Send correct packet to client when unapplying hover, feather fall and water walking auras.

Closes #5704
Core/Movement: Add server side filters for MOVEMENTFLAG_WATERWALKING, _FALLING_SLOW and _HOVER depending on required aura types. Fixes exploiting when aura unapply packets (such as corrected in previous commit) are blocked/altered before reaching the client.
Core/Units: Offset z coordinate only if MOVEMENTFLAG_HOVER is present, not MOVEMENTFLAG_DISABLE_GRAVITY.

(Remnant from an early incorrect version of my UNIT_FIELD_HOVERHEIGHT patch)
Scripts/Icecrown Citadel: Corrected flying animations for frostwyrms in Sindragosa's Lair and prevent reentering combat with Deathbringer Saurfang after encounter is won
Core/Movement: Added more movement flags that cause units to select flight speed instead of run
Core/Spells: Fixed copy paste mistake that caused all area spells to search targets starting from caster's coordinates instead of targeted destination
Core/Spells: add correct checking for dispeling errors. Fixes spammable cleanse.
whitespace cleanup
Merge branch 'master' into moje
players see the same hands for each other
On hold for Lucas full implementation of KeyIndexableGraph.
Edge API changed -- Edge.getVertex(Direction). BAM.
Neo4jGraphs default behavior is to not check for index/graph consistency in a transaction. There is now a Neo4jGraph method that will allow a developer to turn this feature on and off.
Fixed a problem of order of serialization of arguments
another temp commit, rebase out
moved lib contents to root
added integration for npapi build and deploy services
own \startsamepage; reworked title
got votes working, now to deploy for production run
fixing model relations so admin interface works better
synthesizing new measures
file push fixed, username check, query users' statuses (I.P)
- Mark the check for the confirmation mail as pending
Update max zoom
Another unnecessary optimization
crucial ampersand reduces runtime by 60X
TIL there is a 'hypot' function in the C math lib
Upgrade libgda to 5.1.1
added logic not to show image if one doesnt exist
add tag for prev post
Added some sort of responsive-ness to content header images.
Add a README file

So that there are some notes for users viewing the git repo on the
github website.
moved partial into other directory
add file for folder share
hide /psd and project file
Merge branch 'f-actorconnections' of github.com:transparencyint/CGIP into f-actorconnections

Conflicts:
	.gitignore
Merge branch 'f-actorconnections' of github.com:transparencyint/CGIP into f-actorconnections
fix pixel problems

looks like query ui does not yet support 'box-sizing: border-box'
Merge branch 'master' into f-actorconnections
merged with master
fix drag bug

replace first 'relative' to 'absolute'
set content editable to false (gets activated on dblclick)
edit actor shadow
edit name on dblclick
add input

.editName on .actor toggles the visibility of the input field
actor controls WIP
change name with input field and chage server to local server
update position when dragging
prevent  global text-selection
Merge branch 'f-actorconnections' of github.com:transparencyint/CGIP into f-actorconnections
add border-radius
remove unnecessary text-cursor
optimize drag performance
rename to actorEditor
Delete Strukturierung in MVC
throw params in case or mismatch
check user
trying to fix auto complete
Fixed Bug which prevented to cells with the highest & lowest values from displaying.

It's really time to move this to Processing.js
deferred related cleanup
Added GitHub files

.gitignore, licence and readme
Added GitHub files
log into volunteer and admin accounts simultaneously
join a team or sign a waiver while admin
small update for phase step creation
tips bis zum 05-30
Add LXDE autostart settings.
Remove bad "multiplThenFilter" example
validation bug fix in merlin
Finished first cut of the User model
sample app: user login
Add first test
Tweaks to site layout.
Add footer. Update share buttons.
Changes to footer.
Move post CSS to partial. Tweaks to footer.
HDFS-3469. start-dfs.sh will start zkfc, but stop-dfs.sh will not stop zkfc similarly. Contributed by Vinay



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380003 13f79535-47bb-0310-9956-ffa450edef68
LoadingPanel
- Исправлены ошибки отображения и множество других косяков
Merge pull request #28 from rsoeteman/master

Dashboards without code
Make default servlet configurable
fixed a font size problem when printing

The fix for 2.0 was overiding moodle's print font size so I changed it
to size smaller rather than larger to hit 11pt when printed
compiled the most recent un-minified less.js
data cleansing version 0.3

added 'deleted' flag to positionfix
impl server-side processing for data cleansing
mark positionfixes within multipolygon as deleted
change most positionfixes queries to check deleted = false
añadido estilo al signup
devel comp
Light radius moved to graphic component.
Added Shape component to hold both CollisionObjects
GameLayer is now on graphic component.
WorldObject don't have a state, just a alive flag.
Hud handles caster or damageable missing better.
Update src list.
Condition component, to hold Conditions.
Actual Conditions renamed to Effect. Removed sight_count!
Fix module.
Changed Condition to hold shared_ptr to Effects, to simplify AddEffect users
Added a validation to effects
Derp
Merge branch 'wobj_cleanup' into dev
First working pipeline
first commit
Merge branch 'master' of https://github.com/v-iacovella/pipebook
Added puppet-lint (jenkins) and fixed formatting.
Synchro with master and fixed some bugs
#288 fix filesInProgress counter issue when running in non-auto-upload mode
More backbone integration and data abstraction

TODOS: Default settings, more abstraction, more config options ...
stuff.
Finalmente entra no usuario! Tive que mexer em algumas linhas no final do boot la antes do pulo pra main
a face of the first character is completed
added Cookie support
do not reduce quality of the image
manually patch keystone.conf file
v0.0.0.8 - home - some mods
Some cleanup.
Merge branch 'master' of https://github.com/vjovanov/bigdata2012

Conflicts:
	evaluation.tex
Added alt text to widget.
added dist version with jsmoduleman included
Crossport fix for "no defined unaccounted method for nil:class" from serengeti branch
corrected typo to service name
#1 add fixtures for automatical superuser creation admin:admin
Bug fixes, may break for older versions of Requests.
Commit pour rajout des beaux br

vyros
Commit pour application des modifications de nicog

vyros
Commit pour mes identifiants BDD

vyros
Commit pour mes identifiants BDD

vyros
Commit pour retouches css

vyros
Finished problem 2.
Working on 6.854
Ignored stuff.
Ignored stuff.
Bump hubot to 2.3.0
Trying to upgrade wabot to latest hubot
fix in dialog save onsave function call
Merge branch 'shf_rename' of github.com:webnotes/wnframework into shf_rename
if type date, auto convert to user date string
log exception in receive's get_messages
Merge branch 'master' of github.com:webnotes/wnframework into unicode
Merge branch 'master' of github.com:webnotes/wnframework into unicode

Conflicts:
	py/webnotes/utils/email_lib/receive.py
Merge pull request #6 from websiteduck/staging

Staging
Change $tpl to be an object instead of an array
Change initial controller, view, template to use $tpl object
Merge remote-tracking branch 'origin/master' into staging
switch to the b2g qemu fork repository
Merge pull request #3 from marshall/platform_external_qemu

Switch to the b2g qemu fork repository
added iptables and dnsmasq support
try out linaro mirrors to see if they are faster than google's
experimenting with faster android mirrors
Merge remote-tracking branch 'origin/master'
Add strace
Some horrible hacks to temporarily make the emulator build again
Add hcidump for Bluetooth profile debugging
Merge pull request #14 from eric30/add-bttool-hcidump

Add hcidump for Bluetooth profile debugging
Add opensans font
Another bustage fix for the emulator
switch over to mozilla-central from our local copy
sp8810-test
change remote to linaro

Conflicts:
	default.xml
Attempt to start migration to Object.defineProperty when possible
BREAKING CHANGE, implements overrides extends when defining a class that institutes both
finishing up edits.
ready for the design show.
xss solution with no private server
Merge branch 'master' of https://github.com/wetherbeei/XHack2012
moved Abe's stuff out of the vendor folder
Naive keyword search
enhanced search capability
update README file (gem install tinyssh)
added wiredpm-12.16.12
The latest TOT play2 now has more than Routes in the routes file
Merge pull request #43 from Xeralux/pullreq-play2-update

The latest TOT play2 now has more than Routes in the routes file
lm.R update
Removed the now unneeded Handler subclass.
Update package.json

31
Se agregó la medida de rendimiento Tamaño promedio en cola
fix resetting of participants widget
Merge branch 'refs/heads/master' into remoteStorage-0.7
Merge pull request #1 from xificurk/next_release

Commit right after the file processing is finished.
release 1.2.0
Merge branch 'next_release' of github.com:fordfrog/ruian2pgsql into next_release
version updated to 1.2.1-SNAPSHOT
adjusted index creation ddls to make them compatible with postgresql versions lower than 9.0
configuration moved to static class
added command line switch --dry-run
refactored utility code
refactored logging
minor refactoring and code cleanup
version updated to 1.3.0-SNAPSHOT
added command line switches --convert-to-ewkt and --debug
Add support for MultiCurve element.
Initial commit for in_ID (Indonesian) Locale.
Warning message in case scope doesnt respond or takes an unusually long time.
20120908

20120908
remove files that needn't be tracked.
[cleanup] Remove leftover
Quick hack for onTabChanged being called multiple times.
GHC 7.4 bug
Added "replace text" functions to macro recorder and scripting engine
simplify UI

added npm version

added Procfile for Heroku

added configuration for Socket.io on Heroku

change interval 60 secs

added callback url
Merge pull request #11 from yhanada/feature/change_env_to_heroku

change production environment from nodejitsu to heroku
first commit

Signed-off-by: Yves Torres <ynamite@bluewin.ch>
Merge branch 'master' of github.com:ynamite/redaxo-4.3.3
coffee landing page content
Merge branch 'master' of https://github.com/yonidonner/Checkmate
RangeSet intersection
add exp file
add Add() fn and simplify the code.
Added active state to tabs
moved cancel account link to show instead of edit
Creacion de Admin UI
Creacion de Admin UI
Fixed PULSE_SERVER use glitch
Fixed sorting of changelog entries
improved entries_helper
default the visual studio cimpiler project link to static library

Signed-off-by: yayanyang <yayanyang@gmail.com>
install default packages
simple-friends added
added a stupid pic to readme
Implemented rest of built in functions
Added '.md' to indicate that README is markdown formatted.
initial java execise
Azoth Xoox: smarter blind vCard requests.
Azoth Xoox: set proper capability to MUC presences.
add new option.
when xfb wall -a : print all message from global wall
when xfb wall : print message  from user's wall
when xfb wall id : print message from id
revised parameter
Merge pull request #2 from TerrenceTang/master

fix wall can not  list friend's activities
Add events listing for ftw.workspace details PDF.
Add translations for events listing.
avoid "Input past end of file"
Renamed SQL file and removed references to 'car'.
Throw 500's for unknown paths
Hook to authenticate with some service
Slashes in branchnames are totally legit

Like in this branch ;)
Merge pull request #10 from 99designs/bugs/slashes_in_branches

GithubNotifier: Slashes in branchnames are totally legit
Traverse to root namespace
Warn about plugin API deprecation
Merge remote-tracking branch '99designs/epic_refactor'
Merge pull request #9 from 99designs/features/nickserv

Hook to authenticate with some service after connecting.
Document the new state of the API
Add myself as a contributor
Merge pull request #11 from 99designs/update_docs

Update docs
Allow users to hand in Procs to be called directly

But don't break existing API, let users hand in symbols and have Base
close over the method.
Merge branch 'routable_procs' into notifier_mixin
Fixed a PHP error.
Add title song file
Merge branch 'master' of github.com:ACM-Game-Jam-2012/STZ
Merge pull request #28 from ameade/master

Add title song file
stub out api changes

* All API access is over HTTPS
* All data is sent and received as JSON
* Force using OAuth2 Token (sent as a parameter):
fix for /f list command throwing an error if an invalid page number was specified (ex. 5 pages available and they run /f list 6)
Release 1.7.9 Beta

Also fix for improper message being sent to person who changes a faction description if "broadcastDescriptionChanges" is disabled
Merge remote-tracking branch 'upstream/master'
Some UI niceups in the module (sidebar)
Merge branch 'develop' of github.com:AKSW/cubeviz.ontowiki into develop
README.md tweaks
README.md tweaks
clicking logo goes back to dashboard if logged in; default message if no classes
Encapsulated HID communication in a class
Updates to support HID comms class
Updated readme to reflect latest findings
Added: show current dir
Fixed: mainToolBar
graph constants, DRY constants, graph spec, link in "enterprise"
add tinkerpop
docs sources
closing input file changed
simplified buidlout means simplified docs
install docs
ubuntu hints
Send and received with correct delimiter fixed.
Configurador funcional, popup inicial
Merge branch 'master' of https://github.com/Appsolution/Dizmember.git
version 1.15 pre-2
* Added experience patch compatibility for GemRB and Mac platforms
* Check for pre-existing GUI Switcher changed to GUI_Mods/GUI_Mods.2DA
* Corrected importation of some French and German sounds
* Fixed inventory icon for Algernon's Cloak a la BG2 Fixpack
* Updated German translation
* Updated Russian translation (now uses English prompts only)
* Updated installation for all platforms
Rename the test to reflect it is for Tomcat 6
Fix cut&paste
Add support for web.xml AnnotationProcessor installation
Fix for #717. Also rename threads based on their associated Broadcaster for debug purpuse
Invoke the onDisconnect callback when a connection has been resumed
Add unit test for onXXX Callback handling
Reimplement HTTP Streaming support, remove all API allowing to output junk, now only output whitespace. This change is BACKWARD INCOMPATIBLE
Rollback to previous transport
Move Default Response's headers support to an Interceptor
Fix tests
More print work
Supports Buildcraft Pipes as it should ;)
Added shiny Nether Ores. They also utilize the Netherrack texture to
blend in with their environment.
Preparations for Sacrification Altar Crafting
Buildcraft Pipe Support, not yet working completely
Rename and privatize.
in.h header added
אפשרות לערוך מחסנים,נקיקים,אסמים

הוספתי לכם 3 אפשרויות חדשות בקונפיג השרת.
כעת תוכלו לקבוע את כמות המחסנים מהקונפיג מבלי להסתבך.
כלומר, רוצים מחסנים כפול אלף?
תכתבו ב capacity 1000
Hopefully fixed the map dialogue option box.

This one wasn't updated leading it to be able to change the selection
only once.
Changed the treasure closing caption to 'Ok'.

Sounds more natural.
Fixed Black screen after screen resize on windows.

A big thanks to logzero for that nice patch.
Finally fixed the fade in effect and used it in the light scene.
Fade the music back in when changing map if necessary.
While on it, I added butterflies and squirrels in the forest map.
Definitely removed the boot_credits from Valyria Tear.

I've done something else anyway, and will add more complete ending
credits in another way.
Disabled the incomplete languages for now.

I'll readd language based on translation feedback.
Tested a new grass to grass variation in the wood tileset.

I used also some grass clump to hide defects.
indent and number
Fixed right click issue [Firefox 15]
Fixed cursor issue
Fixed print issue
Updated version and release notes
Added the mysql file that creates the all the tables relating to courses
Macked up a starting base template.
Added a template for the index page.
Added a CSS file to account for the floating header.
Added a basic main file.
Initial cat version in C.
Edit url image widget
CS-14385: cloudstack UI - Host page - add "HA Enabled" column which only shows When ha.tag global configuration is not empty.
bug CS-10789: upgrade changes for the new table and custome disk offering.
cloudstack 3.0 UI - autoscale - populate autoscale dialog if it opens from an existing LB rule.
change version to 3.0.2
CS-15615: Fix Site2SiteVpnService injection
Typos and node check
Added a share button to a list and the share on Facebook plumbing. Still need to finish.
fixed empty phone nums sticking around
Apparently Entered doesn't show anything after the nick.
Show which drive we'll test on startup
Pad tested data with 32MB dummy data on both sides

This increases test reliability.
Add free disk space check
v0.2
The confirm dialog is now loaded with the selected item's
name.
Merge branch 'symfony2upgrade' of github.com:DannyMardini/wishlist into symfony2upgrade
Changing function getFriendEvents to getUserEvents.
Refactoring a little, getItemInfo should really be part of some service provided by the CoreBundle.
My bad... getFriendEvents was correct.
Now purchases that are made can be associated with events.
Merge branch 'symfony2upgrade' of github.com:DannyMardini/wishlist into symfony2upgrade
Fix: State saving deletion of cookies was somewhat broken. It would delete cookies out of order, which is not what we want. Rewrite how the 'overage' of cookies (4K limit) is handled
fix .bashrc print opt and ignore .git*
Couple of fixes
Check type before casting
Check is null before sending
An even better url_title helper. Tests: http://codepad.org/tuJgvkyN
Changelog entry added for 2.1.1
Fixed a bug - CI_Upload::_file_mime_type() could've failed if popen() is used for the detection.
Removed changelog entry
Merge pull request #1117 from tubalmartin/Upload|library|2.1-stable

2.1 stable - CI_Upload::_file_mime_type() could've failed if popen() is used for the detection.
Allow developers to use any string as a separator, not just dashes or underscores.
Backwards compatible when using 'dash' or 'underscore' as string separator.

Tests: http://codepad.org/DWcxVH5r
User guide updated
Changelog updated
Merge pull request #1116 from tubalmartin/helpers|url|2.1-stable

2.1 stable - An improved url_title helper function
Corrected the migration_missing_down_method language string
Merge pull request #1274 from Repox/2.1-stable

Corrected the migration_missing_down_method language string
Added a return false if an image doesn't pass XSS cleaning to prevent file_get_contents from returning a NULL and passing through unscathed.
Check cookie against md5 regex.

Otherwise, cookie can contain arbitrary injected code that gets sent
back directly to the browser.
Use tab for indent
Revert "Use tab for indent"

This reverts commit c3eb672ed01c57a543dd8cdf1b90eb4001498c19.
Use tabs for indenting
Merge pull request #1366 from aphofstede/2.1-stable

Check cookie against md5 regex. 2.1 stable CSRF injection security fix
Added upgrade for 2.1.1 and updated version.
Merge branch 'release/2.1.1'
Fix issue #726
Fix a issue with affect_rows in CI_DB_pdo_driver::_execute()

In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit
makes affect_rows be initialized properly.

Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
Threads done!
FINAL
------------
DUMP
Selection
added netowrk aliases for ping, df(dt) and du(dul) commands
Initial commit
Models done
All files moved over
heroku debugging
Restyled and tidied up
Replace README with right file
Added Submit and Reset buttons
First pages commit
add name tags to iniputs
changes
separate css files and load dynamically
css changes
changes
js comments and minification
brandon.r's changes
brandon.r's changes
changes
Merge branch 'gh-pages'
One more test record in README
v 3.1 patch 3
Added naviagtion menus to Apply & Placement Opportunity Views
renaming base to explore_base
updating footer and header php to correct the favicon and the email address
ADDED makefiles
type of bit rate info changed to float from int
Merge branch 'master' of github.com:EmptyStackExn/spectra
added ASM project
skeleton methods
Added working buttons

still with movement bugs
Generics make the world go round
update README file with Licence info

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
update README

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
add licence file

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Add basic directory structure

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
remove *.out on rm -f *.dvi Tutorial_Latex.rtf *.aux *.log *.toc *.lof *.lot *.bbl *.blg *.out
==> Now cleaning Tutorial_Latex.ps.gz and Tutorial_Latex.pdf
==> Now cleaning .Trash/Tutorial_Latex*

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Dump tutorial from my old SVN repository

- on purpose, I decided that importing the svn history was not very relevant for this tutorial so I simply ignored it

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
ensure the slashbox package is available

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
add roles table and move error messages into de.yml

Signed-off-by: Felix Saint-Paul <felix.saint-paul@wirtschaftswunderin.de>
Fin des merges
version bump up.
Merge branch 'flast'
support x-growl-resource://[identifier].
part of identifier, move to function
oops. include errno.h
version bump up.
retry.
version bump up.
Incorrect function defaults

The insert_point function variable for ADD_SPELL_EFFECT and ADD_ITEM_EFFECT
should default to 0 according to the documentation (and for backwards
compatibility) but was defaulting to -1.
NAME_NUM_OF_SPELL_RES returns correct results.
Added legend, give datafile location on cmdline
subsection per Inlcude ausgelagert
added extension ui preso
added new items
styling 'step' linkjes #90
styling for #86 #72 #32
removed cursor marker as per #51
rollback of minimizing Geozet js
add tagging to create ticket
Добавил подключение переменного окружения[21~
	modified:   .project_template/manage.py
updates to the favouriteQ front-end templates
Implemented iscroll for static navigation bars
Implemented iscroll for static navigation bars
Re-organize DataFrames code based on DataVec changes
Added access control
Merge branch 'master' into contract-model
Contracts can now be found in the mailbox
Merge branch 'release/2.1.2' into 2.1/master
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/master
Bumped version number
Merge branch 'release/v2.1.3' into 2.1/master
Added comments CSS to CP
Tweaked
PHP Version is always acceptable

Fixed a bug in installer (Any PHP version is acceptable). 
The installer would show a fail but yet allow to proceed to next step.
Merge pull request #1777 from broncha/patch-1

PHP Version is always acceptable
Added asterisk to subject and body fields

The validation required Subject and Body but the view doesn't mark it as request with the asterisk.
This fix the "problem".
Merge pull request #1779 from ChristianGiupponi/patch-3

Added asterisk to required subject and body fields in email template
Redirect after login now works on the admin in addition to the front. Fixes #1778

Example:
Navigate to: site.com/admin/blog/create while not logged in
You will be redirected to: site.com/admin
After signing in you will be at: site.com/admin/blog/create
Fixing Lex issue in tree_builder.

If $item['children'] is an empty array, it throws a Lex "array to string conversion error". If it's empty, we need to make it explicitly a null string.
Some italian update

Some italian update
Merge pull request #1780 from ChristianGiupponi/2.1/develop

Some italian update
Fix issue #1752 for new installations.
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop
Update system/cms/modules/pages/plugin.php

No idea why body was being set as an object - it should be an array as it was causing undefined errors on 2.1
Issue 1785: IE font bug
Merge pull request #1787 from rmwebs/patch-3

Update system/cms/modules/pages/plugin.php
Updated user_helper Function Descriptions

Previously were missing or incorrect description
RottenTomatoes: Updated example.
HUMSTW-55: Loader et recadrer des images
Merge branch 'master' of https://github.com/Humagine/humagine-lab
Updated build to use only unminified versions of deps.
Upgraded minified underscore (now same version as unminified).