labofsahil/github-event-dataset-2012 huggingface dataset:
[ParamConverter] "entity_manager" is not a required option for every configuration

Fixes the issue with converters that doesn't define the "entity_manager" option
merged branch vatson/2.0 (PR #117)

Commits
-------

15a63d8 [ParamConverter] "entity_manager" is not a required option for every configuration

Discussion
----------

[ParamConverter] "entity_manager" is not required for every configuration

Fixes the issue with converters that don't require the "entity_manager" option.
fixed namespace typo
merged branch polmabri/patch-1 (PR #118)

Commits
-------

eb1f59d fixed namespace typo

Discussion
----------

fixed namespace typo
Revert "merged branch vatson/2.0 (PR #117)"

This reverts commit cb61b92ed55241d93ed9726bc3f5f47c7d2ce8fe, reversing
changes made to 638f545b7020b9e9d5944a7e3167f60ed848250d.
Merge branch '2.0'

* 2.0:
  Revert "merged branch vatson/2.0 (PR #117)"
  [ParamConverter] "entity_manager" is not a required option for every configuration
Fixes #9 (hopefully). Handling nested save operations.

I'm flying very much blind here, but I tried to implement everything
that I did in the 1.3 branch where all existing tests continue to pass.
Moved enums to shared
Make sure connection is closed
Students notes - Stage 3 completed !!

1. Both teacher and student notes are displayed in the viewstudent dialog
2. all 3 lang translations was updated

Signed-off-by: semteacher <semteacher@gmail.com>
ok its a bit lame but I've added a BASIC up down tilt indicator on playfield.
Change it to a snazzy image or something later but ...

Signed-off-by: aidancasey <aidancasey@gmail.com>
Fixed power function and usings
Actually refer to defined parameter value, rather than just declare it
links in markdownwq
Update custom renderer method signature

It looks like this changed recently.  The README.md is correct, but this .html was lagging.
Merge pull request #2 from Ry4an/patch-1

Update custom renderer method signature
implemented android-mapviewballons to popup information
get the version correct
added part2 stuff ub_test.c
minor edit to hw2_7
Wait for remove action to finish
sync with base
this needs to be separate
Added latest debug core dll
fixed intent
updated readme
Revert "Bypass: Turn off only after FB content is displayed."

This reverts commit f2dbabe786a12e7e9ae15328550b5ba581c5492e.

This change is not needed any more because we are caching the MDP pipe
contents when closing the channel. So no need to wait for postFB finish.

Change-Id: Ia6f01c33953762cb7a97e0b2b795d9afeb60d2d9
(cherry picked from commit 441f1824593bb12a97508b426b597a16b35091e6)
Fixing messed up reverts
add volumes 42 and 43
- Auto-logout after login expires (1 day)
Allow selection of experiment to create samples/datasets under
Fixed redirect
added callback to customize menus
Merge pull request #9 from ajstanley/master

Added callback
added config and added a base controller
Changement Layout
support new chip patch for BLE.
converted upcoming recordings to use the content provider
Merge branch 'master' of git@github.com:MythTV-Clients/MythTV-Android-Frontend.git
Disabled ConceptReferenceTerm validator
Poistettiin hämäävä tehtävä polynomeista ja selkeytettiin kuvaajia.
kertolaskun selityskaaret
Merge branch 'master' of https://github.com/Oppikirjamaraton/oppikirjamaraton-maa2
added some unit tests for new method to determine what name to print on id card
camera: fix torch value write error

This was causing this error: (which also cancel the autofocus)
D/MOT_ISE ( 2141): try to set torch of flash to: 1
E/MOT_ISE ( 2141): torch intensity is not same as 0x10 we want: 64
more cleanup

Conflicts:

	jordan.mk
fixed a bug: edit powers has been tested on adapter
Merge branch 'master' of https://github.com/RedTurtle/auslfe.formonline.pfgadapter
attaching images betterly
New post about Podio
Added create tests to category_spec
Closed #1, Issue Fixed.
initial load - code imported from GAAR project
Settings: Updated italian translation

	Added strings for change:
	"Bluetooth MAP (Message Access Profile) Upstream Changes"

Change-Id: I3bb80d3af2ff01af5ee6a128acd1f40a7d6c2a7b
Power widget: Hide Wi-Fi AP option if it's not supported

Change-Id: I75f34832c95c350576a96d06c7ab0a46542588f1
settings: updated finnish translations

Change-Id: I1d52cf5265b1ca54cab176470afde0058db08edc
Added hungarian translations for bluetooth_mas_* settings

Change-Id: Iff53086e111dbcf6f9d91dbe58d3788c1920e0ec
Settings: Remove non-existing strings

Removes build errors

Change-Id: Id3a09b2f2233d2e4fe4a5ae6024c5dc93209bf61
Settings: Fix Greek translation

Patchset 2: Fixed build warnings and added Navigation bar, Hardware keys & Stylus gestures translation

Patchset 3: Fixed typos again & added GPS source translation

Patchset 4: Add Bluetooth MAS strings translation

Change-Id: I5493c221069c41e4145d662d0f7b39e4ebc9e862
es_ES: Added new translations

Change-Id: If8cedb179a09fde82f0f79145597693218b1ac17
Merge "Power widget: Hide Wi-Fi AP option if it's not supported" into jellybean
Merge "settings: updated finnish translations" into jellybean
Merge changes I5493c221,Id3a09b2f into jellybean

* changes:
  Settings: Fix Greek translation
  Settings: Remove non-existing strings
Merge "es_ES: Added new translations" into jellybean
Merge "Added hungarian translations for bluetooth_mas_* settings" into jellybean
Merge "Settings: Updated italian translation" into jellybean
Merge remote-tracking branch 'cm/jellybean' into jellybean
Add crespo4g files for jb 4.1.1
DB/Gameobjects: Some gameobjects from 4.3 cache
DB/Gossip: Fixed Sub-menu of gossip 10043
Removed dumb .DS_Store
change code 
atts = self.execute_script("return [ window.id, window.name, document.title, document.location ];")
to
atts = self.execute_script("return [ window.id, window.name, document.title, document.url ];")
to fix issue 10 - Get Window Titles break in IE 8/Win 7
change config name

Changes Config_sp5..._VibrantPlus_Board to CONFIG_SAMSUNG_GALAXYS4G
remove count
fix iterations
Initial code contribution for the PHP CB API library, examle and readme
Merge branch 'master' of https://github.com/aparkerw/CareerBuilder-API-PHP-Library

First merge after the creation of the project.
cleanup of readme files
maybe a minor optimisation
Added Ganbarou wallpapers
Changed goo manager version and build
add some tests for generation of bean properties using the node builders and transformers
start using Guice for injecting and managing dependencies
Add ability to split a mutli assignment field to multiple single field declarations. Remove unused methods on MutationCOntext. Further cleanup
fixed button code for change password button
remove company/inventory management/admin
input those features in rt7_adminPage dir
for merge
indenting
and fix mismatching tags
Merge branch 'master' of git://github.com/yblee85/simple-couch-backbone-examples
added user creation to the store level menu
Update src/project_clean/LCS.java
Prepare collective.plonetruegallery 3.2a1.
lots of copy
add newsletter
add photos and slider
credit photos, pause instead of speed
some polish
wipe up the mess
you'll get
FAQ translated over
updated mdesign addons
moved old brandonkelly repos to pixelandtonic
added warning to readme
added ability to set which branch to install
Merge branch 'develop' of https://github.com/rsanchez/github_addon_installer into develop
Update information to latest release
Fixes #5 and #8: validator runs for all pages and is present when valid

Wicket doesn't run the response filters when rendering the buffered
response but when sending the buffered response to the browser. This
means that the validator doesn't know which page was rendered, and that
caused the validator to not run in those instances. Unfortunately this
meant that the validator became pretty much useless, as most links and
buttons render to a buffered response.

When a page has been validated and the markup is valid (X)HTML(5), the
validator should be visible, but not obtrusive. This commit adds a
validator button at the bottom of the screen and when clicked, the
validator window becomes visible.
Fix icon placement
Add availability
Text
Added code to prevent the HA filer mount from failing (EINTR) if the HA directory was
not already exported and the mount point was back grounded (mount w/bg). This issue
was timing related and only occurred under certain node deployment sequences. It has
been previously release noted with a work around solution and this patch eliminates
the possibility of it happening.
Merge branch 'release/fred/master' of https://github.com/dellcloudedge/barclamp-clouderamanager into release/fred/master
Include generated Docbook files
Adding files needed to build webhelp+pdf for autopublish.
Merge branch 'addingPom' of github.com:dwcramer/docbook-service-registry-docs into addingPom
Refactored shared specs
Added scenarios for doing/undoing tasks using the checkbox
Added scenarios for doing/undoing tasks not using the checkbox
Refactored BDD suite
Added hot threads api documentation.
Merge remote branch 'upstream/gingerbread' into gingerbread
Merge remote branch 'upstream/gingerbread' into gingerbread
Merge remote-tracking branch 'upstream/gingerbread' into gingerbread
Simplifly ROM filename, UTC datestamp, add CM_EXPERIMENTAL, datestamp UNOFFICIAL, rm dead code.
CM part

* Remove "update-" prefix and "-signed" suffix.
* Add CM_EXPERIMENTAL builds in the same manner as NIGHTLY.
* UNOFFICIAL builds now with datestamp in the same manner as NIGHTLY.
* date -u uses UTC timezone for consistency.
* Remove some CM7 dead code.
Build delivery scripts
Build delivery scripts
Fixed Multi Entries Survey Questions
merge rails-prelaunch-signup
just kidding.
Adding html_options to button dropdown
Merge branch 'add_html_options_to_button_dropdown'
Settings : Customizable lockscreen targets

Activity icon      : Prash
ShortcutPickHelper : Based on Danny Baumann's work from cm7

Patchset2   : credits
Patchset3   : Whitespace cleanup (Thnx dvtonder)
            : Make shortcutpicker flexible between activities/fragments
            : Switch to queryIntentActivities
Patchset4   : Switch to resolveActivityInfo
Patchset5   : Bring settings up to speed with ux (David Van Tonder)
            : Fix dissappearing icon bug
            : Fix npe on packages w/o activities
Patchset6   : Fix npe's on tablet
            : Modify strings as per request
Patchset7   : Cleanup
Patchset8   : Custom icons
            : New dialog for customization
Patchset9   : Switch to dynamic id loading (Reset required)
            : Fix icon dissappearing bug
            : Fix lockscreen reading saved values bug
Patchset 10 : Add icon pack support
            : Bug fixes
            : New activated drawables
Patchset 11 : Code cleanup
            : Limit icon size in dialog

Change-Id: Ida9d9e8c1bf5970456a61a6602639a4cc6461212
Merge remote-tracking branch 'vorbeth/opensensation' into ics
A very basic version of dynamic listview has been created. Will enhance in later builds.
Adjusted TAB spacing and the layout in general.  Very minimal code
changes.
Primer Commit Ayudante Estudiantil Ingenieria
Add preview images to readme
Site updated at 2012-06-08 09:12:35 UTC
Site updated at 2012-06-08 09:12:52 UTC
swapped out some code snippets for gists
Empty project
Added ES dep
added a presentation to the list

including pdf with the abstract
Travis badge fix.
[~TASK] remove node misspelling
Restructuring of the persistence memory package
css: green links, greyish text
new word order
More ipad testing css
use constraints to center subview
i dun added sorses rite
Update spec/mongoid-indifferent-access/indifferent_access_spec.rb
improved build script and README
Scripts and SPs for Product, Price and Inventory (qty)
correct my git author email address
add "install" and "uninstall" convenience scripts for use during development
add getaddrs.php drush script
consistently prefix field names with "field_"
add nemac_mailing_list_addresses() function to nemac_mailing_list.module
customize node display to listing of addresses currently on list
code cleanup; add README.txt; add python sync scripts
more code cleanup
add DRYRUN internal config flag to NEMACMailingList.py; create new lists as needed when syncing
remove 'anonymous user' role from possibilities; make 'authenticated user' imply all currently active users
more updates to README.txt
when including based on role, only include active (non-blocked) users
enhance .gitignore
add 'DRUPAL-' prefix to GApps group names; use subprocess.Popen instead of check_output for compatibility with python 2.6
updated labels, help strings
use full path to drush executable
css + js additions for ui change
remove OR from text
migrating domain
Make parseInt in JS safer by specifying radix.
Add pending specs for new periodic closer behaviour.
Scenario: Secretary handles a member who has failed to attain the minimum shareholding.
Add a daily job runner.
Scenario: Secretary handles a member who wishes to resign.
Fix whitespace.
Fix 'ambiguous first argument' warning in step definitions.
Make JS call in step definition more robust.

Selenium was occasionally complaining about missing ')' in the JS.
Feature: Managing share payments.
'cooperatives_uk' theme: Fix overlay overlapping prerelease bar.
Don't show list-of-directors chrome if no directors present.
Remove debug code.
Scenario: Secretary processes a share withdrawal application which has fallen due.
Scenario: Secretary waives the notice period for a new share withdrawal application.
Remove old 'Meeting Settings' UI.
Remove old constitution resolution UI.
Feature: Resigning membership.
Feature: Terminating membership.
Scenario: Member views tasks that require their attention.
Don't link to generic Meetings controller from Dashboard.

Instead, we want to use the GeneralMeetings, AnnualGeneralMeetings,
and BoardMeetings controllers as appropriate.
refactor test runner
refactoring other example to use
dedicated benchmark runner
Game start times are off
Merge branch 'master' of github.com:powertac/powertac-tournament-scheduler
Fixing rungame in tournament scheduling
updated version to v0.0.4
Update DefyParts/res/values-zh-rCN/strings.xml
Management Accounting kopiert - muss noch in eigenen Worte gefasst und mit anderen Quellen verglichen werden
GitHub OAuth integration completed
Rebase from 'release/moveit_setup_assistant' @ version '0.2.5'
Generated debian files for quantal
Add time.Since()
bg update.
Added newNum to SECRET

Write a Java statement that multiplies that value of num1 by
2, adds  the value of num2 to it, and then stores the result in
newNum. Then write a Java statement that outputs the value of
newNum.
October 14, second commit
Allowed to add URL parameters
Merge branch 'master' of github.com:softlayer/softlayer-object-storage-php
Site updated at 2012-12-24 14:57:48 UTC
opencv_waitkey_with_cursor_key.hを追加
Updated easing effects for slider
Site updated at 2012-08-03 17:57:17 UTC
Page connexion 24 octobre 10h25
no message
Revert "no message"

This reverts commit ce9c0f21978e29bbf6826c979a8887e174d0e303.
no message
Contact page
Guard and Spork configuration
Localisation updates from http://translatewiki.net.

Change-Id: Idd35c551ef396e1199272c0c29ea1039493fd6d7
State Pointer Hash Table Implemented
Add touch wake Kconfig option
Merge branch 'glados'
Update defconfig
Basic Google Geocoder + magenta dot on starting of each leg
Adding extension and README.
tsubasa: create correct event node for bootrec

Change-Id: I44b93145ec761cebf8b3421bb21cf0c10c2510b4
Increasing ringtone volume option (3/3)

Change-Id: I836d12ee2bf6a3a001ed2c3e516088921e83c118
Phone: Danish translation

Change-Id: I041e60898f69c1eeef6e7e62890f938597c9849e
Phone: implement noise suppression for phone calls (2/2)

Change-Id: Ie72449f952f99b410fbb5bc4a8e6cbc833e6176f
Phone hungarian translations

Change-Id: I976a46fe242515ed8e3cba5e8cfeaab8240b3491
Update Russian Translation-Phone-CM9
Phone - Updated Italian translation

Change-Id: Ia10910a19d399a6892c6aa95630894c7dd48b255
PT-BR: Translation for noise supression

Change-Id: Ic8723cb39af4a93e8e21f2c5678c1a4d8f37c036
Merge "Phone hungarian translations" into ics
Merge "Phone: Danish translation" into ics
Merge "PT-BR: Translation for noise supression" into ics
Merge "Phone - Updated Italian translation" into ics
Merge "Increasing ringtone volume option (3/3)" into ics
Button activates/deactivates grid-rendering
MURDR
Merge branch 'mr1-staging' of github.com:DroidTh3ory/android_packages_apps_Phone into mr1-staging
fix total ST
Use our custom wifi setup
Update DEW_Negocios/app/views/emprendedors/index.html.erb
Added pointer black magic
Added Oohoo headers to all files. Need to finish commenting 3 js files.
Added missing hungarian traslation

Change-Id: Ief00975c28a22c19753b308d23196ea8c4179276
Merge remote-tracking branch 'upstream/jellybean' into jellybean
Update notes for submitted changes

* Revert "HSPA+ Support"
libhwcomposer: Remove dimension Align checks for copybit

gralloc is already taking care of source buffer width alignment
based on the color format.Alignment should be based on source format,
But not dependent on FB format.

CRs-fixed: 344311 355814
(cherry picked from commit 8c8edc440288def7017eb12d93391cb785196f55)

Change-Id: Id83f926068d65896b6c7bb93dd086aa9d8c3b406
Overlay: Close channels on s3d format change

Fix 3d to 2d video switch, make sure params are cleared and pipes closed.
Fix other 3D regressions coming out of external connect-disconnect.

CRs-fixed: 349421
(cherry picked from commit 2ec3805e293d4e84e80e3de41b8fb6587849456e)

Change-Id: Ie6ba0aca2acf580081bcd6d293ddecef4143c6b3
Merge "Overlay: Close channels on s3d format change" into ics
libqcomui: Allocate idleTimer dynamically and arm it to expire once

This change:
    1) Allocates idletimer object dynamically in HWC to explicitly
       initalize its members
    2) Modifies idleTimer arming logic to expire only once after given
       timer delay

CRs-Fixed: 365305

(cherry picked from commit 3091112c6af4ef75e911d59e73029a72704c0f11)

Change-Id: I28f1ffbbbe8dc70d4ae6065866f77ff91bfe3cf9
libhwcomposer: Make fb width 32 aligned.

GPU need 32 aligned FB, and FB driver also expect the same.
It is mandatory for non-32 aligned FB resolutions like QHD panel.

CRs-fixed: 355814
(cherry picked from commit 2febae47ebd2bab247c7eeabb89bdf24438fe7db)

Change-Id: If82315bdf4ec2e7692d8b140efbb13f717dd34d1
Merge remote branch 'cyanogen/ics' into ics

* cyanogen/ics:
  libhwcomposer: Make fb width 32 aligned.
  libqcomui: Allocate idleTimer dynamically and arm it to expire once
  Overlay: Close channels on s3d format change
  libhwcomposer: Remove dimension Align checks for copybit
fix image credit positioning
- many adjustments;
- SimulatedObject inherits RigidBody;
- implemented trees (QuadTree, BVH) to treat coarse collision;
solved by answer: http://stackoverflow.com/questions/12094910/rails-association-with-delegate-methods-possible-bug-with-ar/12097231#12097231
fixed streak7.mk to match new location of files
Call header 8973 instead, since this is what the salsa uses.
added cellmate-cloudbase-0.1.jar into lib
Code
* added JS files to scanning target
Set Stock music layout for Lockscreen while enabling Circles style

Change-Id: Icb9cf56b0401408b0f5f457d00287c85f73b0078
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'aokp/jb' into aokpcm10
Merged Conflitcs an adapted to IWorkbenchContext
adds some textmate-like shortcuts
some more smart preferences
portuguese dictionary
Readded the styles.css redirect
added maintenance type to event
Merge branch 'master' of github.com:cargo8/Wharton-Computing-Communications
extracted superuser email to settings class
Add showColorLabels attribute to activities in rails backend
Add quill info to cases json file
Use activity route as key for stars. === BREAKS OLD LEARNER DATA! ===

Update caselog to use only case json file, not to download activities.

We now key stars off of activity route instead of activity id, since
we'd have to ask the back-end for the activity id, and we don't want
to download all activities. Also stars will stay with user if new activity
uses an old route, and will go away if an author changes an activity 
record's route, which seems like better behavior.
Rm old global activities query: not being used anymore
rm comet.js script reference from index.html
Merge branch 'master' into ungamed
mach: latona: disable vsim voltage regulator
a git ignore file for coverage reports etc.
remove coverage info from git, as too noisy
Updated boot.img to CM9 alpha 5
* improve usage text
Revert "Use location.hash", broke functionality

This reverts commit 54f7d455321e046f308acc62c5c171101c5d9c84.
Added new slide overview of demo.
Added colors and beutification to process, new repo export with this proc.
Anzeige-Probleme im IE gefixed.
Fetch new stuff
Merge branch 'dev' of github.com:fabianschwarzfritz/Yet-Another-Calendar into dev
Changed my include paths a little to see if that would help with getting my perl script to work on Heroku.
Added JUnit test for MongodForTestsFactory

(Organized imports for MongodForTestsFactory.java)
Merge pull request #17 from trajano/master

Unit test for MongodForTestsFactory
Output to console. UNIX Style.
fixed stopprogataion bug in showoptions()
CORE-3584: switched to the most recent version of lein-iplant-rpm
better focus separation: only railways and stations left; put OpenStreetMap attribution; hover highlight for segments and circles; larger time; smaller zoom level upon location entering; circle colors changed; commented out the christmas tree animation
better focus separation: only railways and stations left; put OpenStreetMap attribution; hover highlight for segments and circles; larger time; smaller zoom level upon location entering; circle colors changed; commented out the christmas tree animation
improved awesome_btn
first commit of the templates
Update to support Google's new Layout.
better alignment of the print buttons
Initial drop of the Cordova layer for Windows 7 prototype
Update README and remove storage.h/.c as this area is only being started
Large aggregate commit mostly made of additions from Regis Merlino:

- update of the shared Cordova JS code to 2.0
- implementation of storage, file and file transfer API groups

Plus some fixes:

- exec interface
- error handling
- video capture
General update:

- Updated project file to Visual Studio 2012 format
- Fixed accelerometer code so it accepts 8 bytes samples
- Enabled low latency Media Foundation pipelines on Windows 8
- Used thread naming trick so threads are named in VS debugger
- Updated Cordova JS codebase
- Centered notification dialogs
- Added back key handling
- Added preliminarly compass support
General update:

- Updated project file to Visual Studio 2012 format
- Fixed accelerometer code so it accepts 8 bytes samples
- Enabled low latency Media Foundation pipelines on Windows 8
- Used thread naming trick so threads are named in VS debugger
- Updated Cordova JS codebase
- Centered notification dialogs
- Added back key handling
- Added preliminarly compass support
Minor file renaming in html section of project file
Minor file renaming... take two
Update Visual Studio version in README file.
Visual Studio Express 2012 for Windows Desktop can compile the project.
Merge branch 'master' of github.com:purplecabbage/cordova-win7
Merging+Moving Windows7 specifics
Added tag rabbitmq_v3_0_1 for changeset 32df99afe1ae
Add argument: req_tx
[artf502844] check in
adding temperaturefield and thermaldiffusivity
First commit: Create database tables
MINOR: changed formatting help reference CMSLink to CMSEditLink (Fixes #28)
Merge pull request #57 from silverstripe-scienceninjas/issues/32

MINOR: changed formatting help reference CMSLink to CMSEditLink (Fixes #...
Changed permissions; updated DAC src
Removed backup file, continue work on main.c
bcmdhd: update wireless driver to 1.28.11.9 from Korean S3

Conflicts:

	drivers/net/wireless/bcmdhd/Makefile
Add Column PROCESS_DATE
Removed echo statements so print_disclosure() and update_status() now return HTML, rather than print it.
Turnitin - when saving settings page for the first time, populate $turnitinsettings correctly
Turnitin - tidy up code based on codechecker tool, ignoring line length check, some commented code and an if/else statemetn that looks tidier in it's current form than using Moodle standard.
Turnitin handle previously uploaded files correctly - clear the event.
CONTRIB-3457 typo
Removed echo statements so print_disclosure() and update_status() now return HTML, rather than print it.

Conflicts:

	lib.php
Bump required version as print functions have changed to allow better use in renderers
Merge pull request #23 from mattgibson/avoid-echo

Removed echo statements so print_disclosure() and update_status() return HTML
Separated creation of new start time from creation of new assign id.

This was causing duplicate start times to be created when the create event didn't run smoothly the first time
Merge pull request #26 from mattgibson/dtstart-separation

Separated creation of new start time from creation of new assign id.
Remove typo in the styles for rank 9 that created a white text on white background issue
Merge pull request #28 from jamesballard/patch-1

Remove typo in the styles for rank 9 that created a white text on white ...
MDL-31028: now works with pathnamehashes
Re-added stored_file to get_file_result definition
Moved check to see if file exists
Moved $efile === '.' check to an else if

and removed a comment
Merge pull request #30 from chtombleson/MDL-31028

MDL-31028: now works with pathnamehashes
bump version as file handling has changed in preparation for Moodle 2.3
Crear estructura
rn TableDefinition Table
Fix extra ) in doBatchDelete #129
Merge branch 'master' of git://github.com/cedriclombardot/AdmingeneratorGeneratorBundle
Add localized_date_format and localized_datetime_format (default: medium)
Add method getTwigParams to Generator
Localisation updates from http://translatewiki.net.

Change-Id: I1f66784eafde42f7a3ad2f7128719898acbf36fe
(minor) assue re-caching works for sites table.

After updating, we need to wait for slaves to catch up before
we re-cache the sites list.

btw: this functionality should be moved into core.

Change-Id: I2965a4f7f54a930e19afa4bfcdf9cd711b22c5cc
Merge "(minor) assue re-caching works for sites table."
(Bug 41624) Add labels to user contributions

Some of the special pages sets the html used as link text
up front to full text version of the title and then the test
for the html will fail. By testing if the text is the full
text it is possible to try to make something nicer.

Patchset 2: Removed sporious code from another patchset

Change-Id: Iadf1b3deb695d3bf4d5670f9419b3ec3e4e15ebb
Merge "(Bug 41624) Add labels to user contributions"
Moved failing tests into their own file, to more easily track breakage in already-passing tests.
Setting : Added missing French translation

Patch Set 3 : Fix spacing before caracter :;!? and add more understable translation.
Patch set 4 : Yahoo! and correction Appuie => Appui

Change-Id: I4778cc5f4c723b929c4c4d1d1bde5cf405eb2a2b
Settings: Simplified Chinese translations

Added stylus-related translations, as well as modifications to existing
strings.

Patch Set 2: Undo an accidental change to the lock_after_timeout_summary
string in http://review.cyanogenmod.org/#/c/22753/. My mistake.

Patch Set 3 & 4: A slight modification.

Patch Set 5: Corrected a typo.

Patch Set 6: Slight modification again.

Change-Id: I17b12e698364ea571b32404b061d6943fe2003c9
Merge "Setting : Added missing French translation" into jellybean
fix typo, lowercasing

Change-Id: I8a1b9e6f3236d812983199ac44c26b561a4f104a
Merge "Settings: Simplified Chinese translations" into jellybean
Merge remote-tracking branch 'cyanogenmod/jellybean' into tablet-build
added tumblr folder
(Telephony)(2 of 3) Bring in CM10 Dialer. Thanks cyanogenmod.

Squashed commit of the following:

commit 26ec3ef839a0d52fc3adbfbb1f89a74455f64055
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Jul 15 05:56:03 2012 -0700

    Don't crash if a bad value sneaks in.

    Change-Id: I4e45f7a8b374aa56b763cc3e75f7a310a90bb417

commit 084a9d5ee564c758ff7709690ab404d6ac58e78d
Author: Mathew Inwood <mathewi@google.com>
Date:   Wed Jul 4 14:16:59 2012 +0100

    Don't sort contacts supplied to global search app.

    They are to be sorted by the global search app itself instead.

    While we're at it, also remove 'create contact' and 'dial number'
    suggestions since they're not used.

    Change-Id: I0c56f638e347d101468e22d8fb2417552891eaa9

Change-Id: Idcd60b3769386c4e8d3cea71c39bda9e08322593
added events places relation
now working with articles at first level
added reference to base_controller in specs'
Merge branch 'master' of https://github.com/BBC-Knowlearn/news-labs-events-prototype
Running batch external
Added InvokeFeedbackOnDispatcher chainable method to IServiceCallState.
fixed bug in energy tracking and added std dev to Results
Declaration des Npc du raid bastion of twilight
Added loading section from and external file
Merge branch 'master' of github.com:CloudifySource/cloudifysource.github.com
Update guide/recipe/app_recipe_ref.textile
BoardConfig: enable webgl in webkit

see http://review.cyanogenmod.com/18230

Change-Id: Ib03c54d3edd9f8a1aaac935ab2f4d79f72c54764
PT-BR: Focus sound translation

Change-Id: I79c3748f04d983dfd06ec2a3eb1511e43213494b
Merge "PT-BR: Focus sound translation" into ics
move clock settings menu back to system settings
Add optional phone status bar volume slider

Change-Id: I95b6488cdca4f94da9c18ada0a28da38067ca5ae

Conflicts:
	res/values/strings.xml
connected method
hum
Merge branch 'master' of
git@github.com:IPierrot/Projet-d-option-GIPAD---Amadeus.git

Conflicts:
	Projet-d-option-GIPAD-Amadeus/bin/context/Client.class
	Projet-d-option-GIPAD-Amadeus/bin/context/userConstraints/cve/CVE.class
	Projet-d-option-GIPAD-Amadeus/bin/context/userConstraints/cvf/CVF.class
	Projet-d-option-GIPAD-Amadeus/bin/context/userConstraints/cvo/CVO.class
	Projet-d-option-GIPAD-Amadeus/bin/dao/DAO.class
	Projet-d-option-GIPAD-Amadeus/bin/solving/ComplexTripModel.class
	Projet-d-option-GIPAD-Amadeus/bin/solving/SimpleComplexTripModel.class
	Projet-d-option-GIPAD-Amadeus/bin/utils/DateOperations.class
flag scoring system gui clean up and code preparetion
start codding of flag system

need to to the judge loading and selection
added some more code to flag system
schema
first commit
Merge branch 'master' of https://github.com/MercuryRising/Google-Publication-Grabber
keywords in one box
Fix scrollingcache not setting anymore
increased timeout for API_HOST connect
Icds logic changed
Merge branch 'master' of github.com:Polytechnic-University/MitosEHR-Official
added default ISPConfig web_domain_advanced template
shoud be at nginx, anyway, we want both directive fields to be visible
added custom nginx directives support (we already have the field visibile in ISPConfig)
added memcached location with apache2 fallback
added expires
changed memcached port
Merge pull request #6 from Rackster/experimental

Custom nginx directives support
removed memcached lookup
* Fixed SSL ssl_enabled for vhost loop
hide all nginx options except directives
fixed options visibility
Merge pull request #7 from Rackster/master

Fixed SSL vhost loop and directives support
STS-3047: Fix eclipse-integration-commons tests executed in a mvn build
Continuo aggiornamento PQ
Aggiornato PQ con le ultime modifiche apportate ai vari documenti
Modificato capitolo 3: dettagliato meglio il raggiungimento degli obbiettivi di qualità del prodotto.
Pull Scott's changes & turn off zRam for now
asx: Does not need GTK_CFLAGS/LIBS.
refactoring background to work as a single AssemblaApp object
adding ticket code for space selection, missing liks to wiki etc
deleted jekyll introduction
Site updated at 2012-05-02 03:19:04 UTC
BUG:修改 搜索函数 不能搜索到地址问题.
BUG: getSearchData() 函数Subtype_id 拿错到mantype_id了.
Search.php 默认为支出.
adding 404 page, article about marketing
* code/spike-sorting.lisp: New functions added (diff, unique, A-to-D-output, window). They are all documented. The example script 'the-script.lisp' has also been updated, showing how to use the new functions.
First and most likely last commit. See readme
Disable Automatic brightness checkbox if automatic brightness is not available

also need to be disabled here

Change-Id: Ib32b9af5f79d5c5f7383dd5542891a82a17f3989
Settings: Fix stylus gestures settings and related NPE

This commit fixes two things:
 - The stylus settings category was not removed on non-stylus devices
 - Include all stylus gestures related preferences in the PreferenceCategory
 - A missing null pointer check caused a NPE when IME selector was triggered
   Issue 6503: "Set up input methods" crashes the Settings application

Patch set 1-2: Initial commit
Patch set 3  : Change variable name to better match category name

Change-Id: I6c0a746b33c4a86b977f443233ed79d626859495
Settings: Fix code formatting derp

Change-Id: I82fb82d46c14381b46752e7d14317935bd12f427
Merge branch 'jb-devel' of git://github.com/codefireX/android_packages_apps_Settings into jb-devel
Close file handles in rake task when finished
rspec + spork + guard; scaffold generator
delete test files
gpib test, open close with every write and read
gpib work basically, but interrupts of read or write transfers corrupt linux-gpib
refactoring template.rb
modify for windows. setMouseLenkrad
smba1002: i2c typo fixes
code is ruby 1.9
IPC with sockets
processes
Minor fixes to dynamic options data initialization
RuleML rules, query, widget facts.
Bug fix. Query wrong.
Site updated at 2012-10-25 18:12:13 UTC
pyramid: update prebuilt kernel for wifi tethering fixes

Update contains reverted bcmdhd at version 5.90.125.94 to fix wifi
tethering.

Change-Id: I5d69b6727fd4c69e73f692ba43084d89a2b74a55
Kernel-side lpm fixes for Infuse4g Bluetooth LPM

Based on C1att fixes for the same problem

Change-Id: I5150884fdecee7a50cf9b8074291ea5cbe107b20
Preliminary 1.6ghz overclock

Conflicts:

	arch/arm/mach-s5pv210/cpu-freq_c110b.c
	arch/arm/mach-s5pv210/include/mach/cpu-freq-v210.h
	arch/arm/plat-s5p/include/plat/pll.h

Preliminary 1.6ghz overclock
Fixed the persisting of the schema attribute of datasets
Changed Nunit version
msm_vidc header from Andromadus :/ again
Removing use /Type/collection.php.twig statement. File is no longer exists
updated navigation links to work, separated out LM section
Remove whitespace
Styling fix
Change kc.com to www.kc.com
Add footer
Add HN button, refactor
Fix HN button titles on blog index
copied the wrong language define - should be empty yet
Added multmip3 sample, removed gurobi solver from other samples
updating with examples for simple mocha usage, api testing, and mockrequire usage
Merge branch 'master' of github.com:mateodelnorte/node_hands_on-unit_testing
Redirections for some popular URLs
Custom 404 error page
Re-integrate BM's style tweaks on blog in sass file
Formatting fix for install output
updated readme to depracte project
Modified for presentation of the data.
Newton method assignment done.
Octopress init
Site updated at 2012-09-28 07:25:09 UTC
Site updated at 2012-09-28 07:28:49 UTC
Site updated at 2012-09-28 10:53:19 UTC
Site updated at 2012-09-28 10:53:56 UTC
Site updated at 2012-10-01 14:11:17 UTC
Site updated at 2012-10-01 14:12:04 UTC
Site updated at 2012-10-01 14:23:07 UTC
Site updated at 2012-10-01 14:23:23 UTC
Site updated at 2012-10-02 10:50:14 UTC
Site updated at 2012-10-02 11:08:24 UTC
Site updated at 2012-10-03 05:45:54 UTC
Site updated at 2012-10-04 09:40:31 UTC
Site updated at 2012-10-08 06:09:12 UTC
Site updated at 2012-10-09 07:31:46 UTC
Site updated at 2012-10-17 12:26:04 UTC
Site updated at 2012-10-29 10:06:25 UTC
Added Missing DLLs for building
don't hide some of the preamble
Added 3DObject files, bitmap, etc.
cleanup left over code
[config] added die file to gitignore
SD - [#32400275, #32400203] Database is set up for adding and deleting
courses. List view doesn't populate properly, but the data is shown
after closing and opening the app (data stores properly).
link mostrar todos os cursos
Initial Commit for Access Intel.
Merge github.com:unpoetic/Access-Intel-Mobile-Application
change project framework type
Added keypresses and some other cool stuff.
fixed issue with inserting images into posts
(OK) need a rest, call it a day.
Made some minor edits to nicks draft. Added a template.bib file to handle references. added a figure place holder which nick should replace with an image he made.
Revert "No j4fs"

This reverts commit 9d3797dd383ccec829be869c062aa35a74453d64.
Revert "gitignore"

This reverts commit a941f13d8ee26fc3082683eb1691732105a3d9c0.
Camera HAL update from Defy (Part 2/4)
Created a more interesting test.
Added debug info on both axis
Added restartOnEvent options property
always return jQuery object
user entity and proper services was added
add flag to "maybe" fix touchscreen issues in Unity3D games
add new media profiles
Ncx v8.0 beta1 kernel
fixes to device tree

ramdisk fixes for max freq stuck issue
overlay flag for Tegra3 compatibility and ROMControl
Add missing setting (LIVESETTINGS_CACHE_TIMEOUT)
Merge branch 'hotfix/startproject'
Merge remote-tracking branch 'francois/feature/askbot-integration' into hotfix/ab_timeout
Merge branch 'hotfix/ab_timeout' into develop
Merge branch 'hotfix/integrate_contribute_template'
Fix #1020: Add iframe cms plugin
Merge branch 'hotfix/cmsplugin_iframe' into develop
Simon's tinymce config changes for newsletter
Merge branch 'hotfix/tinymce_newsletter'
Added SLQB memory allocator.
Fixes and config for 10.1

Conflicts:

	.config
Tweak cpuidle governor to enter deep C state faster while still not breaking media scanner wakelock.
Tweak cpuidle governor to enter deep C state faster while still not breaking media scanner wakelock.
LMK pushed to 3.4 kernel version. Picked from Fugumod repository.
Update SIO
Reduce Wifi voltage for power savings
Should be beneficial for a wifi only device
Overclock to GPU to 384MHz
Pegasusq
Kanged and tweaked from sonicxml
arm: remove "optimized" SHA1 routines

Since commit 1eb19a12bd22 ("lib/sha1: use the git implementation of
SHA-1"), the ARM SHA1 routines no longer work.  The reason? They
depended on the larger 320-byte workspace, and now the sha1 workspace is
just 16 words (64 bytes).  So the assembly version would overwrite the
stack randomly.

The optimized asm version is also probably slower than the new improved
C version, so there's no reason to keep it around.  At least that was
the case in git, where what appears to be the same assembly language
version was removed two years ago because the optimized C BLK_SHA1 code
was faster.

Reported-and-tested-by: Joachim Eastwood <manabian@gmail.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Conflicts:

	arch/arm/lib/Makefile
Added kernel config option 'OMAP_C4_MPUOSWR'.

Conflicts:

	arch/arm/mach-omap2/cpuidle44xx.c

Conflicts:

	arch/arm/mach-omap2/cpuidle44xx.c
Added kernel config option 'OMAP_IPU_DEEPIDLE'.

Conflicts:

	arch/arm/mach-omap2/Kconfig
	arch/arm/plat-omap/iommu.c
	arch/arm/plat-omap/mailbox.c
I/O-less dirty throttling, reduce filesystem writeback from page reclaim - backport from 3.2 - Part I
I/O-less dirty throttling, reduce filesystem writeback from page reclaim - backport from 3.2 - Part II

Conflicts:

	fs/fs-writeback.c
	include/linux/backing-dev.h
	include/linux/writeback.h
	include/trace/events/writeback.h
	mm/backing-dev.c
	mm/page-writeback.c
Revert "I/O-less dirty throttling, reduce filesystem writeback from page reclaim - backport from 3.2 - Part II"

This reverts commit 57c3ff4c7240a76291caabc401eb6c4c5fb32462.
Revert "I/O-less dirty throttling, reduce filesystem writeback from page reclaim - backport from 3.2 - Part I"

This reverts commit 54d6a262136cad5b9bf190f572cca2beade8e717.
Make get_embeded_croc public for theme developers

Signed-off-by: Mike Doss <mike.doss@medihiave.com>
DOH!

Change-Id: I8b3af549cf1c53143399f5f8fb2bac127bfb9588
Add backup TLS registers for allow rmmod module
Added screen size to board config.

Change-Id: Ida33a2d60814aa6cf4170d8d1e505ea0681b5fb5
tweak
added "public" group to all requests to fedora
Merge branch 'master' into submissionForms

Conflicts:
	fcrepo-cdr-fesl/src/main/java/edu/unc/lib/dl/security/ForwardedGroupsToFedoraRolesFilter.java
using abdera client instead of http client
Zen Implementation Intranet Addition
Wired up structure map and raven db. Started products controller.
Improved DrPublishApiClientArticle::getDPSlideShows(), added DrPublishApiClientXmlElement::getDPSlideShows(), updated documentation
完善3.1小节
Added a note to readme about the mount point for the image storage
Merge "Prevent saving reminders when event is deleted"
Import revised translations.  DO NOT MERGE

Change-Id: Ib51cdfde0dff61c1cba5ea9ce1bf46b4e39a258a
am cda28a55: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'cda28a559678892e354227b13c5a0ca40adf1fdf':
  Import revised translations.  DO NOT MERGE
Change alpha for declined events text

Change-Id: I21fdbd7ae15abc9ad9c45251703b0f051836927e
Import revised translations.

Change-Id: I9b7f3a99c141b0f9766d0bcbb25e2ade74aefc55
Merge "Import revised translations."
merge in ics-release history after reset to master
Import revised translations.  DO NOT MERGE

Change-Id: I67174ea05fba51f1428a1d9d2e1afe86e9c38717
am c3d0965f: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'c3d0965f199adf33f29df72d63037b71c96eb4c9':
  Import revised translations.  DO NOT MERGE
b/5497100 Fix substring requests in DayView

We had a case where we could request a substring of -1 length. This
puts a protection around it and fixes the bug that caused the bad
request.

Change-Id: I20bc901853871c32aff36011026bf2f50fb8bff2
Merge "b/5497100 Fix substring requests in DayView"
Import revised translations.  DO NOT MERGE

Change-Id: I34b13523ee9226ef49c738142486bcbe123497a7
am 1ee9806f: (-s ours) Import revised translations.  DO NOT MERGE

* commit '1ee9806f2e69aceb00fa5ae007014649aa421a55':
  Import revised translations.  DO NOT MERGE
merge in ics-release history after reset to master
Import revised translations.  DO NOT MERGE

Change-Id: I03a7ca7684e9aad715145177f20fb1705b16b5bf
merge ics-mr0

Change-Id: I2edd22bf9f2bf69e3e56201dea63c75347af3398
Vertically centering day headers on appwidget Do Not Merge

Bug: 5404464

Change-Id: I7485b9670ec3d8a076fa4dd652de1170cb75860d
b/5514124 Protect against a null time zone

The db could get a null time zone in it, this protects against
trying to use the null value.

Change-Id: I43999c4321c0d64caa98fd4f7f586858d216e39a
remove conflict markers

Change-Id: I6279d811b4299822f68ab1d1bf6b0d43118a9f29
Merge "Vertically centering day headers on appwidget Do Not Merge" into ics-mr1
audio: added legacy audio wrapper
Merge pull request #3 from dhiru1602/ics

Legacy Audio Wrapper
Working on HTTP provider

Initial tests for HTTP provider, and new HTTP-specific type parameters
(url, path) to provide a bit of flexibility to how you use the HTTP
provider.
Bucketed by day and ready to display
changed to glass
Removed bluetoothd

bluetoothd is no longer needed as it's building from source and seems to be working perfectly.
-Updated README
-Working on LadspaHost tutorial
-LadspaHost: Loading of AM pitchshifter works, need to implement processing and controls
add example LOG data & example output
Add HTML output + improve dht2ht.sh
Setting /dev/tun permissions and removing unused bthid module
Added (UML) domain model....
November 27b final
Version bump to 0.0.0
lots of fixes and better readme
Allow system to modify i/o scheduler control files
Add Seconf Chance Alg.
API final revision
fix permissions for torch
README - change
readme
[i/82] Variables fix. Get message after compiling eg. compiled, not compiled. Documentation of code. lessPHP settings change.
[i/82] global remove from is_modified.
Merge pull request #82 from Culprit-CZ/i/82-sn-theme-fix

SN theme
- updated to: 1.1.4
Added support for ARV drug regimens though doesn't seem to be saving them and proper mapping between IQChar regimen components and OpenMRS drugs is not implemented yet
amg2006 32768 mpiP data
BUG: SendNotification flag not saving/showing in the SubscriptionPage backend
add example for disableDays
algunes modificacions al README
actualització de REAME -> estructura de directoris
fixing eshell aliases
added function to extract morphemes and glosses from corpus

for #68
Merge branch 'master' of github.com:iLanguage/iField
oops, was removing . in glosses and morphemes.. that was silly
Merge branch 'master' of github.com:iLanguage/iField
Fix new test input height
Added initial travis config + build script
Localisation updates from http://translatewiki.net.

Change-Id: Ied3f9bbc8bf0fa9291417828e5cbcb966aa77134
enable ping sensor; debug serial message parse
Update notes for submitted changes

* msm8660: Update msm_mdp header to match kernel
added cyanogenmod strings in values-ko strings
Shortened project description
Calendar: Dutch translations

Change-Id: I94f41277934deb728e2f7ad0adbc69b70f8c7658
Update notes for submitted changes

* Settings: PT-BR - Fix translations
Lets use a new partitoining layout
Add to ActionMailer [named matching_mailer]
Merge pull request #1 from GRardB/gh-pages

Add me, swift!
Added HN link
Support
Merge pull request #2 from vaibhav2614/gh-pages

Supporting Twitter Independence
Merge branch 'gh-pages' of https://github.com/theycallmeswift/declaration-of-twitter-independence into gh-pages
Added support
Merge pull request #3 from DeviaVir/gh-pages

Please add me as well :-)
Update index.markdown
Empresa Services
quick non-optimized solution
enable mass storage, replacing mtp

Change-Id: Ie278a27c2acdffa5214ee8b835cc986c349f1a77
Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
Adding in Lloir's vendor/qcom/proprietary
Site updated at 2012-11-04 19:00:34 UTC
city simulation error corrected
len -> len_
loadNewPosts don't count oppost
Remove extra assign
Merge pull request #381 from Y0ba/master

Исправления
Refactor processInput
Add option to 'clip' to allow specifying adaptors in a fasta file
Merge pull request #4 from drpowell/master

Add 'adaptor-file' to nesoni clip
Select Sliding NavBar Widgets
Now appears to work properly

Change-Id: Ib3e9a758436fbe05a4fc772f62b8760a2b304933
Link tron
Merge pull request #4 from vrana/master

Link tron. Thanks Jakub!
Disqus Check
Modified couple of files including lib/bbwp.js,lib/config-parser.js,lib/file-manager.js,test/unit/lib/config-parser.js,and test/unit/lib/file-manager.js
Changed little logic for passing option args[-o] or not passing any option args in lib/file-manager and also modified its unit test case
Fix the logic in error condition,and rewrote unit test
Minor code review changes
Starting a PHP primer
Updated changeLog
Moved reindexDocSubscriber from collective.geo.geographer
Add example documents
[grammer] _post
[posts] clarity
green focus for input fields
Add to be added list
exercise solved in class
Merge branch 'master' of https://github.com/deparis/ProgrammingConcepts
fixed image name in file upload
made pagination
better ui for expand/hide btns
Fix from l-j-silver
Error in Makefile
Add overload to updateVerbInfo for changing root
Pass nħasel, ntiżen treebanks (Form VII)
Minor updates to roots.txt readme
deleted:    nb-configuration.xml
	modified:   pom.xml
modified:   src/main/java/es/upm/fi/dia/oeg/map4rdf/share/RDFModelProcessor.java
Update for formtype number

Adding additional fields for form generation from the metadata
Further simplification, plus note about prebuilts.
Use correct path for egl.cfg. :)
- make sed on plugin source work in-place
- rel 4
fix tiap module
fix 2ndboot script
fix charge only mode
set console to null, gps can work without it
Remove prebuilt modules
disable build governors
compile all modules during android build
add last  working on defy source for hboot
enable l2 cache (thanks to SkrilaxCZ)
 compile hboot and cmdline during build android
 compile hbootuser during build android
fix compile hbootuser
fix compile ext modules
temporary use prebuilt wifi modules
fix local module path for hbootuser
kill perror(fscanf())
set interactive governor by default, fix oc script
add power hal
zram init fixed in cm
add bp_ptc service, binary not included
Use SSL rather than HTTP to load Gravatars

Gets around local network restrictions without (I think) any browser issues.
Merge pull request #1 from benbalter/gh-pages

Use SSL rather than HTTP to load Gravatars
increase overclock potential to 1.5ghz
Made some Updates to the query handler to enable file input
Version 2 working afaik :D
Github being silli? or me?