labofsahil/github-event-dataset-2012 huggingface dataset:
caricata traccia
ajouter fonctiond de box.java
Merge branch 'HEAD' of https://github.com/wangtz/ASR6-microprojet.git into HEAD
add few coms to DB. excel version 12
Qt Animations: More consistent duration

(More responsive movement for V-locked cards and H-locked launcher)

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
Merge branch 'shiftyaxel/qt-animations' into webOS-ports/master
Card View: Scale CardDropShadowEffect

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
Merge branch 'shiftyaxel/ui-scaling' into webOS-ports/master
Fixed login message / assigned session[user] to a variable UserID
Merge branch 'master' into dev

Conflicts:
	Default.aspx
	Default.aspx.cs
Merge pull request #6 from ShannonTurpin/staging

login/master page
Merge branch 'master' into dev
More untested changes.
working on the glimp module
Changed libui

This should fix issues with the 'RegisterNatives failed for 'android/graphics/Paint', aborting' error
Extract MappedItem from MappedFuzzyItem
Introduce IdFieldMappedFuzzyItem as @Id keyed fuzzy item
Fixed install version check
Change search filter to "cmd" from "string"
Revert version check change
Change copyright symbol
Formatting
Toolbar layout changes
Change copyright symbol
Fix element type
Add function visibility
Formatting and plugin additions
Add defaultSkin class
footprints!
update function check
it is an example, name it as such
Fixed parsing of URIs with just a path.
Updates to make the LF a block
Latest line follower
Fixed up start and stop line follow. Still contains debug information in file.
Implement s3 uploader
Prep for heroku deploy
Do GAE launcher setup for it, which is less ugly
[Feature] detect prefered header language if locale is not set
Cloudbees configuration
Update README.md
Use cloudbees-deploy-config
Merge branch 'cloudbees'
update deployement on Cloudbees
Moved extensions to a separate file
Adding linux specific settings.
comapreCands relocated and static now
fixed send file
add send sit letter feature
Fix NullPointerException in DatabaseHelper

	modified:   src/com/better/alarm/model/AlarmDatabaseHelper.java
SetAlarmActivity: removed revert() from onDestroy

this was causing a NullPointerException because of an attempt to revert
twice (first in onClick() and second in onDestroy).

	modified:   src/com/better/alarm/presenter/SetAlarmActivity.java
add timeq test

Signed-off-by: yayanyang <yayanyang@gmail.com>
add ignore rule 'runtime' path
add user model
create user CRUD script
create items CRUD and model script
remove google fonts include. readd jquery include
Merge branch 'master' into gh-pages
db.sql can drop your database and re-create it, createTestData.py can automatically create data
修复查看评教的BUG，不过如果访问URL改成get_assessments服务器会500
CSS update

Added a comment in the css to test my Evan branch
Merge pull request #1 from zyglobe/Evan

CSS update
Fixed text color for Android 4.0 and up
General Cleanup

Cleaned up documentation
Cleaned up logging
Update translations from Transifex; changed: languages.et relationships.nl
Fixed profiler paths
Track our fw/av until decision is made on commit

http://gerrit.sudoservers.com/#/c/2830/
update project name for maguro (AOKP own repo now)
Re-add Launcher2, weird things happened...
Changed Exception handling (added TcmsException)
some soft and hard iron calibration
make questions and contact slides optional (not on handout) and add github ribbon
recompiled Core Java and Platform Android projects

Updated NetBeans projects and distribution libraries, using the last
available code
Added sample Android project for Eclipse

A new version of the AppverseTwitter application for building in
Eclipse and ADT Plugin
added ignore rules for "build" and "dist" NetBeans folders
node server
testing
second test
another node-server
Removing banner from blog and about page.
idea#56
Removed color boxes behind dudes
Added List Constructors to Models, Added setduration to Stack
Demo finally loads and displays Tiled map.
update package.json
bump for package.json updates
Restructure coordinator to use new error handling pattern
Merge branch 'master' of github.com:Burgestrand/twitterskylt
install formgen by default
Added Assertions for Gateway-2001
Merge branch '3.3.1' of github.com:CONNECT-Solution/CONNECT into 3.3.1
GATEWAY-3088: Initial commit for scheduled task message polling
GATEWAY-3088: Modified spring app context to schedule message handler thread
GATEWAY-3088: Cleanup
GATEWAY-3088: Refactored to return number of messages handled instead of tracking with instance var
GATEWAY-3088: Enhanced logging for the message handling, made session debugging configurable
GATEWAY-3088: Added missing return statement
Merge pull request #182 from mlandis5am/GATEWAY-3088

GATEWAY-3088: scheduled task message polling
GATEWAY-2955: Initial commit, untested to get compilation working
Merge pull request #110 from mlandis5am/feature-direct

GATEWAY-2955: Initial commit, untested to get compilation working (do not merge) - code builds but doesn't work.
No puppet module atm - comment out
run puppet
Haven't pushed in a while

not sure this code works exactly but I will fix it today just wanted to
make sure I got it committed.
delete yesterday night work:( delete circle, square, heart feature
add prev and next button
add choose sauce activity without sending data from crust activity
Mltiple files
New Update Testing
Autocommit: $BUILD_NUMBER: 49
Autocommit: $BUILD_NUMBER: 31
Big changes - Down to 2 parse() calls.
Re-enabled previously defunct maintenance
automize nfs setup
automize nfs setup
IMM76J
IMM76K
IMM76L
Merge commit 'android-4.0.4_r2.1' into ics
added sportraad logo
test first and fake it
updated data loader and data file format
threaded network visualization updates
refactored packages
added wine data file
Added some custom map functionality
Getter und Setter für x und y
Farbige Raumschiffe
downgrade to vs 2010
fixing tests
more broken tests
conversion to the mac
Merge branch 'master' into AddAgency

Conflicts:
	app/models/day_home.rb
And so it begins
lots a agency and test stuff
agency with user and dayhome associations mostly working
merge
merge and adding fields to agency
I think the agency thing is starting to work
update the seed
adding agency to registration...broken at the moment
a little closer
register works, access to my dayhomes, but page empty...need to update to pull from agency when appropriate, need an agency edit page outside admin...ie my agency
starting the admin of agencies from a user perspective
admin coming together....god this needs a styling
agency administration coming along...moving down the path of model change
and there we go, agency self administration
install commander and ignore node_modules
fix cp-draws.js to use new structure
jigglimoning my readme, 2
jigglimoning my readme
inital commit rev1270
use CDN for dependencies, fix bugs to get initial counter example working
Quick prototype implementation of an AudioCube agent.
This needs better structuring and topology change support.
Ideally each cube would be a different port instead of a different
channel.
Fixed Font issue

dirty
solution converted to VS 2012 format
FluentMigrator package updated to version 1.0.2.0
connection string for production server
references to FluentMigrator.Runner corrected
>in out<
operoi kommentointia ja SISENNYKSIÄ
Praktikum 7 - Sesi 7
Uh... dodano web attack, poprawiono dużo, oszyszczono nieco kod, dodano sugestie, nowe pomysły etc... a, i progres i status report na wszystkich funkcjach.
more bugfix
Merge remote-tracking branch 'origin/master'
more bugfix
-correction bug checkbox et textbox quand trajet entre deux meme pays similaire
- recolorisation du pays avec la bonne couleur

voir les "reste à faire"
Merge branch 'master' of github.com:FracArt/PFE_Green_Quizz3
Imported Upstream version 2.02
Imported Upstream version 2.03
Merge tag 'upstream/2.03'

Upstream version 2.03
Imported Upstream version 3.00
Merge tag 'upstream/3.00'

Upstream version 3.00
Imported Upstream version 3.01
Merge tag 'upstream/3.01'

Upstream version 3.01
Imported Upstream version 3.02
Merge tag 'upstream/3.02'

Upstream version 3.02
Imported Upstream version 3.03
Merge tag 'upstream/3.03'

Upstream version 3.03
Fixed bug in applyShear.  Now applies a shear, rather than a distortion.
(#27)
fixed line length in docs spoiled by merge
(#26_ccdnoise)
Add CheckPyTMV to check if TMV works from within a python module.
Suppress warnings in running test suite
Use the full python path name in the shebang if the user specifies something with PYTHON
Add more diagnostics to gs.error output
(#261)
Add mkl_mc3 as a library to try if TMV module doesn't work
(#261)
Merge branch 'master' into #261
Merge branch 'master' into #243
sniper rifle added
V0.95 changes.
Final working stuff!
make GUI objects public so they can be extended by the QA app
Merge pull request #47 from GroupCommerce/jeff-app-change

make GUI objects public so they can be extended by the QA app
rygel: patch default config

Shorten the playbin name to be just @HOSTNAME@
paragraph sortable
fix checkout path
change
Merge remote-tracking branch 'origin/master' into HendryBranch
give a beer discussion
Added example throw to generate an HTTP 500 error
fixed following site change, and replaced webkit with mp4
Added liberator dev dependency.
Several improvements to structure:
 * Replaced isFinal and isAbstract flags on ClassDefinition with ClassModifier enumeration, as they can not be used in unison.
 * Renamed ITopLevelStatement to IGlobalStatement
 * Added ParentNode to abstract away child node collections
 * Added INode
Removed whitespace and commented tests.
Updated EditviewController
version bump, stuff and stuff, etc
Added index.html
Added index.html
Added index.html
Merge pull request #1 from Irv5/master

gh-pages updated for master
Merge branch 'gh-pages' of https://github.com/SingaporeClouds/SingPath-GUI into gh-pages
define common stylus_functions.styl
update home.html => Profile panel
wokring density zooi
Added ActionBarSherlock

Added ActionBarSherlock beta version 0.0.0.01a
Added a Tweet class

The cache now stores the Tweet objects, allowing for storing of only the
data we want!
Reworked Animation, Full screen jumping requires gizmo toggle.

Added benches
Adventure files can be drag-and-dropped
Rename draggable->main
Merge branch 'master' of github.com:JannesMeyer/student-hunt
add assets and some map logic
Merge branch 'master' of github.com:JannesMeyer/student-hunt

Conflicts:
	index.html
Final version of source code
Merge branch 'master' of github.com:Jasdev/NXTControlStation
Edited README agai
Bash aliases, and intall to $HOME.
EA-34448: INRE
EA-34815: INRE
fixed SOE
EA-34563: assert
Slightly fixed ScalaTestAstTransformer to get Style annotation better.
Corrected pytz import
Merge pull request #9 from Johannes-HAWHH/master

...
Einige Änderungen im HTML-Quellcode und Anpassungen an den Stylesheets. CSS Dateien aktualisiert.
Merge branch 'HEAD'; https://github.com/soenkelange/Projekt-A
Made some changes to formatting of log
Created the basket
deleted old libpd project, created new test (not working)
this is a test file.
test2..
Global variable class initialize
Revert back to eppy's :)
remove unneeded volatile
rej_fif2rej_time.m : Use this script to list the blink events detected by the rejection step in steps of time(seconds). Results saved as subjID/rej/..heog/veog_time.txt
started adding rotation menu
post页面样式调整
Updated - Boostrap 1.4
Updated - Boostrap 1.4
made readme more professional
kaze class added

Signed-off-by: kotaro <kotaro@kotaro-PC>
Rewrite Reflect and Light Screen's description, again.
Running emberjs:generate
Adding activemodel_serializers gem
mimms has the wrong version number in setup.py

Adjust full_requirements to rectify this, otherwise pip complains and bombs
Bash Profile - Custom Terminal Commands
Tweak lp dvfs frequencies and remove tegra clock shared ceilings
The install script will now perform the initial database setup using the settings in settings.py
add explanation about node registration
Merge branch 'master' of https://github.com/NTTdocomo-openstack/nova
Put ncs_navigator_schema back to its proper revision.
Merge remote-tracking branch 'upstream/master'
updated .gitignore
made changes to strings.xml
Allow multiple instances to run at once without murdering each other
Removed executable flag from files.
Added a history icon for future use
NuriaWrapper now also exposes type and category of Message
VlcPlayer now registers MessageWrapper as uncreatable type as Message in domain 'nuriaproject.org'. It is now possible to use Message.Type and Message.Category in NurPlays QML UI.
react-0.9.3 doesnt need oasis either
add github-0.4.0 update
Merge branch 'master' of git://github.com/OCamlPro/opam-repository
refresh the ocp-endian compiler with a newer trunk snapshot
add github.0.4.1 update
Merge pull request #263 from mirage/master

ocp-endian refresh and github updates
UML-205 : inefficient "add related element"

First version of the re-implementation.
Made the image download function not exit the program if a failure occurs
Add doc about set_moderator command
Removed the Eclipse project files, one has to generate these when the sourcecode has been downloaded.
typos

some changes to test again
Initial project creation.
Add Home controller and Index view.
menu cache bug fixed
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
Revert "Massive improvements to movement, fixed typos"

This reverts commit 03131f00327dd0ed8c5a5c99eaada3bc56e389ad.
[fix] wrong utils.py file move in history app
[mod] warn me if the script die due to unaccessed keys
[fix] get competences even if only one of the 2 language is updated, avoid dico stop process because of unaccessed keys
Add configstring parse test, disable performance test by default.
Tidy up test pre- and post- actions.
Add basic docs.
Adding presentation overview.
Argh last time
generate with rails_apps_composer 2.1.0
'adding custom loader gif'
Add xclip fonction.
add gc stats
Added comments (currently read-only)
remove $ on credits
city and locality table added
Remove empty lines
Fix bug with argument parsing in marketpredict.cs
new branch
new_feature
new_feature developing
Merge branch 'new_feature' into develop
Merge branch 'develop'
new_feature developing
Fixed Spout (2
)
Added README.md and removed BURNING
updated source files
updated source files
updated source files
Next step closer to the end
Added spa graphics
Fixed bug with songs selection
User data structure implemented.
Login crash bug fix.

XMLRPCResponder constructor was missing.
This fixes the following crash signature:

VIEWER      : 2012-12-12T14:25:13Z INFO("AppInit"): setStartupState: Startup state changing from STATE_LOGIN_NO_DATA_YET to STATE_LOGIN_DOWNLOADING
VIEWER      : 2012-12-12T14:25:14Z INFO("AppInit"): transferRate: Buffer size:   1308 B
VIEWER      : 2012-12-12T14:25:14Z INFO("AppInit"): transferRate: Transfer rate: 11 kb/s

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff33df7f5 in XMLRPC_RequestGetData () from /usr/lib/x86_64-linux-gnu/libxmlrpc-epi.so.0
(gdb) bt

Reason was that if the server replied with some error code then
mResponse was undefined.

I also added code to retry three times in that case;
the http status code that I get was 503, which really
mean "Service *temporarily* unavailable", so a retry
is in order.
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
add icon file...should've done that a while ago
Added longtable to latex preamble.
Legacy touchscreen: Fix B key issue

Patchset 2: Clean code

Change-Id: I4c0bcb7f1cea0744ab983c87167af0bb9a472859
Work over the internal mechanism of Sublime Build System variants
Work over the internal mechanism of Sublime Build System variants
Add images in README.md
Fix images in README.md
Fix images in README.md
Add authors in README.md
Change links to my GitHub in README.md. Rustam, don`t foget to change they to your.
Change GitHub links to my. Rustam, don`t foget to change they to your.
Merge pull request #1 from BorisPlus/master

Work over the internal mechanism of Sublime Build System variants
Add controller actions for meeting.
Rename helper files from role to meeting_role, delete test folder.
FAQ page styles #853
Initial commit of the test stuff I did yesterday

	modified:   courses/exams/views.py
	new file:   templates/exams/test_xml.html
	modified:   urls.py
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Make ready for @jbau to look at

	modified:   templates/exams/test_xml.html
merged origin/master back in
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises

Conflicts:
	main/courses/exams/views.py
Merge branch 'wescott-master-c2g-exercises' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises

Conflicts:
	main/courses/exams/views.py
Make problemset XML root, create problem divs from children

	modified:   templates/exams/test_xml.html
Jason step 1 database
Merge branch 'wescott-master-c2g-exercises' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Some bugfixes

* Added better enumeration for short answer types--it was not enumerating previously
* Changed class from "problem" to "question"
Code cleanup/bug fixes, compress layout
	modified:   create_exam.html
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Minor fixes
	modified:   create_exam.html
wrapping up JS parsing function in JS obj
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Fix form saving button
	modified:   create_exam.html
	modified:   renderPreview.js
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Account for textarea in exams [Issue #1292]
	modified:   templates/exams/view_exam.html
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises

Had to address conflict, so just swapped out old exams/ line for new
one that includes the exam_type list @jbau please let me know if this is
not a good conflict resolution

Conflicts:
	main/urls.py
changing begins to began on landing
Adding flag to NOT package source code up into the ZIP files. Source is available on github.
Updated README
Added PLACEHOLDER file to common folder so that it shows up in commits / repo
Created PLACEHOLDER in common/kaijin/InventoryStocker along with a stub class "Stocker".
Merge branch 'master' of https://github.com/Tallinu/InventoryStocker

Conflicts:
	src/common/kaijin/InventoryStocker/PacketHandler.java
	src/server/kaijin/InventoryStocker/TileEntityInventoryStocker.java

Resolved conflicts by using Tallinu's files
removed PLACEHOLDER
Merge from Tallinu didn't complete cleanly. Manually removing additional file
Added bukkit source code. This is code that was decompiled from the working vanilla SMP server compiled code. Future work should be done on this to see what needs to be modified on the original source to allow it to be compiled for a modded bukkit server without having to go through the decompile state first.
final placeholder deleted
Rev VERSION to 0.3.0
Updated server and client mod_InventoryStocker files to call a common Utils.java function to return the version number
Added Utils.getVersion() to Utils.java. Edit that along with the conf/VERSION file to update the version number.
Menu items now change the pointer to appear clickable
reworking variable names
reworking variable names
fixed a bug in the generation of config.yml files where ddns_update_url was getting the word 'nil' written to it all funny.
ajout fichier plus correction pause
Starting with contract confirmation
Update todo.txt

Stuff & stuff
Merge pull request #1 from Elmling/patch-1

Update todo.txt
thanks elm
Calling radiratio-function correctly
Update promo widget content
change subtitle handling in avisynth scripts

different handling for .sup and text subtitles
changed updatemirrors.sh to 9 mirrors to look at not 10.
Added benchmark skeleton, and at least stubs for all of the necessary functions
Working on benchmarking test. A lot of things needed to be const and weren't.
Benchmark test case array needed to be terminated with {NULL,0,NULL}. Noted that in comments.
Benchmark is actually broken right now, for mysterious double-free related reasons. I will dig into this tomorrow.
h_benchmark and h_benchmark_report work. Need tidying.
Changed malloc.h to stdlib.h for OSX compatibility.
Finally wrote a damn README
made prereq header a little smaller
double 'const' decl was causing clang to error
gcc 4.4 requires stdarg in hammer.h
Reorganizing makefile requirements
Refactored tests; make just builds library, make test builds/runs tests
Correct EpisodesActivity description.
Recreate all fragments if changing episode sort order, reselect page.

Most of the time the wrong item is activated, but the correct detail
page shown. Not sure if this is a race condition, as it auto-scrolls to the right position. Ref #72.
Loaddata working
Removing jekyll so default static files will work
New snippet: animated profile popover (13).
Site updated at 2012-11-07 06:59:48 UTC
Initial plugin of new UI
Missing images
Need to remove things that don't apply to Wordpress, such as K2 / EasyBlog
[#29096803]
Оказ от использования собственной системы драйверов БД и переход на использование DBO
Finished Project
Assignment finished
Add localtime_r function which is not existing in Windows
to Ex10
... meh
- hooked up item creation. parsed date string to date type
- return response after creating item
Merge branch 'master' of https://github.com/YufeiG/thedolphinproject.git
Refactored the code to smaller components
Initial implementation.
Add copyright information.
Added checks to prevent double-entry in method mv

Double entry would happen if the  original topic was in the course
syllabus alongwith the target syllabus but was not removed as part of 'mv'
First attempt at styling the favourit-ing button
Incorrect reference to non-existent column 'from' in layout?

Was causing buildQuiz request to barf
Using 'thin' webserver in production mode
added heroku prod deployment settings
run.py -> serve.py in examples/pyramid_backbone_redis_chat/README
Merge pull request #58 from brunoqc/patch-1

run.py -> serve.py in examples/pyramid_backbone_redis_chat/README
more work
and more
[Cartilage.Views.SourceListView] Added SourceListView for use as sidebars with some default styling.
Prettyprinting Condition. It's not that pretty.
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Merge branch 'master' into pprint

AND FIXED THE GODDAMN \r\n BULLFUCKINGSHIT

Conflicts:
	student/Access.java
	student/Action.java
	student/BinaryArithmeticOperator.java
	student/BinaryBooleanOperator.java
	student/BinaryRelation.java

Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Deleted nonfunctional menubar items, all works now
Signed-off-by: Eileen Liu <contact.eileenliu@gmail.com>
Changed Node constructor
as well as those of:
  - Program
  - Rule
  - Update
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Parse table works. Does not construct AST
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
LL(1)-->LL(0) transformation works.
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
WIP for AST creation
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Merge branch 'table' into FaultInjection

Conflicts:
	student/BinaryArithmeticOperator.java
	student/BinaryRelation.java
	student/Condition.java
	student/Expression.java
	student/Node.java
	student/Update.java

Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
test of packaging node with the ide
Emergency quick-fix to statues to make selection by section. Very very messy
Update mwatch.co - fix github URL
Some GUI improvements

- Subcat text in manual solver frame gets cropped if too long.
- Tricky mouseUp now working "properly" (ti "bug" when the cursor wasn't
shown and the click button was still pressed. It acts as Enter now, as
kind of expected)
- mouseUp overall (since it's expected/needed for sButton's improvement)
- sButton more realistic (actually pushed when being clicked on §
release when mouse exits the area)
- Overall focus color change : it's now light blue (it now looks better,
I guess)
heroku db
gem thin
added libopenssl-ruby for 10.10
Envio de arquivo de teste
Lavanya: Added functional test for create profile, refactored create profile method
Revert "Lavanya: Commented out the functional tests"

This reverts commit 7cf573d0a8d4ece1008a59a908e3bb50d75dc3be.
Finished sign-in out sections
Make the interpreter use DCPU16 namespace.
New formula: sendfile 2.1b
minor addition to karen post
Update dm-developement.js

added input selection to simple selector engine - $(':button')
Add the feature files that we need to run the experiments (moved over from private svn)
express error
add navbar demo for new nav design
changed event handling to aloha.selection.context-changed event ind following plugins/files: sidebar.js, format-gin, list-plugin, cite-plugin
Merge branch 'hotfix' of https://github.com/alohaeditor/Aloha-Editor into hotfix
fixed function comment in format-plugin.js
Merge pull request #605 from peponesound/hotfix

Hotfix
Fixes IE8 "unspecified error" javascript error
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
Updates requirejs and r.js to 2.0.5

Fixes loading error in Safari.
Merge branch 'hotfix-0.21.x' of ssh://github.com/alohaeditor/Aloha-Editor into hotfix-0.21.x

Conflicts:
	build/hotfix-0.21.x-changelog.md
Added a few things to searching
Add border property
Implement fewer arguments feature in color property
Added a bootstrap css class to the round table
minor tidy up
added back navigation to views
Track 1-1-stable on spree git, fixes order quantity change bug
Watched lecture 3
Merge pull request #35 from CatoTH/master

Imprevements for the FB-Connector
Reworded the UI of NSFW to make it more obviously a general purpose content filter
Merge pull request #36 from beardy-unixer/master

NSFW -> Content Filter
Improved nsfw/content filter
Merge remote-tracking branch 'upstream/master'
Merge pull request #37 from beardy-unixer/master

More improved NSFW
Merge https://github.com/annando/friendica-addons into apull

Conflicts:
	facebook/facebook.php
Merge remote-tracking branch 'upstream/master'
Changed the README for my variant, and changed "Last" users/likes/posts
to Latest users/likes/posts.
Brought README up to date.
Brought readme up to date
Brought readme up to date
Brought readme up to date
	deleted:    adult_smile/adult_smile.php
	modified:   smiley_pack/smiley_pack.php
	renamed:    adult_smile/icons/bong.gif -> smilies-adult/icons/bong.gif
	renamed:    adult_smile/icons/drunk.gif -> smilies-adult/icons/drunk.gif
	renamed:    adult_smile/icons/sperm.gif -> smilies-adult/icons/sperm.gif
	renamed:    adult_smile/icons/tits.gif -> smilies-adult/icons/tits.gif
	new file:   smilies-adult/smilies-adult.php

Renamed adult_smilie for PR reasons.  Also linked unlinked smileys
Merge pull request #38 from beardy-unixer/master

Readme updates/Adult Smiley rename/small bug fix
smilies_adult install issue after rename, package updates
dash in filename won't work with plugins
add renamed package
more wrong name
Facebook: The import is now formatted in another way to make it look nicer
add NE VS JU
remove styles
Update docs for Tomcat plugin for Tomcat 7.
adding extra to login panel
ignore style.css in build directory
cambio en la tablaHash a global y creacion de la funcion busqueda para palabras reservadas
updated Projektisuunnitelma.doc
Merge branch 'hotfix'
Merge branch 'develop'
Release: v1.8.6
Merge branch 'master' into develop
Added image optimization & inlining tasks
Build Index of Column Number implemented
Merge branch 'master' of github.com:ashishc1990/dbsiProject2
find not bought by organisation name or technical email
show emails on notbought page
let use saved url
[DVBLink] Fix logmessage
Make configuration setting to use channel handle or client id for stopping
streams and cleanup of parts of the code
Merge pull request #2 from avdleeuw/channelswitch

enable the use of channel handle instead of client id when stopping a stream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README
	project/BuildDependencies/scripts/libcurl_d.bat
	project/VS2010Express/xbmc-pvr-addons.sln
configure: enable --enable-external-libraries switch
allows building with external ffmpeg
[droid] add android platform and ldflags

Android solibs must be unversioned.
[droid] make prefix and extension configurable per-platform

This is a nasty hack, but one that was used fo vis and screensavers as well.
Android libs must be of the form "^lib.*\.so$" in order to be shipped in the
apk.
[droid] update addon names
[pvr.hts] Fix EPG genre problems caused by HTSPv6 updates.
Merge pull request #54 from adamsutton/master

[pvr.hts] Fix EPG genre's
Merge branch 'master' of https://github.com/opdenkamp/xbmc-pvr-addons
Fixed a dependency problem with Release build referencing a folder is should not
[vuplus]: Add Vu+ addon 0.3.2
Update PVR API to v1.5.0 (pause/seek support for LiveTV streams)
Update the PVR addons with empty stubs for the new PVR API v1.5.0 functions
MediaPortal pvr addon: add timeshift support
ForTheRecord pvr addon: add timeshift support
Merge pull request #52 from theuni/master

Changes for Android
Merge remote-tracking branch 'margro/frodo-timeshifting'. closes #50
sync timer state changes
added changelog. changed to DEFAULT_BUNDLE
Merge branch 'release/1.0.3'

* release/1.0.3:
  added changelog. changed to DEFAULT_BUNDLE
Merge branch 'master' of git://github.com/awellis13/laravel-binder

* 'master' of git://github.com/awellis13/laravel-binder:
  added changelog. changed to DEFAULT_BUNDLE
fixed the recursive call in init()
Merge branch 'hotfix/1.0.3.1'

* hotfix/1.0.3.1:
  fixed the recursive call in init()
Fixed some bugs
Added a newlaunchfile
add binary download
use environment variable to choose which sudo command to use (sudo or gksudo)
Refactored making the callback
I may very well throw this away.
README: add getting started directions
README: add notes
Update docs
Update docs
prototype for sent counter
Support subdomains
move to non-min
Nit-picking the website.

Code tags no longer overlap with text lines above and below. Also, code text is no longer pink.
Start of Windows Documentation
Windows documentation version 1
Fixed up Windows Documentation
Changes asked for in comments
rebased
Merge pull request #17 from kgeorgieva/clusteringDoc

Miscellaneous windows documentation
Merge pull request #20 from benniel/nit-picking

Nit-picking the website.
Fixing misuse of window
Hiding ping message
deleted old uploaded images
Update title to reflect possibility.
Fixing README bug
unfinished but working report
added years and months, optimised css
Remove extra .rdebugrc
Update PS1 string
Add pathogen to vim
Stip trailing whitespace on save in vim
Set leader key to comma in vim
Show commands as they are typed in vim
Set insert mode tab width in vim
Add comment for trailing whitespace
Highlight current line in vim
Allow switching buffers without saving in vim
Only allow numbers in decemal format for increment and decrement commands in vim
Add <leader>w save shortcut to vim
Add <leader>e open new file shortcut in vim
Add <leader>d delete current buffer shortcut in vim
Add <leader>se open new file in split shortcut in vim
adjust comments template
change entry-title to be contained in <h2> tag
nicer comments output
experimental comment_form
adjust search submit button
center image attachments
add class 'th' to linked images
more comment improvements
Remove humans.txt
Revise.
Scale down heroback to 1920.
Bug fix on CV web.
Change footer, setup site title.
Remove og:description and meta description for it does not escape <img>
Add docstrings for the db module
Add is_patch and _check_patch methods

is_patch returns True if the patch is in the list of paches and
the _check_patch raises an exception if the patch is not in the list of
patches.
Add patches_before method

patches_before returns a list of patches before the the passed patch
name.
Add docstrings for the push module
Refactor apply patch to the behaviour of quilt

Quilt applies all patches up to patch name if they aren't applied yet.
Add a apply_all method to push

Apply all patches which aren't applied yet with the apply_all method
Run push.apply_all if -a or --all is passed
adicionado a classe Pessoa.
Added module for staff.
Merge branch 'master' of github.com:bobber8073/nomercygamers
Improved behavior of forums.
Added help :D
add format_page_title method
set _page_title using format_page_title()
Merge pull request #150 from trumans/create_format_page_title_method

Create format page title method
Fixing mobile redirect tests due to changed behavior on prod
Nothing to see here, move along (forgot a leading /)
Add MockArticle class for issue #115
Commit includes:
* Add MockArticle
* Update TestKnowledgeBaseArticle to MockArticle
* Update TestLoginLogout to use MockArticle
* Update PageObjects to reflect MockArticle naming
* Minor pep8 cleanup on files I've edited
Remove @pytest.mark.destructive marks.
For Issue #134
Merge pull request #156 from birdsarah/remove_destructive_for_issue_134

Remove @pytest.mark.destructive marks. fix #134
Merge remove_destructive_for_issue_134
Merge branch 'remove_destructive_for_issue_134' into add_mock_article_object_for_issue_115

Conflicts:
	tests/desktop/test_login_logout.py
four changed locators

and skip rather than xfail
Merge pull request #157 from klrmn/fix_login_button_locator

four changed locators
Update login/reg locators
Merge pull request #158 from zacc/update_login_reg_locators

Update login/reg locators
Merge pull request #155 from birdsarah/add_mock_article_object_for_issue_115

Add MockArticle class for issue #115
speed up login by changing check for logged in state
New faster test for logout
Merge pull request #159 from birdsarah/speed_up_sumo_tests_with_login_page_changed

speed up login by changing check for logged in state
Merge pull request #161 from birdsarah/speed_up_sumo_tests_with_logout_test_changed_no_stale

New faster test for logout - confirms SignIn button
Fixed a locator on questions_page which was causing failures
added CMake files to .gitignore
Created CMakeLists.txt for the library
18 removed errors with  and  variables
fixed loading jquery
Merge branch 'development' into piotr
conditional check for attributes location fixed
EXT Modal Serviço OK
Revert "Use a map instead of a tuple for the form. There's probably a better way to do this."

This reverts commit d4421e8b2e5b2761dfc3d0db0d8b1446575a2392.
Revert "Revert "Use a map instead of a tuple for the form. There's probably a better way to do this.""

This reverts commit d9d2bb1a60974ddbfb346a1690412e4c15b0102f.
WEWT! The profile change form works now.
Re-implemented the request management side of the change control daemon.
Continued the implementation of the change manager
added the basic action instance configuration
Continued the implementation of the change manager
change control daemon into gradle
added new PHP how-to guide: How to configure PHP in Windows Azure Web Sites
Improved server code
Added live mailer information for production
botons socials
Revert "Remove the json require"

This reverts commit 20ede82aa71606c3019a717ba3fdb0d58b60a120.
Fixed issue with classes with recursive parents and children.
removing bash configs
switching to oh-my-zsh and removing custom zsh files
removing railsrc
removing github gem repo
improving readme
adding cap completion and other minor improvements
disabling autocorrect and adding a few aliases
adding ~/.bin to PATH
fixing a couple installation issues
ensure .erb is at end of file name in installation script
adding bundler oh-my-zsh plugin and moving load path above zsh include so it uses proper version of git
moving bin directory into plugin
Making changes to theme values.
Removed unsigned functionality, created .jar file
082502
new traitor objective to steal money

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
misc anomalist job tweaks

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
fugitive - splice wissel, nerdtree auto laten sluiten, powerline, ctags command verbeteren (hopelijk)
Wrap tx.
Initial Commit
Added CLLocationManager class and overrode initWithNibName method
Implemented CLLocationManagerDelegate
more allies
more allies
css
.markdown -> .md TEST
Fix to pom.xml for org.eclipse.m2e.
Updated benchmark results to APIB
add logging for beginRendering and beginParsing
Change-Id: I0000000000000000000000000000000000000000
Change-Id: I0000000000000000000000000000000000000001
ajout contenu - design
Show GEOPS legend in layertree
Updated with thread

Thread still not working.
gen_event template
Made licensing prettier
User now prompted to add additional info after FB connection.
Program successfully transforms matrix over Z to Smith form
Add new post about chef_gem
test pushing to github
Revert "test pushing to github"

This reverts commit f8282ea8338c8b4e0a52f4f24dc4701aa3da4655.
Modified some settings in the makefile

These allow more granular recompilation.
Modified method signatures to fit

Added SymbolTable and ReservedWordList arguments to each machine. This
allows the IDRES machine to accurately describe reserved words and
identifiers.
Whitespace fixes.

Two fixes here. Firstly, we don't actually care about any token of type
TYPE_WS -- rather useless to the compiler.

Secondly, I forgot that lines already end with a newline, so there's
really no point in printf("%s\n").
More fixes to the symbol table code.
Added error reporting code.

This might need to change (to support multiple error types), but
currently each machine has the option to set MachineResult.error to
whatever error it feels is represented by the token it just received.
Currently there are five error types, but this seems modular enough to
be improved on.
Added translation table to strings.

Oh my. There has got to be a better way to do this. I hate non-DRY code,
and this screams of it. What happens when somebody adds a new constant,
expecting it to just work? Maybe I could try including src/types.h in
the redistributed package, and parsing it, using those instead.
Forgot a semicolon...

:/ rebase this into the first one
More changes to "convertConstantToString"

Added to header file and actually used somewhere.
Changed method signature to return pointer.

This is more standards-based and makes more sense for memory allocation.
It also promotes cleaner code.
Added K-Stop consonant.
Fehler in CaptureImageActivity behoben.
Remove last direct Rake::DSL
Wrong comment
Start saving / showing attachments
Finished saving to disk / showing attachment
Bugfix release
fix git url
lets use a real example
Added all my filters.
testing all files
inital commit of bat release
added license & readme
Added some calls to support assigned workouts
read file switch two thread
Maven Repos Ver1.0.0 Committed.
CHanged to recent id
Add Get-AHApplication cmdlet
Add placeholder test credentials
added ron to staff list
Clean up README
Minor fix to line breaking on the SR template
Corrected styling for table of recent orders
Added styling for account-address page
Added private members for rowId to prepare for deleting
A couple lint warnings (pos used out of scope)

Hi, I'm using htmlparser in my project. In my html file was problems
so i trapped in throw exception, when minified it, and saw a
couple lint warnings, so I fix them up.
Thank you for good script, it do his work very well :).
CSPACE-4796: Remove post-init check that effectively blocked the default 'reader' database account in PostgreSQL from obtaining read-only access to extension schemas.
Merge pull request #74 from aronr/CSPACE-4796

CSPACE-4796: Remove post-init check that effectively blocked the default...
CSPACE-5440: Create database indexes during startup within tables not associated with any specific tenant.
CSPACE-5440: Send all indexable columns and table names in a single call.
CSPACE-5440: Add clarifying comments.
Merge pull request #52 from aronr/CSPACE-5440

CSPACE-5440: Create database indexes for non-tenant-specific tables/columns at startup.
NOJIRA: Removing obsolete files from repo.
Merge branch 'master' of github.com:collectionspace/services
Merge branch 'master' of github.com:collectionspace/services

Conflicts:
	services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptAuthorityDocumentModelHandler.java
Merge branch 'master' of github.com:collectionspace/services
Merge branch 'master' of github.com:collectionspace/services
Merge branch 'master' of github.com:collectionspace/services
CSPACE-4406: Now including authorities in default refobjs requests
CSPACE-4406: Now including authorities in default refobjs requests
CSPACE-4406: Adding comments so we can fix refObjs payload when the target of the call is itself a authority item
Merge branch 'CSPACE-4406'
Merge branch 'master' of github.com:collectionspace/services
CSPACE-5359: Removing private static class member for storing/cacheing getCommonServiceTypes.  This is better (more safely) computed with in the getter. Performance should not be an issue with this change.
CSPACE-5227: Improved error messages when attempting to save an authority item record with an invalid payload, such as when containing a term with a missing display name.
CSPACE-5227: Trivial change to one error message.
Merge pull request #34 from aronr/CSPACE-5227

CSPACE-5227: Improved services error messages on saving or updating authority item records.
CSPACE-5332: Substituted logger calls for System.out|err print statements in Imports service.
CSPACE-5332: Restore inadvertently deleted comment.
Merge pull request #36 from aronr/CSPACE-5332

CSPACE-5332: Replace System.out|err print statements with log statements in Imports service.
Merge remote-tracking branch 'upstream/master' into CSPACE-5359
CSPACE-5488: Refactoring authority item partial term searches to work in resource super classes.
Mailer Rough
updated the CSS files with files generated by Twitter Bootstrap v2.0.3
jnlp and config test of offering link

besides simple formatting verification, this test
checks that the session is transferred through jnlp
fix a dependency on librt
[webui] follow package rename in fixtures
[api] prepare for rounding errors - 0.1000000042 is indeed not 0.1
[api] reset_auth between tests

So reset_auth as first instructions is pointless now
[api] update activity more often
[api] do not store the _meta to the backend just to update the activity_index
[api] add more defaults to the production.rb
[api] updated_at is important to be updated too

Unfortunately rails3 has no method to update 2 columns at the same time ;(
[api] show also remote distributions from all remote projects
[api] complete the api docu for /distributions* operations
[api] remove remote projects from distribution database, we do import request them on the fly now
[backend] create a copy of the jobs array to make iteration more safe
[api] fix test suite in reverting the 3 commits for remote distributions

Moved them into the tempory branch remote-distributions
Added code for API2 custom perl module example, rewrote some of the overview.
Add my old talks to my page, so they're not only at Academia.edu (testing).
Add allocated projects view
修正由于 Typo 导致的 Bot 崩溃
resolvido problema de salvar quando editava alguma informacaoe fechava a aba e adiciona o SimNaoCancelarDialog
ResourceHandler: Check that the cached image file exists before deleting it (unloadImage).
index and readme files
tring something crazy
add names of states
fixed block problem
add user image
fix user refresh
dodanie pep8 do requirements.txt
Added CNAME for blog redirection
Merge branch 'source' of github.com:czzarr/czzarr.github.com into source
Removed unused function "Close()" from passwordcreator.go, because the Creator shouldn't be responsible for open/closing the output
deleted old OTAPI_funcdef.h and replaced with OTAPI_Basic, updated swig
Site updated at 2012-03-23 07:29:28 UTC
ignore .swp
shrink images to increase lightness
place shrunken tiles randomly off-center
sql problem
Fixed sql syntax, robust against negative L, a, b.
Make random margin feature safe for margins that happens to be 0.
Repeater added, some GUI Changes
Revert "Changed sqlite3 to pg in Gemfile"

This reverts commit 504a80168fcba7b0d6fb9f2e1f0dcc382e2af69e.
exercises for chapter 5, piece of cake ;)
added unicorn.rb and include unicorn in gemfile
First commit
Merge branch 'master' of github.com:danilopassos/gmaps4games
Default to 1 minute timeout
The decoder does its own buffering, so bufio isn't needed
Style
Updated docs now that Adam Singer moved some stuff around
Factored out MEDIA_ROOT into localsettings.py and updated installation instructions
multiples images
Añadido el generado.sql

Aquí tenemos la bbdd diseñada entera
updated to show deprecations
prc_stdout now returns 0 for None matches
repo cleanup
Valida conteúdos do comentário
changed display name of test and test method for feature tests
made test method name optional for tests that arent parameterized
added slightly optimized common lisp version
Added information about next hotfix release
Fixes bug with floatingmenu's reading of configuration settings, and fixes positioning of floatingmenu when the view port is scrolled.
Implements the dom-to-xhtml plugin

The plugin required extension of editable.js so that it is able to
install its own serializer.
Adds missing changelog entry for the dom-to-xhtml plugin
Fixes attribute names which must be lower case in XHTML. Also, adds a test for disabled boolean attribute.
Updates documentation to reflect recent change that makes attribute names always lower case
Added information on jslint setup for aloha
Corrected error message for api building
fixes aloha selection issue 48141
copy & paste in an editable in an editable
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
changelog entries added
Signed-off-by: Thomas Huber <macwreck@inode.at>
fixed typo and added css information
Merge pull request #442 from macwreck/dev

Dev
Extending repository manager to make timeout configurable
Added tests and docs for repository manager timeout
Repository guide update
updated documentation
Merge pull request #449 from draftkraft/hotfix-repo-timeout

Hotfix repo timeout
Server will now allow plugins to append json output messages in an easy way.
fix risks table header
Time Logging date picker selected/highligted week must be mon-sun.
Limited index length because of MySQL limitation
Read/Write pixels
fixed folder structure for splash screens
Do not close tag in response to request if the request left the stream tag open
minor (version) bug-fix in package.json
Better "X".
optimize sql - add index on user_id. update version
Bump version number for 1.3.3 bugfix release.
Client should now recognize if the server decides to do something weird.
2 new tests in jdk lambdas
update js build with Yeoman dependency
Double precision
rewrite config for local DB
like button was added
More work setting up the GUI. Also began the process of storing Range
data in a few XML files.
about/comment
dont check in my fork of ini
unbundle ini
relax test
0.3.3
add tests with stream-spec and stream-tester
fix to pass tests
link to spec and tester
0.0.1
.gitignore
0.0.2
/patterns/jquery.rst done.we set earlier.
Formatted.
Got a few things working in gradle_doodles.
Initial Commit
Merge pull request #1 from dpnonne/rename

Initial Commit
this changes is mistake
reverse hash
deprecated method(.on)
update changelog until 0.1.3
update to v0.1.4
[bug fix] Skip for undefined value if its not required
v1.1.2
Tighten code, pass some more tests.
Changed the default glassfish path.
Added some test classes and moved some to their propper packages. Also
created some empty test classes, which need to be implemented later.
Removed old test classes
POM - added dependencies for testing with arquillian
Wrote some tests - need to check out on JBoss later
First Commit - Knights Tour Game.
Merge github.com:dwaynedwards/KnightsTour
Fixed an error passing data through to create staff
Fixed some data reading problems
Renamed IbssmNotFoundError to IbssmResourceNotFoundError
Merge pull request #1 from eastwoj/staff-invitation-fix

Staff invitation fix
Source config