labofsahil/github-event-dataset-2012 huggingface dataset:
edit in done box sezioni
Feedbacks Styles.
Merge remote-tracking branch 'origin/develop' into develop5
Feedbacks Styles, comentarios ajax,
privilegios, internacionalizacion.
Merge remote-tracking branch 'origin/develop' into develop5

Conflicts:
	app/views/my_projects/index.erb
Clean up & missed files
bumping erp_app to 3.0.12 and updating CHANGELOG
Update README.md
adding comment for contact_us form
adding tooltips
removing show_in_multitask from dynamic_forms table. should be on dynamic_form_models
adding show_in_multitask to dynamic_form_models
formatting dates with .strftime(@@datetime_format)
replacing action columns with toolbar buttons
added field types hiddenfield & related_combobox
fix for related_combobox
adding tooltip
renaming hidden to hiddenfield
adding hideTrigger
Merge branch 'orangelake' into formbuilder
adding alias for hidden
adding filefield
adding lots of field options
refactored sorted_dynamic_attributes(options={})
  # options = {:with_prefix => false, :use_label => false, :all => false}
  # :with_prefix = false will remove the dyn_ from the attribute key
  # if :with_prefix is false, you may choose to use the fieldLabel as the hash key by setting :use_label = true
  # :use_label is useful displaying data on a view screen or formatting an email
  # :all = false will only return attributes that are in the form definition
  # :all = true will return all attributes with those not in the form definition last
  # you can set :all = true and :use_label = true, but attributes not in definition will use key.titleize
  # if for some reason a form cannot be found, sorting will not be attempted
fix for sorted_dynamic_attributes
updated mailers to use new options
fixed bug where related_combobox wasnt showing in grid, needed width
other code cleanup
added validation to field_name input
Merge branch 'formbuilder' into rails32

Conflicts:
	erp_app/CHANGELOG
	erp_app/lib/erp_app/version.rb
cleaned up migrations added attr_accessible in correspondance to rails 3.2 security risk
fixed width error in user_management application
added attr_accessbile for mass-assignment
move photo caption
submit bids
don't allow multiple bids on a contract
remove ridiculously long comment
view bid
delete your own bids - don't actually remove them from db though
add link to view own bid
add support for .vendor-only and .officer-only css classes
added the script to extract contact in csv from google account
added the contrib directory with the nginx configuration
the configuration file associated with the scripts
few more modification and playing around
Add wp_list_authors
Updates to blog, add author to blog, add detail class based views.  Coverage reports.
Adding some factories.
s/NullPrincipalBlock/EscapeExecutionContext
v1.1.6.9
Merge pull request #9 from mfenniak/master

Escape execution context
minor changes to run on windows
starting to simplify configuration.
first refactor for support jpql
improvement jpql implementatio with projections.
 implemented projections.
improvement and fix the jpql execution.
improvement to support this keyword.
fix bug on operator filler and improvement test.
fix for backward compatibility.
Revert "Added connectivity functions"

This reverts commit c44f8b0a29b72856cc23803a14845a5c34bf3ffb.
Revert "Revert "Added connectivity functions""

This reverts commit 5d9f79d4c7f94c8cab1cf7d1b44466fc74993194.
Update connectivity functions
deleted compiled file
getting proper tabid
Added hook to post a card to trello.
Revert rotation changes for camera

Change-Id: I06a88ff4d2a88a40690c45b4493e434d1163639b
pong: Brought paddles off the endue.
dump both buggy MooseX::Types::DateTime* and just do our own date coercion
Fixed up the code entry boxes
Added lt-ie10 class, <article> tag, site header
Changed com.saliman to net.saliman
password protect prefs
added ParsInsert
rtax
Updating fastx_toolkit
fix the pose results Python wrapping
helpers add form_method
Localisation updates from http://translatewiki.net.

Change-Id: Ic59ad19ee4703fd50ec6ba4c8d216d87b3ad8ae5
Localisation updates from http://translatewiki.net.

Change-Id: I4ef3e9e209b7703f95abc21790a73c1313edcba1
Localisation updates from http://translatewiki.net.

Change-Id: I69b835ec9afbd0f68e82b549ca414c6ef08f5666
ForcePluginsTest were not running at all after recent merge from unstable (because we now only define the TestRunnerPlugin in the test project) and unstable is still using plugins.xml while unstable20 uses config.xml
wtfpl, no merger, statistics
added wget and virtualbox
vboxusers
moved RDF tools to Natural Language Processing
dependencies for Spatial
added Spatial to cleanup and install drivers
Added helpers and components for all controllers.
Using CURed color for fieldset legend.
IRC User Online Activity 1.0.0
return to jordan bootloader name

Change-Id: I9231260027cbe512f4242471935a253a5e4a7b03
Update notes for submitted changes

* drivers/cpufreq: Send a uevent when governor changes
Update notes for submitted changes

* drivers: cpufreq: remove HTC 2 phase on demand option
2_Spannungssprung
.
Merge branch 'master' into Dirk2
Sprungantwort soweit Fertig und kommentiert

gn8
Modif CustomerService
Supersonic: Update kernel branch.

Change-Id: Iece445af151927e0352104324441139508717abf
Updated lat-long with decimal types
Travis build at 2012-03-29 14:27:56 -0400
Merge branch 'master' into worace
another rename..
First commit
Merge branch 'master' of https://github.com/LeandroCannizzaro/TestDatabaseCreation
TF101: Proper build combo entry (1/2)
Revert "Mms: Fixes mms automatic retrieval (1/2)"

This reverts commit aff900d8e2c1b82c0a240e3f22c85780fc445691.
Mms auto-retrieval (2/2): mms app

- AndroidManifest: WRITE_SETTINGS permission
- MessagingPreferenceActivity: writes mms auto-retrieval to Settings.System

Patch set 2   : Fix NPE when the preference was not yet set to a defaulted
                value
              : Set proper default values
Patch set 3   : Rebase

Change-Id: I99c73bc4f8d189055b9001f1b198e8255d32f44a

Conflicts:
	src/com/android/mms/ui/MessagingPreferenceActivity.java
Allowing HTML in body.
[maven-release-plugin] prepare release mythtv-android-frontend-1.0.4
some test cases and fixes
Settings: Lock screen Weather (Part 1 of 2)

This commit adds the settings side support for displaying the
current weather forecast on the lock screen.  It also cleans up
the layout of the lock screen related settings.

Patch set 2  - Whitespace cleanup
Patch set 3  - Fix interval selected value
             - Disable preference persistence
             - Set defaults to true for timestamp, show location and metric

Change-Id: Ibf847f9eea3485fcb6acdebaa9388374b25bf862

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/xml/settings_headers_p990.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
2.1 release
consistency changes for upgrade path, new maven repos, and retrieve content app prep
fix Interface.h include for vaultserver
Better async time values for alerted state
msm8960: Enable and update target-specific headers

Change-Id: Ifaf238b1929de38b8caf17cbe235376f8f5e023d
auth redirect for track pages
Updated To DayZ: Taviana 1.5.0
authorship note adjusted
DB/Creatures: More updates for creatures speed
Renamed packages, Created titan connector
Added "South" to the process
Fixed load API for adding scripts to canvas. Also added example script to show this feature in example project
removed cordova framework after accidental commit
Merge branch 'canvasBeta' of github.com:Wizcorp/phonegap-plugin-wizViewManager into canvasBetaFonts
Small change
Added color picker
small change
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Launcher2
added cellular-automata-rule-explorer to navigation
Ajuste de testes.
my initial commit for the node express faye example
Resuelto el 7
Initial changes to convert from CM10 to pure AOSP
misc copy changes. closes #5
Wrote this beautiful README file
change to use done
relative positioning challenge
removed some CM9 values
Swaps OAuth2 for OAuth1 library.
Abstracts some of the OAuth store so that it works with wpdb
Basic consumer token request infrastructure.
See #11, #12
Первый коммит решения задачи с собеседования в Домодедово.
Merge branch 'master' of https://github.com/cybermath76/MSSQL_task_from_Domodedovo
Added gap cost to constant memory
Clase Circulo2D
update calendars on input
Merge pull request #9 from ellemenno/master

release 2012.05.16
* adding rel-2012.05.31
merging
Fleshed out basic Djano Models more.
Added a few basic model admins.
Added basic model admin
Added default test path.
Added source & test paths to component manifest.
[io/path] Added getPath(), fixed getParent().
[io/console] Fixed commmand line parameter handling, removed dependency
to $argv / $_SERVER['argv'].
파일 추가 및 코드 인코딩 변경.
Adicionada barra de progresso para o carregamento das venues

Versão 1.1 do código PHP. Separados os arquivos edit_csv.php e edit.php
em load_csv.php e load.php com novos comentários. Novo arquivo
ProgressBar.Class.php. Implementado controle de sessão e
redirecionamento.
Aumento do limite de leitura e remoção de linhas em branco

Aumentado $capture_limit_in_kb para 10 kB e removidas linhas em branco
no começo e final do arquivo.
Adicionada importação de página salva do 4sqmap

Atualizada ajuda do arquivo de texto e carregamento com suporte ao
http://www.4sqmap.com, desconsiderando eventuais IDs duplicados.
Adicionada exportação dos IDs das venues para um arquivo text/plain

Criado submenu Exportar. Os arquivos passam a ser corretamente
exportados com o charset iso-8859-1 usando o método encode(). Extensão
.csv agora é adicionada por padrão.
Fix event return codes and tests
junit only needed for testing
INFRA-1 Initial ingest initiator: Nu med Nexus
Site updated at 2012-09-04 05:39:55 UTC
added field to tiles UI
CORE-3520: updated the compatible database version
Merge remote-tracking branch 'remotes/origin/dev'
Worked on getting something panel-like around the metadata table. Still not happy with it.
index file created
authors of the  project
readme file
implement body2
Better output for working in the first project.
Updated javascript/parameter loading to be more readable/extendable, and fixed player.swf loader
Fix wrong entry title
Adding Ace Jump post
changed the disqus shortname to the correct one
add links to post
DRY things up a bit
Also allow to define page fields
Update README to include reference to fields config
Bump version to 1.1.0
build camera libs and fix-up camera board defines
add exception to del-method in generic-list and add some unit-test to it
Update haddock. Add an example in document.
Update a json example.
pom changes
Merge pull request #2 from gundakiran/master

POM changes..
add twitter bootstrap library
reviewer 2.4
Added Example Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	svm.persistence.hibernate/src/Main.java
Upgrading to ElasticSearch 0.19.3
fix .project file to have correct project name, org.jboss.tools.itests.feature (JBIDE-12974)
Add mongo for ueberDB
More public accessors to make it simpler to design UIs
Added pruning to detail scrolling.  Keeps memory consumption down much lower.
Remove background sizing due to lack of browser support.  Moved to repeated images.
correct values for tab7.7 vibrator (still broken)

Change-Id: I4e7bba62adb99fdabb6c408461534e6d47cbcbed
don't prefic private method with an underscore, that's an old php4 bad practice
Put Licence in README
styling nits
always set the cache value unless the instance variable already has been defined so will be returned instead of the cache resolve the problem of the cache being nil or false
adding therubyracer to Gemfile
Split the start-server-instance script into 2 parts, see issue 614. Added a mechanism for error feedback to the admin. Also some minor refactoring.
Removed hasBootstrap field from games table, see issue 613.
Refactored RunBootstrap and RunGame into 1 transaction.
Removes block styling for program links.
Moves category content for programs to config file.

Adds styles for category info displayed on individual program pages.
Add new devices for IRB experiments
thumb banner marker adaptor
tab bar hidden in some themes fix CONTRIB-3639
Site updated at 2012-04-12 09:27:12 UTC
a spec to guarantee that when some configuration is omited on .standalone_migrations, a default value is used
if some config is omited on .stadalone_migrations, a default value is used
enhancing the configurator's inicialization.
skeleton specs for configuration loading from configurator
more precise specs for loading env configs from configurator
configurator now loads de env configuration
spec to guarantee that configurator can return the environments config hash
configurator loading environment configuration
standalone_migrations using configurator to load env configs
there is no such thing as global DB_CONFIG =)
skeleton specs: allow user change/create configurations using runtime information
allow change an environment configuration dynamically

usefull to use the heroku ENV["DATABASE_URL"]
update specs: not allowed to add new configurations, just change the existent in runtime
creates a configuration proxy to change existent database configurations in runtime
description to specs which don't use db connection
oops, removing a debug puts
updating README with runtime configuration feature
some love to ::environments_config example
omg! a colored readme (syntax highlight)
configurator should pass the current config as argument to the block
added support for editing notifications and adjusted design document name referenced for welcome from the logout function
Stablized dependencies to fix grunt 4 dependencies.
Bring back stock MFC memory allocation
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Optimize MFC memory usage, properly
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Use better method of allocating memory for FIMD.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
cpufreq: Add and enable 'lazy' governor from Ezekeel
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
mtd: OneNAND: lighten scary initial bad block messages

Initial bad blocks are normal but the messages look like
errors.  Make the messages less scary, make the main
message an informational message not a warning, make the
message displaying registers a debug message and include
the address there instead of in the informational message.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
mtd: onenand: Invalidate bufferram on resume

When first page read after resume was the same as the last page
used before suspend, a new read command was never issued. Bad
data would then be returned if the chip had been powered down.
Add an invalidate bufferram call to the resume function to force
a new read command.

Change-Id: I0b20dc21505f8f8c83574a5f35ccf85484a6b9f2
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Amending welcome message
removing the sample user from the constructor.  sorry bob bobson from
haiti.
Package for the PyPI properly.
Moved the rebuilding to the toggle manifest, and thus removed the naming issue.
commit conde to gh-pages branch
Settings: use DefaultContainerService for all file operations

For devices with non-emulated storage, the system uid is not allowed
to access the storage (to prevent system_server from being killed
on UMS mount). Old code remain that make file access directly, change
those to use DefaultContainerService

Depends on http://review.cyanogenmod.org/28179

Change-Id: Ie6bdaf27249daeabdc7f0ef1d73d484764ee35f0
Merge "Settings: use DefaultContainerService for all file operations" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1
Site updated at 2012-08-06 22:00:28 UTC
some minor restructuring
adding new thread content
adjust readme for new url
fixing perms
Turned off XML comments to avoid lots of compilation warnings
Fixed compilation warnings
Keep fixtures of static and non-static bodies into separate broadphase structures.

This avoids a large performance hit when adding lots of fixtures for static bodies (like tens of thousands) in one timestep.
It is not supported that bodies change their type between static and non-static.
http://farseerphysics.codeplex.com/workitem/32777
Run formatter on itself
re #43 now showing students their assignment due dates.
re #53 Adding filter widgets to the user view, although they do not
yet work.
re #72 chooser requests now get a unique ID, and recipients keep track
of the most recent request ID for each type of chooser request they
make. Thus, a recipient can determine if the incoming chooser result
is of interest.
Updated WordPress theme metadata
Added author to LESS stylesheets
Added author to SCSS stylesheets
Clarified authors in log
Added JenMac.me header to readme
Updated screenshot preview for theme picker
Merge pull request #1 from AndrewAlexMac/feature-updateauthor

Updated theme metadata
Changed app to use local decodePoly method, so we can remove this from
the POJOs library.
Some small clean, made menu smaller and removed logged as text
satsuma: swith to sony DASH sources

Change-Id: Ia8fb9e34989fc38a3b8b03852a69eaa116ed131f
cpufreq: interactive: set at least hispeed when above hispeed load

If load is above go_hispeed_load, always go to at least hispeed_freq,
even when reducing speed from a higher speed, not just when jumping
up from minimum speed.  Avoids running at a lower than intended
speed after a burst of even higher load.

Change-Id: I5b9d2a15ba25ce609b21bac7c724265cf6838dee
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: don't drop speed if recently at higher load

Apply min_sample_time to the last time the current target speed
was originally requested or re-validated as appropriate for the
current load, not to the time since the current speed was
originally set.  Avoids periodic dips in speed during bursty
loads.

Change-Id: I250bda657985de60373f9897cc41f480664d51a1
Signed-off-by: Todd Poynor <toddpoynor@google.com>
add lv_LV
Nombres Correctos categoria
Changing temp of NML2 example
Initial adding of NeuroML2/NaF.nml
All rate variables for naf and calva matching between nml2 and neuron at 32degC
wifi: Allow Settings to retrieve country code

This makes getCountryCode behave like getFrequencyBand

This allows Settings to get/set country code like
it can for frequency band.

Change-Id: Id9f00d3a678642c6c142fd1511af820d729507a7
Prevent from KR Locale's Ugly Japanese fonts (inside of NanumGothic.ttf)

Change-Id: I1296a477a5458a90d248da82285b908edac76e04
frameworks/TR: Initial commit for Turkish

This commit includes:

 - Port CM9 features to CM10
 - ADB Over Network, integration of the adb-host mode
 - Kill App on Long-Press Back Key
 - Camera : Powerkey shutter
 - Framework: Add option to always show battery status on lockscreen
 - Add SD card description for Dock based cards
 - Lockscreen: make lockscreen weather time more friendly
 - HW rotationlock JB forward port
 - WebView : Add openUrl menu item (2012-08-05)

Change-Id: I95702e95a0b974f0d42a32929cfb5608a47cc156
Update Russian Translation-CM10

Update Russian Translation-CM10

Update Russian Translation-CM10
Lockscreen: Move weather request into thread

Change-Id: I938d2d734f7e584af42f5b71c68771305ba7006a
Adds ability to answer call with hardware HOME button (preparation to winter time)

Change-Id: I5d10da25360067dd443ffc83ec408e0b3001ad6b
Merge "wifi: Allow Settings to retrieve country code" into jellybean
Merge "Prevent from KR Locale's Ugly Japanese fonts (inside of NanumGothic.ttf)" into jellybean
Lockscreen: Add clock alignment (1/2)

Screenshots:
- Left: https://dl.dropbox.com/u/4806199/Screenshot_2012-09-08-20-24-30.png
- Center: https://dl.dropbox.com/u/4806199/Screenshot_2012-09-08-20-24-15.png
- Right: https://dl.dropbox.com/u/4806199/Screenshot_2012-09-08-20-24-23.png

* Portrait only!

Patch-set 2:
    * Fixed boot loop when using security settings
    * Support for sw600dp

Patch-set 3:
    * Update sw600dp

Change-Id: I41aeea50e95b0655c2bc90b56ee506e7baa470e2
Merge "Update Russian Translation-CM10" into jellybean
Merge "frameworks/TR: Initial commit for Turkish" into jellybean
services: Fix tethering (softap) startup

The interface must be started after firmware reload. If it's not
started, the driver is unable to configure it.

Change-Id: I18b255caf961d23c0f7d4d29dfef040761536c2e
RIL: make data call APN a selectable RIL feature

Disabling this for all RIL versions above 3 can cause issues with some
device RILs and establishing a data connection.

Change-Id: I7be41b120663b0839beec95c22d0615f5e79c582
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into jellybean
finish up adding in logic to sum up YTD totals for paycheck display
- Added initial client library.

Signed-off-by: BEllis <ben@collstream.co.uk>
ARQ-1133 Upgrade to Arquillian 1.0.2.Final.
Merge pull request #8 from VineetReynolds/ARQ-1133

ARQ-1133 Upgrade to Arquillian 1.0.2.Final.
ARQ-1122 Corrected logic to build the HTTPContext for multi-war apps.
Merge pull request #9 from VineetReynolds/ARQ-1122

ARQ-1122 Corrected logic to build the HTTPContext for multi-war apps.
e4snapshot: add writing operations on snapclone files
Tweaks to module pattern section
Update easy_accessbar/test/test.php
Second Commit

Added some files and modified few
Increase electrobeam animation timeout.
Removed googlesearchbox
Got kang happy
On pyramid not shooteru
Add author tests
Fix dep 2
Changing showevent to be asynchronous. NO MORE SYNCHRONOUS CALLS
Create Meta.json instead of Meta.yml
v0.4.0

    Generate JSON instead of YAML for the META file
Undo accidental commit of config.inc.php
Added Exponential (instead of linear) analysis
only use htc ril
Add note about volume 4
Create client1.cpp
Validation should only run when selector is found

If the jQuery object which validateCreditCard is applied is empty,
the validate function should not be called because it will return
a Javascript error.
deserialização
First steps towards extracting static

This makes 'static' a separate module. Lots of cleaning up still to do, but
first I'd like to try and remove the unsafe stuff from Dynamic and properly
support polymorphic types.
Start development of Rank1Typeable
Finish first implementation rank1dynamic
Use the new rank1dynamic package in static
Clean up static
Clean up and document Static better
More cleanup, and fix bug in BuiltIn

The bug wasn't caught by the unit tests because the tests were broken; fixed
that too. Added a note to the documentation of Static explaining what the bug
was and how to correct it.
More cleanup
Fix the TH code to use ANY and co
Update README
Bumb version number in prep for Hackage release
Improve doc
Merge branch 'master' into dev
Adjust premium url
Adjust the e-mail links
Adjust the e-mail links
sudo Ant minify
Add newsletter online course adwords
debug sonar output
record machine availability information
support killing dtask
note
don't set up an *additional* monitor unnecessarily
core-3678 fix help tool tip 
core-3695 add collapse all functionality to data nav panel
Merge branch 'v1.6' of git@github.com:iPlantCollaborativeOpenSource/de-webapp into v1.6
Added ivendor's cameraHAL
Geometry: KDtree proper coloring of a Node's region
fixed regression on job deletion / rename (file hierarchy was not deleted in scm whereas it should)
Initial Commit
Project Structure Made
Change :
Changed version to 1.9.15
Message :
Adding a blank README
gitignore try 4
Added pages and menu
merge conflict
restructured css for modals
added footer to both templates
bug

solve a bug
MultiProject reporter for maven.
idea this'n'that.
Make maven aggregation plugin work during site-goal, and respect the output dir.
Initial commit
Lets see about IDE stuff later.
Added full apns conf again, fix mistake in device definition, cahnged kernel to siyah at te moment
added parameter fixup for video recording

Change-Id: I4fcff3b83d704b4a90508d9cdd22294052ebf349
Eclipse Settings - Included Power widgets, statusbar mods (2/2)
Collapsible Google Map with configurable default behaviour.
config.yml.example needs to be renamed config.yml
Merge pull request #7 from nemesisdesign/master

Collapsible Google Map with configurable default behaviour
better totals and attrinbutes in the template

and proper media upload enqueue
fixed Checkstyl issues
Yet another file-moving for Rails 3.2
updates based on app fixes
Add .gitignore.
Update initial README.md.
Add initial node.json and node.json.empty files.
Add initial Cheffile templates.
Add initial Vagrantfile templates.
Add .gitignore.
PT-BR: Missing translations

Change-Id: I6c3ddafa78db755b7a832fe79a2ddc470dc5545c
Remove misleading "default" indication

18% is not the default in any way, so don't claim so.

Change-Id: I913ec98986e4fbff11c6d67ab14694856cb15a50
cmparts: update italian translation

Change-Id: I99a8aff6cb2f1e6bbe75c54e02b4ff48e960ec74
Recreate gesture store on load.

The gesture store isn't cleared on loading, so when reloading the store
after creating a new gesture the gesture instances were duplicated.

Fixes http://code.google.com/p/cyanogenmod/issues/detail?id=3476.

Change-Id: Ia7f18384820612cb6a69399ca22288c31a2d6889
Fix list settings initialization.

Change-Id: Ib3037b8d1b91a17417f4201da19df6642be2c5cb
Merge "Fix list settings initialization." into gingerbread
Remove entries of "CMStats" and "Update Notifications".
updated rosdeps.
Revert "Trimmed the branch to only the compressed_depth_image_transport sub directory"

This reverts commit 0c1fbce33611d85d606b7fe013ec1c91313ba2f0.
Rebase from 'upstream' @ version '1.8.15'
Trimmed the branch to only the compressed_depth_image_transport sub directory
Make Selenium installation instructions more clear. Missing Japanese.
Merge pull request #65 from afilina/master

Make Selenium installation instructions more clear.
Add mobile site files
Move templates to templates folder
Merge remote-tracking branch 'upstream/master'
Change file permissions
Change file permissions for tpl files
Merge pull request #10 from aishahalim/master

Merge the mobile flourish website
Slimmed down game piece box, and added stl file
Updated controller spec tests
primeira versao publicada na store
Experimental collapsible sidebars for 640px view + 640px veiw backgrounds.
add custom form types to access container #136
Missing preRemove and postRemove actions in DeleteController generated by Bundle
Now you can use container ($this->get) in menu builder (for example to get security context)
#143 fix
"More standard"
Double "\"
Merge pull request #137 from kusmierz/master

pre/postRemove and allow to get container in menubuilder
Fix admingenerator.twig on cache:warmup
Merge branch 'master' of git://github.com/cedriclombardot/AdmingeneratorGeneratorBundle
add Yaml::enablePhpParsing(true)
Merge pull request #141 from jaugustin/fix-yaml-parser

add Yaml::enablePhpParsing(true)
Fix getModelPrimaryKeyName for pk with _
fix admingenrator to admingenerator PR #144
Fix: issue #145
Merge pull request #146 from K-Phoen/fix-issue-145

Fix: issue #145
Fix: incorrect PropelORMFieldGuesser::getRelation() return value

The PropelORMFieldGuesser::getRelation() did not consider the plural
form of the relation names, which could lead to incorrect results.
Merge pull request #147 from K-Phoen/fix-propel-guesser-getrelation

Fix: incorrect PropelORMFieldGuesser::getRelation() return value
Update Menu/DefaultMenuBuilder.php
Merge pull request #149 from vbardales/patch-1

Update Menu/DefaultMenuBuilder.php ...
Fix cs
Fix permission bits for some files.

These files are obviously non-executable.

Change-Id: I42b8bfffc1f086e7ca0f4f238fdcffe626bfcf59
Merge "Fix permission bits for some files."
add localisation for talk link, word separator and cleanup comments in RC formatting

Change-Id: Ibff45ea8c8b553f0ae8a4fe7342fa69e7119640a
Merge "add localisation for talk link, word separator and cleanup comments in RC formatting"
comments and sentences stats per bug report added
Added variables and mixing to sass code.

Briefly touched on media queries.
Fixed minor glitch in do_begin_form
added how it work and how layout
証明書のパスを「リンクされたリソース形式（${IOS_CERTIFICATE}）」に
Feathersを試しに使ってみた
Add BP panic daemon.

Change-Id: Ib14155657336b748a7dae500d678732d4a1d1e9e
Add secclkd.

Change-Id: I29b6ca8a67a98d880266e6fba220cd7999fbab36
Add GKI panic daemon notifier.

Change-Id: Ic0a0f54e10c0b13a1111d36f8a0601808124a421
Update notes for submitted changes

* call makefiles only if target device is stingray or wingray
p31xx: add trebuchet overlay

Change-Id: I310a370cf6fd31ed3be94948cf638de83f8baea2
Update notes for submitted changes

* smultron: add DASH dependency
fascinate: better fixes for issues in dpram modem driver

increase drive strength to GPIO_PHONE_RST_N to match stock
Samsung gingerbread source code

reenable request_phone_reset() in dpram driver

Change-Id: Icbbbb10f1065eb8d59af3b743a60f951683f99f5
sdcard mount changes

Change-Id: I62fcca2a4a690ae7c7f7708d72d83f6b569f6022
tuna: change USB OTG mount point to new convention

Also add symlink for backwards compatibility

Change-Id: I2324a2a4e9bb72189a3e03422cec4666a0bd86d8
Phone: Danish translation

Change-Id: Id1d0a6f6a9acbee5c67d0aa977c71d8f5fc56586
Update Russian Translation-Phone-CM10
Added hungarian translation for device phone number settings

Change-Id: I1c1a23129e6274fbeb6e1fcc9f30cd24ae8241c6
PT-BR: Added Missing Translations

Change-Id: I3497e8d8d4861e58ce30c6c14d574d9f18ef1e58
Merge "Phone: Danish translation" into jellybean
Merge "Update Russian Translation-Phone-CM10" into jellybean
Merge "PT-BR: Added Missing Translations" into jellybean
Merge "Added hungarian translation for device phone number settings" into jellybean
Merge branch 'jb', remote-tracking branch 'cm/jellybean' into jb
Updated default README.
A minor fix, so that C++ files work from editor (wrong filetype fix)
[Def. Prod.] Inseriti nomi significativi back.connection.* e aggiornata lista metodi
Update master
Merge pull request #4 from baggius/patch-2

olipad100: add tablet to define
Added option to create an admin user after migrating people
Manual merge with master
enable irc notifications
missed a bit
Modificando Clase Cliente
fixing index.erb
Site updated at 2012-07-14 19:15:31 UTC
Minor de.po fix
Dreamweaver markup.
correct bug in open service
Implement a commons Dir using https://github.com/vbardales/MultipleAppKernelBundle
Linking up download to raw not blob
New post about tab limiting
missing trackball bool
Add pm script to kill and restart syndaemon on resume, as it mysteriously stops working after suspend.
Pagination did not work.
completed css concatenation and javascript minification
Added new GUI classes and GUI functionalities design document
Merge branch 'master' of https://github.com/derekchiang/Cornell-CS2112-Group-Project
My .bash_profile configuration
My vim configuration
iTerm2 terminal app profile configuration (Mac OS X)
CCTP Maps v2.5 Updated modinfo file

merge after the files :)
Added: Inheritance support for enums (though there seems to be only one case which we ignore anyways).
Added: Multiple inheritance support for global types.
Slightly better hero text
Added docs for the tickets.
CORE-1898: modify the workflow element retrieval service to work with data sources
Arreglado visitas en Tuenti (Twitter en proceso)
un poco de css para el modstore
add assignment 2 folder
add C++ version of forestFire and include tests
Merge branch 'master' of github.com:inge91/Inleiding-Modelleren-en-Simuleren
added CU link
Facebook and Foursquare OAuth logins.
nServiceBus / SignalR Idea.
clarified and expanded the first few steps
Changes to C101 FrontDesign

- VESA mount removed
- Camera mount on reverse side.
- No 1/4 thread on back
- Smartkeys holes: One hole
- Generally: Updated for new footprints (encoder, slider, smartswitches
boards)
Build results of 17ef782 (on master)
Build results of 17ef782 (on master)
Build results of 17ef782 (on master)
Update Sinatra version
Configure Atom feed
Add RSS button, other small RSS fixes
Navbar styling
Formatting
Add projects
Formatting
Add todo
Add back sftp-server, droidsshd needs it.

Change-Id: I497328daf4e5fd38f1347c0ce1b9250d9d67f799
Initial
Added link to gjallarhorn api docs
Merge pull request #5 from piotras/master

gjallarhorn docs
Testing resetdemo code
Added resetdemo and cleaned up index.erb
Added trailing ; to prevent errors
[ubuntu] depend on the plex-archive-keyring package to ensure all users have it
Update LP answers file for PE 2.5.1
Remove crufty comments from class learning
Tune ActiveMQ heap size after installing PE

On resource-starved VMs like this one, ActiveMQ will eventually run out of
memory and go kablooey; you can tell this has happened because the pe-activemq
service will claim to start and then never stay alive for more than half a
minute.

Luckily we can tune that with a Puppet variable. Even more luckily, we can
automate adding a parameter to our node in the console. So, that.
Allow specifying a VM name in vmware2vbox

We were shipping LP VMs named "Puppet Training." Boo. This adds a variable for
that, and also a reminder of what the salient variables are in the README.
Don't blow away localhost, even if our hostname is different

There was a sed command in the centos.php kickstart script that was replacing
localhost with the machine's domain name. This was bad. Among other things, it
caused console auth to blow up if the machine's official hostname wasn't
"localhost.localdomain."

This commit rearranges it a bit. Now it appends the official hostname to
localhost's entry instead of replacing it; then, once the bootstrap class is
applied, it will split the two entries, so that there's an entry for our
official name and, if our name isn't just localhost, a pristine "127.0.0.1
localhost.localdomain localhost" entry.
Merge pull request #26 from nfagerlund/learning_puppet_2.5

Learning puppet 2.5
expose ro.modversion (Settings)
Site updated at 2012-05-23 16:58:29 UTC
sec_battery: Raise charger voltages by 50mA

Change-Id: I776c7f34e0669d18e12f16dc2605ae0635f0621d
config: Disable wrong SMB136 charger driver, enable SMB328 driver

It turns out CONFIG_SMB136_CHARGER_Q1 is not just some #ifdefs
in the main SMB136 driver, it's a completely different driver.

Having both enabled does unpredictable stuff, it seems like
the non-Q1-optimized version takes priority and then
misbehaves.

Also enable SMB328 - Apparently many Notes have this instead
of the SMB136 - the driver probes for 136 then 328.

Change-Id: I351a195accbdc85b31e7120c74b6fc5ef05e529f
Revert "sec_battery: Raise charger voltages by 50mA"

This reverts commit 366105ff489f50bb32c47c1999e75824c64639bc.

These current settings do NOT do what one would expect.

Read max8922-charger.c and smb136_charger_q1.c for more info

This patch will cause USB to be treated identically to AC,
causing 650 mA pull from USB on I9100 and I777 and 950 mA
pull from USB on N7000!

The only values of these numbers that matter are:
>450 mA = AC assumed
<= 450 mA = USB assumed

Side note:  These are currents, not voltages.  You can't
raise a voltage by 50 mA!

Change-Id: I2929f60648c541741ca0869dbe75b59d95962a2f
Signed-off-by: Andrew Dodd <atd7@cornell.edu>
Merge branch 'ics' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4210 into ics
galaxys2: move mfc firmware out of the kernel into system/vendor/firmware

Change-Id: Ia6c123d80789023f9fb1bbb5dc106e988361fbec
Merge branch 'ics' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4210 into ics
Moar work
-Switched to Nexus wimax drivers (see epic4gtouch.readme)
-Add red/blue leds
-Some cleanup
-Moved mfc_fw.bin to vendor branch, same as gs2
Added lift_and_drag_new.pdf
Octopress init
Site updated at 2012-10-26 08:38:08 UTC
[ZY] Add more example for round rule and sales tax
enable battery LED settings

Change-Id: Ic8af35c921dba35590fe5bc903fd1847da00924d
fix 2.11.9 XML
Merge pull request #19 from ingbrzy/master

fix double strings MERGE IT NOW...!
Added comments and sample usage
Now the ball bounces off the paddle/bottle

Signed-off-by: Will K <Will@Willknott.ie>
msm8960-common: update kernel headers
Added frontend settings utility and used it to load the welcome page,
removing a redundant request.
Whether the info button and welcome tab are shown now depends on settings.

The info button is currently off, and search is shown as opening tab.
Pyramid builder now sends an e-mail on upload completion.
Merge branch 'master' of github.com:AnnotatedBooksOnline/AnnotatedBooksOnline
Fixed the e-mail notification method described in issue #25.

The only thing still missing is the link to the binding in the e-mail message.
Additional alias
Update notes for submitted changes

* Create preset screen
s3cfb: Don't lock for vsync poll

Ioctl vsync polling runs in its own thread and will always hold
a lock on the framebuffer, only releasing on a vsync event, causing
microlags. Do not lock to prevent the issue from happening.

Not locking should not have any negative effect because the original
uevent code does not lock anyway.

From patch http://review.cyanogenmod.com/#/c/23634

Change-Id: I9fc56503f9952ae5dfc14eda64e0a43361ca2478
Merge "s3cfb: Don't lock for vsync poll" into jb
Added joitn touch detection

useful static in Gesture.cs
Fixed Visibility Mistake

bool isDoingGesture() should've been public; not protected.
Added Gesture that Uses Other Gestures

Demonstration of proper bypassing of the DateTime logic... since Vectors
are static, construct a new Gesture on the fly when you're writing a
Gesture that uses other Gestures and simply test the boolean check.
Added Update Method
Added Example Windows Form

Form Interfaces with the Kinect API and Gesture.cs by updating statics
and dynamically checking for gestres.
JB style mounting SD card
Some changes for camera
完成抢答状态九宫格
Realign With CyanogenMod Source (Credit CM)

Change-Id: Ibecd8a1155e5e6a8a3a991e0fa87da5ce5292b8b
160_non-breaking-space.sublime-snippet - created
161_inverted-exclamation-mark.sublime-snippet - created
162_cent.sublime-snippet - created
163_pound.sublime-snippet - created
164_currency.sublime-snippet - created
165_yen.sublime-snippet - created
166_broken-vertical-bar.sublime-snippet - created
PhoneApp: Option to not lock automatically when a call ends (2/2)

Depends on http://review.cyanogenmod.com/23251

When a call ends while the screen is off the phone is automatically locked. This commit adds an option to disable this behavior.

Navigate to Phone->Settings and uncheck the option Lock when call ends under the advanced settings section.

Commit includes option in english and translation to portuguese.

Patch Set 3: Android conventions compliance

Change-Id: Ic0894bc5095fc8263ca350fb6b7ffcad494a4050
Support GSM AT commands for SMS over bluetooth (2/2)

Modifications required to support the older GSM "AT+" commands for SMS over
the bluetooth transport for use with car radios, etc. This must piggy back
on the existing handsfree code as the spec uses that channel for the commands.
(2 parts: frameworks/base and packages/apps/Phone)

packages/apps/Phone:
hooks into BluetoothHandsfree for watching/sending AT commands via
BluetoothSMSAccess, and also for the special PDU handler done at the JNI
level (see frameworks/base changes.) BluetoothSMSAccess contains all the
functional code for handling the actual SMS related AT commands and the
contentObserver for the SMS database.

Change-Id: Ibb7cf03164cd9ed5e4b8139d137a28c0e0fd986e
Signed-off-by: Gary Dezern <garyd9@gmail.com>
Phone: Danish strings for proximity sensor

Change-Id: I75287a982b8dbf56b232079d5cef1915f1121cfd
Merge "PhoneApp: Option to not lock automatically when a call ends (2/2)" into jellybean
Rename.
Adding a link to the tests.
Adding an explanation.
add partition info
added signing properties file
updated the checkout item view when sent from punch with a category 4 item, working on randomize features
Updated build and release process

Now builds against .net 3.5 and .net 4.0
Updated nuspec to include MicroLite dependency and fixed license url
CZE translation - update

From https://github.com/valib/ps3mediaserver/commit/b795109d001bee6ee7d499c45642ea9f78ad345f
Optimised imports:

Removed unused imports
Merged instances of many imports from the same package
Put them in alphabetical order
Update future release date
Version fixes and cleanup:

v1.isPmsCompatible(v2) -> Version.isPmsUpdatable(v1, v2)
Make Versions comparable and add equals, isLessThan &c.
Check invariants in VersionTest

Based on https://github.com/ps3mediaserver/ps3mediaserver/commit/3bf379ac603b508a3dea2218d4ea5db262ce6b69
Fixed bug with FFmpeg options tab
Simplify updater

We don't need it to wonder if it should update or not, it just always should
Replace stringbuffer with stringbuilder
Refactoring 'application.json'
Some refactoring in DeviceService
Tests for DeviceService
audio for test
Cleaned up onsets code and ripped out a lot of dubious stuff.
removed assert which caused an exception for incomplete matrices
implementation of classifications, fixes
got agent set working, but now i realized i may have made it more complicated than needed, committing for history (addresses #3)
simplified agent vs agent set handling in add command (closes #3)
base: genlock: remove BIT macro usage

The BIT macro is not defined for !_KERNEL_ resulting in compile errors.

CRs-fixed: 356263
Change-Id: Ib2acd913033fccca63716d6585a51707c72debf0
Signed-off-by: Jeff Boody <jboody@codeaurora.org>
base: genlock: protect kref counting with spinlock

A race condition exists where the attach may not kref_get
before the kref_put finished. The genlock_file_lock was
originally added to protect against this case however it
was not protecting the kref.

CRs-fixed: 359649
Change-Id: Iab1fc847c2d3357ec1be79b7cc3e004643126dec
Signed-off-by: Jeff Boody <jboody@codeaurora.org>
20120313 changes done
crespo4g: Removal of unnecessary files as of Android 4.1.1 (JRO03R)

Change-Id: Ie8ddc051b39c934e4a0a7a31b8fc3992199e4367
toro: Update binaries to latest OTA (JRO03O)
Merge pull request #117 from burnsra/jellybean

crespo4g: Removal of unnecessary files as of Android 4.1.1 (JRO03R)
i9300/n80xx: libsync is opensource
Fix cbd/rild derp

Change-Id: Id64e5a29412bf6a8c033da0b364fd261625b1a32
Update with mali r3p0 libraries

Change-Id: Ia9ab4932a3a843c9c6743259075f478074a9cd3d
Merge pull request #121 from espenfjo/jellybean

n8000: Fix cbd/rild derp
Revert "Update with mali r3p0 libraries"

This reverts commit d2d4803dd5bfcdf1ead00dbd6b1dba5d54161457.
Merge pull request #122 from espenfjo/jellybean

I9100: Revert "Update with mali r3p0 libraries"
Merge pull request #120 from fitsnugly/jellybean

toro: Update binaries to latest OTA (JRO03O)
toro: fix libsec-ril_lte.so derp
Merge pull request #123 from fitsnugly/jellybean

toro: fix libsec-ril_lte.so derp
Allow r760 to pull.
Update with mali r3p0 libraries
Update with mali r3p0 libraries

Change-Id: Ia9ab4932a3a843c9c6743259075f478074a9cd3d
Merge branch 'r3p0' of git://github.com/ohanar/proprietary_vendor_samsung into r3p0
Remove libsync dependencies
Merge pull request #127 from espenfjo/r3p0

SMDK4210: R3p0 blobs
add sec_keyboard keyboard daemon

Change-Id: I5767efa82bbc2342616ad1a8a55cbc39a43a40a2
epicmtd: Modify SprintMenu for uart switch path.

- Modifications to PhoneUtil.smali:
Change /sys/bus/i2c/drivers/fsa9480/7-0025
    to /sys/bus/i2c/drivers/fsa9480/1-0025 to match our kernel path.

- Reassemble SprintMenu.apk
Fixed bug causing options to behave incorrectly.
Bugfix
First cut at presentation content
should be setting the content type for XML like for JSON
Add safeguards against attempting to delete already-deleted entities.

There's a bug in the extract-loader that adds current_way_nodes for deleted ways. In addition to fixing
the extract-loader, it's worth adding in the safeguard here in case something similar is lurking
in the main database.
Added the prettify language extension files.
party included!
querySingle aliasing and registering auto-namespacing to the object
Revert "Merge remote-tracking branch 'korg/linux-3.0.y' into android-omap-3.0"

This reverts commit 90ebdb37511844ee897c35a673b39adbc50770ac, reversing
changes made to 9489d6e58c90fac28ddeadb1d3f569552c7ebecb.
Revert "Revert "Added Custom Voltage version 1.""

This reverts commit 9489d6e58c90fac28ddeadb1d3f569552c7ebecb.
newline in README
removed unused MouseListener (was used by applet)
reverted another title
Remove notion of swappable column in readme until said functionality actually exists.
Revert "Added files don't know what will happen"

This reverts commit 5771f901b20c1d136a6871f8d19e38707ffdd523.

Conflicts:

	src/scroreWriter/Measure.java
Updated Git url to point to Openshift repository
This solve issue #2
changed some names to fix ambiguity
started refactoring of bigint lib
started work on quick prime searching
added library for reusable utility functions
initial attempt at 41
c210-common-vendor-blobs.mk: fix typo
midterm documents
media: drop to 44100 sampling rate
UPDATE - textAreaExpander -> elastic
ADD - Browser outdated
FIXES
build_toolchain.sh
fix gcc and compile libcxx in linux
don't download/build clang and llvm
Makefile.config
first-asm-bootloader
create boot.bin
make qemu
fixed repository placement
Album Module added with language translation etc.
Re-solved problems
Clean up of ZF2 vendor
Updates .pot file with recent string changes
Merge remote-tracking branch 'upstream/master'
Text was updated in XIB
more slides
better supervisor command.
add helper for rev'd assets
Fixed the rest of the images.
working on #9 the corpus dataum fields shouldnt be selectors now that we found bootstraps typeahead
can add fields in corpus again, for some reason the updating collection is not updating when the models chnage, it seems like it has its own copy of the models so we cannot see the models when whe switch to the corpus read only view. @trisapeace i added a line in the updating colleciton to set the options if they are not set. maybe you might be able to track odwn why the collection in the updating collection and the models in the corpus are not the same? this will have ot be fixed eventually for #151
container had an unclosed ul and i put the tag edit back the way it was so that you can change them in edit mode
pretty session done button
rare fields are hiding fixes #9
removing the files link from audio video
Merge branch 'master' of github.com:iLanguage/iField
Merge pull request #305 from cesine/master

Datum hides rare fields, rightnow rare is considered not one of the 4 defaults, later we will build a couch view which calculate the frequency of datumfields
clearing local stoage temporatily because pouch isnt sure if it shoudl replciate
Merge branch 'master' of github.com:iLanguage/iField into session
Whenever a new datum is saved from the datumcontainer, it is added to the default data list #306
Removed "See Sample" button from data list view #306.

There is a bug with re-rendering the data list views.
Replaced some leftover icon-checks with icon-books.
Localisation updates from http://translatewiki.net.

Change-Id: If96f1d6d4a9decd1b377fa8eea9871e68b103540
Preference messages for notification

Change-Id: I5704ac2561df0f7cb78bf8145acba75759d7e81c
Merge "Preference messages for notification"
Localisation updates from http://translatewiki.net.

Change-Id: Ifbb787255e00e3a76db2910a31d020c6dab731e9
Revert "Trimmed the branch to only the ecl_navigation sub directory"

This reverts commit c174b01a5140368505b3cf23acbeda7604ff9863.
Rebase from 'upstream' @ version '0.50.2'
Trimmed the branch to only the ecl_navigation sub directory
Update notes for submitted changes

* msm8660: Add headers for audio codecs
cleanup after power widget removal
Update notes for submitted changes

* Fix baseband extraction handling.
"made a few changes to reverse engineer the classification that Alec had done to the data after the last interation on this map."
delete test projects that already exist
Brought over our brightness table from CM7

I think there were other tweaks in this file, I'll have to dig through the commits to find them and see if they were worth it.
Paranoid settings: Added Czech translations (by shaez @ MoDaCo)

Change-Id: I38d0dcf9cf1a1470e131c30162dd82582dfffcae
Structurel changes still to be made.
GUI-Grundgeruest fertiggestellt
Merged, Konflikt behoben
Implement checking whether a post is age-restricted before showing the age verification dialog.
Add some missing comments describing the PHP functions handling the admin panel controls for this plugin.