labofsahil/github-event-dataset-2012 huggingface dataset:
Started work on profile stuff. Also, searching is pretty much done
Merge branch 'master' of github.com:rmahmad/Library-Management
Removed search.html - It was replaced by booksearch and custsearch
Fixing Bootstrap issues
Added overdue books UI/preliminary return stuff
Merged two branches
Forgot to accept changes in login.erb last time
Finished return functionality, hid administrators from the customer list, added 'enter' functionality to forms, added ID searches to customer/book searches, and did random bug fixes.
random layout fixes
Merge branch 'master' of https://github.com/rmahmad/Library-Management into Rachel

Conflicts:
	Library Management/control.rb
	Library Management/views/bookman.html
	Library Management/views/booksearch.html
fixed conflicts in book search and bookman
uncommented content-toolbar
design- background of green stuff/fonts
Merge branch 'master' of https://github.com/rmahmad/Library-Management

Conflicts:
	Library Management/views/bookman.html
	Library Management/views/style.css
Merge branch 'master' of https://github.com/rmahmad/Library-Management into Rachel

Conflicts:
	Library Management/views/style.css
fixed outline
took out what lang is this
right scope for ziplock
surfacetexture: Add option for choosing texture target on old Adrenos

Commit 417d892 removed a workaround for
old Adreno drivers which are not optimized for GL_TEXTURE_EXTERNAL_OES.
This causes performance issues for some platforms. Add a compile time
option to enable this.

Cherry picked and formatted..

Includes CM commit: 417d89259effb373c0c3a411b7a7d1f7f75b2eb2

Change-Id: Id79b13a90bf79b8a23f5c5c3bc1723f85ed52325
Add back the 'Bypass Texture Creation' hack in frameworks

this might be useful for 8x50
depends on BOARD_ADRENO_DECIDE_TEXTURE_TARGET
enable with BOARD_ADRENO_AVOID_EXTERNAL_TEXTURE:= true

Change-Id: Id785aa01e563ee803efd7871617a605df2384bd4
frameworks/base: bluetooth: AVRCP 1.3 feature changes

Bluetooth module will listen metadata/event change intents
from Music app and post data to Bluez stack.

Modified by Chris Boyle: removed PLAYSTATUS_REQUEST/RESPONSE.
See http://review.cyanogenmod.com/14001

Conflicts:

	core/java/android/server/BluetoothA2dpService.java
	core/jni/android_server_BluetoothEventLoop.cpp

Gingerbread change Icbfb1712dde98c9677f57c869bcfffed2bb42a14

Change-Id: Id8cbec68302b53befbec4273013668a58c755369
Quick unlock : Fix bug

There is an issue where users whose passwords are greater than 8 chars and
have quick unlock enabled will be unable to unlock their lockscreen.
This is due to the logic evaluating anything beyond 3chars as a password attempt.

This change modifies the quick unlock behavior so that when typing the password,
each character is considered an attempt, however if incorrect, is not reported as a failed attempt.
Only when the user presses enter is it considered an "explicit" attempt and a failed attempt is reported.

Patchset 2 : Rename runnable to better reflect its purpose
Patchset 3 : Switch to new behavior
Patchset 4 : Fix padding

Change-Id: Ida6289c77f6724cb42e8d3b82593f29afe3d6d1b
Fixing a bug that when an app is dismissed or loaded that changes
the current active audio stream, if the volume overlay is visible during the swap,
if you adjust the volume (with hard keys) after the steam has changed while
the panel is still visible, the wrong panel (view) is still visible on-top of the
one that is being adjusted.

A good way to replicate this is to
   Open the Phone APP
   Go to the Keypad Screen
   Adjust the volume (not the icon on the overlay)
   While the volume is visible Hit the HOME hard key
   Before the volume dissapears, adjust the volume with hard keys

You will hear and feel the volume adjusting, but the overlay will not update.

Change-Id: I1c7a23d6e569d8582d3dab20523eef3aa9bdde0c
Add separate headset and speaker volumes

This is a simple implementation of keeping separate volume
settings for the wired headset and the speaker without
overhauling the audio system.

This allows a person with sensitive headphones to keep music, ringer
and other stream volumes lower than they would usually keep the
speaker volumes.

Change-Id: Ia614c1e3ac548ff4e0104a090cda13b9daef09cb
include my own customisations
made duplicate meshes posible
Merge branch 'master' of github.com:robmcrosby/Cuda-Rasterizer
Debug location code. Add emotion node graph code (with shared keywords as edges).
remove color2 option, automate striping under 1% gutter width threshhold
Site updated at 2012-04-16 19:40:50 UTC
changes for rosjava
Merging rosjava-changes.
Revert "Trimmed the branch to only the moveit_ros sub directory"

This reverts commit 3054bad214c3a068e8071a77665474b4831a1921.
Rebase from 'upstream' @ version '0.3.2'
Trimmed the branch to only the moveit_ros sub directory
Rebase from 'release/moveit_ros_planning_interface' @ version '0.1.4'
Generated debian files for oneiric
Rebase from 'release/moveit_ros_benchmarks' @ version '0.2.13'
Generated debian files for quantal
Rebase from 'release/moveit_ros_benchmarks' @ version '0.2.20'
Generated debian files for oneiric
Rebase from 'release/moveit_ros_planning' @ version '0.2.13'
Generated debian files for quantal
v1.0 of RestrictByUser OpenMRS created by Ayvee Mallare
Merge branch 'master' of https://github.com/roseannsale/RestrictByUser

* 'master' of https://github.com/roseannsale/RestrictByUser:
  Initial commit
add some slide links
补上Readme
added files to create user, not working currently
Created blog and added disqus comments.
Added new theme zion

- New theme zion is based on ashleydev
- It removes date from RPROMPT and disables vi-mode indicator
html inegration for pop up boxes
Added additional reset CSS (based on pages.github.com).
[api] import the requests into the API database

This is a rather huge change and didn't happen overnight. But now the
requests are stored just like the packages and projects within the
same database and the XML is only rendered on request.

The informations of the requests are stored as strings, not as foreign keys
because we delete projects and packages in the database, but (so far) leave
requests for them around.

This is not so bad actually as the database indexes work well enough on such
small strings
[api] avoid empty sql groups
First commit
Update README.md
Create core/ and web/ modules
Add 'server' task
Rename Stopwatch{Factory -> Group}
Rename Stopwatch{Factory -> Group}
Update comments
Add StopwatchGroups object
StopwatchGroups was a bad idea, removing
Use JRebel if available
Use Scala 2.8 by default
Add enabled method
Fix Java -> Scala conversion
Add spread method

Add enabled method
Add enabled method
Fix whitespace
Serve stopwatches over web
Runnables weren't thunked properly
-Now measuring elapsed time with System.nanoTime
-Introduced TimeUnit class for safer time unit handling
-Stopwatch APIs changed accordingly
Fixes:
-StopwatchStatistic.toString methods display time in millis.
-_sumOfSquares now a Double since squares of Long's easily overflow.

Cosmetic:
-"factory" renamed to "group"
Added a new link to resend the email verification message.
Add Ricardo Paiva as Contributor
Merge pull request #30 from paivaric/master

Just authoring
Add log debug outputs.
Move function paddleCollision() closer to where it is called for quicker debugging.
Merge conflicts with Stephen's last commit.
Change ball sprite to build from asset instead of tiled asset for simplicity.
Remove comments.
AI paddles at orientation = 0 now hit the ball with the edge of paddle instead of center. Need to make a random offset so it doesn't always hit the edge exactly.
New plain ball.
Little things such as indents, comments, and logging messages.
branch test
test2
add all
Added new (blank) view for friends
Hardcoded list of friends, working on making list expandable.
missed a layout file
added icons for status. (temp green for all)
request and parse json response and display zone: working
Merge branch 'master' of ssh://github.com/sfu-innovation/WifiLocator

Conflicts:
	SFUWiFi/AndroidManifest.xml
	SFUWiFi/res/drawable-ldpi/ic_launcher.png
	SFUWiFi/res/layout/main.xml
	SFUWiFi/src/com/sfumobile/wifilocator/WifiLocatorActivity.java
	android/res/values/strings.xml
recommitting pretty_date codes
adding status to sendrequest
Merge branch 'master' of https://github.com/sfu-innovation/WifiLocator
Site updated at 2012-03-23 13:33:31 UTC
Use Prefabs instead of normal classes

Made the level and gridController part of prefabs. This will allow them
to be integrated into the Unity infrastructure and allow other classes
to access them through Unity.
Allow no config file and specify all options on cmd line.
Merge branch 'develop'
Add Facebook SDK and base page structure
Remove needless code
Rename tutorial to examples
Move example into examples directory
Set executable
중간저장,

JSON::RPC::Legacy 접속하는 부분의 공통부분을 떼네려고 하기 전에 저장.
왜 떼네냐면.. 여기서 생성한 로그인객체를 이용해서 다른 함수에서 사용해야 하는데
현재 connect() 에 한번에 다 몰려있어, 이것을 분리해야 합니다.
- Fixed proxy not sending federated fields to main server, now federated data is rebuilt every time the meta is sent
Added NEAK defconfigs
Added build scripts
add manifest dir + modules
build with GHCFLAGS, even with Cabal
add 2012 to copyright in openpgp.cabal
add test-suite as an option to openpgp.cabal
Updated url as of support email
Revert "recompiled JS with support for wmode transparent"

This reverts commit 61a05bfb938f0078611dd18f998c9d2e5ede545a.
Array hasn't been defined yet in certain error conditions. Also attached https://github.com/jesperp/node-formidable/commit/89f0fe92d7f4e66eca3c2c958fee677e652976fc fix.'
new post MFC
fixed animations so the center orb is the root prim
Calculating the md5/sha1 hashes.
Correct readme, a bit more documentation in plugin
cleanup
main
remove manifest
cleaning up spacing
tweaked image check
Removed small typo from README
Fixed another small typo in README
Merge pull request #2 from edwardmarks/master

Fixed Small README Typos
Added some styleing
add all my git project to readme
almost done converting to new schema, new models/mappers/services, removed some messy crap like model linker service, more work to do on catalogmanager
further progress
uoms and availabilities
images can now be imported/linked
more changes - working with categories
update schema
specs, category addproduct
update abstractmapper to follow standards"
categories
adjust how images and documents are stored
minor tweaks
cart item meta
refactor mappers for bc breaks on zfcbase
refactor for latest zfcbase
add itemnumber to cartitemmeta
Merge branch 'hotfix/normalize-schema' of https://github.com/nclundsten/SpeckCatalog into hotfix/normalize-schema
remove tables not related to speckcatalog
modify schema slightly, fix option view to use new getter
Merge branch 'normalize-schema'

Conflicts:
	Module.php
minor SG services bug

clients were not de-registering!
Add in ballbehindwalls modules
Πακέτο για Ευκλείδεια  Γεωμετρία
quick update for branch; prepare for mpi implementation
Made some MPI changes that are not ready for merging to master
code should now compile properly, whether using mpicc or cc
Finished writing sort/merge functions for populations. Waiting to merge to master
Made changes for MPI runs. Debugging to come (For multiple nodes). Side note: BCCD has the worst text-editing program for commit -a
Deleted DEADJOE file? (I hate this editor on bccd)
Loading cities being debugged. Needs to grab the city size from master
MPI works for loading cities. Now, debugging tour sending mechanism...
Wrestling with MPI conversion functions. I blame Kyle :P
Everything working up to EAX with MPI.
Still trying to find issues with the conversion functions and MPI calls.
Prepare for unforeseen consequences
Merge branch 'master' into mike

Conflicts:
	include/tsp.h
	makefile
	src/main.c
html views for entries
Finishing touches before publishing
First draft of the open etcs ERTMSFormalSpecs using Eclipse and EMF
subdiv 1060
Change Standard Response Object

Make the standard response object take individual variables instead of an ASIHTTPRequest to facilitate ease of use and testing.
#fixbug:inject functions can not found in jsc-process file
a
Merge branch 'master' of github.com:superscience890/18-349_G11

Conflicts:
	Lab3/lab3-support/kernel/c_irq_handler.c
	Lab3/lab3-support/kernel/i_handler.S
	Lab3/lab3-support/kernel/include/arm/timer.h
	Lab3/lab3-support/kernel/kernel.h
	Lab3/lab3-support/kernel/kernel.mk
	Lab3/lab3-support/kernel/main.c
	Lab3/lab3-support/kernel/s_handler.S
	Lab3/lab3-support/kernel/setup.S
	Lab3/lab3-support/kernel/sleep.c
	Lab3/lab3-support/tasks/rot13/package.bin
	Lab3/lab3-support/tasks/rot13/rot13.dep
	Lab3/lab3-support/tasks/rot13/skyeye.conf
	Lab3/lab3-support/tasks/splat/splat.c
	Lab3/lab3-support/tasks/typo/typo.c
merge
Merge branch 'master' of github.com:superscience890/18-349_G11

Conflicts:
	Lab3/lab3-support/kernel/kernel.h
	Lab3/lab3-support/kernel/setup.S
Merge branch 'master' of github.com:superscience890/18-349_G11

Conflicts:
	Lab3/lab3-support/kernel/kernel.h
	Lab3/lab3-support/kernel/main.c
	Lab3/lab3-support/tasks/rot13/rot13.c
Merge branch 'master' of github.com:superscience890/18-349_G11
Compiles though, some things like mutex needs to be changed
typo does work correctly I think
delete eniro
M  css/coderay-mod.css
add objects on rails writeup
Added tests for Text::auto_link() with punctuation
Fixed bug #4208, Text::auto_link() issues with path in URL

This also includes unit tests to ensure correct behaviour
Merge remote-tracking branch 'alex/bug-4208' into 3.2/develop

refs #4208
Merge branch '3.2/develop' into 3.3/develop

refs #4528
add tests to HTML class (3 of which fail) refs #4529
fix failing HTML tests, refs #4529
Merge pull request #272 from kohana/bugfix/html-bug-4529

Bugfix/html bug 4529

fixes #4529
Merge branch '3.2/develop' into 3.3/develop

fixes #4530

Conflicts:
	tests/kohana/HTMLTest.php
vf support for do_all
Added the time field to the user object, changed the usermapper to insert NULL instead of the string None if the variable is unset for password and other NULLABLE fields in the MySQL database.
Revert "Make vendor-blobs use variable again;;that wasnt the issue"

This reverts commit 5ebefded6d410fe35b3e4ad144299193320b1ae5.

Revert this for one more test
	modified:   proprietary/droid2/droid2-vendor-blobs.mk
	modified:   proprietary/droid2we/droid2we-vendor-blobs.mk
	modified:   proprietary/shadow/shadow-vendor-blobs.mk
add fullname
spec target
reset option for config
temporary disable API check until RSpec 2 has append_after hooks
Fix minor issues on about page.
ajustando os asserts para o novo formato de retorno
updated Mongo Csharp driver to version 1.3.1.4349
test case for active SSL config
code editor tests
Group save is working again.
plan for mixing disabled/displayed properties
MutabledEvent based action firing
variant lookup with multiple
ArraySet.add support for similar values
ArraySet remove
ArraySet of similar values and arrays
StatefulField construction
modifyable events object on IE
call cleaners for stateful field
stateful fields cleaned

stateful cleaner on any stateful element
stateful.destroy()
matching with lowercase tag name
Added first simple unit test for log-in
Added unit test for login.
Refactor circle drawing to separate class - to simplify detection
Site updated at 2012-12-30 21:25:39 UTC
fixed new  filter
JBTM-1212
JBTM-1245 update to 4.17.0.Final-SNAPSHOT
Updated modules: captcha, chaos tools, feeds, imagecache, mobile tools,
transliteration.
Changed link on main page to point to the signup page;
Added a window with the next piece
Today was a nice day.
Add mal.js (under)
Fix moan.js
fixtures/ymls: adding dummy references for models that need them
draft_controller_test: checking that we get a successful response
functional/draft_controller_test: checking assigned :players
adding message box for flash messages
adding draft/draft controller, view button, and route
draft_controller: removing extra param
draft_controller_test: adding test for drafting player
adding a README for quirks
models/fantasy_player: adding current_players()
models/player: adding undrafted()
WIP displaying only undrafted players
adding columbus.csv
players/index: showing UltimateTeam name (not id :/
adding bluegrass roster
adding connecticut.csv
philadelphia.csv added
Fix parsing that's changed in 2.2
Add the ability to avoid following links with sesskey parameter
Update readme file
Improvements to whitelisting
Test active page
Atari.QuickStart.doc - fixed missing comma

Atari.QuickStart.doc - fixed a missing comma in code example
Agregado cargador de articulos al objeto de la consola
This should be "binary"
Unconditionally install libssl0.9.8 for Riak

We are guaranteed to be on Ubuntu 11.10+
Lost in condition branches, move libssl recipe dependency out
update trebuchet branch
adding livestock table scripts
re-adding this blog post
Site updated at 2012-09-18 15:33:32 UTC
changed view and global check method names for clarity
Patrick wil ook graag in de contactenlijst
added my email to footer
Merge branch 'develop' of https://github.com/typecode/connecting-lights into develop
Merge branch 'develop' of https://github.com/typecode/connecting-lights into develop
header changes
adjusting css styles
Merge branch 'develop' of https://github.com/typecode/connecting-lights into develop
header work
better email in footaer
update and external stylesheet
fixed bug on URIs
amplitudes
blah
add support for queues size sum
Removing database config file
slight formatting in CMake file, just cosmetic


git-svn-id: https://freeglut.svn.sourceforge.net/svnroot/freeglut/trunk@1305 7f0cb862-5218-0410-a997-914c9d46530a
Swaping level 5 with level 6.

Level 5 was easier.
add ModalViewController sample
Specialized for durham
Commenting out dino code until Durham has it set up
remove dot it still leaks and the author has not fixed it
Site updated at 2012-09-02 19:08:22 UTC
make sure node series update node is not the node we just saved, as this updates the same node twice
empty case added
added console rake task
defined to_json method for Profile
Styling the success message of the user creation.
minor
minor
Labs CRUD.
Merge branch 'master' of https://github.com/wbotelhos/wbotelhos-com-br
replaced sleeps with waitFor
Fix Emacsrc
more placeholder for slides of first week
Add more thing to resume.
Change resume.
small edit to HB 368 post
Site updated at 2012-11-12 14:59:54 UTC
trying markers...
new action working again
Added assortment of different functions to be cleaned up and sorted.
Draft v0.1.
Minor typos.
Added readme files.
Added more information to readme.
Minor break fixes
Check if the overlay module is enabled
Merge pull request #1 from mareksotak/development

Development
Added direct call to drupal_get_path_alias().
Added hook_form_alter().
Merge branch 'development'
Startup changes
Merge branch 'master' of https://github.com/xander-svk/vlsm-calculator.git
Site updated at 2012-12-18 18:03:53 UTC
Site updated at 2012-10-15 15:33:02 UTC
I should read the documentation :D
modify adb
Merge branch 'master' of https://github.com/yaochen1025/EmmaForEclipse
implement setting page
Initial demo project files.
Doesn't show vessels that outside transfer range.
name refactoing
Let ARC do viewDidUnload clean-up
Changed license information to BSD 3
eclipse提交，查看冲突
合并冲突
Merge branch 'master' of
https://github.com/zhouss135ss/TestWebProject.git

Conflicts:
	TestWebProject/src/com/test/Test.java
Line order change
Fix up rlimit crash and close crash.
Site updated at 2012-10-02 13:32:04 UTC
Entity: fix many-to-many association does not recognize new table prefix
changed location of helper and model dir
Import translations. DO NOT MERGE

Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
Display FCC id for LTE in Settings.

If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Import translations. DO NOT MERGE

Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into jb-dev
Import translations. DO NOT MERGE

Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
Display FCC id for LTE in Settings.

If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Implement issue #6819955: Add button to take bug report.

Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
Merge "Implement issue #6819955: Add button to take bug report." into jb-dev
Import translations. DO NOT MERGE

Change-Id: Ief2131970749fdea0ec210f4d9ab309e671eb166
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
merge in jb-release history after reset to jb-dev
merge in jb-release history after reset to jb-dev
Merge remote-tracking branch 'aosp/jb-release' into jb

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: Ia519bc98b78d8bb7910c5b51c8cc155f307431c0
Settings: update swedish translation

Change-Id: I4eaf40462d12ddaab2909b124f71612e4ea653ed
Merge "Settings: update swedish translation" into jb
Added preliminary listing for volunteer confirmation.
Added a default constructor for MemcachedService
updated to version 1.13.2
use strict in spec files as well
мидлваре для пренаправления на SSL
Added jquery-ui-1.8.17.custom.css
adding option that allows frontend or backend forms
OSIS CourseProj
1. add demos of qq weibo and renren. 2. add factory methods for qq weibo and renren
return empty posts
disable and remove syntax highlighting
Make the if statement works under Alpine Linux
raaandom static
check_updates_here
check_updates_here
Add cmake build dependency.
Initial competition search results
Merge branch 'master' of github.com:Bustedblah/Challenge_Finder
suppression de l'intertonialisation
Updated Javadoc in DatabaseHelper, ServiceManager, and TaskManager
add .gitignore for unwanted java-related files
added stub testing
forgot to add file
added week to bonus
Add artist is functional
00-local/meteorite: Added
Merge branch 'master' into scilab
Added Proccess.cpp, will work on it soon.
Added a Makefile and implemented the basic behavior: A child process is created when a process object is instantiated, and is reaped when it is destroyed. If the child is not finished when the reaping happens, the parent process stalls until the child terminates.
dalšie
Added InputManager class and made a small message show up in output
seperate admin conf to admin.py
Required Name

Used the same function to validate password, validatePresenceOf, to
validate the name, fixing the bug of having no name
Fix AMD modules
setting up git, css: a color to blue
The game is now correct again, tests are broken
Made the button work
Adding a couple of newlines to the README
Cost functions modified to accept a vector as argument.
Progress on WindowTracker.
WindowTracker recognizes the window being closed.
WindowTracker keeps track of the slot data now.
WindowTracker handles SetSlot packets.
Added WindowTracker#loaded?.
General refactoring

- Rename flask to diaoul
- Remove references to flask_small
- Add donate sidebar with Flattr (theme option)
- Add GitHub watch sidebar (theme option)
- Add GitHub fork me badge (theme option)
added the correct georef data (jak.txt) to the alpha files.

added the correct georef data (jak.txt) to the alpha files:
veg_LL_alpha.geo.tif
veg_HL_alpha.geo.tif
urb_HL_alpha.geo.tif
urb_LL_alpha.geo.tif
Hibernate Retaf...
Copy defconfig
Linaro 4.7 build fix
Bump version to 1.5.3
Merge branch 'develop' of github.com:Factual/factual-java-driver into develop
Merge branch 'develop'
We don't need assembly on our lib, dumb me.
Добавлен переключатель режимов и более красивый интерфейс.
добавлена проверка дат в 00:01
register multiple endpoints for multiple routes

 On branch master

	modified:   lib/application.coffee
	modified:   lib/route.coffee
change controller class to mix in
Merge branch 'master' of github.com:Fivell/active_admin_sidebar
Still a bug: idfoy and idfam should be conserved
LTM Sidebar add season

It wasn't possible to add a season until a user
defined season was available!! This fixes that.

We need to make the sidebar Splitter have titled
handles with actions like this on it (ala QtCreator).
There is a feature request open for this.
Merge branch 'master' of github.com:/GoldenCheetah/GoldenCheetah
fin de l'hérésie
reset master branch from vagrant code to vagrant documentation template
rough pruning of vagrant documentation (5d073fbe7283e538834f7b5bb07a454d07a6ba3a) into a template
support also goes into project/
guide, welcome layouts not used
renaming major section getting started to guide
removing docs/backwards-compatibility.md as 1) not needed 2) it uses default layout instead of documentation
renaming documentation layout to docs to match docs/ directory, embed docs hierarchy into extending layout filename
simplify about into single page, default layout
rename contribution documentation to docs (matches major section docs), rename contribution finance to resources to deempasize money
move project homepage as index page of misc section, project
remove articles that dont apply generically, remove contrib resources/finances completely
rename vagrantfile article to generic configfile; manifest shows directory structuring, matching site structure
Merge remote-tracking branch 'doc/master'
add doc-helper to home
pancake init is too hard
Refactored facebook authentication process so it works nicely with native system accounts as well
Added Block Class module.
Styling menubar and header.
added more benches
recovered box normals
Add nginx cookbook.
fix a path-related bug on Windows

Under Windows, when Eclipse imports a project it will replace
'C:\foo\bar\baz' with 'foo/bar/baz', dropping the 'C:\' and
replacing backslashes with forward slashes.  This causes
a problem in Eclipse, because it can't resolve 'foo/bar/baz'
as being on the C drive.  This fix adds an explicit replaceAll
from backslashes to forward slashes, which prevents Eclipse
from doing it wrongly.
still fixing gettimestamp
[FIX] Fixed bug... travis shouldn't fail anymore. However
either dependency
injection via Guice is needed (see Sebi's approach) to provide different
node factories.
Renamed method1574 to toUrl
cb url authentication
visualization 1 based on example by j bostock
send user message when create new account
wszystko poprawione
Quick fixes to the DB schema creation SQL script (with a new schema name, "test_schema"). Now it runs on pgAdminIII (with PostgreSQL 8.4), but it's still CRAP.
add object factory
add spec for create and update
Interim commit to re-align local repo
Fixed loading bug when inserted as gem
Gemini young age color should look more natural for Gemini.
make anchor parsing smarter/cleaner
Update libraries/joomla/crypt/crypt.php
Merge pull request #1557 from elinw/patch-2

Division by 0 in JCrypt
Initial commit of feed package.

Moving some parsing logic around and starting to think about how I want
to make this thing extensible.

Cleaning up some things.

Adding some things for testing.

Updating @since tags and general cleanup.

Cleaning up unit tests.
Tests for JFeed
Fleshing out a lot of unit tests.
Adding tests for JFeedParser
Tests for remaining feed code.
Finishing up the RSS parser implementation.
Update the feed package for deprecation of `JXMLElement`.
Move feed package tests to the new unit test structure.
Weekly view and hour management seems to work. 'Add row' still missing.
Include streams, just to speed up the query
Upgraded user-switching to 0.7
Updated to network-privacy.0.1.4
jr changes
fixed opening braces
fixed closing braces
Fixed start and end dates
added appdata link
Fixed missing URL when adding images to Image Set
jsf+zad4
Correcting a spelling and a link
added thin
Merge branch 'master' of github.com:NewSpring/AirTrafficControl
moved setResolution functionality to set function
Dependency graph sample (colors) :tropical_fish:
вынес создание лини в отдельный класс
создание предварительных данных
test
Added screenshot and text for XCode for Lion OS X requirements.
Added XCode downloads screenshot for Lion OS X requirements.
Merge pull request #961 from pziegfeld/lion_update

Lion update  -- add info and screenshot re Xcode.
恢复上传
部分改动功能上传
removed ; after transparent
Merge branch 'master', remote-tracking branch 'origin'
Adcionei o outro adaptador
Merge remote-tracking branch 'origin/master'
Добавил инструкцию под Win
Cleaned up some code
Updated runnable jar
Unbreak OpenOSPFD but also flag it as depreciated in favor of Quagga OSPF. Fixes #2575
Change up some bgpd initialization, fixes #2572
Fix wording
Fixed execute error call
The ajax is coming along
Core/Player: Removed _lastLiquid from Player class, no need to have it in both Unit and Player
Core/Misc: researched the reasons for instance reset failure and added them as comments to the sendresetinstancefailed function.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
AuctionHouseBot
updated battleye 10/27
mv files_to_copy into publishconf
test-rhui-tcms90962.py introduced
Lade till beskrivning
Strukturen för internsystemet
reverse meaning of vectorized
nth attempt at data frame conversion
use defines from internals.h
catch unsupported types, return NULL
use new syntax
double use for format arg
and derivatives
Basic test harness
Documentation
Merge pull request #36 from RiotGames/test_harness

Test harness
net: wireless: bcmdhd: Allow to push more packets to FW for Tx

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
cpufreq: new lagfree governor

This new governor is based on conservative, and tweaked to lower
the cpu frequency on suspend, and keep it over a minium value
during phone operation.

Conflicts:

	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
wireless: Protect regdomain change by mutex

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Check if FW is Ok for internal FW call

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Improve suspend/resume processing

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix possible memory leak in escan/iscan

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Call init_ioctl() only if was started properly

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Use CONFIG_DHD_USE_STATIC_BUF for preallocated memory

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Update to Version 5.90.125.94.1

- Return zeroed private command buffer
- Fix memory leak in wl_inform_single_bss()

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Add FW reloading in case of FW hang

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix scan crash in ibss mode

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix getting arp_hostip table

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Decrease event wake_lock timeout to 1500 ms

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix proper scan command even if request is NULL

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcm4329: Fix pno_enable if disassociated

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix P2P interface removal

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Enable wlan access on resume for all sdio functions

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Summary: fixed up loops so they no longer lockup due to browser throttling.
Lavet lookupUserRight (CUserManager). Og så er jeg ved at skrive
kommentar til metoderne i FDBHandleren
a little improvment on the build script
HHH-7187 - Fix tests against MySQL
Merge remote-tracking branch 'upstream/master'
HHH-7187 - Fix tests against MSSQL
HHH-7187 - skip Lob test on sybase
HHH-7187 - tests fail on sybase
HHH-7187 - tests fail on sybase
HHH-7197 - update build scripts to not use deprecated gradle apis and change manual's xml declation to use doc namespace
HHH-7197 reimport imports
HHH-7187 failed tests
HHH-7187 failed tests
HHH-7197 rollback change of JdbcDirectoryProfile, seems that is a m9 feature
HHH-7199 - proper JTA and auto-commit interaction for envers testsuite
HHH-6915 - Restrictions.ilike(String propertyValue, Object value) does not correctly initialize LikeExpresison
HHH-7194

Fixed NullPointerException when using nested Subqueries in the CriteriaAPI when trying to determine the entity name and test that demonstrates the issue.
HHH-7187 configurations should be defined in addConfigurationProperties method, instead configure
HHH-7200 SessionFactoryObservers should be notified of the close event in reverse order of the create event
HHH-7204 Clear only regions created by the given region factory

Upgraded to Infinispan 5.1.3.FINAL too.
HHH-7208 - Fix Gradle links in README.md
HHH-7193

Added clearBatch() to the releaseStatements() of AbstractBatchImpl in order to prevent batches from rolled back transactions being applied.

Added StatementCacheTest to illustrate the issue.

Added a validator dependency for c3p0 tests since I needed to have the batch semi aborted.
commit by: Shella

menambahkan halaman comment_view, untuk menampilkan isi setiap topik
cocos2d-html5 show case
MoonWarriors
Make setup.py install_requires get its requirements from pip-requires.
Pneumatics System

Added basic shifting and compressor base to the drive base.

Signed off by: Westin Miller
Updated: Google DOCS FLOWCHART PDF file added
Adds config and test omnirpt app.
pay attention to the parent layer's sublayerTransform (and transform, if the parent is a CATransformLayer)
Create a simple CATransformLayer subclass that understands SMShadowedLayers
Modify the sample project to use SMShadowedTransformLayer
rename the transform layer
make the default specular highlight color a tiny bit subtler
external database connection achieved
DocBook updates
fix implementation of retry
version 1.2.17
update display of result on survey
Fixed a bit of formatting to get examples to show
for testing purposes. Fixed a small spacing error and got everything put
together for the exportSVG. Except for testing, the only thing left is to
fix the curve function.
rename patches - no longer require numeric prefix
* Added new patches from mysql-5.5
        debian/patches/hyphens-in-manpages.patch
        debian/patches/kfreebsd_fails.patch

* Removed obsolete patches
        fix-mysqldump-test.patch
        linked_list_mem_failure.patch
        main_openssl_1.patch
removed old templates
moar refactorings!
過去のいらなくなったコメントとコードを削除。on Boost.java
Edit contents fields types
_PATH_SSH_PROGRAM should point to ssh not sftp - this fixes scp

Change-Id: I3fa7b27156ca6db3a8950f38da243768ac50d389
update openssh to 6.0p1

Change-Id: I2d9720abfcd74ad1428455f42d044320767b7b67
Update config.h to 6.0p1

Change-Id: I1c60a021acae5730f23e26b8fa802733f51bd6d0
Fix pathnames for Android

Change-Id: I38c6abfb7cb9be2c83e184657b8ef9da2846347f
ssh: update sshd config

Change-Id: Ib5bea24b89b0d8754d064959dd9b74db54e29ac4
ahh
test rev
Merge branches 'develop' and 'letimer' into develop
better spi (think it is finaly the right code!!)
better systick
meh
Adding Nuget and config templates.
Fixes Trac #168: Mix of ssl and non-ssl content.
UDP teleop command server.
Updated .gitignore to ignore emacs backups
Merge branch 'master' of github.com:UML-Robotics-Club/igvc-2012
addname
addTS
and another one

Change-Id: I85d9f4bfcbf369aacbdaa4b2a0d300d48255ae96
Adding post patch dynamic include and declare generation
Adding _allowed check
Wrote up a quick demo to demonstrate APE and DataStorm "integration".
Ajustando o programa para funcionar tanto em UNIX quanto em Windows
overriding normal like to only display it on discussions
- merged in changes from craig
add selma'o rule (to nihe) and add all selma'o data
LU add to sumti_6
ssd_Reserve_ticket
Merge branch 'master' of https://github.com/Yotta92/DM77_Cinema_Booking
formatting collection page
formatting main layout
formatting main layout for resizing
formatting user page
Merge branch 'format'
Added check box for tracing vectors
More modifications to GUI
Merge remote-tracking branch 'remotes/origin/Brice-Branch' into Zenith-Detection

Conflicts:
	ADAPT/ADAPT/MainForm.cs
	ADAPT/ADAPTDetection/OpticalFow.cs
Correcting syntax for boldface
Deleted backup-files
change log from flurry to google analysis
修補數學式子及一些錯誤。

親愛的提交審閱者  安安，

你謙卑的僕人,

台北小碼農 Juanito Fatas Huang 於臺北 <katehuang0320@gmail.com>
Added Vendor property
Update art12.txt

Punto 2 su Suggerimento di Luigi Saccavini
server batch file template
Finally added new functionality
Beginnings of dashboard info
Dashbord is in OK shape. Needs updating
Merge branch 'dev'
Finished wrapper for airport class.
Removed link to WordPress plugin which is now discontinued
Tidied up footer
une faute dorthograph...
Updated the JavaDoc.
copyDatabase added
v4.2.3 Beta #4

Didn't have a chance to give a changelog yesterday!  Here you go…
*Updated BuildCraft API
*Updated UE API
*Added support for UE joules instead of watt hours.
*Fixed slow energy transfer between IC2 and BuildCraft machines/energy
storage blocks.
*Recoded IC2 energy transfer system.
*Fixed NPE when loading a machine if you don't have UE installed.
*Implemented BC support for machines.
*Machines now accept power from both IC2 cables and UE wires.
*Merged many methods and fields into TileEntityBasicMachine.
*Updated IElectricMachine with IC2/BC/UE energy transfer interfaces.
*Added UE to ObsidianHooks.
*Other minor bugfixes.
removing regular .css files from git - no need to track these since we're tracking the .scss
added droid sans and crete round webfont source files
consolidated the two vars partials, modularized the @font-face stuff

+ also some changes in here reflecting an effort to make all the font sizes and spacing be a consistent formula so i an working towards a totally dynamic bootstrap as a starting point for projects
some math library | piece
Add BT dictionary
Update wording from John
Changed the invoice structure. Callback is now attached to the invoice
Remove main.o
adjusted calendar widget range
untabify animate.styl
added example file database.yml
Removed toolbar.
Removed toolbar.
some performance improvements and code simplification
initial work on robust regression. Some type definitions and the implementation of an iteration function, though prototypes might change.
Added estimate quality calculation and some comments to clarify the code
temporary commit - robust fit in progress
robust fit initial implementation completed. Debugging still needed
Robust fit tests implemented. Minor version number bumped in cabal file
slightly smaller test-set size for robust fit. Some bugfixes in the test
temporary commit - added documentation
Some refactoring, updated documentation
Added RSqr version for the robust fit as well.
Removed some outdated comments
Merge pull request #3 from uriba/master

Robust fit support
Changing CONTROL file added
Re-adding moved files.
introduction removed
Add autowrite option
Updated config error
Merge pull request #8 from antonyliang/master

More pulling
Merge pull request #9 from antonyliang/master

another merge
fixed testcode, code is now equal to testcode
..
彼女募集中でーす。条件のあう人がいらっしゃたら紹介してください。m(_ _)m

Signed-off-by: aoisensi <aoisensi_mpodaisuki@yahoo.co.jp>
api: Annotate some systemvm commands

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
api: Annotate missing systemvm api, annotate SystemVmResponse

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
more efficient json_encode
Completely changed tbar model- now using display:table-cell
Added senseGrp from HunNor-PDF.
Add font icon
Reduce contrast of footer
Revert "Minify"

This reverts commit 95c3d34cd79282ebf596d35d55328bd4f40fb349.
Merge branch 'gh-dev' into gh-pages
Minify
[TIMOB-6234] Updated drillbit test.

Attempting to access LoginButton.style fails because
the property is not exposed.
Added some initial dialogue for the mayor of Durrok in level 3
pagination fixup and post
BDEV-527 - Bamboo Git Plugin (native mode) shouldn't hang when using ssh protocol on windows.
Bump version 1.2.0.dp5

Change-Id: I2712dee2a867cacff1948fc466f79268e5189c2b
Reviewed-on: http://review.couchbase.org/17310
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Cambiamenti ai model (Autori)
- campo Nome e Cognome: lunghezza massima aumentata a 60
- campo Cognome: non più obbligatorio
  I campi Cognome provvisoriamente impostati a '-' dovrebbero essere
  aggiornati a '' (stringa vuota)
  > UDPATE Autori SET Cognome = '' WHERE Cognome = '-';

Signed-off-by: Sebastiano Barrera <barreravastiano@hotmail.it>
Vari aggiustamenti ad HTML e CSS; migliorata compatibilità IE

Signed-off-by: Sebastiano Barrera <barreravastiano@hotmail.it>
Removing special characters in media files for thumbnail generation
simple put test
simplify interface
Method to determine whether a select key has been pressed.
New option: autoReprocess; whether to reprocess or not after an item has been selected.

If an item has been selected, the current behavior is to perform
the reprocessing right away. However, it doesn't necessary most of the
time, so a new option has been introduced: autoReprocess, which is false
by default at the moment, so it changes the behavior after a selection.
Fix SCM entries
Merge pull request #8 from baranowb/Fix-SCM

Fix SCM entries
still need to compute euclidean distance between user-note and computer note
Plugin repository changes.
Fixed include in BigBlueButton.html to point to correct file: bbb_api_bridge.js
Merge branches 'master' and 'master' of https://github.com/binux/ThunderLixianExporter
removing the bittorrent logo
Updated Read Me and added a way to add a page tab

* Updated Read me with instructions on how to use
+ Added addtab.php which will allow a page tab to be added to Facebook
pages
set proper default for MSG_COMMS
updated the plan
Merge branch 'master' of github.com:bootstrapworld/wescheme2012
Stretched HeightMap more, and fixed bug in heightAt()
dynamic content for bookmark, favicon
merge two async interfaces into single interface for greater usability/simplicity
added some comments and minified pep
Adds the uppercase bridge000.JPG.
Added in 4D sample for both sequential and SMP.
Updated readme w/ copy
Fixing detection of double underscores in protected function names
Closes #29: Minified enough for me!

While it's not as mini as my original vague vision, I'm happy
with how shrunk down it is, and how it's set up to expand. If
I need any more shrinkdown stuff, it's okay to do that in a
new and specific ticket at this point.
fichier wave
base code from http://www.himigame.com/android-game/374.html
atualizado o DTD para o xml de descrição de instalação.
Project renaming to *-patch
Added crontab suggestion
Return bank message in Response from E4 Gateway
[Not tested] - Update icecastlogparser.py

Now will construct a query with the number of 'inserts' in the HITS_PER_QUERY variable. The idea is avoid a query overload. The change has not been tested.
[Not tested] - Update icecastlogparser.py

Added variable definition (if will fail doing the comparison). Added concatenation to 'query' variable.
Merge pull request #1 from gryphes/master

Update
Added basic class inits
add texas notes
removed user authentication file
Add mock auth service
Merge remote-tracking branch 'origin/master'
Better member names
Removed sample request
[gtk3-ubuntu] Update to version 3.6.1 with Ubuntu version 3.6.0 and release 0ubuntu3
[unity-2d] Switch version comparison script to track precise-updates repo
basically done except submit and edit entry
Moved repo to root.
Implemented the virtual Equals(<TYPE>) method.
Shelved Feature List Start
Merge pull request #21 from chriscct7/topic/Update-Readme

Shelved Feature List Start
Push diffs from WAMP
Update easy-stick-post.php

It may be overkill but I consider it good practice to immediately clean user data like `$_REQUEST`. If you don’t cast it to an integer your `$post_id` variable still can contain anything.
Merge pull request #2 from GeertDD/patch-1

Update easy-stick-post.php
Environment production cookbook version updates

iptables: 0.10.17
Added -r/--realm option to account download and site portal command, issue #330
Merge pull request #369 from christav/support-orgid

Added -r/--realm option to account download and site portal command
Starting to add node CLI tests.
add set branch and delete repo command
Adding connection string parser.
Handling quotes.
Adding comments.
Implementing service bus connection strings.
Fixing undeclared variable.
Simplifying condition.
Add support for acs namespace.
Implementing storage connection strings.
Adding tableservice tests for connection strings.
Adding more UT.
Updating connection string parser.
Updating parser.
Applying code review.
Adding more UT.
Merge pull request #3 from andrerod/connect

Connect
Improving error message testing.
ENH: custom parsing for classes
ENH plot.uts.clusters: .set_pmax() method
ENH load.fiff.events(): use mne verbose kwarg
ADD ui.progress_monitor.message() method
FIX load.fiff.add_epochs(): if epochs rejects any event, try to use epochs.model
DOC
FIX: dataset.copy()
MOD mne_experiment: raise Error if root does not exist
MOD mne_experiment: make 'trans' template per-subject
reformatting readme
version bump 0.0.3
Rename 'bleed' to 'damage'
Merge remote-tracking branch 'upstream/master' into powers

Conflicts:
	src/EffectManager.cpp
Clean up passive effect triggers

Added on_halfdeath and on_joincombat triggers.
Removed death trigger because it was useless.
Merge pull request #241 from dorkster/powers

Rename bleed_dmg and clean up passive effect triggers
A typo
Initial version of the "Scheduler initialization" guide
Wording
Initial bits of the guide on jobs & operations on teh
Initial structure of the guide on triggers
First commit
First commit
Merge remote-tracking branch 'origin/IQ-TESTING-2'
Update notes for submitted changes

* unit test Scheduler#after
Update notes for submitted changes

* cancel pending delayed restarts on droplet update
Updated Dynamo version.
Updated Dynamo.
Fixed up some components (needs work - see alerts.py for the most up-to-date version), made extract_attributes script to aid merging attribute hashes together.
display the judgement status for a case in the property history
address load cases from lama
load cases by address model and load cases for addresses with no cases and correct bad lama addreses in import_to_db
Merge branch 'development' of github.com:codeforamerica/blightstatus into development
copy credit/kudos section from wws.
+ allow arbitrary objects in settings via yaml
fixup parameter passing for lcb_make_http_request

Change-Id: I80408d2cd5293cfa518770bbf07340374bff83b1
Reviewed-on: http://review.couchbase.org/20599
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
Simplify libatlas, liblapack packages
Eek - fixed lame display of bold headlines in Firefox.
fixed ignore function
Bugfix
Greatly simplified; bugfixed
connection checking fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	WiFi Map Social/WMMapMath.h
Corrigindo problema de referência para jQuery no Google API
kill obsolete udisks configure options
freetype 2.4.10 with infinality
xspf deps on libcpptest. update standards version
dd
Merge branch 'master' of https://github.com/dario-chiappetta/StolckePen.git
Merge branch 'master' of https://github.com/dario-chiappetta/StolckePen.git
Changedweight from ints to doubles for proper probabilities
added migration definition