labofsahil/github-event-dataset-2012 huggingface dataset:
Add gently support
Multi-level middleware working
Extract plugin running code
Add writefile plugin
Revert "Added gitattributes file"

This reverts commit 6142d0b38d36486819a439859f12517b2bd9a45c.
move some print funs from BitmapFont to Block
improve efficency of 595_138 basic driver
Sanitization of more types, including nested arrays and hashes, fixnums and floats
fix reflection_propertioes and perform_callback_for methods
remove unused properties
CSS changes, add 'search by name' and 'search by loc'
Chapter 14 assignment. Incomplete
added type traits test
added traits test
added reference to Boost.Optional
Merge branch 'master' of https://github.com/akrzemi1/Optional.git
Fix "satisfies?" warning
Merge branch '1.0.0-beta1'
CMake: build both static and shared libs in one build
CMake: set version from version components
Refactor FindPOPT.cmake script

Refactor FindPOPT to:
- Use pkg-config when available. (popt installs with a pkg-config file)
- Use FindPackageHandleStandardArgs which is a default part of CMake
  and thus we don't need to maintain LibFindMacros
Refactor FindXmlTo.cmake script

Refactor FindXmlTo to use FindPackageHandleStandardArgs to have less
to maintain.  Also mark the XMLTO_EXECUTABLE variable as advanced so
it doesn't appear in the GUI by default
Removing unused LibFindMacros cmake script
Refactor TestCInline.cmake script

Refactor TestCInline cmake script to save the inline keyword in the
cmake cache so it won't get lost on a cmake reconfigure.
Print status message of which inlining keyword was selected
Remove unnecessary RABBITMQ_CODEGEN_DIR cmake var
Improve CMake default build type status message
Reorder checks in CMakeLists
Some stuff for the circle module
tiny typos and such
remove some debug code and recompile
qibuild: nicer output for projects on incorrect branch

Change-Id: Ib274b8259fe8faa4769b422ca1a9eedd985e60b9
Reviewed-on: http://gerrit.aldebaran.lan:8080/3332
Reviewed-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
Reviewed-by: gjacob <gjacob@aldebaran-robotics.com>
Tested-by: gjacob <gjacob@aldebaran-robotics.com>
OPENCV: fixing dependencies of package highgui

- adding missing "e" in depends

Change-Id: Ic6404b8384a0e2c04f007b4b0d02d4aec3317e53
Reviewed-on: http://gerrit.aldebaran.lan:8080/3392
Reviewed-by: llec <llec@aldebaran-robotics.com>
Reviewed-by: ewirbel <ewirbel@aldebaran-robotics.com>
Tested-by: ewirbel <ewirbel@aldebaran-robotics.com>
Revert "qibuild.command: make it possible to make some stats"

This reverts commit 064491a9d3fc1561f5cdd7e35dff4513140abc97.

Use qibuild.ui.CONFIG["timestamps"] = True
instead

Change-Id: I84f931e00cf9d5b3602524a868c95dfbf6b39460
Add missing license header

Change-Id: I3705131b4de0979a5aca6ac14c68337fa9fff37f
doc/Makefile: fix for python2/python3

Change-Id: I7ced7ef313ccb2e124c9c27e9769f3e0f6134845
test_git: cosmetic changes

Change-Id: I572c19b32ae88f8d2b1687b3fc7499441a90f97e
qisrc review: cosmetic changes

Change-Id: I77a6f48296c088c229006cb119364088bae81ced
changelog: fix links to tox and py.test web pages

Change-Id: If03fd0797ececcbfaf4b7bbdd0684a329c15b281
Mark more tests as 'slow'

Change-Id: Icd1ca4199549abb23023e40d3cfbe4f96a622524
git.update_branch: small fixes

* Do not fail if stash fails when git.is_clean() returned True
* Call rebase --abort when stashing back changes fails
* Do not bother with 'git stah pop' if first stash failed

Also:

* Add a FakeGit object and use it for testing update_branch

(bug fixes were found using the mock)

Change-Id: I77a8919e48c485d25e9353252c62e5ec4af67c46
doc: document qisrc.test.* useful modules

Change-Id: I8532fd2318fee3d0028cd4c50c7263c7750d27a4
qisrc: quick and dirty bug fix when there are broken submodules

git.is_submodule() did not return a correct result when
git remote metadata did not fetch .gitmodules settings

There's probably a better fix for that, though.

Change-Id: I88fa5d0b2810a52ce28270b114e2c6bca01ab34b
write app configuration to a json file
path to config file in app's environ
pass on hardcoded services to application
services passed to application as mapping
configure path to a 'var' folder
create var folder if non existent
Merge branch 'services'
actualitzacio
Merge branch 'master' of https://github.com/alex23/Sapalomera
Added WebForms sample
upated network and explosion animation
handbuch
handbuch
headerkonflikt
initial export from lookseq on sourceforge rev 101
Fix stylesheet name so it's included in the asset pipeline
Stop the 302 redirect from /guide to /guide/part-1-url. 

This 302 is bad for SEO and will cause problems when combined with the
301s coming from legacy websites through the redirector.  

It does however cause a further SEO issue in that /guide and 
/guide/part-1-url both serve the same content. This will be fixed in a
future commit using a canonical URL
Add canonical URL for guide parts

This is partly to resolve the issue where the first part of a guide can 
be viewed at both '/guide' and '/guide/part-1-url' leading to duplicate 
content.
Merge remote-tracking branch 'origin/master' into remove-guide-302-redirects

Conflicts:
	app/controllers/root_controller.rb
We should no longer redirect people to the first part of a parted thing

This behaviour is no longer used as both guides and benefits should
show the first part at /slug AND /slug/part-1
Identify a request for parts that don't exist correctly
Check for unknown part / unknown video / empty part list earlier
Changes to tests to account for removal of 302 redirects on guides
Temporarily removing rendering tests for business support format

More work is to be done on this format soon that will change the way
the format works so this broken test is currently not useful.
Merge remote-tracking branch 'origin/master' into remove-guide-302-redirects

Conflicts:
	app/controllers/root_controller.rb
Merge pull request #37 from alphagov/remove-guide-302-redirects

Remove 302 redirects from parted publications
Add authority slugs
Redirect licences with a location to the appropriate authority slug
Stub location in tests
Move location form more inline with page
Authorities includes both snac and gss codes
Update root controller to use new method on AuthorityLookup
Merge remote branch 'origin/master' into licence-location
Don't reset WebMock in setup and teardown blocks, breaks stubbing
Update licence integration test to use the new contentapi test helpers
Merge branch 'master', remote branch 'origin' into licence-location
Licence actions load into side tabs
Add ommitted licence overview partial
Bump gds-api-adapters to 2.6.0
Allow user to change location once selected
Remove method that sets unused instance variable
Allow licensify API to be overridden by edition.

A LicenceEdition can override the call to Licensify by providing the
'will_continue_on' and 'continuation_link' attributes.
Move side effects inside the action

Methods being called from the controller were creating side effects (setting
instance variables and params). It's much easier to manage when all of this is
done inside the action.
Merge branch 'master' into refactor_root_publication
Move some publication config
Only local transaction needs to set not_found
Make snac a local variable

It doesn't seem to be used in any views so it shouldn't be an instance
variable.
Bump version to 0.8.16.
Specialist guidance should not be pluralized.

The default humanized format pluralizes the format name, turning
specialist_guidance to Specialist Guidances before this change.
Format names should be in sentence case, not title case.

Neil Williams pointed this our, and I've checked with James W too
that sentence case is the way to go.
vimproc, vimshell
I believe this is only necessary for the postgres side of things to keep items for the same day in the same order as they get checked off, nonetheless, doing it here.
Got connections to a local postgres db and the included sqlite db working essentially side by side. Just need to swap out which context is being used in the task controller.
Modified errors
Added HAL
Nicer background in CSS3D molecules example.
export LANG=ja_jp.UTF-8, css.dict, とか
- SimpleXMLResult array acces, look for method first.
now using oh_my_zsh, works.
Création d'une méthode annoté postconstruct pour la vérification d'authenfication

Implémentation des appels aux managedBeans de type session dans la fonction commande
Merge branch 'master' of github.com:amaniago/BooXtore
changed spacing on listit
Updating Saturday to 'ش' and Dey to 'دی'.
reverted java groupId name
sample basins
Adding default color kwarg to all puppet calls. Setting to 'false' turns
off colored text output.
Typo fix in timezone
Merge pull request #2713 from techhat/baremetal

Typo fix in timezone
class _Puppet(object)

+ added a couple of comments.
- removed the --test argument from 'puppet agent'
+ when 'puppet agent --test' is called, --detailed-exitcodes is enabled.
  this causes the return exit code to be 2 if changes have occured during
  the run. without handling these we can instead manually specify each of
  the options --test turns on, without the detailed-exitcodes.

def run(*args, **kwargs)

+ edited the conditional on args so that when _no_ positional arguments
  have been provided the _Puppet.arguments() method is still called.
  allows salt '*' puppet.run, to identify the agent subcmd and add test
  parameters.

def facts()

+ put continue on a new line to satisfy pep8 rules.
Merge branch 'develop' of https://github.com/saltstack/salt into develop
impl: some fix
Implement creating objects and calling the constructor (at compile time only so far).
adding basic tmux.conf
changed some history related options that were missing
Make sure the deps directory is present.
Easier to follow.
Merge branch 'master' of github.com:anha0825/dia_test
Modifed John Shandy's weather plugin and introduced new timings
Tidied up a little
fixed merge conflicts
Merge branch 'develop' of https://github.com/anhstudios/swganh into weather
Fixed more merge issues. Now builds and runs.
Tidied up python script with help form rcythr <3
fix merge"
small tweaks here and there, also added persistance of sub objects
fixed weather service, properly calling SetSceneWeather now
Merge pull request #1 from Kronos11/weather

Weather
Merged with develop
Fixed weather service crashing server periodically
Merge branch 'weather' of https://github.com/Rexz/swganh into weather
Merge branch 'develop' of https://github.com/anhstudios/swganh into develop
Merge pull request #425 from Kronos11/develop

Develop
Merged with latest develop
Added weather description
fixed script lowecase name issue
Merge pull request #426 from Rexz/develop

Weather service merge with current develop state.
model build for tables of db askeet
after building forms

symfony propel:build-forms
At the end of day 2
Input data the program failes on which.
Merge branch 'pull'
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  community meta tag renamed from "ika"

* master:
fix dispys' css and layout

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #124 from simonlnu/master

fix dispys' css and layout
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:
fix dispy-dark photo album stuff

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
backend for "save to file" feature
more save to file backend
Merge branch 'pull'
get tags test improved
Merge branch 'master' of git://github.com/friendica/friendica
add lightbox, fixex in css
Merge pull request #125 from tomtom84/master

fixes in diabook-derivates
Some security against XSRF-attacks
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add lightbox, fixex in css
  more save to file backend
  backend for "save to file" feature

* master:
fixes
Merge pull request #126 from tomtom84/master

fixes in diabook-derivates
use fancybox instead of lightbox
Merge pull request #127 from tomtom84/master

fixes in diabook-derivates
fix css
a little bit of phpdoc
help: load Home.md in aside when not in home,add new markdown syntax
New markdown block "warning"

    ! line1
    ! line2

will be rendered as

   <div class="md_warning"><p>line1</p><p>line2</p></div>
doc: add "Move account" basic documentation
items: new property 'shiny'.
separate 'indent' (''|'comment') from 'shiny' (''|'shiny')
quattro: fix shiny items with threads. fix 'tagged' template
quattro: collapse threaded comment box
add apple/gnome web app tags
PL: update to the strings
DE: update to the strings
glitch with DE, PL strings
Merge pull request #531 from fabrixxm/master

"Move Account" docs
improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago.
Merge https://github.com/friendica/friendica into pull
include some notes on grabbing the tumblr avatar
CS: update to the strings
PL: update to the strings
Diabook threaded comments.
Merge branch 'master' of https://github.com/friendica/friendica
Move-Account minor English changes.
Diabook - yeah, we're supposed to *stop* duplicating code...
vier: The alt-pager and the birthday- and eventreminder is optically improved
generated sample HTML application
generated sample Markdown
xtend configuration removed
amended icon
Simplified Lamda expression.
add templates for rox
Fixed config deploy
Fixes dependance on stopwatch module. Hall effect ifdef removed from cmdSetThrustClosedLoop, new cmd defined for this.
bb -> bu
Accessing unset propery value should return nil not throw exception
Add unit test for referencing missing property
Merge pull request #3 from stevehine/master

Accessing unset propery value should return nil not throw exception
PakReader: Reset error flags after reading so that seekg won't fail after we reached the end of file. (fixes bug #259)
fixed error in figuring out sub boxes
makes works on stupid windows....32 bit dll hence 32 bit jvm
Add Twitter Bootstrap
Major changes
Revert "- Implemented frame resizing"

This reverts commit 508a98d165f3c9263b9b712b4fb825e4973fce38.
seeder_wire_protocol: rm debug
fix the behavior that cusor move from A enter B, B.hover event happen before A.leave event https://github.com/ashbb/green_shoes/issues/62
* Implemented /:room/edit endpoint.
Add javadoc
Tweaking
Adding support in CLI "job create" for wildards when specifying metahost labels

This is a solution for issue #12.

When user specifies "job create ... -m 2*group* ..." it will expand to
scheduling job with all maching labels (e.g. group1, group2, group3);
This is applicable to all labels (not just platform)

Signed-off-by: Julius Gawlas <julius.gawlas@hp.com>
Deleted translations. We can't keep those up for our fork.
Web service
Adding CRUD and Heroku config
Admin Home
Revert "Admin Home"

This reverts commit f9d276b19d82ad6f7c0bc32a30b3676813bd7b57.
Massive rework to Haskell client.
copied contents from introduction markdown to index and changed layout
Small changes for scaling
poi is completed, things to do option to be done
bug: setting css opacity to 0 should add a style with value, not remove the opacity style
comenting out deploy/assets
change ALL_BIT_FLAGS to three bits to allow for 8-aligned type addresses
Added modules, build should be finally usable, all classes are under Wishbone.* namespace, refactorings
Comment оруулав
Ajuste do CSS
the hideousness returns
added test for exploring ways to wrap a Java array
gen
Update README with current feed URLs.
Simple setup script
bash stuff from old repo
gitconfig from old repo
inputrc from old repo
screenrc / tmuxrc from old repo
cheatsheets from old repo
test term colors
some scripts from old repo
git-wtf

http://git-wt-commit.rubyforge.org/#git-wtf
git-jump

https://github.com/git/git/tree/master/contrib/git-jump

Using git-jump
--------------

To use it, just drop git-jump in your PATH, and then invoke it like
this:

--------------------------------------------------
git jump diff

git jump diff --cached

git jump merge

git jump grep foo_bar

git jump grep -i foo_bar
--------------------------------------------------
Reboot vim config
squelch noisy tmux status
restore some vimrc from old repo
Fix path on bash profile
the parent is now asked to provide a key for the new custom picture
choice fields are now disabled when the question type is set to picture
numbers are removed in a choice before sent to tts
fixed a bug where if the new picture key was same as another one it replaced that one in the questionpicturepanel
fixed bug where wrong image would get highlighted if the key was same as another one.
added history test function for client side
Revert "Changes State object to fix tests"

This reverts commit 5c669bd4a5d9851a903c80b28974a21fac8e79c8.
Change whitespace in std/json to be consistent with dstyle
Ch2,3 - Observer (WeatherStation, Swing) and Decorator (Coffee, FileIO) - Complete
Rewrote GANTT data library to only work with dates.
Added slack and some extra styling.
fix for #8921

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10579 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
Initial check in for ImageTask and CleanupTask.

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10580 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
Removing exif code

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10581 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
Removing exif code

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10582 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
Initial commit
Faster ticks
Merge github.com:benblum/SimWeeels
Clean negoapps
data import functional
removed manual overwrites for perspective camera
fixed directional and spot light properties
added option to export geometry only, defaulted to not prefixing object names, various minor bug fixes and cleanups
initial re-factor of geometry processing
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
more re-factor of geometry processing
bug fixes, non-scene geometry exporting works now
Slightly faster string construction
WebGLRenderer: only nulling colors for disabled / removed lights.

Also not sending anymore to GPU directional and hemisphere lights with undefined direction (0,0,0). This is to prevent black pixels in OpenGL.

Fixes #2742
Merged with @mrdoob's dev branch.
Editor: removed obsoleted object.deallocate on object delete
Merge remote-tracking branch 'bhouston/triangle' into dev
Merge remote-tracking branch 'alteredq/dev' into dev
Updated builds.
Fixed canvas_interactive_voxelpainter.
Updated builds.
Merge remote-tracking branch 'zfedoran/dev' into dev
Simplified Plane constructor.
Removed Rectangle.
Updated builds.
add timer to top again
comment: without timer sw <=> leds works
Modification du fichier js.js pour la facture d'achat (nouvelle fonction calcTotalAchat())
Nouveau select_fac_achat.php (de la version netG)
modif sur add_reception2.php

Signed-off-by: Mohamed Ait Slimane <mohamed.aitslimane@gmail.com>
Added Paizo Community Use Policy (CUP) license, notices, and verbs.
Added handler for adding Paizo.com account information.
configure analytics to take ga.js from host file instead of injecting it programmatically
bug fixes to editor and grid widget
Adding logic to hide quick edit when turned off
Nom du fichier erroné
передаем stat в обработчики DF17
забытый add_icao -> check_icao
Added benchmarks section, but it needs improvement
* Blade middleware now uses client caching by default.
* Removed Blade middleware options:
	- clientNamespace
	- clientCache
* Updated runtime.loadTemplate function accordingly
* Updated documentation
* Push to 2.0.0beta2
git-annex: updated to version 3.20120406

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Reverting to revision 1995, this is what AVLinux uses, and works well with jackdbus too

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Adding LCI lambda calculus interpreter 

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33962 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
* Ant updated to 1.8.4.


git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@34551 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
improve _monitor_bought_stock
* Retab.
- Add ability to get request bodies as parameters.
 - Add spec to make sure body_params does not include parameters defined by the route.
Changed 'content' to an object.
Mustaches!
Pagination mustaches!
Better pagination url helper.
Remove testing code, clean up camelize
Merge branch 'feature/hogan-templates' into develop
update user acces token if necessarry
check user session correspond to the currend facebook user + refactoring
add classement tab (todo classement between friends)
risolti un po di errori
Added JQueryUI CSS and JS, added some test content.
Tabs issue fix

The issue was that we did not have li tag around the second anchor tag.
It now works.
Added some styling tests...
More playing
Added some more stuff
Added some fun thingies
Added our names zomg
Some changes
uniform res attempt
tewst
merge it1-bori to master
Read book info from XML.
Better file names (count from 1 instead 0)
corrected hosts_ctl to use STRING_UNKNOWN instead of wsgi_req->host. This
wants the remote_hostname, not the request host header.
switched over to using Postgres.app (instead of SQLite) for development
default.xml: add in bROM Theme repository
The theme will not be built yet, as I haven't added it into the makefile
for the tmobile themes, but I am adding the repo to the default.xml
at this moment so it can be pulled in with the source. I have not made many
changes at all to them theme and it still has alot of work to be made to it
but I wanted to get it on github so I could track my changes and make it
easier to work on it.

b_randon14
Log dumps for gyroscope data
no one found in friend search
Merge https://github.com/brian-l/boxbuildr
added powersupply compatibility to compatibility.py and fetch.py
Added most of compatibility to database, new initial_data.json, changed makerelationships
make compatible with 1.8
del slides, moved to website repo
Make it clear the ShowRSS backlog is limited.
Custom Scene Exception support.
Custom Series names are editable on the editShow page, and shown
on the displayShow page.  These are merged with the scene_exceptions
downloaded from sickbeard when performing comparisons.
fix the (hardcoded???) source url
added wide_caret and tweaked some theme colors
another typeof unit test
Froze some parts of the heap, and made a honeypot called Array.notinspec to see if SES deletes it.
New -continue-s5-eval command, several other miscellaneous changes.

- all_tests.sh now reuses the same initial environment instead of regenerating it each time!
- Added new -continue-s5-eval command, used like 's5.d.byte -load x.heap -desguar x.js -continue-s5-eval
- Removed state from stores (required to implement -continue-s5-eval)
- The tests/s5 script now takes a filename argument, and a list of commands. To read from stdin, use ./s5 stdin, or ./s5i
- Froze some parts of the environment that never needed to be modifiable in the first place
- Added a honeypot called Array.notinspec to see if SES deletes it
- Added checks for prototype cycles in src/analyses/ses/heapwalk.ml (there aren't any)
Merging
Use `s5 x.js -eval-s5 -save x.heap` instead.
Fix #23 - Missing try...catch() block in Table\Manager::execute()

Parameterizable - Improved class description

AbstractPDO - Improved documentation and fixed lastInsertId() throwing
method

TableException - Counter-part of #23

Exception - Changed unfullfilledRequirements(), logic() and wrongUse()
to use Late-static-bindings, fixing all catch blocks referencing to
Exceptions thrown through them

Exception Handler Development Template - Improved Call Trace. Now class
names, if available, are displayed

Response, Adapter\Socket, Session\Environment - Removed $throw and
adjusted implementations to not use them anymore

All references to these methods (like in Stream\Reader) adapted too.

Adapter\AdapterException - Removed duplication in documentation

ClassMapper and ClassMapper\XML - Changed directly instantiated
Exception to ClassMapperException static method call.
added support for heroku.com
added support for heroku.com
added support for heroku.com
added support for heroku.com
added support for heroku.com
added support for heroku.com
Merge branch 'master' of github.com:bsi/parallax-site
pushing chages from 10/8.  New page structures.
fixed the video carousel in the blog section
fixing the bg-image size so safari doesn't freak
resized chalkboard image to 2000x1334px
some small cleanup of text...
udpatd bg image for smaller size
new files for GH
No need to store st_mtime, modified_time is the "standard" in pyFilesystem docs.
Update tpl/en/search.mtt
Added handlers for similarity and recommendation. Refactored stanza
builders.
data put in right place
Set the BuilderStatus's category on reconfig

Fixes #2331.  Tested manually.
Add buildsets to the data API

* addBuildset moved from master to a data update method
* schedulers updated to match (note that the addBuildsetForXxx methods
  are staying in BaseScheduler)
* assertBuildsets can skip asserting on buildsets.  This is ugly, but
  once everything else is in the data API, can be straightened out.
use ascii2unicode, rather than .decode('utf-8')

..and use unicode literals
handle bsid==None in assertBuildset
fix typo
Test fixes per tomprince's review

* add docstrings for test utils in test_data_buildsets.py
* use symbols for arbitrary epoch timestamps
add docstrings and factor out fake messages in Dependent tests
fixup! use ascii2unicode, rather than .decode('utf-8')
refactor base scheduler tests to not use assertBuildset
Factor out buildset addition testing

Only test schedulers' calls to the BaseScheduler addBuildsetForXxx
methods.
Merge branch '9/buildset-rtype' into nine
Merge branch 'nine' of github.com:buildbot/buildbot into nine
travis: cd to correct dir
fix bugs. plug testing holes.
Overhaul permalinks
hdl,sim - dut_if rewrite: fix bugs, fold away decode stage

 * Fold the decode stage into the execute stage since there wasn't
   really any need for it.

 * In doing so, it is now possible to stall the fetch stage from the
   execute stage early, so that no words are read from the FIFO while
   execute is processing/stalling.

 * This pretty much completes a first implementation of multi-stage and
   triggered capture. Other things that are left to do are,
    - Think about pipelining the execute stage and provide pipelined
      execution.
    - Pass through the timeout and cycle information to the check
      module (through the RT FIFO).
Added travis config.

Lets go.
Show rating stars
moved models into own package and removed enums
broke attributes into attributes and interactions
cleaned up branch a bit before merge
merged interactions, funky stuff in CommandDisplay, AI broken
merged master into branch prithvi
lista y detalle de regentes
correctly set the tmux terminal and send an urgent hint on activity
random color on nicks, based on nick length
do not make a new active window the current tmux view
Added suuport for Rating Question

Added rating question type in QuestionView
python implementation for VCDIFF (RFC 3284)

implementing a humble vcdiff enc/dec (rfc 3284) using python...
d to dotfiles
Fixed butter tray to fully load in IE9 [#1861]
[#1764] Trackevent now always open on single click
[#1852] Updated popcorn submodule and removed reference to unsupported attribution plugin
[t1797] WIP status bar almost done

[t1797] most elements showing up - timebar fixed

[t1797] useless timeline file

[t1797] trackhandles working properly

[t1797] trackevent colours and plugin tray working

[t1797] timeline working again

1. Fixed bug in trackevent preventing 0 times from working (possible dragndrop values).
2. Cleaned up dragndrop module a bit to compensate for id-less elements.
3. Removed console.log that were not necessary.

[t1797] timeline droppable reactivated

[t1797] couple of timeline bug fixes

[t1797] WIP plugins/tray

[t1797] Moved the add popcorn tray to an editor

[t1797] removed context-button entirely

[t1797] css redo and cleanup

1. Reimplemented changes for modularized LESS after a rebase
2. Removed unnecessary console.log

[t1797] review changes - mostly style

[t1797] review changes

1. Linting errors
2. Fixed new plugin type drag/drop
3. Force editor tray open

[t1797] fixed broken tests (better null checks)

[t1797] class looking for add track button

[t1797] keep ui out of tests
[#1876] Updated popcorn submodule
[#1765] changed flaot right to float left and width to get proper alignment.
[t1874] Have CSS Lint ignore -moz-appearance rule
[#1727] initial custom controls for basic template.
[t1877] resizing trackevents is visually correct

1. TrackEvent checks and stores padding of its view element.
2. DragNDrop resizable stabilized based on padding.
3. TimeUtil rounding upped to 5 decimal places for better accuracy.
[#1878] Removed references to attribution plugin
[t1832] Added normalization
[t1886] te-editor can use options with values

1. Removed ontilt event from googlemaps (was updating improperly and is useless).
2. Added value detection in trackevent editor.

[t1886] bit of documentation
[#1828] Separated out all tests that used butter into their own individual test pages
[t1880] Add instructions for new github landing process to README
[t1881] initial work complete

1. Moved AddPopcorn button to header and changed inner text
2. Removed plugin tray panel entirely
3. Cleaned up a couple of id/class name confusion points

[t1881] fixed a couple of bad ui state checks

[t1881] whitespace review changes

[t1881] review changes - no need for padding reset
[t1888] Added css-lint-ignore lines to normalize

1. Added css-lint-ignore lines to normalize less file.
2. Removed two spaces after lint process.
[horizontal-resize-timeline]

1. Removed segments which set "width" property on timeline elements and
   replaced them with correct "right" properties.
2. Removed extra zoombar elements.
3. Fixed scroll bar timeline resize.
4. Added transitions for shrinking timeline horizontally.

don't need extra space for myevents panel anymore

[t1891] overflow:hidden on scrollbars

Added overflow:hidden on scrollbars to guise lack of handle resizing during size transitions.
Add html5 lint
[t1899] Added onchanged handlers in te editor.
[#1857] Updated browser id urls to persona.
agregando style.css
Update urls for Persona rebrand
Add a Makefile to simplyfy typing rsync.
Load provisioning_api based on document.referrer

Thanks to mook in #identity
Cleaned up some files
Added exception handling for queue connect
test
Merge branch 'master' of github.com:candres26/Vimelab
Agregada Vitacora De Variables
add: Better display when unavailable informations
cartas de vidente y de pueblo
carta del vidente
Expose p4est_connectivity in py4est
[PACKAGES] Change the name
Teste para juntada usando a busca (#5)
Adicionando Busca de protocolo em juntadas (#5)
Teste Aceitação para Desapensar processos (#6)
Action desapensar processos de juntada (#6)
Adicionando factory para juntada (#6)
Javascript para selecionar juntada dinamicamente (#6)
Metodo para desanexar processo && atualizar processos (javascript)(#6)
view para desapensar processo(#6)
rotas para atualizar processos dinamicamente  && desanexar/despensar processo(#6)
Adicionando action desanexar processo (#7)
Metodo simples (OO)
Teste para desanexar processo (#7)
Adicionando view para desanexar processo (#7)
Rota para desanexar processo (#7)
working: scanner -> storm -> bottle -> backbone
Set the terms of service in the email to plain-text.

The registration email is now sent as a multipart message where the content as described in the database is HTML, but the terms of service is always sent as plain-text.

Closes #354
Merge branch 'ohmage-2.12' of github.com:cens/ohmageServer into ohmage-2.12
Handle preexisting states of /etc/default/grub better
Assume upstart presence rather than testing
Fix apparently-missing command ''
Trying to get changes to pages.
Cleaning up stuff.
Refactored the implementation of BBox.

This implementation is quite a bit cleaner than the previous one.  There
are now two classes: BBox and BBoxT.  BBox is just a simple bounding box,
with various methods to manipulate it, test rays against it, etc.
BBoxT is a bounding box that can have multiple states through time,
for supporting motion.  BBoxT is implemented via BBox, by using BBox's
to store individual states in time.  BBoxT is now the primary bounding
class to be used throughout Psychopath's code.

Also added a bunch of unit tests for BBoxT.  Hooray for unit testing!
Change database-specific result types into void.
fixes #85 all custom mail parameters in sendEmail()

 * use the mailparams argument.
 * must be an array of structs
update readme with new instructions for api generator
add category and function list pages to documentation
add generated api documentation
Reseteo y borrado

Borro archivos de prueba para empezar con lo serio
prueba...
Use "" instead of NULL for access_key and secret_key.
digest_len is an in/out parameter, treat it as such.
Logic error.
We don't need the md5 calculation since we don't include the header.
Use "" instead of NULL for access_key and secret_key.
OCR 적용..
Merge remote-tracking branch 'origin/master'
Link up profile fields with those set up on thatcampdev.info now

IMPORTANT : Can these fields be set up or copied over to the main site please Boone?
SImplified documentation pages
CC logo
Footer logos with less spacing and reordering
Better search gradient
sample item image
Merge remote branch 'origin/master'
Cambio en la minuta #15

Referente a acuerdos por aparte sobre la parte de la capa logica como
deben de ir
Committing to Main
crap
Implement password hash checking, add bcrypt tool to hash passwords.
Update Italian translation.
Support for images in Stardict dictionaries
Support user icons for Stardict dictionaries
playing with styling etc..
Added fancier tag cloud
Playing with image widths
Playing with category labels on index
reset stylesheet
Fixed up bug in base template
new post
new post
main/valgrind: fix build on eglibc 2.17
Borrar Jquery UI del proyecto y de los archivos que lo utilizaban

también se reubica la clase DB.php desde la carpeta lib (que es
eliminada) a la carpeta class, con las demás clases del proyecto
Unified read_dxf(), read_image() and read_stl() into single read()
Merge branch 'master' into hadoop-os-build
Eschew barclamp merge conflicts.
Eschew barclamp merge conflicts.
Move barclamp submodule refs back.
Move barclamp submodule refs back.
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into hadoop-os-build
Sync all trees
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Sync all trees
Add some initial rails3 pieces and move assets
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge pull request #1078 from galthaus/pull-req-release-rails3anddb-master-24dbbbf748

rails3 initial hacks [3/6]
Merge pull request #1081 from galthaus/pull-req-release-rails3anddb-hadoop-os-build-afb6a13675

rails3 initial hacks [6/6]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Add more rails3 changes.
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Fix create release

When building jobs that have a prepare script, spec file must be read
after the prepare script execution, because the prepare script is who
finally builds the spec file.

Change-Id: If8618cda7c2fbcc4d310b782fa6afcea1d968bf5
Merge "Fix create release"
Fixed cli terminal size calculation when not invoked via tty

Change-Id: Ie75dbaa40921a6292646092ca97fa9e10d8f560f
[bugfix] apps can't get staging log

The root cause is that vcap_redis can't start since multiple redis
version supported in the previous change.

Change-Id: I9492a742d09d2305bb7554b2f10d48805547238f
Adding a redis spec.
demo link
Version: 1.2.1
Splitted into AMD modules (not sure if right though) and worked on Model a lot
issue #1564: Make TestJavascript works on windows.
Merge pull request #1625 from dumganhar/iss1564-update-tests

issue #1564: Make TestJavascript works on windows.
Fix comment. No functional changes.
Merge pull request #1386 from folecr/gles20

Fix comment. No functional changes.
update hubot
downgrade hubot to 2.3.2
upgrade hubot and fix idle issue
add buscemi script
add docs, allow custom update strategy, update specs
yotsuba: fix break from HTML change.

4chan has a JSON interface now ¯\_(ツ)_/¯ we'll see how things pan out
add package.json for now
Add autoload example to the package repository docs for clarity
Rewrap docs
Logic error in install script
more pirate talk
Add man page with CMAP keys created by corosync

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Remove info pages see also from cmapctl man

Corosync doesn't have documentation in info format, so information is
corosync-cmapctl was not true.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Renames artisan to shen
Added artisan class
Fixed spacing, using now 2 spaces instead of 4.
MB-6841: [lhttpc] Un-urlencode credentials in urls

Comments in split_credentials correctly indicate that any special
chars need to be 'percent-encoded'. So in order to get their true
values we need to un-encode.

Otherwise there's simply no way to use usernames/passwords with
special characters when doing basic auth via urls.

NOTE: This is same patch as was recently accepted upstream except we don't
have lhttpc's tests. I.e. https://github.com/esl/lhttpc/pull/19

Change-Id: I1ea38d890d3b41e33e813c62deb52166ae7794fe
Reviewed-on: http://review.couchbase.org/21461
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Reviewed-by: Damien Katz <damien@couchbase.com>
Reviewed-by: Junyi Xie <junyi.couchbase@gmail.com>
Some performance improvements and updated render system
Merge branch 'master' of https://github.com/countnoobula/LD25.git
Added concrete block and collision detection
Merge branch 'master' of https://github.com/countnoobula/LD25.git
added functions to remove handles from individual categories
Reorganise mozorg tests
Helper function for easy redirects in urlpatterns
Remove commented-out CSS
Merge pull request #257 from sgarrity/bug-763659-fx14whatsnew

Remove commented-out CSS
Fix redirect to work with+without trailing slash
Use jinja highlighting and fix some code blocks
Merge branch 'master' into dev

Conflicts:
	apps/mozorg/tests/test_helper.py
	apps/mozorg/tests/test_util.py
	apps/mozorg/util.py
fix postgresql-plpython name for debian squeeze
Add Flask-Redistore to handle connections with Redis
Merge pull request #9 from crateio/add-redis

Create pluggable data store for synchronization data
Site updated at 2012-07-09 13:30:19 UTC
Merge remote-tracking branch 'upstream/master' into tomdev
Module cssjs chfilter form-inline css fix
	modified:   ../cssjs/js/chfilter.js
Merge pull request #42 from tombombadilom/tomdev

Tomdev
Added files from Little Schemer and SICP
Merge branch 'master' of github.com:crunchbang/Scheme
Tri's updated project
Tanvir's documentation on more than half of the classes.
Merge branch 'master' of ssh://git@github.com/cs301w03/cs301w03.git
Remove App class and App test - no longer needed
Upgrade to BDB 4.1.17, to fix GC issues
Added je-4.1.17 to the Eclipse classpath
Minor fix in the batch file
Patched with different fixes that are not yet pushed in Master
Reverted change until is properly tested
AddWaterMark and AddWatermarkImage
modify watermark
Added support for returning result_ids. Fixed search subclasses not being able to leverage the result caching in the search superclass.
modified:   bench/pagerank/PagerankMap2rc.java
	modified:   src/java/mapred/org/apache/hadoop/mapred/Child.java
* the beginning
Added greeting page
fix event names for event and function remote_add_obj, add test, add
extra data as argument for object creation events.
Now not-printables will be shown differently in Vim.
This hopefully fixes the documentation for the fail module
Fix variable injection in pause module args. Closes #1209
fixed random seg.fault on Debian (squeeze, wheezy, sid) with openoffice or libreoffice
Merge pull request #67 from vpa/master

Random seg.faults in unoconv
Finger scrolling for scene
teste branch..
teste
ich templating for messages
Подключение win32ole перенесено внутрь инициализатора.
Merge branch 'master' of github.com:dancingbytes/s41c
Правки в readme, мелкие правки в серверной части
restore hg
update sock
version_0.0.2_starship
cambios
Global Asax Changes

Just4Fun
merging
Merge branch 'dev' of github.com:danielfilho/vewJS into dev
working test
Modified input order in colorset.php, resulting in presets that can be modified at command time
fix line-wrap bug
delete problems easily and safely by just setting a 'deleted' flag

Physically deleting a problem record is dangerous because
lots of other records are linked to it, and if a problem id is
reused then suddenly stale/invalid data is linked to the new
problem.  Setting a deleted flag just means that searches for
the problem need to ignore deleted problems.
ignore bin and log directories
bugfix for issue #3 - save problem doesn't work

The problem was that ProblemAndTestCaseList.copyFrom was allocating
a new Problem object rather than copying data into the
existing one.  The EditProblemAdapter didn't know about the new
Problem object, and was continuing to edit the old one.

Fixed the issue by changing ProblemAndTestCaseList.copyFrom to
always reuse Problem/TestCase objects when possible.

Also made a couple improvements to equals methods for Problem
and ProblemData.
Updating POM to 3.3
Added new MessageTypeAndContentsCondition

FSM TransitionCondition to check the type of the message and the data
contained in the message
Added more port condition functions
Improve wording in README.
added LabelImage
Doesn't seem to work
Styling
SSLR-234 All matches should be presented in parse tree
SSLR-237 In case parse error, show the extended stack trace instead of assuming an empty prefix match
tweaking display parameters to see what actual models look like when framed properly
Adding five
initial projectile, small refactor of collision (added rayhit and non-entity), some other clean-up
Redesign of the management of display of attributes.
Highlight row numbers in lists.
Deleted old images, new content images and slider1 image
Crop Image
Merge branch 'develop'
Merge pull request #72 from decaturguy/master

 Added more Viasat channels
update
update
Version bump to 0.9.6
Regenerate gemspec for version 0.9.6
間違いなく存在しないファイルをrmしていたためrmをしなくした
before starting actual work, verify that all instances of worker are
dead
i18n and exceptions for geocoding
fix edge decomposition
#67 optimized jump drive path finding; modified async route finding
- SolarSystem now stores a map of near jumps, created once on demand
- ActiveRouteProxy internal timer modified; bulk loop limited by time
add align and command-t scripts with key mappings
Add bill report to odf
Added HardwareCAN.cpp to wirish makefile
Signed-off-by: Devan Lai <devan.lai@gmail.com>
Fixed misuse of const in CAN and removed defunct can_dev CAN from main can.c
Signed-off-by: Devan Lai <devan.lai@gmail.com>
relevantDate is now included in output
Merge branch 'relevantDate' of https://github.com/23min/passbook

Conflicts:
	passbook/models.py
modified error controller to be cli sensitive
Fix invalid route in README.md
Removed SelectedPreview state from tree items

What was the SelectedPreview state is really just the Focused state. This has been updated accordingly.

Also, support for all Windows XP themes (Luna, Royale) has been added.
MS DC template picker override
new post types.  remove old ones.  yeah.
Little traslation "HOME" /post
Merge pull request #3208 from movilla/69

Little traslation "HOME" /post
check for existence of key instead of checking secret twice
oembed video info
Merge pull request #3260 from panckreous/twitter-conf

check for existence of key instead of checking secret twice
Merge pull request #3418 from Raven24/nicer-oembed

oembed video info box
update-gems
Merge pull request #3424 from justindthomas/update-fog

update-gems [ci skip]
updated 41 locale files [ci skip]
make serbian translation available
[SECURITY FIX] please update your pod ASAP
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
Merge remote branch 'upstream/master'

Conflicts:
	db/schema.rb
comment send mail
add link to downloads section
Add the "generated" php_browscap

This is the only one that matters to me :-)
Added Facebook iOS app updates & FF 16 for Android
Extensions were refactored a bit.
crf was ok, so let's try 27
11.2'
11.2
removed extending status_for across base
delete dup file

whoa calm down NUnit
implements reco_config, fixes #4
Merge pull request #7 from samircury/reco-config

implements reco_config, fixes #4
Make a basic User model (including secure passwords) end of ch6
movie: movies can now be reserved. Feature is primitive, but base functionality exists.
Fix css so the main page looks like it used to again
dprduction false cache added
added parenthesis to make javascript linter happy (jsl)
JBIDE-11836: fixing parser context feed for the IDE
fix for DRL parsing context failing tests
GUVNOR-1885 : Guvnor maven modules: Create war modules and change the current wars to jars
- Splitting some ResourceBundles
Don't be fatal on data "get'n'throw".
add card image to data store and pass as PIL image into drawCard template, also auto convert databases on load
Minor INFO fixes
RDNSS and DNSSL data in RA for dnsmasq
.osx: Correct symlink for iOS Simulator

Ref. #135.
.osx: Restart Dashboard
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .osx: Restart Dashboard
  .osx: Correct symlink for iOS Simulator
created new device driver for controlling leds and modified the push button driver to use functions instead of shared variables
modified the project to add new includes and the led driver
changed the uart driver to print a hex byte and to use the proper function so that no casting has to take place for printing strings of char, repaired the LED driver to keep from writing past the end of its bounds, added the status LED blink for the system status to main, and added push button 0 press and release blinks to LEDs 9 & 10
Merge branch 'master' of github.com:ductape/DMX-Relay
cleanup crossref merger
Edges added

It is possible to add the edges.
[FIX] vertices spec

the vertices fixture was missing due to a copy error.
Vertex verification

The allVertices method is checked if it returns the correct vertices.
Edge verification

The graph is checked if allEdged yields the correct edges.
fixed menu resize
new functions and changes
Final changes prior to public release as version 1.4 on CRAN