labofsahil/github-event-dataset-2012 huggingface dataset:
OAEWDGT-60 Adding interface for CRUD operations on Languages
https://jira.sakaiproject.org/browse/OAEWDGT-60
Merged 'sakaiproject/master' into OAEWDGT-60 resolved conflicts, made slight CSS class tweak.

Conflicts:
	app/assets/stylesheets/_mixins.css.scss
	app/assets/stylesheets/admin.css.scss
OAEWDGT-60 Minor cleanup for new Language Management interface
https://jira.sakaiproject.org/browse/OAEWDGT-60
OAEWDGT-60: Following up on Feature Review:
 - Sort languages alphabetically on 'Language' column;
 - Default page when clicking 'Widget options' should be the 'Languages' page;
 - Add some basic validation to make sure all fields are filled in when adding a Language;
 - When removing a language that's in use somewhere, show a warning (still able to delete after warning);
 - Cancel button should be styled as a link.
https://jira.sakaiproject.org/browse/OAEWDGT-60
OAEWDGT-59 Adding Category Management interface to admin back office
https://jira.sakaiproject.org/browse/OAEWDGT-59
OAEWDGT-59, OAEWDGT-60 - Refactors and cleanup for both Language and Categories Management
https://jira.sakaiproject.org/browse/OAEWDGT-59
https://jira.sakaiproject.org/browse/OAEWDGT-60
NOJIRA - update nakamura to latest version
Merge remote-tracking branch 'apex13/OAEWDGT-59' into OAEWDGT-59
OAEWDGT-59 - additional changes for languages/categories
Merge branch 'OAEWDGT-59'
[TIMOB-9002] Initial pass on User, Debug, Developer log levels.
[TIMOB-9002] Suppress excessive width/height == 0 messages.
[TIMOB-9002] Removed 'height/width 0' warnings, fixed compilation error.
[TIMOB-9002] Add 'Developer' config as Debug+-DDEVELOPER for logging.
[TIMOB-9002] Cleanup log messages for clarity and consistency.
- Some dead code removal as well.
mac support
[TIDOC-370] Updated Blob doc.
TIMOB-8993: Give volume control to Ti.Media.VideoPlayer, fix typo in range check.
TIDOC-586 APIDoc: Cloud - reformat and add user login required where necessary
windows support
linux32 support
linux64 support
TIDOC-586 APIDoc: Cloud - reformat and add user login required where necessary - rev1
TIDOC-586 APIDoc: Cloud - reformat and add user login required where necessary - rev2
[TIDOC-336] Updated & edited Codec docs.
TIMOB-8993: Remove useApplicationAudioSession check; MPMoviePlayerController lies about supporting it.
[TIMOB-9183] Added "up" and "down" swipe events.
[TIDOC-370] Updated to address review comments.
Merge branch 'master' of git://github.com/appcelerator/titanium_mobile into TIDOC-586
TIDOC-586 TIDOC-640 APIDoc: Cloud - reformat and add user login required where necessary - rev3
Winnow algorithm added to fork
Site updated at 2012-07-30 17:21:21 UTC
Initial commit
Removed old file
Copy changelog to kernel-zip folder
Per server installs.
Closes #40.
Removing some dummy text from the layout.
Update readme, add autohidden stuff
Wrote a short example that tests how I would get my data from the backend
Update app/helpers/bootstrap_flash_helper.rb

finished fix
Merge pull request #395 from achempion/patch-5

Update app/helpers/bootstrap_flash_helper.rb
Rewrite to use newer plugin development pattern
Add the module.xml file
Octopress init
Site updated at 2012-04-20 07:10:15 UTC
Site updated at 2012-07-29 16:04:49 UTC
Site updated at 2012-07-31 11:15:36 UTC
Site updated at 2012-08-02 07:07:50 UTC
Site updated at 2012-08-12 09:21:15 UTC
Site updated at 2012-08-26 00:21:11 UTC
Site updated at 2012-09-01 13:37:30 UTC
Site updated at 2012-09-22 03:41:34 UTC
Site updated at 2012-10-01 03:53:10 UTC
Site updated at 2012-10-01 03:54:34 UTC
Site updated at 2012-10-01 12:47:46 UTC
Site updated at 2012-10-03 04:39:01 UTC
Site updated at 2012-10-03 04:47:02 UTC
Site updated at 2012-10-03 05:00:41 UTC
Site updated at 2012-10-11 04:33:01 UTC
Cleanup, securestore additions
Use the private repo url
Added computation for Arousal and Valence, improved code
Fix blocks not called when same URL requested for download several times simultanously (fix #137)
Memory cache reserves 12MB free RAM to prevent watchdog from killing the app before memory warning is sent
Add a dedicated target with MKAnnotation category

This free other targets from unwanted MapKit framework requirement
Add a dedicated target with MKAnnotation category

This free other targets from unwanted MapKit framework requirement
Fix README type (fix #146)
Fix the no image issue when no placeholder image is used with UITableViewCell default templates
update to release 2.0.3. Modified the bootstrap.css and min files to use the package dir structure for the glyph icons. Also updated some of the package metadata.
Included links to documentation on website.
Readd framework again
Update 2.0
Merge pull request #838 from axzx/patch-3

Update 2.0
Site updated at 2012-05-20 16:31:18 UTC
bad layout still.
Fix android part of cmake buildbot script on Mac

git-svn-id: http://address-sanitizer.googlecode.com/svn/trunk@1454 3c3640eb-14a6-2bb8-0b94-e9e73afe33f5
FullScreenSample; 제목표시줄 숨기기, 알림바 숨기기, 화면 방향 고정하기
Merge branch 'master' of https://github.com/ssidang/dimension-drive-downside
Added MemoryThresholdObserver
Cleanup with Jigsaw CSS validator
low band site v.0
Site updated at 2012-07-26 17:45:25 UTC
making the name tag optional for markdown and html
cleaned up xml date handling,  added invoice support for taxDate and exemptionCertificate
Now can customize display param during OAuth2 auth
router: uppercase name
	removed 'currentRoot' attribute, not sure what it was for
	added attributes 'pathInitial' and 'urlRoot'
	added return for 'callRoute' method
base: now put in anonymous function to allow dependency injection and having a local scope for all tmlib stuff
	reorganized with config and main at bottom now, to be sure everything is set when main is run
	new headings, reworked style of headings
lib/tmlib: added 'isObject' function
Minor fix in Tabsadapter.
Added icons to the menu items in the "Local" tab and the search header items.
supports to have a default font already in the input
there was a problem when the input was empty, also remove unneeded code
Merge pull request #3 from hanoii/master

Added support for a default value
Ukrainian-Russian localization
update Ukrainian - Russian
fix bugs replace \" with just "
Russian localization updated
intro section was wrong
adding credits for ru/uk translation
CONTRIB-4002 Edit slot: allow deleting all appointed students
CONTRIB-4004 Datelist: correct identifier of "With whom" column
CONTRIB-4003 Various errors in CSV export
CONTRIB-2995 Fix the display of "static" checkboxes
volume_id/ext: detect ext4 too

function                                             old     new   delta
volume_id_probe_ext                                  108     132     +24

Signed-off-by: Dees Troy<dees_troy@teamw.in>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
typo fix in comment

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
mdev: add support for $DEVNAME and /dev/mdev.log debug aid

function                                             old     new   delta
make_device                                         1843    2083    +240
mdev_main                                            712     804     +92
packed_usage                                       29236   29251     +15
keywords                                             288      19    -269
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 347/-269)           Total: 78 bytes
   text    data     bss     dec     hex filename
 887506     497    7584  895587   daa63 busybox_old
 887982     497    7584  896063   dac3f busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
hack: allow retry on socket init, to fix the buggy bind(PF_UNIX) init

sometimes the socket already exists/remains (/data/misc/wifi/hostapd/tiap0)

Change-Id: I703af876d8414ca43b6f024869cfa751943d2147
Add suggestion for DAL
Load configuration parameters from a config file specified in a commandline argument
Deutsches Datumsformat
Datumsformat: 25. Dezember 2012
Merker: Aktualisiert am 21.11.2012
Deutsches Datumsformat
Filters: date_de -> date
Übersetzung auf Deutsch
Deutsche Übersetzung
gitignore: *~, .preview-mode
Duplikat gelöscht
'Neueste Beiträge' in rechte Spalte aufgenommen
'Neueste Beiträge' in rechte Spalte aufgenommen
Написание эстимейта
pushing with MVC UI
GnomeTrigger should work now
Merge branch 'master' of github.com:verwirrungstaktiker/gt-minecraft
fixed breaking of GnomeTrigger
Merge branch 'master' of github.com:verwirrungstaktiker/gt-minecraft
Octopress init
Site updated at 2012-07-04 19:35:07 UTC
Fixed bug adding enpoint where peer was added instead
Changing values for blood group dropdown
Add documention for the dumper component
Merge pull request #12 from Baachi/docs

Add documention for the dumper component
Add an IIFE filter
Add dsl test
Merge pull request #41 from twinturbo/iife

Add an IIFE filter
check base class for required fields
bei fen chu wen ti
fix title parsing error
Updated type for sf2.1
bug fix!~
Revert "Remove the need for compiling the kernel at compile time"

This reverts commit ebf895fb57338cf2f42a16264fe219de1369430e.
Split controller into several task controllers, but keep a MainController as a proxy so we don't break other people's code.
Fixed error occurring on an empty list of tokens
Move out command handling to a separate function
Version bump to 0.0.0
Add some stuff to gemify.
SOund update
Corrected some frequency/voltages and add table for Extreme Undervolt
Added Open311 service entity, Dao, spring ad test files
Fixing a problem with uppercase array key
Typeset FlashPunk
frequency plot now faceted
Merge branch 'master' of github.com:ConstantineLignos/MorphProcessing
Adding .nojekyll
Moving .nojekyll
Added new built-in component - MeshComponent; added ability for
components to list other components they depend upon and have those
components be loaded automatically
Added license info
Comment Added by Deepak from Swati's Machine
evita: BoardConfig: replace BOARD_FORCE_RAMDISK_ADDRESS with Googles BOARD_MKBOOTIMG_ARGS

BOARD_FORCE_RAMDISK_ADDRESS - BOARD_KERNEL_BASE = ramdisk_offset

Change-Id: I1cb241cfda99d19b22f9d8aa681852e7702615af
adding sections to the readme
Merge branch 'master' of https://github.com/Faryshta/PHP-Programmer-Community
Updated to match 'clean-css' version 0.8.1.

* Added pre-minified tests as in 'clean-css'.
* Added better tests for switches.
* Added all missing features that has been added after version 0.4.2 - (keepBreaks/-b) option, removing url quotation, stripping special comments (--s0, --s1, keepSpecialComments), Node 0.6 dependency.
commenting out publishing authorization creation to redis until it's ready for deployment
test
Merge branch 'master' of git@github.com:IAS-ZHAW/machine_learning_scripts.git

Conflicts:
	mlscripts/text/word_dict.py
index on master: d1617db Merge branch 'master' of git@github.com:IAS-ZHAW/machine_learning_scripts.git
WIP on master: d1617db Merge branch 'master' of git@github.com:IAS-ZHAW/machine_learning_scripts.git
new replacements
small logging framework
Merge branch 'master' into log

Conflicts:
	mlscripts/ml/hebbian_clustering.py
Merge commit 'dffb2e0981fe0113447e7bc6d030b7448e534a46' into log

Conflicts:
	mlscripts/text/utilities.py
site upload 3-30-2012
Updated News Feed to only display 10 perceived logs, fixes bugs of the redis format
added documentup index page
backlight userspace changes
keylayout: Switch back to CM default
committed some old changed code
check admin user's password
support multiple indexes
simplify the posts.py.
There is no need for a url property
Remove pass
Add some comments and inform the user, if a feed isn't valid
fix the API
update no_photo.png
Update 2/0000/0000.txt

Some little changes from a Brazilian fan
Added a file parser class in App.job
Merge branch 'master' of https://github.com/MarkyMarkMcDonald/spacefarmer3000
Little test with .md file
I think the next thing I should do is LinkedHashMap QEvent and its
respective Thread to prevent creating so many thread objects that an
OutOfMemoryError occurs (like I just had...)

Signed-off-by: Robert Xu <robxu9@gmail.com>
Crap - must find fix for block break and damage entity :|

Signed-off-by: Robert Xu <robxu9@gmail.com>
DB/Gameobjects: Added some missing Gameobject Loot
Merge branch 'console_errors' of https://github.com/Mogale/TrinityCore_4.3.4_DB_Alpha into console_errors
Site updated at 2012-04-11 15:58:23 UTC
updated pom so project can be included with maven central
Messaging: Add the ability to mark a message as read from the notification

Note: It will only shows on single threads, just like the Call action

Also tweaks the settings strings a bit

Change-Id: I4b4ca1eb7c4d211b0d5765f0093263f351776a9a
Messaging:  Only allow Mark as read when Quick reply is active

Change-Id: I60f5bcf4803eff7a673f7fcaf85f868609063f9a
QuickMessage:  Better 'Mark as read' handling

Allow for marking messages 'Read' when the pop-up is enabled. When the
thread a marked read, the matching message pages will be removed from the
pop-up, leaving any unread messages in place.  If all messages are marked
read from the notification, the pop-up is dismissed.

Change-Id: I597ba30e0f2a09626bfdd9257aa7be98623e0d73
Messaging: Fix the order of the Mark read action

Change-Id: I7ba5a08f67de57c8b9be2b037c474d517bcc2c4f
QuickMessage: Fix the dialog size for the N4

On the N4, the keyboard seems to be taller and it overlaps the bottom
of the QuickMessage dialog.  This commit makes the pop-up 5dip shorter
so that it maintains a small gap between the dialog and the keyboard.

Change-Id: Idf80d2192d4ef6b0ba0abb1d48908e0d8b7216dc
Fixed spelling mistake in the ReadMe
long query change, added debugging in lmngservice, changed test content
update in the ignore and workaround in eclipse bug
Add require for HelperMethods
tidy up xcode project
Fix for the reload of cloud tree
fix

Change-Id: Iff21cede25c3b2a15b16f4e3dab261ccb61325de
p725: initial Jellybean commit
Merge branch 'jellybean' of github.com:RonGokhle/android_device_lge_p725 into jellybean
Fix our scaled score in the extensions test
removed some escapings
Added es_UY translation. Thanks to francogp.

Another new translation by francogp.
Simple Monte Carlo for Call, (S-k)+
use new BOARD_WITHOUT_HW_COMPOSER flag
Merge remote-tracking branch 'quarx2k/ics' into ics
Modificação: Agora o svg gerado deixa os circulos próximos.
Fixed custom-session-quit to actually work properly.
We dont need the post installscript anymore. fpm 0.4.10 supports rpm users and groups
Implement Option.filter
Adding red line to contact.
Adding background to take the test button.
Added realtime push capability with socket.io
Merge branch 'master' of github.com:adrianlee/instagram-realtime-feed
Correction on "Contact" section.
Fixing a typo in the source files for the client.
teste com Jquery e dir Cartas
TORNADO!!!!
Fixed bug where vertical scroll appeared on page
Separated mData from mRender.  Added plug-in for currency filtering
Added main logic files
changed folder structure
added setup folder with empty setup script
added c# client library
Napstar-xda / v5.0.2.7 CWM / gingerbread
add full CTT functionality (same as BTT)
add CTT read from file
Merge branch 'master' of github.com:rnatar609/ASTT-RoboCup-At-Work
update jar file
Fix reset teamname (to Unknown) on competition finish 
Merge branch 'master' of github.com:rnatar609/ASTT-RoboCup-At-Work
Disable openButton and openFileMenuItem when competition mode is set to true
Delete CompetitionLogging class 
Fix spell error
Add new functionality.
CompetitionMode cannot be quit without checking all subgoals (no subgoal should be in state INIT) 
prepare for 2 clients in CTT
merge
fix save CTT -> new CTT String looks like: CTT<initialsituation(D0(screw));goalsituation(D1,line(screw))>#<initialsituation(D0(screw));goalsituation(O1,zigzag(screw))>
add goalTeam1, goalTeam2 to ctt situations
remove , after the configuration in BTT
update config file
load ctt task spec form file works
errores en el readme
Validate presence of comment body
support for virtualenv, support for non-standard settings location (using os.environ DJANGO_SETTINGS_MODULE environment variable), loading manage.py that might set DJANGO_SETTINGS_MODULE
Playing with responsive fluid-row list items
Forgot to commit this. Balls
Major modifications for import users and some navigational changes
Removed admin users from active admin
Added in place edit for active admin records.
Import action name change
Added graphical view
Modified css
Major modifications for import users and some navigational changes
standard time format for record index
Estructura básica.
Añadidas imágenes y diseños gráficos.
Arreglada etiqueta 'meta viewport'.
Trick para evitar errores.
Añadido jQuery 1.8.1
Arreglado id css canvasGameScreen.
Resolución de juego a 800x600.
main.js y camara2d.js: Estado='Licencia'.
Estado='Menu'.
Estado='Juego'.
Desplazamiento simple de la bola y contadores.
Estado='Ganador'.
Game over: Reiniciar.
Estado='Perdedor'.
Estado='Pausa'.
Desplazamiento simple de pala_jugador.
onkeydown modo jQuery.
Evitado lag de teclado:
El evento keydown depende de la repetición de teclas configurada
en el sistema operativo.
Colisión de bola con pala de jugador.
Desplazamiento simple de pala_ia.
redesigned use of Invokation Framework

using action VIEW without MimeType and Target
only works from C++
URI is read-only in QML
Share Action removed, View Action added - then from invoked App Share is possible

Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>
title and subtitle redesigned

for Rooms, Subrooms, Folders, Files.
Also workaround for ListView bug to refresh title and subtitle on demand

Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>
Don't use Bundler.require
added framework tests for assert.not.null
renamed assert.that to assert.true and added assert.false
Added MaxEnt Package.
rekursiv und zeilenumbruch neu
Added libspatialindex dependency
Use long instead of int for integer parameters
Update documentation
Add Environment#toString()
Java doc comment style fixes
Add RequestBuilder #send() and #sendOrThrow()

Alias for fetch/fetchOrThrow without return values
Allows for a slightly sweeter syntax when making
requests where the return value is irrelevant.
Time german
* Fixed GWT code which was broken when document ID stopped being between -INT_MAX and INT_MAX
* Made GWT client code get attached to XWikiDocument in .xar file so it need not be copied in manually.
generate sitemap for easier crawling
fixed README reference in setup.py

Change-Id: Ibb8c114e4fc953477797187944a2baf132dd66ca
Reviewed-on: http://review.couchbase.org/16953
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Volker Mische <volker.mische@gmail.com>
Tested-by: Benjamin Young <benjamin@couchbase.com>
switch to ini config files
Changed robot::step to use an iterator instead of redefining servoNames.
Added Robot::step as friend in servo.hpp
Merge pull request #38 from DavidMansolino/NewCallupdateSpeed

Changed call of Servo::updateSpeed in Robot::step
check course info before adding
Merge branch 'mongo' of github.com:dementrock/ninjahelper_refactored into mongo

Conflicts:
	config/initializers/task_scheduler.rb
Melhorando conclusão.
collection.inc
islandora_workflow.inc; includes fixes to calls to t() which had concatenated strings rather than passed arguments
islandora_workflow.install
islandora_workflow.module
islandora_workflow.object.inc
islandora_workflow.permissions.inc
islandora_workflow.rules.inc
Islandora Workflow Assignment module
nice bullet points for FIXMEs
cpufreq: interactive: set floor for boosted speed

Allow speed to drop to flooor frequency but not below, don't pin
to speed at last boost.

Change-Id: I0147c2b7a2e61ba16820605af6baaf09570be787
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Linux 3.0.30

Changelog:
http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.30
remove smooth scaling. why? 1) it was too complex for people to understand 2) it will cause too much trouble with new dynamic freq step changes.

Conflicts:

	arch/arm/mach-exynos/cpufreq.c
Revert "move inline struct to the unit where it should be (to fix compiler error with latest linaro toolchain)"

This reverts commit 8fb0faf10f573e65f7215d623d0696d3efee0c94.
Revert "Fix compiler warnings introduced with gcc 4.7"

This reverts commit 9aaf751208d6f4cf1946c278d8130541720f427e.
Fixed web.config, added README
helper to create css stylings
skip if on login page
enable use an array for css options
SettingsOverview Part 1 - new feature
Version 2.4
Idle: better check for C libraries. Closes #70
Added rake key bindings.
Added snippets for describe and it in coffeescript.
Went from double to single quotes in the javascript describe and it snippets.
Fixed merge problem.
Update location/java/android/location/LocationManager.java
[maven-release-plugin] prepare release maven-sandbox-project-2
Manage Glance paste configs w/ Augeas.

Adds a new pythonpaste.aug lense for Augeas. This lense supports editing
a variety of OpenStack paste style configs for Glance, Nova, Keystone,
etc.

Updates glance module to use Augeas provider to inject keystone auth
token configs into paste config files. Eliminates the overhead of
keeping Glance paste config file templates in sync w/ upstream.
inserido view error para production
Item11808: perltidy them all, so people are not accidentally impacted by the new enforced rule

git-svn-id: http://svn.foswiki.org/trunk/TWikiReleaseTrackerPlugin@14680 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Change 150mhz slot to 180mhz to prevent SODs and raise 300mhz to 350mhz

Conflicts:

	arch/arm/mach-omap2/opp4xxx_data.c
fix a typo in template files
add equal validator to password field
fix a bug (create exception)
#44 add some constants
Forked and popped specs2 in

We use specs2, and obviously we don't use com.twitter as our prefix. So,
this makes the fork and does all the changes we need to run it
ourselves.

Thanks to @twitter for making this available - it was invaluable in my
training while at Twitter and I just still want to use it.
Fixed spec
Layout changes, client requests
Removes video from cocreation room
Correction in list adapter implementation
Initialising default attribute for cluster size
minor fix on attributes
Fixed problem with unwanted chart border when printing in Chrome. Closes #980.
Adding artful.ly to head
Minor text updates, bumping version
added some better credit card routines to the lesson4 code
added the hello world app into the tutorial code
Comitado Parte3 e Sistema Escolar
Adicionado Parte4 nao completa ainda
Finalizando Colecoes (comitando exercicios 3 e 4)
Merge pull request #8 from msardenberg/master

Atualizando os exercícios.
Andy/Mikhail Datepicker ReadOnly Test
Registration code can be case insensitive.
Bumped version to 1.3.1
AkzeptanzTest Par-Differenz bei Lochwechsel
Merge branch 'master' of github.com:itagile-csd/nerd-golf-tracker.NET

Conflicts:
	AkzeptanzTests/AkzeptanzTests.csproj
fixed home_spec
Fixed destructor.
Taking the biggest viewbox dimensions.
lib8 gem fix
fixed broken link to child icon and category
protect against SQL inject with intval()
- Reformatting/spacing for readability; removed some unnecessary punctuation.
Cleanup geom.fs
Cleanup intro.fs
Removed unused functions in prop.fs
- Miscellaneous small optimizations.
- Some reformatting to better F# style, e.g., using pipelines.
Fix remaining warning. First F# version with no bugs and warnings except suppressed warning.

Signed-off-by: Eric Taucher <Researcher0x00@gmail.com>
added to do item: PHP support
finished mutation_map, corresponding tests and added change base, repr to rna_org
Merge conficts
Adding exported logic for API.
Renamed bibframework to marcr
Re-inserting actual built Middleman files.
Adding in the LESS JavaScript library to handle language.

This makes CSS quite simple to declare. It would be better to pre-compile
it with the rest of the jekyll at runtime but at this point it was drop-in
and let me run with it.
Changes to support the layout being broken out into fragments.

This is just basically following the jekyll paradigm to have separate
layouts for pages, posts, and other content. Goes a bit further to break
out the article and subfeature into two separate fragments.
Some cleanup and settings
switched reactive_grasping arg to false (since reactive grasping currently doesn't exist in this repo)
took pr2_grasp_adjust and reactive_grasping out of launch files
added dependency on image_transport_plugins after all
added near clip dist to pr2_im rviz config
Merge branch 'groovy-devel' of https://github.com/KaijenHsiao/pr2_object_manipulation into groovy-devel

Conflicts:
	applications/pr2_interactive_manipulation/launch/pr2_interactive_manipulation_robot.launch
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel
add proper error message for invalid domain name
Halfway through reorganizing css, html is somewhat solid.
Corrected the close-button background image path to http://civapps.kynan.net.au/img/close_button.png
Add link to screencast and do some history-rewriting
Boiling down streams, level 1
Removes some futile pauses/uncoverings
Fixes a missing closing bracket
Some better formatting to basic_istream formatted input
update composer for symfony2.1
Added command line args parser
small cleanup
added verbose logging parameter
added files to runner.py'
Merged with current klaska's d7_base.make.
File d7_base.make renamed back to make.ini.
Merge branch '7.x-1.x', remote branch 'origin/7.x-1.x-dev' into 7.x-1.x
Quick fix 3 in classdiagramm
remove files that should not be in git
deployment works
MIFOSX-26 Group and Client office validation support.
WIP UI configuration based on permissions, application and tenant
WIP UI configuration based on permissions, application and tenant
WIP UI configuration based on permissions, application and tenant
WIP UI configuration based on permissions, application and tenant
Add edit option for deposit account
resolve the bug which, if the input area has a width different than 400px, the dropdown's width, will not fit it and it's bigger or smaller.
Merge pull request #224 from azinazadi/patch-1

resolve the bug about the width of dropdown
Add toggleDisable functionality

Add functionality to toggle enabling / disabling the widget.
Added example of this functionality to demo.html

Fixes issue #47 from upstream
Remove left-over toLowerCase()s.

This was sort-of resolved by loopj/jquery-tokeninput#216, but the query
was still being lowercased in one place, meaning that the results were
not being rendered (!!) when the query contained uppercase chars.
Merge pull request #231 from adammck/no_really_dont_lowercase_the_search_term

Fix results when query contains uppercase characters
Merge pull request #230 from vitorbal/disabling

Add toggleDisable functionality
Added reference to 'settings' object on call() to URL function, computeURL(). Allows for greater dynamic URL functionality with references back to the original init() of the token-input.
Merge pull request #233 from mcouillard/master

Small change to improve dynamic URL function ability
set the real width to the dropdown so that it exactly matches its related input box
Merge pull request #235 from azinazadi/patch-2

set the real width to the dropdown so that it exactly matches its relate...
Added config option for z-index. Fixes bugs with Twitter bootstrap modal dialog
Merge pull request #241 from anroots/master

New config option: z-index
Check url type before setting crossDomain. Fixes #247
Merge pull request #248 from driverdan/master

Fixes #247
Fix IE token navigation problem. (Fixes #258)

Currently tokeninput sometimes loses focus when navigating
between tokens using the keyboard in Internet Explorer.
Here we apply what seems to be the common workaround for problems
with focus behavior in IE, namely wrapping requests for focus
inside a setTimeout.
Merge pull request #259 from ryguasu/master

Fix for IE focus bug, #258
Fix for #49 ("Arrows keys in IE8...")

Fixes the issue by taking kuroir's suggestion of preventing
the default action. To be consistent with the rest of the
code, we do this by returning false in the event handler.
Merge pull request #260 from ryguasu/master

Fix for #49, IE arrow keys strangeness
Added `token-list-focused` CSS class to mimick focused state.
Merge pull request #308 from leonkenneth/focus-state

Added `token-input-focused` CSS class to mimic focused state.
Link to alternatives

Closes #3
modification du document de spécification pour qu'il compile
Add date picker to example
Update MVC example
Modify file name and add funcitons prototype into class
Update locally cloned path
Debug switch implemented.
Esi and http cache enabled only when debug is off.
MMowar
Moved stuff around.
Backport: Trunk r9080/9081; Prevent garbage collection of texture handles which still have a non-zero load count.

git-svn-id: svn://svn.icculus.org/fs2open/branches/fs2_open_3_6_14@9135 387891d4-d844-0410-90c0-e4c51a9137d3
Installed ChildBrowser.
Merge branch 'master' of github.com:niths/niths-android-fadderuke-app
Added hidden array fields!
Added helper function for displaying messages.
modified submit answer method
donut charts works
first time all movies should be visible
don't expect todo.sh to be in the path
Separate Cache
Reintroduced the substring fixes:

The latest changes in e07f000f1eb474cb3d88a30e27df5f8306b8fadc
removed the substring fix, which in turn reintroduced phpDocumentor/phpDocumentor2#574.
Merge pull request #24 from boenrobot/patch-2

Reintroducing the substring fixes
perform 'diskutil list' on _target_ machine
Clear registry
Relaxed comment sniff strictness
Added a sniff to ensure multiple classes cannot be defined in a single file
Added a Sniff to ensure that a new line is present before return statements (when appropriate)
Added a Sniff to ensure that all interfaces are suffixed with "Interface"
Updated "not yet enforced" documentation
Merge pull request #16 from davehauenstein/master

Added 3 Sniffs: Multiple Classes One File, Blank Line Before Return Statement, Interfaces are Suffixed with "Interface"
Previous line is now allowed to have comments. This also allows developers to add code folding markers for text editors such as VIM'
Merge pull request #18 from davehauenstein/master

Added support for VIM code folds.
Added support for "ignoring" {@inheritdoc} function comments. Fixes #17
Merge pull request #21 from asm89/ignore-inheritdoc

Added support for "ignoring" {@inheritdoc} function comments. Fixes #17
Merge remote-tracking branch 'opensky/master'
Initial project commit, this includes the pom.xml to generate hibernate sources, abeit the wrong place
Refactored out the DAO, DAOImpl and models
adding ignore of the classes directory
Removed the view generated classes and updated Sysdiagram dao, may need to remove those as well
Spring Hibernate configuration and first working test
ignoring output directory
added the backing database
Merge https://github.com/rahible/northwnd-spring-hibernate
Added new section for tags
Added report screenshot with tags
Completed section on tags
Added a line to mention that the parameterized step libraries tests should use ThucydidesRunner
Updated for minor changes released in 0.9.12
new enhancements to @UseTestDataFrom annotation
added details of screenshots configuration and annotations
added new section for experimental features - fluentLineum and shortcut operator
Merge pull request #12 from rahulj51/0.9.77

Added details of screenshots configuration (release 0.9.77)
Merge pull request #5 from rahulj51/Thucydides-73

Thucydides 73
Merge pull request #8 from rahulj51/parameterized-step-tests

Added a line to mention that the parameterized step libraries tests shou...
Merge pull request #9 from rahulj51/0.9.12

Updated with details of minor enhancements released in 0.9.12
Merge pull request #13 from rahulj51/fluentLineum

added new section for experimental features - fluentLineum and shortcut ...
correct couchdb link
Merge pull request #2 from onemach/master

I corrected the couchdb link
basics for video are done
write your changes in index.html
Revert "Add preference for enabling root access (3/3)"

This reverts commit 0bf53483be40d0454f62131ef417d3fdb6f0300e.

Change-Id: I040d07a83294ee60d83dfe23d975f2fbc74fc235
lock home and mms into mem

Change-Id: I76a1ca3ba088c7d79fadb849e60cb737a1f4b827
forgot to import provider

Change-Id: I384202b9ab072ac382e074bf5f6bf969b6d11ab7
Fixed category
Merge branch '7.x' of github.com:roblib/islandora_image_annotation into 7.x
more asserts by Travis
Updated README.md code syntax
- filtro por todos tipos de issue
improved(menu added)
rename services into connectors
Add should_exist argument
changes specific to Notes and some other improvements
Setting gemspec, readme and versión for the new gem.
Merge branch 'gem_settings'
Renamed gem for coherence with the refinerycms extensions
nomenclature.
Merge branch 'gem_settings'
Fix copy and paste error.
fixed typos and updated with new tit bits of info based on exploring omniture logs for actual field values
LogAction is now correctly writing out to file
comming soon image for leaderboard,
more informative message about facebook auth failure,
version goes to AppStore
removed environment 2.0 from travis.yml
Fix import error - Ordered dict varies from py 2.x to 3.x it seems
Merge pull request #7 from ekarlso/master

It fails with python 2.7.x on Ubuntu 12.04
Make #content bg white.
Merge branch 'master' of github.com:stephenaument/wordpress-bootstrap
Changes to make work with latest Ethercard library
add PeriodicRebuildAllBlogs.pl
Fixed resize
Merge branch 'master' of github.com:svenkapudija/Android-ImageResizer
Added list to store redundant table names
Added option to print only unique sqls, useful for DBAs to look what queries are executed on their beloved database :)
adding the hatred for targetable files
adding examples
some html output for presentation
removing special path name
Drop left over code
Add browseable API docs from @alecperkins
Update README.rst

Fix documentation link.
Merge pull request #323 from madisvain/patch-1

Update README.rst
using 'pk' in fields throws KeyError
add missing imports
Browsable API seems to be working fine with FBV's (2.0.0)
removing snippets from the URI doesn't make sense
remain consistent in using SnippetDetail
Merge pull request #343 from asfaltboy/fix-docs

Fixing tutorials
Add device specific java overlay

Change-Id: Id26e8e7b1214d473a661e47a8eb34d1892b99d2b
Update Readme for jb

Change-Id: I7d7bc69d988917f83fd32c03926f2102350b85d1
Setup the new paths for mb526

Change-Id: Ifddc8797c8e681a5619ea49d02f321daddb34e22
include both expires at and in, in case anyone would prefer to not count
Rochade abgefangen - ungetestet
Added a PostObject to send ratings.
Move ingame chat dialog into a separate class
Rename the final horizons.main.fife instances.
* Fix collector table for #1366
* Fix collector restriction table. Closes #1366
* Clean up print_db_data
Site alert is now a meta field!
Add ContaineUtils
Update ContainerUtils
Update ContainerUtils and tests
Merge branch 'master' of git://github.com/vdemeester/vaadin-container-utils
Add PropertyMetadata
Update ContainerUtils
Add untested AbstractContainerFactory
Remove @Transient reference
Add LICENSE and complete pom.xml
Add github-pages plugins and generate it on travis
Remove auto-generation of site in travis
Change maven skin
Add reporting section
Add test and fixing ReaderAlgorithm implementations
AnnotationReadeAlgorithm test rename
Add more tests
And fixe behaviors
Fixing AnnotationReaderAlgorithmTest
Ooups
Fixing javadoc on AbstractContainerFactory
Fixed tests for travis
Adjusted ODM service name
Merge pull request #1 from inspiran/master

Adjusted ODM service name
Fix for #5, failure on windows onCreate.
Remove system dependency to avr-gcc and avr-libc.
wp edit a bit
Removed mod_env from apache modules list
use package_home for template paths and add title to search index
Added natures doc
finish regist,login,get psw function
when there are zero matching products, it shows all products instead of a empty pages.
Added start of workflow. Needs a lot of work still.
MyTest app
Site updated at 2012-11-30 02:32:49 UTC
Update Russian Translation-Weather-CM9
Polish translation update

Change-Id: I2c0f5003b5c781ba39aaf532e63c02cdca45d8d9
Updated navbar spanish translations

patchset 2: fixed typos

Change-Id: I930e8a5fe0994532b31dfbb0c6dec6cc0b969d68
No changes: Build Angstrom v2012.05 of angstrom v2012.05 for machine beaglebone on Angstrom-F16-vm-rpm
images: Build Angstrom v2012.05 of angstrom v2012.05 for machine pandaboard on Angstrom-F16-vm-rpm
packages: Build Angstrom v2012.05 of angstrom v2012.05 for machine pandaboard on Angstrom-F16-vm-rpm
No changes: Build Angstrom v2012.05 of angstrom v2012.05 for machine qemuppc on Angstrom-F16-vm-rpm
images: Build Angstrom v2012.05 of angstrom v2012.05 for machine beagleboard on Angstrom-F16-vm-rpm
packages: Build Angstrom v2012.05 of angstrom v2012.05 for machine beagleboard on Angstrom-F16-vm-rpm
Update code-backend/models-controllors/src/com/icat/ProjectME/controllers/MarketManager.java

mirco -> micro
Removes Footnote.__unicode__() (AbstractText.__unicode__ is almost the same).
Remove some unused namespaces.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
Update the version.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
Modify the visibility of the resources of the Domain project.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
Fix a unit failure cause by a typo.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
Add internal visible to SQLite.Test project.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
Fix some typos.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
Fix some bugs, add the unit test.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
add note about sonar
Revert "ace: Support for Webkit acceleration"

This reverts commit 55d8d7a6b99feefa8c65231b79880c2f8befe30c.

Change-Id: Id860a3090f49b1945d87336ccd46d62bf059e057
Prevent NPE in CCconverter
Various minor tweaks.
Minor tweaks.
Site updated at 2012-12-07 17:09:44 UTC
Lösung Übung 1 Aufgabe 5
Version 0.7beta3
use the validator in separated class
...done
Prefer double quotes around the code
Apply Jonno's Edits
Started code on the emails enumerator, but xcode update is causing issues
Give the tomcat user a shell
fixed typos in README. Grr.
ResultGenerator and DataSender implemented
Content building (via BuildContent MSBuild task, but without MSBuild)
Status
Fix merge
Still learning how this works :p
 MAybe this time?
fix tree when page is offline
Merge pull request #37 from Kunstmaan/fix_cklinkchooser

fix tree when page is offline
added some specs to test the gem
Added friction to the character
Added knockback from guns and friction to the game
Added pdf file and more comments for tex file.
images
notes
added prevent default to plus and minus icons
prevent default with plus and minus icons in search result quickview
edited the help text for datum field settings judgment - blank can mean gramatical
edited json message for drag and drop audio/video tooltip
edited quick start instruction
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream
changed the title and description for the first default datalist. closes #669
Merge pull request #692 from hisakonog/master

everything together up to now
new curl trying to solve some problems in safari browser.
Fixed a bug preventing registration
First working login page
+ title faffing
Merge branch 'master' of git://github.com/cgrinker/redmond-app-manager

Conflicts:
	catalog.py
Also fixed errant tabs that where in the file
Adding *.pyc to .gitignore
Merge branch 'master' of github.com:PhillipNordwal/redmond-app-manager

Conflicts:
	.gitignore
	catalog.py
Solucionado: static/pln/json/country_codes.json

Y otros
msm: hotplug: support hotplug with wfi only power collapse

Currently the pen_release is not set to -1 after we return from
msm_pm_cpu_enter_lowpower. This doesn't happen when we actually power
collapse, but it does when we only wfi. This will cause the next hotplug
attempt to fail and crash the system, as the cpu comes up when the
system is not expecting it. Fix this by explicitly setting the
pen_release when we wake up in this manner.

Change-Id: Ib39c406091412b04510df5de660fd6346763f2b8
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
(cherry picked from commit 766ccf63f869157a6c992bccc4d9f1dc52cb89b8)
Add helper methods to build complex query strings
Rev to 0.8.0 - get rid of require relatives to be more ruby 1.8.7 friendly
filestructure update, rename to accessor_utilities
Move from Pineapple
Change the revision ID.

Signed-off-by: SkyFire <admin@projectskyfire.org>
Use 'E: ' as a prefix for all error messages, #nfc.

This makes it easier to parse the output of the script.
TODO no moar!, #nfc.
Log each operation and keep schtum during execution.

This commit simplifies the output of provisioning scripts by
muting all unwanted junk (e.g., progress, etc.) and only printing
out essential messages (e.g., warnings, notices, etc.)

`apt-get` commands have also been simplified to use
`apt-non-interactive` which properly sets up non-interactive mode
and defaults.

'-q' or '--quiet' is often used to supress annoying messages.
Add 'System' functions for managing the distribution and services.

Add the following function:

- system-upgrade() - Run a complete system (distribution) upgrade.
- system-service(name, action) - Command a system service.
Whoops, add missing `local` definitions.
Add function `apt-packages-purge(package[, package[, ...]])`.

Perform an unattended complete removal (purge) of package(s).
Add 'Nginx' functions for managing an Nginx server instance.

Add the following function:

- nginx-sites-enable(name[, name[, ...]]) - Enable a list of sites.
- nginx-sites-disable(name[, name[, ...]]) - Disable a list of sites.
- nginx-sites-create(name[, path = name[, index = 'index.html']]) -
  Create a new Nginx site and set up Fast-CGI components.
pyramid: enable CMDLINE_OPTIONS
bluetooth_bluez: added custom hciattach and hcitool

can be used with
BOARD_HAVE_BLUETOOTH_CUSTOM_HCITOOL
BOARD_HAVE_BLUETOOTH_CUSTOM_HCIATTACH

Change-Id: Ic702e4364b43f3e179acdbd681450e4c1bab2afa
Bluetooth: add Qualcomm In-Band Sleep support

This adds "qualcomm-ibs" to the supported controller types list
and claims HCI UART protocol number 5 for it. This corresponds the
kernel tty line discipline configured as HCI_UART_IBS, which
supports Qualcomm's Software In-Band Sleep protocol.

Change-Id: Ie6f568833db76e234d3bed89f9d4b06a005e3d30
Bluetooth: AVRCP 1.3 features changes (1/2)

Adds AVRCP 1.3 Profile Features to Android, for sending meta-data over bluetooth (track/artist/album/etc)

Merged the following from ICS:
Change-Id: de0bdbd24e17c2d174535c5675f2f05017064f5c
Change-Id: c93d82c400136c2645940f12970f0afe0eca7751
Change-Id: 76aafe23e2uef06b1040fb954de8039eddf8c918
Change-Id: f58618dfaf40527ad054853f05d45b5e5f9cabea
Change-Id: 83f8c50831d467af52ba73246258239c8a356cb8
Change-Id: 1bb723ce2ca7abc248346766eeba6951637d3d9c
Change-Id: 93a2ad997ba8455a47f6040ccd4eca6830308796

       modified:   audio/control.c
       modified:   audio/device.c
       modified:   audio/sink.c

Signed-off-by: Trey Briggs <treybriggs@gmail.com>
Merge branch 'jb-release' of https://android.googlesource.com/platform/external/bluetooth/bluez into aosp
Merge "Bluetooth: AVRCP 1.3 features changes (1/2)" into jellybean
Ported: Bluetooth Message Access Profile (MAP) from CM9

This was added to CM10 to restore message exchange capabilities with automotive systems.

Change-Id: I88af538273bdf9dd24c971c196500d713f54f6ab
Merge remote-tracking branch 'cm/jellybean' into jb
Replace old libion.so with libsecion.so

Patchset 2: Removed trailing space

Patchset 3: Renamed libsamsungion to libsecion

Change-Id: I08ee35c95a680bfa8021c56bb237baf332e393e0
Merge remote-tracking branch 'cm/jellybean' into jellybean
<<< REPOSITORY UPDATED >>> --- 10 Changes --- e17 | e17-plain | EFL-libs
Changes to action-records template to support the applyDNSTemplate (g.templateName conditional) ... also moved add record above the if records conditional (cause it made more sense that way)
Cleaned up return stuff and added the g.templateName for the actions-records conditional
Add Thermistor research table.
fixed different return values
更新如下：

* 更改專案名稱為「自由軟體選單專案」
* 更新Readme
parse curl output into hash using json; add substasks to user output
put in email appendix
first commit
added page
Merge branch 'master' into gh-pages
Update master
pointed page to custom domain
Merge branch 'master' of https://github.com/albertelwin/albertelwin.github.com
Update master
Update master
Update master
Update index.html
Merge branch 'master' of https://github.com/albertelwin/albertelwin.github.com
Update index.html
Merge branch 'master' of https://github.com/albertelwin/albertelwin.github.com
Merge branch 'master' into source
rescue full size file download
Site updated at 2012-08-21 18:05:52 UTC
- Hashtable data is written to disk after indexing.
- Added FCTH functionality.
Site updated at 2012-11-13 13:51:45 UTC
Altering regex handlers to match better
Adding __examples__ sections
Cleaning up files slightly
Small improvement to shortMessage
Adding a help plugin

This reads the class __examples__ attributes,
helping in remembering certain plugin usage on the go
Can add HTML to annotations instead of text
bh-4 - modified:   scripts/git-log
renamed project to Lecture_Together
Create aliases with 0 euros transactions
Typo ... XD
Adding link to wiki for more information on adding your RFID card to the door access system.
added iphone as a build target
added arrows to iphone table rows
named views and changed styling of search view.
major change to how the activity indicator works on ios.
fix multiple attaches of recentSearchesView
added very basic (read hacky) support for ios navigation and "favouriting"
default splash/icon binary files created by titanium
update default icon and splash
New 'twikish' command line tool with emacs support, misc fixes
New 'twikish' command line tool with emacs support, misc fixes
Clarified Example
Fixed text
Getting MIDI tempo sync from ableton into a synthdef looks like a bit more involved process than I want right now.
Add class name attribute to portlet template
added mongoid v.3 style indexes
Merge pull request #28 from hck/master

Added mongoid v.3 style indexes
.
.
Used getAlignedReadFileList() in countTags() of FPETTCP
Merge remote-tracking branch 'origin/master'
Added code to get the *estimated* sales report as well.
Remove jQuery dependency! Custom Modernizr build
pdf, odt, html reporting support was added.
Sharing updates, Entitlements, Bounce Video create on share
Added Jekyll compiled version of last commit
Added a debug javascript function
Finish Location Pane, and Cutomer Usage Pane