labofsahil/github-event-dataset-2012 huggingface dataset:
map of current location
map view
Moved URLS into RequestConstants, Added Image request for images
Merge branch 'master' into alex-bbos
Merge branch 'mike-droid' of git@github.com:sfu-innovation/WifiLocator.git

Conflicts:
	android/src/com/sfumobile/wifilocator/Friends.java
some remaining changes to remove post parameters
Handling some exceptions with qr reading
Merge branch 'master' of git@github.com:sfu-innovation/WifiLocator.git
Creating view friend requests activity
changed satallite, and bg
add tables!
fixed stash value for recent_comments as a ArrayRef
----
LWSActionController: adds "SetHTTPStatusCode" method.
----
translate added to content-active
Swith to groovy 2.O branch, because that's what the cool kids are doing.
Ignore the output from package builds and checks.
Initial migration from Heartbeat to transfusion-dvm. Outputs lists instead of dictionaries and is missing a small number of data files
Readme update

Fix breaked include tag
Fixed some things here and there.
added classical component menu
Added some navigational components
fixed typo Exception not Excepcion
Unzip content in SpdyUrlConnection like NSURLConnection does for http.
Merge branch 'master' of github.com:sorced-jim/SPDY-for-iPhone

Conflicts:
	SPDY/SPDY/SpdyUrlConnection.m
updated video listing for 9b
Fixed overriding global codec set on support-seeking-unbuffered-position-* tests
added gitignore and rvmrc
event-ify address addition
form status messages after any element is changed, now requires a manual save
save after link is clicked
Updated reference to latest version of jQuery.
reverted...
Merge branch 'master' of https://github.com/stefansundin/The-Tangibles
removed a lot of this
Fixed main.xml. Now includes jetblue logo
Merge branch 'master' of https://github.com/stephenball1/Hackathon2012
add a rebootall script
restructure drectory
rm --cached gyro.html
Fixes button color
before hw4
hw4
gitignore
Modified sfmqueue mgmt cmd to show whether the entire queue is being taken into account.
Added livebackup and restorebackup mgmt cmds.
new download button for nav
Made livebackup and restorebackup put documents and metadata files in a zip file.
出力先ディレクトリを指定　エラー時に戻り値-1を返すようにした
Add new modules to config
Added more stuff to app
dashboard changes for multiple devices
massive update

- remove most parts of JB for cleaness
- add i18n tools
Added h1 css.
Added indexcontainer styling.
Changed indexContainer type from class to id in style.css
Changed client initialize text.
Changed textarea object to text type input.
Merge pull request #38 from ckkinay/master

CSS styling.
reword them
bugl3SS ==> 0map
Adds attr_accessor for resource_klass_name
Removing workspace from repository
Ignoring workspace
Order BY RANDOM
miniprofiler
Added feature to send additional params to plaza service. This is mainly for future use.
Version 1.0 Beta Code

Final Code. Everything works at a minimal level!!!
finish question 1

efficiency needed for question 2
First commit
XBMC init script
install xinit instead of xinitxinit
Revert "test"

This reverts commit d800007ec8087e7d719cbade23d77c275297e851.
Revert changes to .gitignore
8 Bit Styled Fun
Site updated at 2012-11-05 11:20:32 UTC
Add a comment on ein:ac-setup-maybe
Fix ein:ac-config
Add more comments on ein:ac-setup-maybe
Move comment to docstring in ein:ac-setup-maybe
script.remoteshutdown 0.1.2 -> 0.2.0
payload dictionary and json encode
Initial commit of relevant files
Set version numbers to 1.0.1-SNAPSHOT in preparation for using release plugin
created jekyll blog, first blog post
New cookbook for clang
Include clang as part of build_essential
renamed:    application.html.erb -> app/views/layouts/application.html.erb
Site updated at 2012-07-23 07:39:49 UTC
Work-in-progress backup commit.
Added rounding to duration display. Added tests.
email addy wrong
Merge branch 'master' of github.com:tychay/mwgadget.GuidedTour
Tie-in between Order, User, early permission work.
Tied in store, orders, users - early permission work
index all types
Fixed some space vs tabs indentation
Modify test-cases
installer script, messed with the top banner
replaced endless scroll with infinite scroll;
hid bottom nav
fixed filters;
added loader img
merged endless_scroll_paul
Remove trash on celeryconfig
Ajout du Val dans js
module pattern test not passing
receive parameters undeclared
Changed target environment to 10.7
Site updated at 2012-08-23 22:33:53 UTC
Updated Repo to use git over ssh
Site updated at 2012-11-08 20:01:49 UTC
pyramid: add initial defconfig extracted from HTC kernel
linux: update kernel tree to 3.0.25
mach-msm: add .arch_extension sec\n to scm.c

Conflicts:

	arch/arm/mach-msm/scm.c

Conflicts:

	arch/arm/mach-msm/scm.c
scm: only use '.arch_extension sec' if the compiler is newer than gcc4.4
This fixes broken pre gcc4.6 compilation.
rework gcc version check for '.arch_extension sec'
fix GCC version check (>=4.5.2) for arch_extension use
arm: mm: fixing 'offset.un' may be used uninitialized in this function
fix warning: statement with no effect
net / netfilter: remove annoying 'comparison will always be true' warning

-adding a new function which avoids this warning
-using the new function in all places where it makes no sense to check
fix warning: statement with no effect #2
compile fixups for bcm4329
kernel: return_address: hiding warning (TODO)
board-pyra-mmc: Lower Wifi chip voltage to lowest (ref. sheet)
bcm4329: allow low-wifi-signals to be seen
Makefile: adding config variable for Os/O2/O3 compilation

Conflicts:

	init/Kconfig
Makefile: Added Snapdragon optimizations

Conflicts:

	Makefile
Makefile: Optimizing build-options for linaro
arm: mach-msm: corrected assembler fail if compiling in thumb2 mode

Conflicts:

	arch/arm/mach-msm/idle-v7.S

Conflicts:

	Makefile
-O3 compilation fixups

Conflicts:

	drivers/gpu/msm/adreno.c
mach-msm: fix 'unimplemented: inlining failed in call to 'notify_modem_cache_flush_done''
mach-msm: dal: fix uninitialized variables
remove reset password to ldap message in academic profile
fix conflict
Bashrc Update
a really fast and small update, removed mercury, some small fixes in appearance
Preparing to add markitup editor
markitup editor added
First beta version with markItUp editor
Minor changes to edit content css and js
change-same-line
Merge branch 'master' of github.com:weijianwen/GitForBeginners
Site updated at 2012-04-24 16:12:59 UTC
Cleanup and first map tests
Update sysaid-text-cs-CZ-utf8.properties

Stazus za Status
commint1
Merge remote-tracking branch 'origin'
commit2
Merge remote-tracking branch 'origin'
CI Development Update
using less version of bootstrap instead of compiled css
Putting all the top level config into a toplevel.py file
Site updated at 2012-07-27 02:15:22 UTC
Add initial PKGBUILD for syck-git
Site updated at 2012-09-24 03:19:26 UTC
makefile is ok
Added media files
Merge branch 'master' of github.com:yorikvanhavre/FreeCAD-docu
removing deprecated api
Ping / version requests now work
pull to root
Runloop-defer pushing the view controller for .1s, and spaces instead of tabs
横画面用の navikey を配布用 zip に追加しました。
dependency changes
Merge branch 'master' of https://github.com/zestjs/template-browser-cs
Site updated at 2012-04-09 12:51:01 UTC
remove junk
(div.content_wrap,div.contact-us,)
Merge remote-tracking branch 'origin/master'
Update changelog for v1.0rc1
Add date to tags
Merge remote-tracking branch 'origin/master'
update sql
ooops
Add php console log ;)
Merge remote-tracking branch 'origin/master'
Backup sql and admin panel
#public test
remove junk, no need it anymore
#public test
Fixed: name of project var
Move back and remove duplicate
Dynamic products from admin panel
Dynamic Categories
With Improved Search Engine Friendly Urls
Improved Search Engine Friendly Urls
Backup DB
remove junks
Ignore private files
Improved: Auto config file
Update README.md
Update README.md
Merge pull request #1 from mahlad/master

Update README.md
Adds find_range_by_project_id to ChangeRepository
Settings: Updated czech translation

Change-Id: I71fb15346ad5152d672684b2885de5033142effd
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Merge "Settings: Updated czech translation" into jb
delete rooms, author class, simple cleanup
author class and delete room button, enter room is a button
Class for "my messages" and removing over-specific rules. font-size changes for personal preference
Streamlining

Just thought I could clean the example up
mac store cleanup
gitignore
using one shared file
Merge pull request #2 from scottux/cleaner

Streamlining
Add tooltips to classes and containers
баг с картинкой в чате вопроса
phpMorphy 0.2.3
*) Remove all var stuff from source code(now really E_STRICT compatible, i hope =])
*) Rename all interfaces to {interface name}_Interface(old version is: phpMorphy_I{interface name})
phpMorphy 0.2.3.1
*) Remove php4 stuff from fsa_state.php
phpMorphy 0.2.3.2
*) Fixed bug with disabled prediction(both) and bulk mode used
phpMorphy 0.2.4
*) Improve perfomance in bulk mode; thanks to Wicked
*) Fixed bug in shm storage type, with php5.2.6; thanks to berkut
phpMorphy 0.2.5
*) Fixed bug: with_gramtab option have no effect; thanks to andreypaa
phpMorphy 0.3.0
*) new dictionaries format
*) mutliencoding support(need dictionary compilation)
*) added functionality for control of prediction process
*) new enhanced API for deep analisys
*) new query: getPartOfSpeech()
*) rewritten shared memory cache code
phpMorphy 0.3.2
*) getWordFormsByXXX always return array
phpMorphy 0.3.3
*) Fix phpMorphy_Fsa::collect() in sparse mode
*) New methods in morphiers for access to Fsa_Interface from Finder, Morphier
phpMorphy 0.3.4
*) Fix bug in phpMorphy_WordForm::hasGrammems($grammems) when $grammems not array
*) Fix bug in phpMorphy_Shm_Cache::openSegement(), throws exception with invalid  message
*) Add missing files for generating dictionaries (/utils directory)
phpMorphy 0.3.5
*) Add new methods getGramInfo, getGramInfoMergeForms, getAllFormsWithAncodes, castFormByGramInfo, castFormByPattern
*) getAllFormsWithGramInfo signature changed, second argument is (bool)$asText now
*) New initialization options: use_ancodes_cache, resolve_ancodes
*) Add ancodes cache
*) Add ability to use phpMorphy <=> Dialing ancode ids mapping
phpMorphy 0.3.6
*) getGramInfo(), getGramInfoMergeForms(), getAncode() returns distinct descriptors
*) Add new method castFormByAncode()
*) More accurate work with indeclinable words
*) castFormByPattern() now recieve grammems to compare for each part of speech
phpMorphy 0.3.7
*) phpMorphy now work when mbstring overloads string functions, i.e. mbstring.func_overload  & 2 == 2
disabled some elements
disabled some elements
parsers.c: remove warning: 'size' may be used uninitialized in this function

Some compilers / compiler options (such as gcc 4.7) would emit warnings:

mercurial/parsers.c: In function 'pack_dirstate':
mercurial/parsers.c:306:18: warning: 'size' may be used uninitialized in this function [-Wmaybe-uninitialized]
mercurial/parsers.c:306:12: warning: 'mode' may be used uninitialized in this function [-Wmaybe-uninitialized]

It is apparently not smart enough to figure out how the 'err' arithmetics makes
sure that it can't happen.

'err' is now replaced with simple checks and goto. That might also help the
optimizer when it is inlining getintat().
tests: do exclude what is expected
check-code: recognise %= as an operator
push: accept revset argument for --rev
push: refuse to push obsolete changesets

This is a first version. Simple but not very efficient.

Note that this changeset introduce the "obsolete" word in the UI.
revset: add an `obsolete` symbol

This predicate matches obsolete changesets.

This is a naive implementation to be improved later.
obsolete: compute unstable changeset

An unstable changeset is a changeset *not* obsolete but with some obsolete
ancestors.

The current logic to decide if a changeset is unstable is naive and very
inefficient. A better solution is to compute the set of unstable changeset with
a simple revset and to cache the result. But this require cache invalidation
logic. Simpler version goes first.
convert: make filemap renames consistently override revision renames

When the source repository had a revision renaming "$new -> $old",
but the filemap a "$old -> $new" rename, the converted revision could
use either $new (deleting the file) or $old (keeping the file) when
getting the file data, depending on the lexicographical order of
those names. So the resulting revision would leave some files
untouched (as expected), but delete others arbitrarely.

--HG--
branch : stable
push: refuse to push unstable changesets without force

User should resolve unstability locally before pushing the same way we encourage
user to merge locally instead of pushing a new remote head.

If we are to push obsolete changeset, at least one set of the pushed set will be
either obsolete or unstable. The check is narrowed to only heads.
obsolete: compute extinct changesets

`extinct` changesets are obsolete changesets with obsolete descendants only. They
are of no interest anymore and can be:

- exclude from exchange
- hidden to the user in most situation
- safely garbage collected

This changeset just allows mercurial to detect them.

The implementation is a bit naive, as for unstable changesets. We better use a
simple revset query and a cache, but simple version comes first.
merge with stable
Merge pull request #2 from dscho/default

Default
Replace all html escaping
merged conflicts
removed capybara webkit
get caught up to master
redirects are more specific
Show actualy date that task was completed
Merge branch 'master' of github.com:Andrewglass1/teacher-center into channel-view
deps changed
prebuilt: new Linaro Android 4.6.3 toolchain
prebuilt: new Linaro Android 4.6.3 toolchain
Remove empty android-sh directory

It looks like it was meant to contain a kernel but never did.

Change-Id: I118cad008bdc7abf4706dcc030b090dc538cb304
Updated i686 toolchain prebuilt for darwin

Change-Id: I62fe79dd1d2149a3dae7afd916c1986ac5c82d19
Delete prebuilt emulator kernels - they've moved to a new home.
Update linux-x86/SDL with X threading bugfix

The XInitThreads bugfix from commit external/qemu/7851751.. was only
taking effect in standalone emulator builds since the full Android and
SDK builds use the prebuilt library. This change refreshes the
prebuilt from HEAD; there seem to have been other changes (like
disabling audio) that hadn't made it to the prebuilt either.

This also moves the static libraries from lib/ to libs/ and removes
some stale files from earlier build systems, in order to make
refreshing the prebuilt just a straight copy from the build output
directory (see PREBUILT for instructions).

Change-Id: I09d6cba7fd8feff540f0a3df16991d546f17506b
New lib64SDL.a and lib64SDLmain.a for 64-bit emulator

This is built by following the instructions in file PREBUILT

Change-Id: I11cf36103009ef77e7b612ebc82657c012936bda
Revert "Delete prebuilt emulator kernels - they've moved to a new home."

This reverts commit 859e00f22edd2eda2d257fa8e9d00d86e5eed7b1.
[DO NOT MERGE] Drop the latest llvm-rs-cc from ics-mr1.

Bug: 5242960
Bug: 5650262
Change-Id: I517525fa7d38a1210afd5a7ebfce9ae4f7c7dafa
[DO NOT MERGE] Drop prebuilt NDK r7b.

It's backported from master's prebuilts/ndk.

Change-Id: If49f2c3c784ec58fd2a462ea9cebe5c23ea00961
Drop the SDK 15 official release.

Change-Id: I37f25a18e42e6888ed6929cf2581ec147bd9e1dd
Merge branch 'ics' of https://github.com/ThePlayground/android_prebuilt into ics
integrated recent stations into the station combobox, with
autocompletion
improved handling of comma characters when converting lastfm uris to
text
Fixed colspan for no search results.
Added Server using CocoaHTTPServer for iOS and OS X
Added Server using RoutingHTTPServer for iOS and OS X
Added Server using IntAirAct for OS X
Add documentation for recently added os-used-limits extension.

The os-used-limits extension adds information for limits that have been used so
far to the /limits GET response.

The ext was added in this patch: https://review.openstack.org/#/c/9544/

Change-Id: I8bdb1b9ebdbc4b92a8e9a3143e8ed5d4724ac264
Merge "Add documentation for recently added os-used-limits extension."
Added the GameDriver class for just playing around with the Demo stuff.
...
prod.db config
Merge branch 'master' of git@github.com:BeoWulf72/bwfAlternateModel.git

Change-Id: I2d8f1c34a558d98d7e5e85e0941700e87927839b
Signed-off-by: BeoWulf72 <zend53@yandex.ru>
Merge branch 'master' of git@github.com:BeoWulf72/bwfAlternateModel.git
poxy_icons
automatically Play Next Episode  menu item and preference
refactoring
Added Playing previous episode
Merge pull request #26 from Bilalh/poxy_icons

Add proxy icon next to window title.
Merge pull request #24 from Bilalh/help_improvements

Help improvements - Updated and Finshed
Merge pull request #18 from Bilalh/bin_icons

Update binary bundle icon.
guess color matrix based on video size

HD video should be displayed with BT.709 Color Matrix. Make the GUI internal
renderer use BT.709 for HD videos and keep using BT.601 (which is default)
for SD videos.
Merge pull request #28 from pigoz/colormatrix

guess color matrix based on video size
Merge pull request #19 from Bilalh/readme

Readme
Merge pull request #7 from Bilalh/master

Added a menu item to play the next episode. 
Merge branch 'master' into build
styles colors etc
layout
Modify .gitmodules

Keep git from seeing dirty changes in the ABS subdirectory
add fastcharge support
Add voodoo multipliers stuff

Full code based on Supercurio Stuff for Crespo
Credits also for Ezekeel since he is the first to port this to GN

Conflicts:
	drivers/video/omap2/displays/panel-s6e8aa0.c
Document why .retaining_class is not the default
Remove Spotify::Session.retaining_class. There is none.
Make sure callbacks use the retaining class
Revert "Added NFC Reader support for two new tag types:  ISO PCD type A and ISO PCD type B"

This reverts commit 1b3c962fcdd80d32f7c5a63f012c97fae7cc208e.
Fixed a bunch of imports. This branch contains fixes to issue #59
More cleaning, fixed tooltips for player, player IDs are MUTABLE before the game starts.
Updated ObjectDetector
Add ability functionality
Added microcontroller source code (src/ac/aston/microcontroller)
..o
Adjust prompt colors
Simplify terminal profiles
Search bar on SearchActivity works.
Next and previous buttons are disabled when you launch a new search. The
page number is also blanked.
Next page button disabled on first search, until results load.
Next and previous buttons disabled when loading a new page, next is not
re-enabled if it's the last page.
claspath: remove some old/unnecessary class paths

Change-Id: I0e79233730b0b8e1108cb1dfea094952ac53604e
claspath: rework for new apps and the such

Change-Id: Ia1a9fd5a55e76c72eea62948845ea8a379c15507
Added a return button and removed some unnecessary stuff
[#WEB-811] Improve error message in Reports when variables are defined
Standard output for matrices added.
make sure oneway:<class> overrides standard oneway tag
Merge pull request #131 from emiltin/oneway_class_override

make sure oneway:<class> overrides standard oneway tag
Allowing toll_booth's to be bypassed.
Fixes issue #180.
duration tags on ferry ways get parsed now. Cheers to Mackerski!
Adding the URL of the demo installation to README
Ignoring barrier=no for now. Thanks Derick.
Merge branch 'master' of https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
Fixing a bug with hinting coordinates on one-way streets.
Destination now shows up in turn instructions
Adding tertiary_link.
Update speedprofile.ini
Allowing tracks to be accessed at low avg speed.
Adding tracks if they are tagged with access=yes
Reworking the logic to accept only tracks with access=yes.
bollards are ignored if access=yes tag is set at the node.
Excluding barrier=cattle_grid
Fixing a misplaced min function. Thanks, Gnonthgol
Fixes issue #195
Adding a U-turn penalty for very sharp turns. Fixes #188 and #153 and
also partially fixes #65 and #167
Correcao testes
Total refactor in progress
More changes?
Updates

1. Added a method isPressed for InputManager.
2. Fixed some bugs for TriggerAreaComponent.
Remote SMP commit
Move ipa download info
Move ipa download manifest and ipas to assets/ipa
Deprecates old Crosswalk query and updates docs to recommend use of table read.
Removes deprecated Crosswalk related classes.
Fixes issue with list-based filters
Add support for raw get request using path and param string.
Update version to 1.5.1
Adds diffs support.
Adds match query, updates resolve for better checking of available results.
Merge branch 'develop' of github.com:Factual/factual-java-driver into develop

Conflicts:
	README.md
Optimized mainwindow class
fixed form in logement's window
Added more XP-granters.
Restaged haks to latest ACR.
Getting rid of the deprecation warning about class_inheritable_attribute
dont expire locks, advise bin/ublock instead
bump: 0.0.141
re-gen site
adding my picture
Fix avatar helper and handlebars specs to make jenkins happy
Add ChildBrowser plugin.
filter out communes matching several constituencies
Ain fix
add dummy methods
fixed getAllStates call
marked issue as taggable
Correctly put item back in bag after failed drag on map
TRIVIAL make readthedocs work
pvr.off required a header update to omapfb.h
config: CONFIG_WL127X_TEST is not used
gcc optimization
netfilter: IPv6: fix DSCP mangle code

The mask indicates the bits one wants to zero out, so it needs to be
inverted before applying to the original TOS field.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
crypto endian performance fix
Merge branch 'masterDGtal' into normalVectorEstim
fix errors
Woprking on normal vec. estimator
Working on embedder
fix VS-2010 64bits warnings
fix 64 bits warning
First version of IntegerComputer for doing arithmetic.
Correct bug in NumberTraits.h and NumberTraits.cpp for paramater types of BigInteger and 0 an 1 value. Add testIntegerComputer.cpp
Add convergent method to IntegerComputer. More complete tests of GCD, continued fractions and convergent in testIntegerComputer.cpp
Add ceil and floor division test in testIntegerComputer.cpp
Add Bezout / extended Euclid test in testIntegerComputer.cpp
Fixing Localnormavector estimator. Gaussian kernel added
Class doc added
Adding concept, cleaning up the code
Merge pull request #293 from dcoeurjo/normalVectorEstim

Add normal vector estimator with simple convolution on the digital surface.
test Gaussian map
Correct doc of IntegerComputer::getCoefficientIntersection and update test accordingly.
Correct PointVector::operator*( Component ) into a const method.
Merge branch 'master' of github.com:DGtal-team/DGtal
Change CMakeLists in tests/geometry/surface to take into account if QGLVIEWER is installed.
defer compressed js by default
added holo widget to ensure it's working. added intellij project files
Register piston_up and piston_down as effectors
Lockscreen: Fix NPE (softreboot) if WeatherPanel is null

Change-Id: Ied008c185558d0957011bfc0bef7c6a166df9d72
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'AOKP/jb' into jb
Add google provider for Oauth 2.0
[ADD] Further intermediate commit to provide a BPlusTree/Index
architecture.
Allow pdfs.
example template
Merge branch 'master' of github.com:JumpLink/redmine-swp-script
group counter added
Adding theme settings file.
Adding readme file.
Creating .info file.
Creating info file.
Merge branch 'master' into 7.x-1.x
updating .info file
added conditional stylesheet functionlaity and cleaned up text.
fixed namespacing issue in main preprocessor
making view results theme more easily overridable. adding title_filter function
Merge branch '7.x-1.x' of https://github.com/KeyboardCowboy5/Cbase-Theme into 7.x-1.x
added base development styles
removing debug command
adding css to info file
adding css reset. removing specific classes and ids from secondary menu
combining reset and cbase stylesheets
set standard header sizes
status message and js updates.
Fixed var name in preprocessor
fixing merge issues
cleaned up styles on messages
LPS-30204 source formating
commit with working article object + tests
finished contacts activity ui
fixed width JS addition
do not create "jar-renamed-to-zip" during ant-build anymore
Revert "Revert "Program Withdrawal changes""

This reverts commit f2f4d43bd72ea77563349d7191cf5ada99e06915.
added test case stub
added test stubs
added comments
Attempt fix armor issue
реструктуризация таблицы trends. постепенная реализация записи настроек.
we need to figure out how to not commit these stupid .idea files

I hate them.
Updated readme, added issues image folder to link to on GitHub issues
Finished middle school schedule
Added "single box" functionality
Formatter ergänzt
Added install-introductions
Fixes #2943 - Remove the set of port for syslogd
Fixes #2614: A small typo in copyGitFile has been corrected
Refactoring step
Merge branch 'master' into refactoring-performs
Progress in refactoring
Merge branch 'master' into refactoring-performs

Conflicts:
	FTPSync.py
Refactoring next step
fetching updates from master
Merge branch 'master' into refactoring-performs

Conflicts:
	FTPSync.py
	ftpsyncwrapper.py
Next refactoring step
Couple of fixes
Renaming: empty new name check
More verbose preliminary command quit
Refactored getMetadata
Progress moves for cancelled actions
Relative file paths instead of file names shown
couple of fixes
Merge branch 'master' into refactoring-performs

Conflicts:
	FTPSync.py
Merge branch 'master' into refactoring-performs
Merge branch 'master' into refactoring-performs
Added missing handleException(e)
It is now possible to upload folders as well
Made builder available for recruitment.
Created a javaWriter module.

javaWriter writes logging messages to the file.

Created classes for different log messages.
Add CFP copy to speakers page.
Add Default Text to Popup

Change popup layout, allow custom default noscript text
Add yelloweyeddemon to _aliveEnemies array.
Missed files for previous commit (tying the Makefile to config.yml, introduce Monolog
removed unnecessary deployments
Updated to latest editor base
updated fixes 10/7 + hacked connector (read desc)

the hacked connector is used to connect to remote databases. this is a
great tool for running multiple servers on one computer/dedicated box.
thanks ashfor03 for your amazing work. <3
Fix a mistake, can run now.
Started site dev using robmd.net as a reference. Thanks Robatron/Rob MD
Trying to figure out the best way to combine html5boilerplate with this
Moved over to a hacked together wok and boilerplate/initializr based system
Fixed a few relative path issues, all absolute now
One more path fix...
Don't update completion on keydown, as the value in the text field isn't updated yet.
Bump version to 1.10.
ID EDIT
server and test client added
update
updating some English translations
Chain smoking for local branch master
Added wrap (enter key instead of smileys on keyboard)
Space added or updated: UrLab
ANDROID-115 Upgrade to Gradle 1.3
ANDROID-116 Upgrade to build against Android 4.1.1.4 (Jelly Bean)
changed xsd:boolean to string SGF-78
Make ConversationContainer.nextId() protected

Increase the visibility of ConversationContainer.nextId() to protected
so subclasses can override.

Issue: SWF-756
Fix postgresql user setup + move nginx / supervisor conf
Remove MySQL Python Check, + syntax error
updated voice_app testcases
Update the imagemagick packages
TEMP FIX:temporary Mount System RW
Aplicando estilo
Add themes support to Mms (ala handcent theme ability)

1. Add custom image bgs to both conv list screen and messaging screens
2. 3 different layouts to choice from default, from left, and from right.
3. Option to hide avatar on messaging screen
4. Option to show/hide contact name on messaging screen.
5. Option to use light widget or dark widget (requires restart or resetting widget)
6. Text color options for just about every text color.
7. Smiley colors for both unread/read conv list screen also sent smiley color and recv smiley color
8. Included bubbles 6 styles for now (more to come maybe)
9. Color chooser for both backgrounds. Works with custom image too.

As is theres a few limitations app need a reset (or simple exit and restart) to initiate custom image bgs.
Widget is still iffy going but will get worked on maybe to the point where both can be used at the same time.

Big thanks goes to @DroidJunk for his mms app and me being able to look thru his source code on github for without that I might still be spinning my wheels. Also huge props to CyanogenMod and AOKP for alot of tidbits of code that were definitely implement to make this come together.

Lastly Lets all try to enjoy this right here. Also is anyone wants to help make it even better please do. I have no problem admitting I'm a noob coder totally.
re-added git instuction
create and add README file
Added License information to readme

Signed-off-by: techboy331 <techboy331@gmail.com>
Did a little work to make my mods able to be turned off
Added Twitter to the list of social networks
Merge branch 'master' of github.com:Thinktiv/django-addressbook
Remove installer binary from repo

Jira issue: wp-508
Fix incorrect path in Android build.xml

Jira issue: wp-508
Adding more abbreviations from the TIGER specs as needed for some remapping.
Merge branch 'master' of github.com:ToeBee/ogr2osm-translations
Cleaning a bit more
Fixed a bug where js output of object->gridLines_h would print the value of object_gridLines_v if its value wasn't 'none'
Re-wrote excanvas initialization
Rudimentary implementation of target/action mechanism

Usually NSColorPanel handles it, but we don't have that, do we?
Migration tweaks: Added timestamps() to all three tables in up(), corrected name of pivot table in down() method.
Merge pull request #11 from anaxamaxan/master

Tweaks to Authority's migration
Creating namespaces GLMatrixTemplates and GLTransformationWrappers for the basic OpenGL transformations, overloaded in Vrui, glMultMatrix and glLoadMatrix
Convert \rph & \rpht entries to proper MDF

 * Many additional cleanup edits
Fix positie van label
ADD: 1113
login handler updated
login handler updated
Debug an NPE
Patched previous change errors
Add 'This is event is public' to event entity and form
remove redundant language toggle code
adding item page and routing
comment out publish buttons
minor changes
updates to item page
Updated user bundle routing with localization
Update src/com/parse/starter/ParseApplication.java
SOS-902 + SOS-904 Fixing issue with site portlet names
SOS-1201 CE changes
SOS-1201 Lang keys
SOS-1305 Need to unset so-hook as Application Adapter for Social Office Site
LPS-25150 Getting Recipients email adress from non regular roles in a state action for notification fails
LPS-30872
LPS-30872 source formating
Undo sf for compat
LPS-30860 Regenerate
LPS-27478 GRP Calendar - Agenda view with search bookings
LPS-27478 - Source formatting
LPS-30614 Enterprise Calendar - When creating an event, the Calendar color defaults to previous color unless the event is saved
LPS-30729 When user click in event after calendar change his color, the event background is filled with the prev color value
LPS-30729 Improvement when iterating availableCalendars on event recorder template
LPS-30747 On a allDay event the start hour should be persisted as 00:00 to 23:59:59
LPS-30747 Fixed wrong persistence when date select changes
LPS-30747 Fixed wrong persistence when date select changes
LPS-30614, LPS-30729, LPS-30747 Source Formatting
LPS-30614
LPS-30729
LPS-30747 - Source formatting
LPS-30614
LPS-30729
LPS-30747 - Source formatting
LPS-29266 Undo accidental commit in c2dccc5508d0efc2bf9d90ba41c40accedc1c330
Retirei uns Debug.Log
mach-herring.c: LCD undervolt

Decrease voltage of LCD Panel to 2.8V from 3.0V
misc: deep idle: Replace mutexes with spinlocks

Not sure how this was never noticed, but mutexes might_sleep, which isn't a good idea when called
from an atomic context.

<3>[   86.574371] BUG: sleeping function called from invalid context at kernel/mutex.c:85
<3>[   86.574511] in_atomic(): 1, irqs_disabled(): 0, pid: 0, name: swapper
<4>[   86.574676] Backtrace:
<4>[   86.574845] [<c0039500>] (dump_backtrace+0x0/0x10c) from [<c0480774>] (dump_stack+0x18/0x1c)
<4>[   86.575027]  r6:00012af9 r5:c064fb58 r4:c0638000 r3:60000013
<4>[   86.575534] [<c048075c>] (dump_stack+0x0/0x1c) from [<c0050e90>] (__might_sleep+0xe0/0x10c)
<4>[   86.576571] [<c0050db0>] (__might_sleep+0x0/0x10c) from [<c0484fcc>] (mutex_lock+0x20/0x44)
<4>[   86.577598]  r6:c064aba8 r5:0000034a r4:c06606a0
<4>[   86.578168] [<c0484fac>] (mutex_lock+0x0/0x44) from [<c02277b0>] (report_idle_time+0x1c/0xb0)
<4>[   86.579249]  r4:00000000 r3:000f4240
<4>[   86.579674] [<c0227794>] (report_idle_time+0x0/0xb0) from [<c0049940>] (s5p_enter_idle_state+0xa4/0x1dc)
<4>[   86.580874]  r9:412fc082 r8:30004059 r7:c0641a64 r6:c064aba8 r5:00000000
<4>[   86.581603] r4:0000034a
<4>[   86.581989] [<c004989c>] (s5p_enter_idle_state+0x0/0x1dc) from [<c02da920>] (cpuidle_idle_call+0x90/0x110)
<4>[   86.583191]  r6:c064aba8 r5:c06ab578 r4:c064ab98
<4>[   86.583746] [<c02da890>] (cpuidle_idle_call+0x0/0x110) from [<c0036c44>] (cpu_idle+0x94/0xc8)
<4>[   86.584821]  r7:c0641a64 r6:c0641a6c r5:c0675944 r4:c0638000
<4>[   86.585561] [<c0036bb0>] (cpu_idle+0x0/0xc8) from [<c0479f10>] (rest_init+0x88/0xa0)
<4>[   86.586430]  r6:c0db21c0 r5:00000002 r4:c0638000 r3:00000001
<4>[   86.587167] [<c0479e88>] (rest_init+0x0/0xa0) from [<c000897c>] (start_kernel+0x308/0x35c)
<4>[   86.588156]  r5:c002c254 r4:c063a1ac
<4>[   86.588634] [<c0008674>] (start_kernel+0x0/0x35c) from [<3000803c>] (0x3000803c)
cpufreq_smartass2.c: tweak tunnable parameters.
Move creating the schema object into the Database class.

Where it belongs.
Move the database handle method into the Database class.

This leaves just BackPAN::Index->_populate_database as the only
serious database access outside BackPAN::Index::Database.  Going
to leave that for now as I'm not sure where the index reading
and population should go.  Also that method is most of the
startup cost, its been tuned, and I don't want to mess with it
just now lest I get sidetracked optimizing.
Set up using the sidebar
prezi added to / tools
Sweep2Wake: implemented and fix s2w for atmel touchscreen

Let's try this again since the damn thing was rebased

Conflicts:

	drivers/input/touchscreen/atmel.c
	drivers/leds/leds-pm8058.c
	include/linux/leds-pm8058.h
sweep2wake: correct keypad
config: readd s2w
s2w: remove unneeded stuff
msm_fb: re-add FORCE_OVERLAY_UPDATE dependencies
and enable in defconfig

Signed-off-by: Evan McClain <aeroevan@gmail.com>
Removed un-used imports that were included in the previously accepted pull request.
Update de ultimos cambios Servicios, Login, etc
Merge branch 'master' of https://github.com/aguzmanc/MHS-Prototype-iPad

Conflicts:
	MHS Prototype.xcodeproj/project.pbxproj
	Source/Logic/Logic.m
- Get tops
- Get Flops
- webdesign..
Configuration
Use 'pymongo_test' database and 'test_collection' collection throughout Motor tests instead of a variety of DBs (mainly "test") and collections
Motor tests PEP8
Turns out to be unnecessary in most Motor tests to wait for open cursors to close

This is a very good sign - only a handful of tests in test_motor_cursor must explicitly wait for cursors to close server-side, otherwise all tests end with no open cursors.
Migrated from LESS to SASS
better nameing for events
Call globfree() if glob() returns error.

Closes bug #207.

glob may PARTIALLY fill out the data before returning error
(sigh)
Remove extraneous initialization
Fix warnings found by llvm scan
Check for NULL parameter
Check for NULL parameters to functions
Add getPortfolio by id.
Fixed small dependency issue

Changed default log appender too
more twitt skel
Here I have attmepted to create a form which allows the user to read Student and Job ID, I was unable to do so, it is explained within the Report
create war project for webadmin
Working one-to-one mapping!
Fixing test to work when re-run
Cleaning up annotations, removing auto-increment from address table
Adding test to write person with no address
Cleaning up Person and Address classes
YML import, fix command line parameter file
CHANGE: rotations apply order from (RotateX,RotateY,RotateZ) to (RotateZ,RotateX,RotateY) according to VTK specification
ADD: debug messages to debug.txt
All the interaction is how I want it!
readme
Authenticator
Added local files
Merge https://github.com/anand-balaji/testRepository
Pull repository and delete readme file
Simplifying entity serialization.
inline formsets should show at least one form, so that any widgets are loaded correctly. (#29139575)
optimized get_absolute_url() so that it doesn't hit the DB that hard.
Cache the result for Page.get_content_model()
not required
minor version bump (performance issues)
most parameters to controller can be optional
badge and label updates
debug mail messages
Cleanup the bash script
Fix self-type new
Finished MPI implementation
comments in check, post comments
branch commit
Merge branch 'ticket'
renamed server directory
Prevent bug where csv file is always generated
Anchor Animation with jQuery plugin working
Increased sizes for tablet goodness (not the right way, but the we-have-five-minutes-before-a-demo way).
Merge branches 'serve-precached' and 'public-root-fix' into ag-work
RF: Pull variables from the matlab namespace into python.
BAM-11701 Bamboo does not support SCP-like urls in Git
BDEV-601 REST calls to GitHub use unencrypted Basic authentication
BDEV-601 UT fix
Added CPUfreq governor 'wheatley'.

Conflicts:

	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
small bugfixes.
initPlayerUnit.sqf should now be executed on every client.
taxi driver now gets setPos-ed when he reaches his homebase.
Add port in open browser
PulseMeter::Sensor::Configuration is used to manage sensors
playing a bit
update examples
update basic shading mipmaps
Added JSON Dump
Added missing checks for embedded actions within the createBackupJob method
print free space regions
auto assign ext4 for /home
created buttons for each trait on fitness page
Version increment for rebuild.
Revert "Remove SIO error"

This reverts commit 4a780689c553b95c17b1a14051f46e288a59129d.

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>
changed the tabs to spaces in netPanel.js
changed the tabs to spaces in netPanel.js
- continue converting from SO to conn invke
added ds_store to ignored
geolaction support, faster movement using keyboard, small style changes
fixed .gitignore, add image files
Test for rails2 / rails3 in rake task

Rails 2 and 3 use different environment variables and log formats.

This patch adds detection for proper configuration and paths to the
RLA rake task.
Highlighted target key for easier scanning; fixed a mapping issue in the keyboard overlay
Cleaning up Examples directory.  numbered examples work up to the "FIXME" markers

Signed-off-by: AJ Rossini <blindglobe@gmail.com>
Bug correction on printing formulae node
Added tax rates and products
Added the links of the publications
Links to publications
無駄な行を削除。
終了時にアイテム数を表示するように。
Update img href for live preview.
Auto link urls and emails.
added tests for quote, fixed colors to match selenium tests
Added simple example bullet list
make the room a little brighter otherwise I can hardly see anything. changed CELL_TYPES.void to CELL_TYPES.nothing since void is a reserved word and it caused me some trouble. Solved some minor bugs
scoped_ptr to unique_ptr conversion; removed boost dependency
Combine the two async callback interfaces into one.
Merge branch 'master' of https://github.com/brettwooldridge/scribe-java

Conflicts:
	src/test/java/org/scribe/examples/FacebookAsyncExample.java
	src/test/java/org/scribe/examples/TwitterAsyncExample.java
Fix warning
Silence the warning from gcc 4.5
#29 Moved MCP Message creation into another Gear component
#29 Moved validator stuff into gear_validator.py
Untested commit, will probably need to tweak stuff in gear as well. This is why we need unit tests...
Merge branch 'master' into bug7
Intermediate commit that reveals a horrifying state leak somewhere in the gear system. This will be fun to track down...
Merging all the diagnostic stuff back into bug7 to help test for regressions
Recommented a debug line that was causing tests to fail.
add field cancelled to InvoiceClass
Merge branch 'dev' of git@github.com:celements/celements-invoice.git into dev
Fix : Add _ char after prefix for onOff columns
Merge pull request #100 from AntoineROESSLINGER/feature/fix_onoff_prefix_columns

Fix : Add _ char after prefix for onOff columns
initial commit
Merge https://github.com/chenkai036/hello-world-repo
Update ido to version 0.3.3
create a target for utilities

Signed-off-by: netchip <netchip@netchip-ubuntu.(none)>
Fix up the autoinclusion rules for the utilities and recoveryimage target.

Signed-off-by: netchip <netchip@netchip-ubuntu.(none)>
build: Add support for assembling multi-image uboot files

Change-Id: I7300d36cc4227ada77f1800680869037ef33c5e8
Signed-off-by: netchip <netchip@netchip-ubuntu.(none)>
Allow override of device asserts, including multi-device support.

Set in board file with TARGET_OTA_ASSERT_DEVICE.
(cherry-picked from commit 0f452f21fc9323b9d1fe746161761cf40aaa5030)

Change-Id: I3d06bdc0e3e26bde0c0e646accd050364f9713b9

Conflicts:

	core/Makefile
	tools/releasetools/ota_from_target_files

Signed-off-by: netchip <netchip@netchip-ubuntu.(none)>
Update CHANGES for 0.0.7.
adding python lecture
fixed adb (remount)
- changing the contract for servicelocator, simplified and enhanced
- adding Reply function to servicebus
- added some extension methods for accessing headers
- better implementation for hooking of service locator when dispatching: this way the IServiceBus of the request is properly injected to be set on handlers
configure endpoint mapping
cleanup
updating to run unit tests
Refresh character stats after setting title
Merge pull request #177 from dorkster/bugfixes

Refresh character stats after setting title
1.0.0-rc1 is released
Updated heading comment at top of JS file
Re-did structure. Drag select works.
Simplify to get rid of p4a.subtyper.
Drop the goal of being independent of Plone.
Minor updates (removed modernizr) performance issues / more pragmatic.
Ensure that tests fail if no new proof has been obtained
New design fixes
fixed some javascript;
added panel creation on demand for performance improvements
added smilies without configuration
fixed some Regex
try to optimize pickle by using protocol version 1...
singleton design pattern (ru)
Added forgotten call to super
unified kernel source for all 3 backends
putting d4p site into github
Update code for homework 5 to follow the convention.
changed action.py to be /usr/bin/env
changed to be /usr/bin/env
changed to /usr/bin/env
improved formatting
also applied upstream
purge uploaders
bump to -2 for DEVTMPFS_MOUNT
stable release 0.002000
Tokenizing working.
Added css and js folders in culturefeed_ui
Update README.md
Merge pull request #27 from boyzoid/patch-1

Update README.md for sudo cmdline example
Updated zombies
Updated particle effects for ender book
Merge branch 'master' of https://github.com/diesieben07/Angelic-Cry-Mod
added spin min
More changes to the way podcasts are displayed.
Consolidated audio and video into one field (field_podcast_upload).  Changed node--podcast file to do different things depending on if audio (show image) or video.
After this backup, I am going to try and install a new module called Display to help with the formatting.
upgrade django for security issues
Merge pull request #2 from Solution4Future/master

Django upgrade 1.4.3, security issuses
Change SASS architecture to support OOSCSS
kleine Design-Anpassung
Improving installer to install individual components
Merge branch 'master' of github.com:dolfdijkstra/gst-foundation
Adding .gitattributes file to prepare for correct line endings.
Fix line endings, so it is consistent to LF
Make sure bmc-nat-client and bmc-nat-router get added to allowed roles.
CHange NodeObject to Node
Merge pull request #67 from galthaus/pull-req-master-0f1cf0ec8c

More changes to support non-admin nodes [3/4]
Don't store allocated=false in the node's data for the deployer.
That is a first class node attribute.
Merge pull request #70 from galthaus/pull-req-master-babe57cc7a

Fix deployer and crowbar hash merge prevent admin [2/2]
Resolved issue with parser only treating timeslots as labs
Merge branch 'master' of https://github.com/dpb06/team-boss-development.git
Update to 3.0.52
Revert "Update to 3.0.52"

This reverts commit dcf3104369d5915bb8b85abbe24ed5ef8e3c9460.
Revert "Revert "Update to 3.0.52""

This reverts commit 618f3e4b5a331cb3ac1512a3a82084f8f3d5bb2d.
Update defconfig
Fix race condition commit that was improperly merged
fix Parser#assoc()
turned readme into markdown
Add OSX executable
Tabs in tooltips look good.
fix war directory
upgrade to maven surefire 2.12.3
Need to be ckeck in lab
jckarter/clay@9b1c404 (2012-05-04 18:06:51 -0700) Tests Failed:0, Passed:298
Moved ncbi_taxon_id2full_taxon_hierarchy to taxon_with_name controller
Made number of threads a variable count.
merged
Continue indexing vnexpress.net
CLC-409 - Remove dates from Campus news and merge the icon triangle style.
https://jira.media.berkeley.edu/jira/browse/CLC-409
Merge pull request #226 from christianv/CLC-409

CLC-409 - Remove dates from Campus news and merge the icon triangle style
Remove unnecessary interface, tighten up names
Merge branch 'tk182-extensions' of git://github.com/gustavofonseca/SciELO-Manager into tkt182-extensions
Ajustes nos testes para mensagens no idioma inglês
Aprovado tkt182-extensions incluindo a dependencia no requirements.txt
Merge branch 'master' of git://github.com/scieloorg/SciELO-Manager into bug-locale
Ajustes nos idiomas utilizados para testar mensagens de erro
Merge pull request #148 from gustavofonseca/bug-locale

Corrigido Bug no locale que impactava nos testes
Licenciado sobre BSD 2-clause
Merge pull request #149 from gustavofonseca/license

Licenciado sobre BSD 2-clause
implemented sort by title and by date links
plugin header comments updated
fixed titlepage and other bugs
Facelift finished.
Updated to kernel source 3.0.53 and misc changes
test for github/Jenkins hook
try to fix low in-call volume
Item11808: perltidy them all, so people are not accidentally impacted by the new enforced rule -- Sorry Micha, could not find a way to define specific values within the file

git-svn-id: http://svn.foswiki.org/trunk/SpanishTWikiContrib@14686 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Sam's First Commit
Set automaticly the Authentication params when JMS Secure annotation is set
Allow to add plugins easily

* Plugin require service, that needs to be restarted. If you know
situations when this is not required, please give me know.
* Due to a "bug" in puppet with duplicate locations & aliases we need
that ugly variable like $real_path
Added view controller and main view
Checkpoint commit; got class views rendering, but not styled
Checkpoint commit
Fix the project .hoerc
Update the manifest
Fix the data-directory finder
Fix the name of the data directory

--HG--
rename : data/fivefish/css/bootstrap-responsive.min.css => data/rdoc-generator-fivefish/css/bootstrap-responsive.min.css
rename : data/fivefish/css/bootstrap.min.css => data/rdoc-generator-fivefish/css/bootstrap.min.css
rename : data/fivefish/css/fivefish.css => data/rdoc-generator-fivefish/css/fivefish.css
rename : data/fivefish/img/glyphicons-halflings-white.png => data/rdoc-generator-fivefish/img/glyphicons-halflings-white.png
rename : data/fivefish/img/glyphicons-halflings.png => data/rdoc-generator-fivefish/img/glyphicons-halflings.png
rename : data/fivefish/js/bootstrap.min.js => data/rdoc-generator-fivefish/js/bootstrap.min.js
rename : data/fivefish/js/fivefish.js => data/rdoc-generator-fivefish/js/fivefish.js
rename : data/fivefish/js/jquery-1.7.1.min.js => data/rdoc-generator-fivefish/js/jquery-1.7.1.min.js
rename : data/fivefish/prototype-classpage.html => data/rdoc-generator-fivefish/prototype-classpage.html
rename : data/fivefish/prototype.html => data/rdoc-generator-fivefish/prototype.html
rename : data/fivefish/templates/class.tmpl => data/rdoc-generator-fivefish/templates/class.tmpl
rename : data/fivefish/templates/file.tmpl => data/rdoc-generator-fivefish/templates/file.tmpl
rename : data/fivefish/templates/index.tmpl => data/rdoc-generator-fivefish/templates/index.tmpl
rename : data/fivefish/templates/layout.tmpl => data/rdoc-generator-fivefish/templates/layout.tmpl
Fix the manifest
Handle the callback