labofsahil/github-event-dataset-2012 huggingface dataset:
Resolved conflicts
Removed old code
List order now syncs perfectly
Task deletion and perfect task order sync!
Minor changes to get sync working again
Added success page and better error handling
Implemented upgrade function on the server
Set up versions properly
1.4
Refactored code to make it more stable.
Fixed cleanDB for scheduled task timestamps
Rewrote sync oauth procedure
Merge branch 'master' of https://github.com/stayradiated/Nitro-Sync

Conflicts:
	sync.js
slutligt projekt
Second try pic add
Update .gitignore

20121210 update
more questions
Merge branch 'master' of https://github.com/stuycs-ml7/project1-pd7
added an average word count method
fixed schedule parser
Merge branch 'master' of github.com:stuycs-ml7/project2-pd7
Markdown & Comments

Added markdown syntax and added a comment form
Update go_braille
split up into a detect module and example
added sources
csproj
merged
moved container elements into templates
Added Prev Video button

Added Prev Video button
fix dumb typos
enhancements to user homepage
script to match leg ids
washingtonpost.com was in the default whitelist twice.
master
master
master
master
master
Merge branch 'master' of github.com:sunqi08201329/sunqi0207
master
Version bump to vuurmuur-0.8_beta4
forwardProgram
Merge branch 'master' of https://github.com/sylvainlecoy/tip-off.tv.git
remove dependency on resque service
Add capistrano deployment
Tweaking the deploy script
add a http exchange
Seguindo o novo diagrama de casos de uso, adicionei a possibilidade de acessar o cadastro de um aluno e a partir disso, editar ou excluir o cadastro. 
Limpei o código excluindo alguns dos antigos métodos para começar a aprimorá-lo do zero.
Seguindo o novo diagrama de casos de uso, adicionei a possibilidade de acessar o cadastro de um curso e a partir disso, editar ou excluir o cadastro.
Début Admin check
Merge remote-tracking branch 'origin/Dev2Tatiana' into Dev2Tatiana
Imported Upstream version 7.0.svn.5850+dfsg
Merge branch 'upstream' into launchpad
Use xz compression for orig tarball.
New upload to Launchpad.
Uso la url absoluta del objeto en lugar del token/path.
deploy take two
Don't submit target/ and lib/testrunner/ for Maven projects.
Amend rule for view tabs at small screen size in Hive theme

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4948 2fea6a4d-a838-0410-917b-93a53c48e9d2
Remove erroneous period

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4949 2fea6a4d-a838-0410-917b-93a53c48e9d2
Use 2012 Textpattern logo style, cleanup some indents

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3948 2fea6a4d-a838-0410-917b-93a53c48e9d2
Diagnostics panel: in the pre-flight checks, not everything is an error; warnings and information are fair game too

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3947 2fea6a4d-a838-0410-917b-93a53c48e9d2
cm: Compile Superuser from source

Change-Id: I988d7998bbac3a44770ea8d5fd0564afbca7bedb
squisher: Don't set the OTAPACKAGE name

Instead of setting the OTAPACKAGE name here, expect
OTAPACKAGE will be passed to us. This fixes an issue when
BUILD_NUMBER is defined in an environment with automated
builds.

Change-Id: I0634416e5332790d314f6a70313ea67821fd1331
cm: Build the commandline tools

Change-Id: I854fffb3773524fbc66e32ccf0ab6f3697e61a46
cm: Add quincytmo to nightlies

Change-Id: I1eb091b9644a5a661c3c6263b9868cd77da30da8
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	config/common.mk

Change-Id: I8ca30f687fe6fe5c1c53bb59abee3bff350dfe2c
Jar file Seperated
#82.  JsJsonItem should now return the string value of numbers properly.
added development mode switch to enable browser's context menu on desktop after GWT compilation
added interface for changing view configuration bar extensions after construction (but before init)
Update editor
Update button tooltips
Remove Win32-isms, dead code, add makefile
Update: Sun, 14 Oct 2012 16:23:36 +0200
user_guide commit
Fix a test compilation warning
Added README.md and License info
Add possibility for namespace parameters.

Specific method options (parameters and description) are now merged with the namespace parameters. So you can do something like below, and the serial parameter will be described for all methods in the namespace:

```
  desc 'description', :params => { "serial" => { :desc => "Serial of requested object." } }
  segment '/:serial' do
      desc "Get details on specific object"
      get do
          present object, with: API::Entities::Object
      end

      desc "Reserve an object"
      post '/reserve' do
          present object.reserve, with: API::Entities::ObjectReserved
      end
  end
```
Adapt spec  to new DSL, nothing of implementation needed to be changed.
When parameters where in the path and in a validation, they were twice in the params hash (once with symbol key, once with string key)
Updated changelog with description of #204.
Minor cleanup, pass in README.
Who knew? Grape has a logo.
Add support for Rack::Multipart::UploadedFile and don't care about parameter presence in the validation.
Add test for file validation
+some cleanup of unnecessary spaces
Don't care for nil for all parameters.
Merge pull request #207 from tim-vandecasteele/adapt_validation

Add support for Rack::Multipart::UploadedFile and don't care about parameter presence
fixes a bug introduced by #203 where entities that expose attributes returned by a block (therefore absent from the object) would not be serialized
Updated CHANGELOG with description of #208
Merge pull request #208 from ppadron/master

Entity#serializable_hash must also check if attribute is generated by a user supplied block
Removed duplicate test
Changes how #body_params determines the length of the request
Merge pull request #210 from adamgotterer/master

Fix for #body_params causing undefined method `size'
Fix: #211: Custom validator shouldn't be triggered when optional and not present

Updated validator to only run custom optional validation when the param
is present. Re-wrote validations_spec to be a little more robust.
 Added section to documentation for custom validation.
Changed the order of param validation and coercion

Param validation will check for presence first and then handle any coercion. This fixes a bug where coercsion happens after the fact and validation icorrectly fails or passes
Rewrote coercion spec to be more robust and to cover additional test cases

Minor style changes and an update to the describe block
Stopped passing around doc_attrs and started using an explicit required param
fixed data so that it returns all years
[maven-release-plugin] rollback the release of processingjs-0.6.1
fix javascript
moved control planel inside of center div
search bar working; relocation working
LPS-31186 Preload hibernate proxy classes with PortalClassLoader to allow plugin creating hibernate proxies
LPS-31186 Regenerate
LPS-31186 Source formatting
LPS-31519 Fix namespace regressions
LPS-31519 Source formatting
LPS-31519 Simpler fix?
LPS-31859 Back button navigates to DDM when editing a template in Web Content
LPS-31859 Source formatting
LPS-31831 Remove unused code
LPS-31831 Managing templates in the ADT portlet causes NoSuchResourceActionException
LPS-31831 Format Source
LPS-31899 File Entry details in Recycle bin displays invalid file name
LPS-31448 Rename updateStatuses to updateChildStatus
LPS-31448 source formating: updateChildrenStatus vs updateChildStatus
LPS-31448 Regenerate
LPS-31448 Rename updateChildrenStatus to updateDependentStatus (cause sometimes it is the same object, but sometimes, it's a completely different object)
LPS-31859 Source formatting
LPS-31184 Prevent potential ClassLoader conflict
LPS-31184 Source formatting
LPS-31184 Fix SF
deleted hello.html
Add a StaticPages controller
Finish static pages
Finish chapter 4
Finish chapter 4
Finish layout and routes
Ignore file
Remove user-specific files
Update project for XCode 4
Wake up. You need to fix it.
Merge branch 'hotfix/0.1.4'
2012-09-14
========
redesign module PnlPrescription ( in progress)
Fixed bugs, get rid of Singleton HttpUrlConnection which was causing issues with socket connection pools.

Signed-off-by: Thusitha Nuwan <tmnuwan12@yahoo.com>
coming into the home stretch on getting Pandoc's generic parsing
functions translated.
Chapter 2 of  book.
Revert "Chapter 2 of  book."

This reverts commit e89459073fdda95f3b08588718e38c44555a4e7e.
Chapter 02
showing mp
Merge branch 'master' of github.com:tomaszjureczko/ratemymp
page two with mp
Updates brah
updates …
remove abcmidi as it is now in official repos
hmm, can't just reload every time
prepare for 2.0.1 release
prep for future dev
a typo, and update example
adding private directory and oauth private key
function name sub ":" -> "_"  to gsub
Merge branch 'master' of github.com:tumf/command-line-utils
Created a simple model to hold data for displaying in table
change rubycas version
Removed CUser::CloseProcess() from the login server (completely redundant).
Colocado lib com infinite scroll para funcionar.
README: Remove forum thread, add Python version

* As Ubiquiti pulled it from their forum,
  remove link to thread
* It's Python 2.x code, just specify that.
First implementation of reranker; perceptron ranking not yet working
Added brackets around toponym mentions and document ID labels to VisualizeCorpus.
Modification du fichier result.jsp
removed web project
enable nuget package restore, restored web project framework 4.5
audit queue polling and storing in ravendb
AsUser1
Adding more tests, to get better over midnight coverage.
Really, sleep time.
UI prototype is ready
agregado 3
Change the prompt to change ruby and rails versions and git branch name.
rdrtr
Merge branch 'master' of https://github.com/vinothgithub/SampleTest.git

Conflicts:
	src/test/SampleTest.java
changes commited
implemented basic xml service configuration
Update Wheels_Controller.cpp
created start game step definitions
created codebreaker module and game class
added load path to cucumber env
change output format for Img
Update docs/languages/en/modules/zend.form.element.collection.rst

typo: by -> be
allowRemove - description
DEV : page-page_actualites.tpl.php et page-page_pole.tpl.php
Tout OK

Signed-off-by: webmasterpf-DG <webmaster@provence-formation.com>
Validation fix for exists rules

Signed-off-by: Nikko Bautista <nikko@nikkobautista.com>
Added ZImage from CM9
Merge branch 'master' of github.com:wfsdev/marvel-golf-port
Rebase from 'release/roslisp' @ version '1.9.10'
Generated debian files for quantal
Use commit date instead of author date when ordering and displaying recent commits
50pts version of cdp/ex2
add makefile for cs_gen
Initial commit of mini6410 config
Configure filesystem and networking support
Configure devtmpfs support
Configure CPU frequency scaling
Configure PWM device support
Configure touchscreen support
Configure LED support
Configure DMA engine support
Configure partition types and IO schedulers
Add rtc feature (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Fix add rtc feature
Fix framebuffer and touchscreen configuration
Add SD card support (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Add SDIO card support (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Include gpio-cfg header
Add hwmon feature (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Configure hwmon feature
Add hr_timer support (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Enable hr_timer on mini6410 and smdk6410 (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
Add gpio keys (from OSELAS.BSP-Pengutronix-Mini6410-2011.11.0)
添加readme
更新了在线获取字典Activity

使之可以正常工作
Merge branch 'hotfix/0.0.3-fix' into develop
prepare cpan file and modify dependencies
Merge branch 'release/0.0.4'
Merge branch 'release/0.0.4' into develop
renamespace Net::Qiita to WebService::Qiita
add merkdown
rename test files
Merge branch 'release/0.0.4-fix'
changed jqm header
fixed quote.
- check update of release notes package by looking into selected
  patch contents (better solution for fate#314072)
- 2.17.23
Merge pull request #4 from jsuchome/Code-11-SP3

backport from factory

Review OK
Added a tiny little console search
What is wrong with my git?
Proper container markup for radio buttons.
Add found item to item list
Properly pluralize label
Formatting
Update label before clearing item list
Stub for extracting the name portion from an item capture
move macports specific to darwin condition block.
deleted c file..
Revert "deleted c file.."

This reverts commit 3447f254ab750e92883ec92d4d89a5dccb2ba42c.
small stuf in Frame, not completed MHandler
Fixing conflict 2
* setup.el: batch export setup
* export.sh: export script
Fix analyzer warnings
Change project to target base of latest macosx, and minimum of 10.5
Initial projects commit

Loading the existing project folders and template file.
changes to samecodes, docs additions
several changes to CapParser, etc
tox changes
test changes
Merge branch 'dev'
Update to Wordpress 3.5
Added WP Read-Only plugin
Merge remote-tracking branch 'original/master'
Added Twenty Ten theme.
BMF: query appropriate array length in Predict() method
SVD++: load/save fix, some cleanup
pequena correção #62
Merge pull request #63 from thiagopnts/master

Pequena correção #62
Add scholar housing and scholar study abroad
Merge branch 'master' of github.com:zmcartor/MobileWebGroup
updated hours on userstory spreadsheet
Displaying FAA data
RPC triangulation: Implementation of Jacobian of the RPC function
RPCStereoModel: A class that will do stereo with RPC models
stereo_tri.cc: Add the stereo model as extra template argument
RPC: More work on supporting RPC mode.
RPC: Move implementation code from header to source

This will save some compile time.
RPC: Add some simple tests to RPCModel

This is just to verify that the code doesn't throw an exception
immediately after running.
Some debug code to be removed later
Check for RPC version
RPC: Finish implementing, clean up, and test RPCModel
More unit tests for RPC
RPC: Finish implementing RPC mode and clean
Stereo: Put all sanity checks in one place.
stereo_tri: Compact a bit for readability
RPC stereo model

- Make RPCStereoModel also work without least squares refinement
- Speed up the latter by a factor of 13
I meant ... by a factor of 4.7, not a factor of 13
InterestPointMatching: Clarify variables and comments
RPC: Implement some camera center some functionality in ASP requires that of an ASP model
RPC stereo model: Reorganize code a bit
configure.ac: libtiff deoends on libjpeg
Use generic exceptions in case of nulls
Async false, stupid
    Generate two alert div
added basic api pattern stuff
Merge pull request #9 from ryedin/master

added basic api pattern stuff
Name this version 1.0.9 with the build number 264.
Site updated at 2012-07-27 09:45:58 UTC
Add new version of SocialEngine
dxdal new commit
Merge branch 'master' of github.com:111minutes/111-pod-specs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
correct
add text
seperate parts
class for ul
class
It is for test
some changes
Merge pull request #11 from mahlad/master

Monday settings(3)
login plan over

you need to complete login and ajax filer
theme is now 960, 980 complient
Add group mms threading (1/3)

Change-Id: I339c19563998adb1436d26950c44efb423ee181c

Conflicts:

	res/values/strings.xml
	src/com/android/mms/ui/MessagingPreferenceActivity.java
userlist fix: lock added
userlist fix: alert & scrol
Replaced if with switch
first commit.
Merge branch 'master' of github.com:AlexCaranha/JWavRecorder
Revert "fix doctrine coding standart issue"

This reverts commit 7ebbc98440f7a30a82ede206dbcc4e67686a187f.
Revert "fix doctrine coding standart issue"

This reverts commit a76fdd3a393c3b713f3c2daa82e2ad16eb1d374c.
Revert "fix doctrine coding standart issue"

This reverts commit 5b53ab2bc53afc8f730da82f596ecdd299317671.
Revert "Warring on embedded inserts"

This reverts commit 1bdd41aa357087696d80f25138dabb82e4d36809.
Fix CLI command odm:schema:create fatal error
Add some hints for developers.
Grote schoonmaak van de master branch
Updated achievement creator icon
Updated achievement creator UI
Merge branch 'master' into qt
add test for negative values
Fixed Login Bug
Added mapName

Venturing back into the ScoreCard hole, hopefully an even more basic
"from scratch" method of working will sort everything
changed text file
resolved merge conflict in test.txt
Added some more, added onStep
Merge branch 'master' of https://github.com/Anvil0008/Javintelligent.git
Small refactoring, correcting inaccuracy in last commit
Add warning message to tell about auto mode fallback
add homepage url, also the demo
Added info on how to use sudo if rubies are managed with 'rvm'
In 'check_if_running_with_sudo' method added info on how to use 'sudo' if rubies are managed with 'rvm'
Fixed missing 'require' for 'base' class
Disable message summary for the show.
Merge remote-tracking branch 'origin/master'
Turn off sign error led when joining a new network.
GATEWAY-3167: Added an additional slash in file location on applicationContext.xml.
Merge pull request #232 from CONNECT-Solution/feature-liteweightGateway

GATEWAY-3167: Added an additional slash in file location on applicationC...
fixes issue: GATEWAY-2731 (Make changes to Installer to remove metro dependent packages.)
Changed CopyRight to Vtex. closed #1
Merge remote-tracking branch 'origin/master'
uses more flexible command processor
COMP: fixed for builds with LIBICONV turned on
Adicionado: Primeiros códigos fontes do GABALISE.
Átlátszósítás, magyarítás folytatódik
changes in 05.05.2012
added DTDownload to header and Readme
Clean up PostgreSQL shell init scripts
Merge pull request #29 from CubedEye/master

Updated SQL File
Comments all class methods in Auth classes; and, moved auth_tables.sql to a new folder and renamed it so that multiple database can be added.
Merge branch 'refs/heads/hotfix-auth'
Added a "has many through" relation.
Merge branch 'refs/heads/feature-relations'
Typo in session config;
Further enhancements to Results and ajax result form
Switched to coffeescript for ajax form
Updated permissions and added some new permissions
prvni verze Dart Websocket serveru
added angle conversion
added print for dict
On my way to bots
Added GM 1Bar MAP sensor definition to the constantsLibrary.h file and added it to the S10 FixedConfig2.c file.
Write image when all fragments was recieved
added gitignore so I can better use GitHub on my computer
allowing views to listen for collection.onReset
Update panels feature
Update lib/live-twitter-map.coffee

Show tweets form all over the world
Fix double build
tracks and bounds are object, not arrays
renamed trackId to id
logger and status code can now used in template
logger added
layout changed, looger added

the layout now looks more like the original error page from symfony 2
title is the exception message with status code
remove logger service only availible in dev mode
add img as asset with url to website
CS fix
Merge pull request #7 from hpmewes/master

changed template for email
wbx v4: fixing the drivers for the new rev of the WBX board
wbx: updating the code to allow full range of the VCO.
Fixed isInstanceOf()
We should use our own wrappers ...
Version 4.0 (Mar 25)
Login seems to work tests however do not
main frame

0.0.1
task-fsl: add iproute2 in task-fsl-tools-testapps

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
mov of subfolder
bin folder added to ignored sources
github replaced by gh in the package name
added view plugins
Corrected errors in the comments about script 1
(#101)
fixes to erroneous psf edit, made it clearer that the lowercase refers to a field
(#243)
Merge branch '#243' of github.com:GalSim-developers/GalSim into #243
GCS_Mavlink: add the DATA16 and DATA32 messages definitions to ardupilotmega.xml
GCS_MAVLink: Regenerate mavlink1.0 implementation

created using:
mavgen.py --lang=C --wire-protocol=1.0 --output=./include/mavlink/v1.0 ./message_definitions/ardupilotmega.xml
mavlink repo commit 79cabfe956464c8f745807a6e65062ac3fc09193
GCS_MAVLink: wibble to mavlink_helpers.h to fix build.
AP_HAL_AVR Console: bugfix on buffer bytes free vs used

* had them reversed. doh
GCS Console: add lib implementing message handling from DATA16 and DATA32 msgs

console demonstrates simple loopback
works with our branch of mavproxy at the moment
Small update to message update script.
Merge pull request #26 from KazukiPrzyborowski/master

Small update
include empty plugin dir skeleton in releases

fixes #SERVER-179
Made OrderDetailVoucher and Voucher look more alike.
Merge branch 'aml-master-product-segments' of github.com:GroupCommerce/sdk.dotnet into aml-master-product-segments
Merge pull request #28 from GroupCommerce/aml-master-product-segments

sdk changes for new GetSegmentListings api call
the different kernels were separated in different files, but both OpenCL and C implementations lives in the same file.
Applied resource.py patch from: https://bitbucket.org/jespern/django-piston/issue/221/attributeerror-httpresponseservererror
Fixed issue in utils.py where HttpResponse objects were getting wrapped in a list.
Added backup file pattern from vim to gitignore
Merge branch 'master' into dev
Added mlocjs flier
Merge branch 'gh-pages' of https://github.com/HannoverJS/hannoverjs.de into gh-pages
fix version number (1.5.0 -> 1.2.0)
Friedemann's points of interest guide
Merge branch 'master' of github.com:HonoluluHenk/mysquartier
added test comment

Signed-off-by: Kathleen Bell <kathleen.bell@hughes.com>
update bad legal links

Signed-off-by: Kathleen Bell <kathleen.bell@hughes.com>
Merge branch 'master' of https://github.com/HughesNetworkSystems/G-M

Conflicts:
	govworkerspecial/index.cfm

Signed-off-by: Kathleen Bell <kathleen.bell@hughes.com>
Merge branch 'master' of https://github.com/HughesNetworkSystems/G-M
added YWA code to legal pages and created footer

Signed-off-by: Kathleen Bell <kathleen.bell@hughes.com>
ROFL project added

Ring Of Fire Light added to turtlebot projects
Added README file
test
adding swat logo asset
evaluate site name visiblity based upon boolean
updated after site moved to theplatform
FeatureSelection: Don't use abbreviations for feature names in the selection dialog.
OpFeatureSelection: Use a sliced blocked array cache, not just a regular cache.
PixelClassification: Changed toolbar icons.
PixelClassification:
- Default prediction map layer opacity to 0.25
- Use larger default eraser size
PixelClassification: Change default button name for the "Save Predictions" button.
hopefully fixed a positioning bug
added syntaxhighlighter files.
Context-aware file path placeholder
Text in small scene previews
Doctrine hints management with Entity source
Update s4 and zsh
Merge branch 'master' of github.com:Jesterman81/profile_crap
fix for scaladoc SurroundDescriptor
One more intention for "If expression refactoring"
Made session handle concurrency better.
Added full apache license text.
Merge remote-tracking branch 'JoaoRXFernandes/master'

Conflicts:
	Framework/CQRSlite.Tests/CQRSlite.Tests.csproj
	Framework/CQRSlite/Domain/AggregateRoot.cs
Merge branch 'master' of https://github.com/gautema/CQRSlite.
Newest version of frustum GUI.
项目首页加入勘误表

尊敬的提交审阅者  你好，

本次提交新增了勘误表至项目首页，你可以至这里浏览：

http://goo.gl/IVZD1

你谦卑的仆人,

台北小码农 Juanito Fatas Huang 于台北 <katehuang0320@gmail.com>
blaaarrgh
Merge branch 'master' of https://github.com/JungleJinn/Staying-Alive
Update for ultimate-base v0.4; bump version to 0.8.0.0
add system wlan and change some paths
Revert "Revert "Hmmm""

This reverts commit 376b5ad6b28da5a6cd33b52ee215e7a0663f7299.
Revert "Revert "Hmmm""

This reverts commit 44aee9c6c25016fb86f6858f1c0ccc266877d9be.
Revert "Revert "Hmmm""
Seems to work better I think :p
This reverts commit 5a6e11f9e71e817f14f879ad33ed08c67ef23e8c.
Update assets/close_file.c
Merge remote-tracking branch 'salij/patch-2'
Birthday
self -> read_old
Merge ../encoding_patch

Conflicts:
	.gitignore
	README.md
Add some Rocks to the Simulation.

- Add Debris class.
- Add an Asteroid doodad factory.
Set properties of Debris Fixture to meaningful values.
pipeline.py: Integrating 4Dto3Dnii module into pipeline and semprmm_pipeline.py scripts
semprmm_pipeline.py: Integrating 4Dto3Dnii module into pipeline and semprmm_pipeline.py scripts
second commit
Merge branch 'master' of github.com:L1048576/portage_overlay

github -> local
bug fix for locking to a window
en liten endring i lagre avtale
first attempt at a footer
Project 3 JS Update

Completed the assignment and the flowchart as well, will be uploading
to the dashboard now
Signed-off-by: mori <kotaro@kotaro-PC.(none)>sendGameResultを修正
Added a new status to the task test.
Merge branch 'master' of https://github.com/MallorcaDojo/TaskManager.git
Merge branch 'master' of https://github.com/MallorcaDojo/TaskManager.git
Update StackExchange/literaltab.user.js
build directory ook weer weg
Added name of Entity to log message on line 462.
- revert to 1.7-snapshot
fixed drawing of objectmanager's polygons
OTR: change > to ```
No newline on every message to textarea
Add AnimateMenu.html to Project
Add Style to project
Add Script File .js to project
Add Image Sprite to Images Folder
Add Zepto file to AnimateMenu project
Add reset file to AnimateMenu project
added wireless remote support
minor updates in docs
update host_manager
/view => index.html 파일로 이동
create diagnose, one step forward, still not working
bug: MAIS has problems if a diagnose has an empty diagnosed_date field
-> FIXED
unused jar
Performance improvements for scrolling and text labels in bookcase.
edit category edit view
add package ocaml+twt.0.93
Add descr note about how to install lablgtk on MacOS X

Closes #112
add frama-c Oxygen.

Some optional dependencies are not yet specified, but the core package does build on MacOS X
Merge http://github.com/mlin/opam-repository
Force restart tomcat
Versions
Versions
Progress on the project cutup.
Adding the messages2csv script for automatic translations.
Merge branch 'master' of github.com:OpenSourceShift/OpenARMS into demo
Changeing config files.
Merged
Merged the conflicts
Merge branch 'demo' of github.com:OpenSourceShift/OpenARMS into demo
Added LPMTree. It kinda works? Need to implement lookups.
Coordinates are now known as Vectors.
Forgot to transfer School to Home
Добавлена версия прошивка для Атмега32
navigator offline / online support added
Don't use IP here.
Default to a 10,000 KByte/sec limit
Make that 1,000 instead
Knock this down even more, so as to not go over 1Mbyte/s even if both run concurrently.
Fixup some NanoBSD+VGA bits for snapshot building
Another Nano+VGA fix
One (hopefully last) more NanoBSD+VGA fixup
Use VGA here if needed, too
Since the builds are so speedy these days, go ahead and make the nano+vga snaps during the normal run.
fixed hash case
add command option and remove some bugs
rgba-and-hsla-colors-in-css
Including STL and PRT files.
Merge branch 'master' of github.com:ProjectGado/Project-Gado
fixed testserver settings.. optimized import gah!
Pretty sure we don't need the vendor argument for grape
Remove empty HTML attribute from base template
admindefaults.coffee
Editorerweiterung zum verlinken von Zutaten/Zubereitungen
identify gettext
gettext
detect VM based testing and change virtualization type to qemu.  This helps with hackday testing.
Merge pull request #40 from cloudedge/pull-req-master-9d37a0bf9d

./dev pull-requests-gen --branches master cloudera-os-build openstack-os-build hadoop-os-build --barclamps nova/master [1/5]
modified:   Documents/presentation doc/proposal_presentation.pptx
WIP gallery tests
fixed merge conflict
Add a linkt to player/stage website
glömde en grej
changed package name to avoid conflict with vanilla Sense app
fixed bug in life_tag sensor registration
updated network connection (url fetch) automated test to use default, and all specific implementations supported (by defines)
Cleanup Bag<T> concrete subclasses to not use the mutator word anymore in types
fix type error
Merge branch 'master' of https://github.com/SourceTree/interview-faq.git
fix typo error
Add speech view for signed-in user.
JS function wrote 70 new items :)
Merge branch 'master' of https://github.com/SpeedyShopOne/SpeedyShop
#679 hotfix changes slugs in additional pages to Model.SlugField
Merge branch 'master' of github.com:Stanford-Online/class2go into jbau-celery-email
burn down old migrations 0001-0003 and create initial
Merge pull request #690 from Stanford-Online/jbau-celery-email

2 new migrations that were merged into master now become one initial migration
Remove unwanted import (Count)
Correct client-side attempt count submission

Still needs to be fixed on the server side, so it doesn't rely on
client
	modified:   khan/static/latestKhan/khan-exercise-c2g.js
- HiflinealFarbe in blau geändert
- Marker in die ReplayToolbar eingefügt
Set .rspec to output in documentation format, because the FTP server is chatty.
Added command .mkdir.
change the route style
vim shell, sudo.vim added
fixed kick/ban bug
Link tests and refactored variable.
update error message extraction and success detection for new cryptic usps message about information not avaiable through this service
added walls to terrain gen, changed default spawn location finding meth, and replaced the RL4J library's FOV finding algorithm with my own, because I couldn't make it work for some reason.
Actually fixed the save issues with files/directories not existing this time and didn't fuck up the project by committing everything.
Fixed some issues when viewing on mobile devices
Remove Kurtosis cacluation.

The assert about the fundamental properties of Kurtosis was failing; not
looking into it because it's not useful currently.
ArrayStats: Change for to foreach.
Remove unused ArrayStats methods; variable.
Simplify assert condition.
Remove excess semicolon.
Remove redundant variables.
Fix documentation.

CDF is not increasing, just non-decreasing.
Convert for to foreach.
Minimize method and field visibility.
Fix Javadoc: missing description; capitalization.
Remove old test script.
Track number of directed edges.
Remove unused methods.
Use longest link when desired link is longer.
Sandberg graph: option for number of shortcuts.
Remove unused method.
Change file internals; rewrite graph I/O.
Remove duplicate link length calculation.
Add support for undirected lattice links.

Edge counting similarly modified.
Attempt at less intensive link length source.
Just display tar output instead of throwing an exception.
Merge branch 'master' of https://github.com/Trullidutt/bearded-stuff
Fixed tab.
Update README.md

Lists, have you heard of them?
getMockIgnoringConstructor should be similar to phpunit
removing unnecessary code
Rounded corners for the server list table.
xbee test connection application
Merge remote-tracking branch 'origin/master'
Don't sign assemblies
Add missing InternalsVisibleTo
Site updated at 2012-06-27 17:19:58 UTC
toggles now off on init
Added an input filter
Fix for lists not generating if directory does not exist.
Merge pull request #66 from nala3/master

Fix for lists folder not generating
Octopress init
Site updated at 2012-11-30 04:52:30 UTC
refactoring lojysamban2.hs (not yet finished)
Changes from our recent project, will add more info in a pull request
Refactor TransactionExecutor and TransactionRunnable so they use TransactionStrategy instead of directly using Avaje.
Incorporate Google-Directions travel time & GCal Reminder override

Use Directions API to search for travel time. Grab from hash, using annoying hash notation (rather than simple dot notation, which Ruby complains about). Send JSON dump of event to Google, which updates the reminder override.
Reverting to height=800px. Too cramped otherwise
Site updated at 2012-12-21 23:45:40 UTC
Created a lowpass resonant filter using faust and integrated the generated code into the MetamorphASynth code base. 
Low Pass Filter hooked up to GUI and destroying waveforms.
Merge branch 'master' of github.com:activata/metamorphasynth
added some stuff TODO
deprecated Token
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Ran a whole bunch of Extract Method
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Fixed bug in lexAngle and lexWorm by changing BufferedReader to PushbackReader.
Switched '!' from a singleCharacterToken to a lexWow() method
Added test cases to source control
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
Add in info about how much to sponsor each category, and thank you Real Time Club
Added a bunch of parallel jobs for the different Contiki functional tests
Break out the collect tests into three separate parallel jobs for speed
fix 1527, more tests
changed tests for Python < 2.7 compatibility
more rigorous tests; fixed bug; rationalised methods
remove whitespace
changes some assertItemEquals to assertSequenceEquals for Python 2.6
changes some assertItemEquals to assertSequenceEquals for Python 2.6
faster better simpler nested plugin copy test
use Placeholder.objects.create()
use original_placeholder.slot in copy
Merge pull request #1532 from evildmp/fix-1527

fix #1527, more tests
Fixed page_attribute template tag not escaping output
Added test for page_attribute escaping
2.3.5 release
Merge branch 'master' into develop

Conflicts:
	cms/__init__.py
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge remote branch 'upstream/develop' into bugfix-stability
update record + create record
Bage sets validations
declaring js via hook_libraries()
Buttons to re-order graph targets
separated out the tile reference code to allow for more general calls to find the current tile
styling & cleaned animation
Refactored control.js to make it easier to read.
Implemented the character object constructor.
Update weighted edge
Adding height calcuation/array conversion.

The binary tree can now be converted to an array with the Tree::toArray method, which can further be converted to JSON for manipulation
Additionally, the height (depth) of the tree can be calculated to assist in handling the display
added copyright notice under Apache 2.0 and updated udpdump (file still not updated
decoded the TG/UID that is inside the voice packets (3 magic bytes)
small changes to existing classes
Fonctionnalité sur JList active
Correciones esteticas variadas.
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
consultar partido que se juega actualmento - intento Ajax v1
consultar partido que se juega actualmento - intento Ajax v1
Merge branch 'master' of github.com:alevalv/Torneo-Tenis-WWW
Moved .tns files into /Files
Merge branch 'db'

* db:
  Did stuff
  Removed personal .tns file from repo
  Added formula's for thermal section
  Other db work
  Did stuff to build.sh
- Removed luna binary
- Modified some small stuff
Removed:
  - REFResColor.no
  - FormulaPro Manual.pdf
  - noLogo.png
Build #100
Added args
First arg:
* -a : build all
* -physpro : build only PhysPro
* -definition : build only definition
Second arg:
* -b : make backup of PhysPro-Nspire directory before building
removed personal make.command, added to ignore list
ignored make.command
Fixed issue with atomic mass unit
fix
Release #1
Release #1
Open file in universal line mode (workaround for files originating from any OS)
added second carousel
Fixed overzealous regex
Config arg is required
Reformulates the changelog
Fixes toolbar shows insert tab instead of format tab
Changed deployment target to iOS 5.0
Merge remote-tracking branch 'origin/master'
middlePoint convenience method
trying sql gem again
Extracting AuthHeaderInserter.
Updating assemblyInfo.
Correctly closing pipe streams for interprocess communication
Adding master worker which controls a pool of workers
Update mm-rvm-setup.sh
Added OpenDyslexic support for pages.

Pulls OpenDyslexic, css from server.
Changed CSS location

Actually created a different CSS doc for the iOS browser, and pointed
this to it.
removed unneeded code from previous project.
initial region
Merge branch 'master' of github.com:antistatique/SwissSVGmap
gainPlease enter the commit message for your changes. Lines starting
YAML tweaks
added pipeline test
added pipeline test
Improve documentation comments.
Notes field in the search index doesn't have to be nullable.

Since it's not in the database.
Fix the error message extraction from parsed HTML.
Fix profile page test by reusing existing form-to-parameters code.
added Indonesian contributor
Bumping a fresh new extract from mediawiki DB + minor changes to the extractor itself
Обновление finish_time
Bug fixes - do not show unnecessary medal icons, FAQ page fix, script added to footer
updated wp, revised included plugin list, added default blank theme
peter dont make any change

peter dont make any change
done3

done3
Added easy toggle for using and not using caching

Memcached now could be switched on and off via
single argument of required function (see app.js)
fixed typo in view/index.jade
Updated readme
Clean up some syntax items to pacify JSLint.
changed names of bandwidthSelector output
Changed Notes display method. Fixes #16
Implemented Continue-game system. Closes #15

Although still needing some small finishing touches,
the saving system is now functional.
Fixed syntax error
Add T62 support to self test

T62 is a noise suppression object on more recent chips, it should also be
disabled.
Fix minor bug with cmd variable in self test
Fixed controller script.
updated form header......
updatd..........
Fix tx annotated tests so that they pass in the build

AbstractTransactionalAnnotatedConfigClassTests is now annotated with
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) so 
that side-effects between tests are avoided.

Re-enabled TransactionalAnnotatedConfigClassWithAtConfigurationTests
and TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.

Also introduced a log4j FileAppender for tests that writes to
"build/spring-test.log".

Issue: SPR-9051
Fix regression in ClassPathResource descriptions

ClassPathResource.getDescription() now returns consistent, meaningful
results for all variants of ClassPathResource's constructors.

Issue: SPR-9413
fixing a UI bug with report movement on refresh
Fix some issues with down arrow key on firefox
fixed weekly breakdown
Simple code
Add example config
Add more docstrings to porttree.py
Code clean-up in managers
Litle bugfix for some objects.
Add droping repeating keyword in porttree
Implement controllers linked to routes
Merge branch 'master' into DIC
balanced remote unit tests testing balanced
Revert "fixes for id"

This reverts commit 029817bdf36c8a17283f56e8a5c19a5922ab008f.
Merge branch 'master' of github.com:balanced/balanced-python
Revert "Revert "fixes for id""

This reverts commit 943f4490ad594288f46ff76b5ef53e7fd9a32ecc.
Corrected the port in the readme
Add script to handle outlook msg file.
Added Search Ajax

Back not working
* Added tests for donations feature.
* Notice: donations.broken_javascript contains a human-readable, though not machine executable, test which defines how the donation feature is supposed to work.
Post about UCL demos.
More small fixes to project
Add skeleton django app
Ported to Cordova 1.7 spec.
Add a first post: Troisieme premier billet
Update config
Added verbose output for the database creation; Disabled pose protocol by default.
Minor revise on the hangman post
Downgrade lwjgl (caused runtime problems)
Refresh pauls soundsystem stuff
Cleaned up record field names in EventPayload and created a TimeStamp newtype
Added 2012-GDC

Just one presentation
Merge pull request #15 from pelegri/master

Added GDC 2012
Removed line in mobile header
Change style for display logged in user full name in header
Fixed sorting for Staff::Bans and User
Used Staff module to DRY up the user model.
Added permissions, added team saving
Added NBTTagByte to the list of files to build.
Oops, spelled it wrong
Fixed IOUtils not building properly
Switched to using std::string& instead of std::string* in some places, fixed STL barf in TagCompound
Added function to map TagTypes to a new instnace of the appropriet tag class
Forward declarations of all tag types.
Fully implemented NBTTagCompound
Ran latest version of the JS through Google's closure compiler with simple optimizations
Merge pull request #3 from lencioni/update-minified-code

Updated minified code
Last commit before v1.3 upload - hopefully.
added tests for overhead boulder
added split label test case
tweaks to tests
made defaults better
added more tests and got label repos working
Add Evan Meagher to contributors list.
Add `scala-indent:insert-asterisk-on-multiline-comment`.

When enabled, inserts asterisk at end-of-line of multi-line comments.
Rm trailing whitespace from all project files.
Rm unneccessary `integerp` invocation.
Comment out example binding of `scala-indent:insert-asterisk-on-multiline-comment`
Merge pull request #32 from evnm/insert-asterisk-in-multiline-comment

Add `scala-indent:insert-asterisk-on-multiline-comment`.
added entry for service management in DevCenter/PHP/LandingPages/how-to-guides
tidy some links
Corrected update-rc.d registration
Added postrm script to clean up transient data
Removed deprecated "etc" directory structure
Added postrm script to clean up transient data
Removed deprecated "etc" directory structure
exercises load up when the form is opened
Add some more targets
oops we're not using that yet :>
first.....
lepsi build
speed gut
Gmaps numa so tela.
Pronto para apresentar - começar incremento 2
added succubusy and foolamancer to skrell

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
reworked equip_if_possible to be a bit better
reworked id spawning, added some fixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
new supply packs, modified existing ones slightly (http://baystation12.net/forums/viewtopic.php?f=5&t=5056&p=97631)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
fix indentation errors, etc

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
vermin spawn randomly in maintenance (plus a couple of other areas) at a rate of one every 10-15 mins.

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
added support for activerecord methods
Debugged create new markup tag form
don't show rev and id even though they are in the properties
Add keyboard shortcuts
Merge remote-tracking branch 'mine/master' into source
Coding standards and translations
New ARQ is less strict with @Deployment.
Port AS extensions defaults.
More threads tests.
個人情報登録：現在設定と設定変化を表示
prueba de la organizacion por aptitud completa :D y acomodando punteros
merge
Changed branch to master.
Entrega final retocado estilo
finished lesson 21
Site updated at 2012-12-16 03:15:19 UTC
rename mLogger to LOGGER in EmptyCheckCommand
add TODO exclude isOverlayRequest in isAppScriptRequest
refactor extract prepareVelocityContext out of celementsweb plugin
added mvc4 skeleton
Fix tweetmap, use 'ant clean zip' instead of 'mvn clean install' for geonode-client
Make price savings more obvious to potential customers.
adding quotes aroung kiss metrics identifier
Generalize web frontend to handle S3 input as well as direct upload
Added Hello World
Merge pull request #1 from administrator-up/master

I already commited
added update-environment function
Fingerprints in 2.03.02 gesammelt.
Fingerprints in 2.03.03 gesammelt.
Lese Wlan aus Datenbank.

Richtung und FK_Fingerprint ID stimmen noch nicht ganz.
Fix Array#variance on empty array
Bump to version 1.0.0
Site updated: Thu Dec 06 2012 13:13:43 GMT+0800 (CST)
Implemented basic AcceptanceTestCase class
Wrote test case for AcceptanceTestCase and deleted some files.
Removed downloader test case.
Update notes for submitted changes

* In order for jenkins to understand go test output, we need to convert it to xunit.  This package will do that for us.
Update rightmenu.example.js
fix bug where popup lose filter style after mouseover
Fixed checkout for magento 1.7
Styling for legal text in review section
Fixed change-links in progress section
onload shenanigans.
CSPACE-5024: Resolved issue with adding tests for a second authority (Storage Location); item payload needed to have displayNameComputed flag set to false, or displayName was set to null. Added maintenance clarity via revisions to comments in expected responses and filename changes.
CSPACE-5024: Corrected name of one test.
Ignore Database YAML
Fix ionCube Loader check
add message notifying people of the update
closing issue #2 about not having a README
Oops.. fixed postData to request
preserve case of packages in version pins
Added the xml file and importing function
added \'doc\' directory with a simple 10-min. presentation about harrisonHarmony
Updated licence
LocalHostId wiring for Benny's authenticator
個人イベの景品となるデコ画像を追加しました
+ ‘dab-report.pdf’
Renamed get_free_network_addresses to excluding.
PageReader: Add an interface.

PageReader: Add an interface.
PageReader: Add to Factory

PageReader: Add to Factory
Pages: Add remaining pages to XML file.

Pages: Add remaining pages to XML file.
Build: Temporarily remove PageReader from coverage.

Build: Temporarily remove PageReader from coverage.
PageReader: Parse widget type.

Left off original tests and source.
Build: Includes must be at the start of a line.

One #include in MplayerHandler was indented, which threw the header
trawling script out.
Build: Define a data dir in the config header.

Build: Define a data dir in the config header.
PageManager: Read pages in from an xml file.

The pages are now read in at the start, via PageReader, which the
PageManager later uses to pass to a new Page.
Pages: Remove individual page classes.

Remove the individual page classes, whose data now exists in XML files.
Working on background subtraction

A primitive method for background subtraction has been implemented. It
works by just getting the mean and standard deviation and filtering
anything that lies within 4 stds of the mean. It doesn't work very well.
This is a commit of the release folder because I can't figure out how to make it be ignored
Adding a stack so that we can save state and return to it allowing us to nest operations.
fix fetching data

use jsonp to call yql query
Updated TODO
Added framework for ORP

Added in the code to store and process ORP.  ORP is not in the database schema so the value is processed by the XML but not saved.  Still need to add in the code to toggle the visibility of the ORP.
Added PWM Expansion framework

Added processing PWM Expansion data.  Data is not saved, only processed in the XML handler.
Added ORP label and removed decimal point for values
Added IO xml tag parsing.  Does not store the data.
Added Custom Variable processing.  Does not store the data.
Small changes
Updated segmentation
Added dataset which drops the background class in the training
initial checkin of PySide portion of Text, UVCDAT/GCRM are still under construction
Site updated at 2012-03-24 18:13:06 UTC
trying convert.rb and same error:

invalid byte sequence for encoding UTF8
Fix Object case
uuid generator class
js to now allow quantify below 1
CGA_GetPixel; CGA_FloodFill
add PlayFile
add AVSimpleEditorOSX
Enabling caching of centrality metric
upgrade all for 1.7.9 + fat improvement in how ArrowEntity and ZoneEntity handle their containsPoint(...) method + add pythagoras lib into SITAC project
Drop externals.
new notification factories for notification mailer spec
Basic upgrade to Grails 2.0.4
Complete support for Grails 2 Resources plugin
Basic upgrade to Grails 2.0.4
Complete support for Grails 2 Resources plugin
Grails version.
Clientvalidation works as we want
merge
Fix php error (from merge)
Fix to not load store before login sucess
bugfix calculation of framerate and stim_window while temporal downsamping
Added files provided by proffesor.
scheduled enqueuing of jobs every midnight.
Merge branch 'dev' of github.com:den-plugins/pm-dashboard into dev
list2.p compiles