labofsahil/github-event-dataset-2012 huggingface dataset:
status commit: bouncing html work
status commit:
status commit: bounce computers.  last commit was accidental.
sanitization changes
multipart type should be 'multipart', not the subtype
mime tests pass for limited html (direct and alternative)
status commit: bounce html work
upgrade bleach.js version
Merge branch 'html-mail-initial' of github.com:asutherland/gaia-email-libs-and-more into html-mail-initial
ActiveSync: add a rough implementation for changing local message state
status commit: whitelist improvements, reply/forward logic
ActiveSync: Move implementation of local_do_modtags to its own method
Merge branch 'master' into as-modstate
Cherrypick Cyrus LIST fix from upstream node-imap

Commit 0b1c66178c3e172e92ea6cb777481e1d190e157e
"Always use LIST to get delimiter to support Cyrus IMAP server. "
cherrypick imap.js disposition type fix to replace local fix

upstream commit:
27d2ae8c8d54feec9683d08230631ec8e2235353
"Save message part's disposition type where available"

This replaces my attempted-to-upstream fix at
https://github.com/asutherland/node-imap/commit/4bc4bd8f3f4f48eee8e6eceb4b6ffa477dcf52f2
port imap.js upstream changes

upstream commit:
7efda6cb9e5b73847839f49ef4a4b3f18ae2e76a
"Misc minor changes + be less strict on non-selectable mailboxes"

I have fixed one stupid drift bug from my last commit, plus:
- the connect function cleanup logic to not use arguments.callee is ported
- the noselect regex loosening has been ported, plus the formatting cleanup
  in the immediate vicinity

Various other whitespace cleanup has not been ported because our drift is
sufficient that the goal is mainly to make it easy to determine what logic
changes we might have made that are not in upstream.
ActiveSync: Support modifying message tags on the server
ActiveSync: Update syncKeys when modifying tags on the server
status commit: bounce
ActiveSync: Support pushing message flag changes to the server
Modification du fichier gitignore
Revert "fix sms receiving for some Samsung CDMA phones"

This reverts commit 116b06bdcdbb1f659c99f4d9844e41a0e3052ecd.
Added section on ad size guidelines
Base express app.
fix memory leak casue by sws_getContext
updated flickr section!
intellidemand: add mutex protection around sampling rate change (faux123)
CodeChef(feb,march,april) + SPOJ(segtrees, tries and others)
Work in practical

sierpinski still broke
still ssh fiddling
sign in, datei hinzufügen --> fertig getestet,

Signed-off-by: Patrick Meppe <tapmeppe@gmail.com>
Variable::Magic   0.47   0.48
B::Hooks::EndOfScope   0.09   0.11
CGI::Simple::Cookie      1.113
Class::C3::Adopt::NEXT      0.13
HTTP::Request::AsCGI      1.2
MooseX::Emulate::Class::Accessor::Fast      0.00903
MooseX::MethodAttributes::Inheritable      0.27
MooseX::Role::WithOverloading      0.09
MooseX::Types::Common::Numeric      0.001007
MooseX::Types::LoadableClass      0.007
Plack::Middleware::ReverseProxy      0.11
Plack::Test::ExternalServer      0.01
Text::SimpleTable      2.03
Tree::Simple      1.18
Tree::Simple::Visitor::FindByPath      0.03
Catalyst      5.90011
Polishing intro.
Moving around some quote marks.
A bit on criticism.
아이프래임 예제 추가
Merge branch 'master' of https://github.com/egoing/codingeverybody_html_tutorial
Create report1.bac

This script executes every 1 hour on running SCADA and writes levels and work time data in MS SQL 2005 database
Site updated at 2012-10-29 15:21:08 UTC
fixed problem adding listener to the shown event
fix charset utf-8, and other miss.
ResignFirstResponder is called when menu is revealed.
Site updated at 2012-10-29 16:15:09 UTC
require_relative for in-src modules.
Site updated at 2012-09-27 02:18:36 UTC
modify facebook button to like
Site updated at 2012-11-22 19:31:00 UTC
Site updated at 2012-12-09 22:40:33 UTC
Commented out unnecessary loggings.
jewel: remove flags present in common

Change-Id: I13741b3bf9c93ddc86a8343193da40381eb5994c
Insertanto twitter bootstrap2
Added Metadactyl URL config and utility functions.
Forwarded Metadactyl GET requests to new service.

Updated all metadactyl GET endpoints in Donkey to forward their requests to the new metadactyl-clj endpoints.
Forwarded Metadactyl POST requests to new service.

Updated all metadactyl POST endpoints in Donkey to forward their requests to the new metadactyl-clj endpoints.
Forwarded Metadactyl PUT requests to new service.

Updated both metadactyl PUT endpoints in Donkey to forward their requests to the new metadactyl-clj endpoints.
Notifications now use get-app-description endpoint.

Updated notifications to use the Metadactyl get-app-description endpoint, instead of directly from the AnalysisRetriever object from Metadactyl.
Removed the remaining, obsolete beans from metadactyl.clj.
Removed the obsolete hibernate and DB configs.
Removed obsolete beans.clj.
Removed project dependency on c3p0 and metadactyl.

Converted current-user to a simple clojure map, since org.iplantc.authn.user.User is no longer available from the metadactyl jar.
Removed obsolete reference_genomes.json files.

These files are only required by the metadactyl-clj project now.
Cleaned up documentation and log4j properties.
Updated forwarded requests to not throw exceptions.

This will allow the error response from the remote service to be passed through Donkey to the client with the same body and HTTP status code.
Updated response error log messages.

Updated response error log messages to correspond with the standard description for the corresponding HTTP status code.
Updated RPM summary and bumped release number.
Not loading process instance IDs
Link edition
version 2 of upload with failed times
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.1.1-33.33~ci~20120331223013 vexpress only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.2.1-43.43~ci~20120520002210 omap only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.2.1-43.43~ci~20120717002140 vexpress only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.3.1-37.37~ci~20120506001931 omap only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Merge branch 'latest-sauce-branch' into working-branch
LINARO: CI: Start new release
LINARO: Update configs
linux-linaro 3.4.1-3.3~ci~20120526002322
        created from:
        tree:git://git.linaro.org/kernel/linux-linaro-tracking.git
        branch:linux-linaro
        commit:6ba32bb59015878eff51c3aca1efae959bc2ae8f

packaged-kernel-branch-commit-hash=6ba32bb59015878eff51c3aca1efae959bc2ae8f
commit 6ba32bb59015878eff51c3aca1efae959bc2ae8f
Merge: 3f30472 774c3a2
Author: Andrey Konovalov <andrey.konovalov@linaro.org>
Date:   Tue May 22 20:39:37 2012 +0400

    Merge branch 'rebase-last-minute-fixes' into merge-linux-linaro

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.4.1-3.3~ci~20120908001744 omap only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
deleted pyc files
deleted pyc files
Site updated at Tue May  8 15:19:11 2012
* add pdf for task 1
Added a background and switched back to the v2 instance
Structural changes.
Added missing columns. Again.
Merge pull request #15 from vlad-ghita/9d7c6a04ba39bf36e7581685ec71f3314dc18e3f

Structural rework
Site updated at 2012-07-23 09:39:50 UTC
Fixed rootfs reference to squashfs and /dev/mtdblock4
Changed flash ROM image function to avoid name collision
update version and author info
update readme
IE7 autogrow tests
1. Add a function called add_file_to_obj_lib for moving objs into out/target/product/XXX/obj/lib.
   Becuase some files will check dependency during compile time.
2. Add file - libcnfeatureconfig.so.
+ ‘swiecaca-chatka/schemat.png’
parse method for user.data is added
added new module for rating parser,and (movie_parser,user_parser) is redefined
new function for movie_recommendation are added in movie_manger and movie_buf is also modified
vvv
Renamed function to notify_after_config_change so that we can have another that notifies fater marking change. Functions in place but not called yet.
Added function call to notify other trees.
Merge branch 'feature-marking-refreshes-other-trees' into develop
Site updated at 2012-05-31 22:42:55 UTC
adding one example about EasyMock
First GUI
.gitignore merged
removed defunct rdf file
Fix off-by-one error in vault generation loot amounts
Fix: doubled chat in console log, by disabling chat earlier with chatDistance == -5
fixing bug that client would not shut down correctly
Merge branch 'master' into mobile
Clean up IndicatorResults so that we can safely convert them to JSON.
Clearing the lines of the template
-added onto processor.
-added processor test.
-link extraction is not working.
-spacing.
damn footer fix
adding sitemap.xml for SEO-sake
Remove context_ui & permissions
add log function and Parser path to routes
add magic oneline input functionallity
test/data/
dbpedia
SPARQL
dbpedia
dbpedia
Write tabulated
dbpedia
ids
readded onSuccess, added tests for issue 451
Enhance pedemo config

The pedemo configuration has been updated to use the newer (and
better) module that I wrote. End-functionality for the stacks built
remains the same as before but this paves the way to better demo
content.
Merge pull request #46 from rcoleman/improve_pedemo

Enhance pedemo config
[BUGFIX] Make TYPO3 Flow ignore all the classes and annotations
Retoques, api_FELIPE
Updated the adt-html.js and adt.js libraries
Temporarily removed all input handling in the editor (because it didn't work robustly, preventing keys b and i from being used effectively)
Fix all uri checks in sharing hooks: look for first occurence not last
Move code for setting default sharing filter to Sharing library
Add site filter to reports listing
trying this silent thing
Patches from BlackBox community
Add a note on 'nodemon'
Call for entries permalink.
Site updated at 2012-03-13 17:03:46 UTC
ADD: google verification page.
ADD: go daddy verification page.
ADD: fix miss spell
ADD: make header and footer thiner.
move style.css into static
Тестовый коммит

Прект 11 студии каркаса движка
Test commit 2
Merge branch 'gh-pages' of github.com:Code52/aspnet-internationalization into gh-pages
Updated the build itself
ldeb package
Site updated at 2012-12-07 15:23:46 UTC
Site updated at 2012-12-17 15:04:59 UTC
No calling home if calling home url is not set
*kyusu-tyabatake-XmlTest*
* rm README.md
added ability to sort the list of category children
Initial commit
some more functions
final version of the talk
remove unnecessary trees
Replace date with 'FrOSCon 2012'
Next CSS comit
Merge branch 'master' of
git@github.com:thisisinsignificant/pauladezinacards.git

Conflicts:
	target-eclipse/classes/pauladezinacards/Product.class
	target-eclipse/classes/pauladezinacards/ProductTests.class
aenderungen juergen klemm
Update copy-DLL.cpp
forward step
Supported to deploy of sources.jar.
update standard src
add myself code
hy
JS File to include
up to 00:54:50
Initial commit for YAF 1.9.6.1. Bug fixes for previous versions. Updated  documentation a bit too.
BUGFIX: corrected UIGestureRecognizer handling
TRIVIAL: Warning messages when view controller properties are nil
Added package config, code, and license
added insert of checked webpage into GridFS, probably not OK yet.. variable content_id has strange values, should be _id of file from mongodb/GridFS, makes some database searches problematic
added "success" field returned from result, and also example on adding new List
Tweaks
Build!
Updated to show how to use Standby & Wakeup functions, could put all this into a new file and call it "parsing_with_standby"
Altered user agent
Replace vocab with vocabulary

This commit fixes #18
Changed Extension name back to Portal
Added missing tools
Changed ExtensionAttribute name to Index
Updated Portal and MCM dlls
no message
Merge branch 'master' into Stage

Conflicts:
	tools/NUnit-2.6.0.12051/bin/lib/Images/Tree/Circles/Success.jpg
More changes in the readme!
Update notes for submitted changes

* p5: Bring p5/p5wifi up-to-date with pershoots latest changes for the p4/p4wifi models.
mango: updated proprietary-files list
Update notes for submitted changes

* mimmi : props to enable ant+
zeusc: bootanimation
Update notes for submitted changes

* nypon: add support for init logo
Update polish translation

Change-Id: I8e6ea5e19ebe5107c420b233afae7fdc16761d02
Merge "Update polish translation" into ics
Mms: Simplified Chinese Translations

Added and modified translations in order to reflect recent changes
to the English strings.

Patch Set 2: Some revision.

Patch Set 3: Cleaned up unnecessary strings.
Change-Id: Ic48bde689ff374a2fee8e1cb7dda1a646b1b0c16
Added some more information and better console output
finish regist,login,get psw function
Merge pull request #1 from xwllh627/master

finishi login regist and get psw function
Corrected wrong filepath for the 72x72 apple-touch-icon.

Signed-off-by: Florian Wolters <florian.wolters.85@googlemail.com>
checking in plugins for contributors widget and most popular posts widget
checking in selectivizr plugin
- verbose output of supported audio decoders
- cleanup
- bug-fix for seeking in file when file access is started
- cleanup
- extended OSD display
- use AUDIO_OUTPUT_SAMPLE_RATE from Configuration.h
- rename "Block:" to "Buffer:" for OSD
- improved debug output
- duration handling
- align H.261 code to RFC
- removed fixed O2 parameter to support system dependent cflags
- only strip final binaries in case of a release build
- only set rpath entries in case of non-default builds
beta 1.0.1 ARC conversion and edits
this todo no longer relevant
sort of implement the minimum_age feature
Added missing form fields to the offer form. It is still missing a module selector, but it is almost complete...
Usability improvements in order listing and overall structural improvements to module file structure

Signed-off-by: Eirik Ottesen <Korkonius@ordoxenos.com>
Created initial form for applying filters to the order listing

Signed-off-by: Eirik Ottesen <Korkonius@ordoxenos.com>
From eclipse dry run test
添加baner
ejb-jar 2.0 dtd에 대한 엔티티 생성 
ejb-jar DTD 파싱 테스트 코드 추가
Merge branch 'master' of https://github.com/OpenSourceConsulting/athena-chameleon.git
Code clean up
Merge branch 'master' of https://github.com/PedersenThomas/Asterisk-Communication

Conflicts:
	src/socket.adb
	src/socket.ads
Added first project, cleaned up images on index page
don't use keywords for local block variables
add Jamie Winsor to gemspec authors
remove Gemfile.lock from project
add Guardfile and Spork DRB to project
update README with testing instructions
remove cucumber guard reference
swap one line heredocs for single line double quoted shortcuts
Merge branch 'add-guard'
fixed aggregates (but need to optimize)
- Fixed project URL
- Added SCM section
add utility method to know if nature of projectfragment
add method to travel through the project sourcepath
Implemented unwrapping
Refactor
[STRAI-481] InfiniteScroll 2 new features fixes.
cpufreq: add intellidemand governor [faux123]
-backported from 11b2e698c65b564e36b8bd66b7fd4c27fc4a8482
Add WIMAX_SETTINGS action to WiMAXSettings.apk.

Change-Id: I748a7426aca7db9f33bb48e7ca47c9831db95eb7
Merge pull request #36 from EpicCM/gingerbread

To fix long-press on epicmtd's 4G power widget.
Add WIMAX_SETTINGS action to WiMAXSettings.apk.
Merge pull request #37 from EpicCM/gingerbread

Gingerbread
Update EpicMTD proprietaries for ICS. Also allow crespo4g and epicmtd to coexist in the same tree.

Change-Id: Ie6684b7386befdd82bbb36c67a6c9df7a8fc46fb
Rename sensors blob.

Change-Id: I594e28bc77693971fdd154b78af1b4496ba3337f
Update epicmtd WiMAX proprietaries for ICS (NS4G IML74K).

Change-Id: If2a6026c7832a0d024be94da276ee90f838fb993
add camera .bins for kernel interface
add firmware *.bins
add more kernel interface blobs
Cleanup RIL blobs.

Remove libsec-ril.so since it's not actually used.
Move pppd_runner script into device repo.
Cleanup RIL blobs (I'm seeing double!)

Change-Id: Iaf4641fcb098eac0424879674dea824d0e53e557
Update wimax blobs.
Update wimax blobs.

Change-Id: I3722cb26f8aef6770eb0abbb24d04ad4d8e9ee4b
Add WIMAX_SETTINGS action to WiMAXSettings.apk.

Change-Id: I9722d92aede2dc3ca108428871d4501e26a13331
Add NFC firmware

This is necessary to actually get NFC to not crash constantly. Still doesn't work properly, unfortunately.
Typo I guess. Something was messing up the build.
Merge pull request #39 from EpicCM/gingerbread

Gingerbread
Merge pull request #40 from Kaik541/gingerbread

Gingerbread
Update libsec-ril.so to match epic EL30 fixes volume issues with the libaudio update

Change-Id: Ib268a599bcb3c3b69d2dc66c1d7f399fb7b46195
SubstituteImage class usable but video not working
supports video loading (android support not yet there)
fix wrong substring

The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.
How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "0900111102222"

Jonathan Steadman
Revert "Update display permissions to allow proper accessbility"

This reverts commit 13a6b5676742d5aa95bb3a3d574db7e11b149eea.
Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/external/webkit into aosp
Merge 4.0.4
WebUI: statsgadget: Add utility and effective MH/s to work sources and
blockchains as well
Fetcher: All-new panicing logic... Let's hope this works better
Nice release ! wohoo...
Awesome1
Added picture of game
Adding the db4o JAR to the project
Added news three new files to repo
add user css file
check if the requested fd is in the returned set in read_select
Merge branch 'master' of
https://andersboe@github.com/bartvbl/Fellesprosjekt-2012-gruppe-32.git

Conflicts:
	Fellesprosjekt/src/fp/messageHandlers/GetMeetingHandler.java
	Fellesprosjekt/src/fp/messageHandlers/GetUserHandler.java
Merge branch 'master' of
https://andersboe@github.com/bartvbl/Fellesprosjekt-2012-gruppe-32.git
added wikipediasnippet.inc.php  back in as a fake submodule
use custom function instead of RT::Record->Update

Update method does s/\r\n/\n/g on values. This change
of values is not visible, but if combined with ExternalAuth
can result in regular change of a field back and forth.
Added missing myprojects
simplified the ``RandomgenNode`` class.
messed around with prefix counting
Moved testing docs from plone.org
Added images for testing documents
Fixed testing docs
Merge branch 'master' of github.com:collective/collective.developermanual

Conflicts:
	source/index.rst
Moved testing docs to old reference manuals
Moved testing docs to old reference manuals
Fixed excessive pool initialization
Light refactoring. Restructure example.py somewhat.
add like button with variable "album_url"
Fixed saving of images to PDFs
Modify boardconfig, add liblights, remove audio_policy_legacy
Added env_variables to .gitignore
Scroll effects refactored
Un-pended two user_controller tests
Setting the right path to the VM
Few style changes, upload button name changed
Merge remote branch 'mirzap/master'
corrected rolify's generation for mongoid
Removed settings (now in settings.py)
J'ai ajoute un chronometre avec les options Start, Stop et Reset. Il y a des fonctions qu'on veut enlever mais on veut garder la version de depart juste au cas ou
Adding additional sub sections on homepage.
Adding additional sub sections on homepage.
Add crap and change bird to spawn it
Add Crap class with constructors
Update bird class
Fix conflict with merge
Add chromakey for Crap class
merged Package Control.sublime-settings
on Win7
waitpid() in destroy, to avoid zombies
added back ACME
renamed README so that 'extending' project may have an own README file
Merge branch 'master' of github.com:janimattiellonen/sf2-project-template
Imported Upstream version 0.85+dfsg
Imported Upstream version 0.85+dfsg
Imported Upstream version 0.85+dfsg
some final changes to module xml
PBR-335 Remove unnecessary files from source tree
Add standard gitignore for visual studio
Merge pull request #151 from john-hill/release-1.9

fix for PLFM-1533
Merge pull request #153 from john-hill/release-1.10

Merged fix for PLFM-1533 to release-1.10
Fix for PLFM-1537
Merge branch 'PLFM-1537' into release-1.10
Give up trying to find a directory, fetch the makefile from github directly
This is the entire spambase dataset
melhorei exibicao das novidades na home
Added testes for echo trans, improved regEx patterns.
Bootstrap from vendor bundle, cleaned up, used country for country - INSTALL intl to use!
Fixed null pointer to level editor.
Updated camera driver from GT-I9000_OpenSource_GB_Update.tar.gz

Requires libcamera.so from newer ROMs.

Conflicts:

	drivers/media/video/samsung/fimc/fimc_output.c

Change-Id: Id3815c0b1b3d5304e54e4354bdc83eed7da8fdef
video: s3c fimd: Adjust pixclock to match hw settings

* The pixclock used to report refresh rates to userspace
did not reflect the actual frequency that the hardware was
programmed with due to rounding.
Now we recalculate the pixclock based on what is programmed in
the VIDCON0 register.

* The div bits in the control register where not being cleared
before the new value was OR-ed in.

Change-Id: Ic417b67a3324d94727ed82170d31015967bb1ce1
Signed-off-by: JP Abgrall <jpa@google.com>
S5PC11X: PD: Add spinlock in power domain control

All power domain controls use one NORMAL_CFG register.
So, enable and disable procedure needs a protection
from simultaneous access.

Change-Id: I1f726faa7b546d111bc286e60de8189ebc0ea975
Signed-off-by: Kisoo Yu <ksoo.yu@samsung.com>
video: s3cfb_tl2796: Fix fb_var_screeninfo.pixclock

This value should be in pico seconds not Hz.

Change-Id: I96e7732d0e9ea4812c9751b5972e001bbe1e3c56
Signed-off-by: Arve Hjønnevåg <arve@android.com>
S5PC11X: DMA: Add dma clock gating.

Dma clock is enabled, when dma is used.

Change-Id: I16b93af202041d4cd21f9d1eb0de296255972fb9
Signed-off-by: Choi jonghwan <jhbird.choi@samsung.com>
Fixed overwritten flow
Corrected a couple of typos I noticed.
allow %{nil} just as %nil
report UNASSIGNABLE_METHOD problem only for top-level methods
Edit README
README
Merge pull request #4 from patrickkivits/develop

Develop
[maven-release-plugin] prepare release Cassandra-Tutorial-1-0.0.1
[maven-release-plugin] rollback the release of Cassandra-Tutorial-1-0.0.1
Try2
[maven-release-plugin] prepare release Cassandra-Tutorial-1-0.0.1
Advanced export
sidebar sottocategorie
fix categories in lezioni
remove old files
fix books in prefooter
fix clean better footer
fix
Merge remote-tracking branch 'origin/manuela'

Conflicts:
	doing/css/screen.css
doing form
box corso iniziato done
corsi creati
delete
delete
lezione
delete
titoli edit
box corso
Merge remote-tracking branch 'origin/manuela'

Conflicts:
	doing/compass_app_log.txt
	doing/css/screen.css
	doing/sass/screen.scss
fix bug ctegorie lezioni
Update done/sidebar-sottocategorie.html
Merge pull request #1 from skedone/patch-1

Update done/sidebar-sottocategorie.html
Merge branch 'release/0.1.0'
Updated composer.json to lock down JMS SerializerBundle version
Merge remote-tracking branch 'jmather/composer-json-fix' into develop
Lock `JMSSerializerBundle` to the `0.9` version.

See #1, and #2 for more information.
Document contributing guidelines.
Bump version number.
Merge branch 'release/0.1.1' into develop
Coding standards improvements for #384
Fixed issue with duplicate IDs when multiple variable prices are displayed on a single page.
fixed user mgmt app
fix bug for not logged-in users
track user signins
bring in required variables
Added Fork Me on GitHub
Layout fix
Merge branch 'master' of github.com:raphaelmolesim/Para-onde-foi-meu-voto
Last CSS changes
Merge branch 'master' of github.com:raphaelmolesim/Para-onde-foi-meu-voto
Fixed incorrect conf directory path in stingray-wrapper.sh.
cascading and uni-directional for m2m and 1to1 relations
Changed to double click for better funcionality
all commit
Merge branch 'master' of https://github.com/sheldonzipingchen/design-for-homework
Created JoinTrigger and added to SelfBuildPipeline.  Juts need to write tests and see what the advanced join options are.
More stuff
Merge branch 'master' of https://github.com/startupandrew/AndrewAndJamesDoDisrupt
Update server to list all users.
Änderungen bezüglich der Kommenare von Jan + etwas Silbentrennung
the eclipse configuration of checkstyle improved
methods made non-final
added pacbio for wgs-assembler
Adding orthoMCL
Added a content manager. Now parsing of "toc.json" will happen in one place. Changes to "toc.json" format. Cleaned up Experiments Menu.
Syntax
updates
Added
Added mention to the Bootstrap Module requirement
Added a Force-DirSync function which replaces the Run-DirSync script.  This makes it completely generic, removing server names and the scheduled task that used to also be ran.  At WTA, I moved the scheduled task to be triggered on the EventID 4 (success) of the DirSync process rather then timed.  This way it will run right after any DirSync without additional user action.
README is improved a little bit more.
Clean up index.php significantly
Clean up layout and configs

- Layout helpers used inline instead of in code block at the top of the
  layout.
- Removed unnecessary config keys
Add jquery to layout by default

I'm not 100% sold on shipping this with the skeleton, as it's one more
thing people have to remove if they're not using it. However, it's
required to make the responsive layout work properly and having it
included makes ZendDeveloperTools work with the skeleton out of the box,
which is a plus.
Merge branch 'feature/bootstrap-redux' of https://github.com/EvanDotPro/ZendSkeletonApplication into feature/beta5-readiness
check-all for overnight
no libatlas3 patch for now
added mpich2; just run the task view and document the bugs!
-03 Fix #1
tf300t: Trebuchet: Remove nebkat's derp

Change-Id: Ibaa55ece4ef87d52f87c9eb9658b79bbfd3a13a4
cm.dependencies: fetch hardware/samsung

+ cleanup

Change-Id: Ie322603e80733e9cc7560cded6084ab1d16d8505
Update notes for submitted changes

* iyokan: Fix front camera
Update notes for submitted changes

* cardhu: update source to 10.4.4.20
Added in all sizes of pictures; Pinch to zoom
Uploading initial files
Merge branch 'master' of http://github.com/DiabolicOne/Kolbot-WithAddsBy-Diabolic
delete railroad cache
Merge branch 'master' of https://github.com/EPSI-Bordeaux/CSII-3_Team_LesBranleurs
Update Index Homepage
Set Config JSON
Defer relation geometry diffs
Do not redact type tags on relations
Add more tests in russian
Removed stuff that didn't belong in root
Finished Code

This is the final code with some commenting
Revert "Added system to build LegacyCamera if specified"

This patch does the complete reverse of what it's supposed to.

"ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))" matches the _absence_ of LegacyCamera in the list of packages.


This reverts commit dd9c5ca25902e723b2229d1438be4c297e6f348a
Merge remote-tracking branch 'CyanogenMod/jellybean' into jellybean
pick-up-to-call battery fix

Change-Id: I35bad632c2e528adb3a40b5bf1b56d62e13f892d
added RobotControllerPlugin to caesar with some settings for testing
Added search to top of toolbar
actualizacao do log individual

mensagem
jar.mhvisual Structural Analisys in progress
jar.mhvisual Structural Analisys in progress
- implementa testes de LoteGen para bancos itau e bradesco.
Edited readme file with markdown
A few adjustments and new images

Change-Id: I2ab37751ca1df43922d3a0564951b401cd7cf2b0
Cleanup, AVR support stuff and WIZnet stuff started
WIP angular events
sync sources with defy+
Change to Read Me
Changed text for S Pen Challenge.
Settings - Update Italian Translation thanks to Francesco Margiotta

Change-Id: Ie23d428eb914e6f5d4bbbff821236da08e56cab3
Update korean translation

Change-Id: I24be4f81347a714f3fd5e7fe54b4c2acdd13fd20
Use preferences from default launcher

Add a new category "com.cyanogenmod.category.LAUNCHER_PREFERENCES"
which should be added to a launchers preference activity manifest.
Then the "Launcher" button will link to the default launcher's
preferences screen.

Change-Id: I53ce6393e151995a54a252690da0113082ea39a4
Merge "Settings - Update Italian Translation thanks to Francesco Margiotta" into ics
Settings: Data usage: Linear chart option and 2GB to 100MB vertical axis limit.

Add a menu option to switch between logarithmic and linear chart.
Set vertical axis limit from 2GB to 100MB and add more grid steps, for show all linear values properly.
Clear estimated data on tab change.

Change-Id: Ia84ad580d9727ce9168f789fb15262c5c03ac8af
Merge "Update korean translation" into ics
Merge "Use preferences from default launcher" into ics
Settings: Updated icons

This commit contains the updated icons for Profiles, Launcher, System,
Themes and Advanced Settings.

Change-Id: I2a2e13f3efce02fccc68e6c8f83e7af04f227264
Settings: Add Missed call and Voicemail to notification light settings (1/3)

This commit adds the ability to configure missed call and voicemail light
settings for devices that have voice/phone capability

Requires Part 2 (framework) and Part 3 (Phone) commits

Change-Id: I3df711bd687cc01227e65d38f5b963696e6c01cb
Enable Wi-Fi Direct Settings Menu.

Change-Id: Ic435064e22aa0d5735de3a967c4bc3600e6e040d

Settings/wifi/p2p: Fix for P2P-DEVICE-LOST event update on GUI.

Update the p2p peer list once the GUI receives P2P-DEVICE-LOST
event from the supplicant.

(cherry picked from commit a2d8f7767ed0b5b724920783383f9da107b3598b)

Change-Id: I23fd1554c72adc1c7243837560338baefa37d239
CRs-fixed: 333598

Packages/apps/settings: Remove advanced settings menu from wifi Direct.

Remove the advanced settings from wifi direct since there nothing
add to that menu.

Change-Id: I0134609d5b9f264a968e0da619ec485ab1d7c163
CRs-fixed: 333875
(cherry picked from commit 3d01f37d4dfa76734d46a1c1fe542a6a38051bab)
PT-BR: Missing Translations

Change-Id: Ie0ecab145b7c72d65c6f7832c3b445dd50589dfc
Fix duplicate strings in pt translation.

Change-Id: Id03bcdc411903342343b0023c57ef3bc93f9fcb1
Merge remote-tracking branch 'cyanogenmod/ics' into ics
Revert "Update proprietary blobs from I9210XXLPH_I9210TLALP2 ICS release"

This reverts commit db357208bfbdcdcc39b460cfb54bb8ad36a141f6.
grouper: Binaries for Android 4.1.1 (JRO03R)

Change-Id: I92363a0cc6b3392b6ab72833f79c5751bdcc0718
Merge pull request #10 from burnsra/jellybean

grouper: Binaries for Android 4.1.1 (JRO03R)
Hack to bootstrap.css for use in jsFiddle.net
Added handle image for mobile nav
Saved local changes
Merged conflicts
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
prepare for pull
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Commit do _config corrigindo a url de producao
add google+ profile
bash hurting me
Merge branch 'master' of github.com:artursapek/reddit-bot-hackNYspring2012
[Add] BMPerformSelector (1.0.0)
Merge branch 'master' of https://github.com/bearMountain/BMPerformSelector-Podspec
Added --no-edit -n to make the script work correctly with revert patches.
use google sql if datastore can't be implemented
irradiance and feed in tarrif values from sql based on cityselection
changed the way the main customer login works (using async waterfall)
edited the way user.login works (async.parallel)
indenting on rt7_admin_login
tweaked using phonegap-start
Refactor for get_email_message().

Lots of fixes for more standards compliance.
- Default function arguments changed to None instead of mutable types.
- Add get_email_message() for returning EmailMessage instances.
- Break up some long lines for PEP8

get_email_message() has a different function signature to be closer to
django's EmailMessage.
Merge pull request #17 from yesimon/return_email

Refactor vanilla_django backend for get_email_message() / get_templated_mail() to allow extracting the EmailMessage object without sending
Am adăugat prezentarea Andrei și am rezolvat o greșeală de ediție
Refactors configured type parsing.
Simplifies configurable type handling.
Adds predicate type configuration.
Corrects configurable predicates to use type.
Fixes bug in predicate type handling.
Added preserve original functionality
Original documents are now saved
Initial commit.
Merge https://github.com/bytecode-nu/planning-consistency-check
Added brain and other methods
Added operations
brain teaser rename folder
Site updated at 2012-10-04 19:36:01 UTC
Final cleanup of CD artificial viscosity code.  The force/dissipation is now calculated using the form suggested by the CD paper, rather than the default GADGET method.  Also the signal velocity is now calculated as per the CD form, rather than GADGET form.  Both these changes only apply when using the CD AV method obviously...
Altered:

Event HostilePig so that time was always night and always storming
Link to better TouchDB page
Tested

Tested and ready for delivery.
Auth capture test.
Fix logo img tag
Fixed a merge bug.
Fixed writeTarget to put predictions in the correct order.
Remove tracer bullet for search.
improve cluster update settings API page
Merge pull request #254 from Paikan/patch-34

improve cluster update settings API page
Fix typo in doc example
Merge pull request #177 from vrana/patch-1

Fix typo in doc example
Fixed a bug where collage wouldnt save messages
TINYINT is handled as must be handled
EL 처리 변경.
설명문 변경
Minor tweaks and polish
Set maintainer to ubuntu devel for entry into archive
Added watch file and get-orig-source target
Merge tag 'upstream/0.82'

Upstream version 0.82
Tweaked control and wrap-and-sort'ed
Filled up Description with more details
Minor tweak to description
Removed cruft
Update version of debian/changelog to v0.85

Conflicts:

	debian/changelog
Imported Upstream version 0.82
Imported Upstream version 0.82
Imported Upstream version 0.85
Imported Upstream version 0.85
Imported Upstream version 0.85
Merge tag 'upstream/0.85'

Upstream version 0.85
update packaging for 0.85
generate thrift sources
regen patches
Updated system-jars.patch to remove all references to unit tests, coverage, and Eclipse.
Remove unnecessary patch file disable-broken-tests.patch.
365 days on canvas: intro
365 days on canvas: end of intro post
365 : first week - draft
365: first week - added canvases
fixed GitHub repository listing (html escaping)
minor edit
365: first week - added comments, fixed pub dates
Merge branch '365-canvas' into source
Initial commit of task plugin
fix drawing 100x100-3
Adding blocks to be delegate of textview on textFieldShouldReturn:
better handling and back compatibily
adding self.callback to call the setter as the property is copy, on dealloc released the callback
Merge pull request #18 from dchohfi/master

Adding support to BlockTextPromptAlertView textField delegate using block
Copy and Paste is not always your friend!
Change Folder Name at 9:56PM
added deploy-to as part of server configuration
CORE-3168: added the iPlant repository to project.clj
Don't quote truthy and falsey as code.
shell scripts for different cities
fix output directory
handle fields for different cities
more lenient on attributes length check to handle files for different cities
add output results for different cities
output of hadoop jobs
Updated Ukrainian translation.

Change-Id: Iaf64a900f54aff05974a734e7c473fa7da277bcc
Get rid of the un-Holo background drawable in the running app detail view

Change-Id: Ib66178381c8a11cc141485bf3f8bcc61ef131f48
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
updated pt-PT (european Portuguese) translation. fixed blanks and minor language fix

	modified:   res/values-pt-rPT/arrays.xml

Change-Id: I524dc129bda0f358d4ee44037386cd07aa8770b1
Settings: improve Spanish translation

PATCH2: removed all white spaces

Change-Id: I5727efd1831faf083219a9f8f3d2b3343ba6e021
Settings: Use Holo theme for ActivityPicker Dialog

This commit changes the ActivityPicker and the AppWidgetPicker dialogs
to use the Holo theme by default - seems that Google forgot about them.
Now both matches the rest of the ICS UX.

Change-Id: I9fee7f1944fbf0d83faae43fa69eb14522d45f8d
Settings: Fix font size mismatch in RingerVolumePreference

This commit fixes the font size mismatch between the 'Link mute
states' and 'Link volumes' checkboxes in the RingerVolumeDialog

Change-Id: I019a49e406c87c3b34c9f0535cd2b00f3836255d
Settings: Fix font size in Profiles dialogs to match design

This commit changes the font size of the message text in the Profiles
related dialogs to TextAppearanceSmall to match the other dialog boxes
in AOSP Settings.

This also cleans up some redundant click listeners in the same dialogs

Change-Id: I2e4e1041e1b707a27a782eba86f8afc015c17527
Merge "Get rid of the un-Holo background drawable in the running app detail view" into ics
Electron Beam Animation (2/2 Settings)

Change-Id: I40a73daf78379d00533ceb701a5cab530cb1b053
Japanese : update translation, Add new translated string entries.

  Patch-2: add arrays.xml

Change-Id: Ib2b7d4e0ca8380c223b7bb9fc14713d4598f1cc4
Merge "Updated Ukrainian translation." into ics
Merge "updated pt-PT (european Portuguese) translation. fixed blanks and minor language fix" into ics
Ad-hoc network support (settings part)

Based on GB patch by havlenapetr

Change-Id: Icb59e817d346dfc0e93a254ffafa9761fa47ec0c
Merge "Settings: improve Spanish translation" into ics
Settings: Slide lock delay settings (Part 2 of 2)

This commit modifies the already merged slide lock delay settings to
be more respectful of AOSP security settings.  The CM settings will
only be used when a secure lock screen (user has a pin/pattern/password)
is not enabled (slide lock screen type)

This also fixes when the QuickUnlock and MenuUnlock options are enabled
- QuickUnlock = only if secure or slide screen
- MenuUnlock = only if secure or slide screen and if button exists

Patch set 2 - fix whitespace

Change-Id: Ic928638e1f0b31c50d1c6cff44babbab048fc2db
Merge "Settings: Fix font size in Profiles dialogs to match design" into ics
Merge "Settings: Fix font size mismatch in RingerVolumePreference" into ics
Merge branch 'ics' of git://github.com/CyanogenMod/android_packages_apps_Settings into opensensation
Revert "Electron Beam Animation (2/2 Settings)"

This reverts commit 19afbc78486801128e7c13394b2b248ca35ea134.
Merge "Settings: Use Holo theme for ActivityPicker Dialog" into ics
Reparaciones - Generación de certificados de usuario
Adding new blog post and updating styles to be better on all devices.
Bumped version to 0.3.0.

Closes #22.
add Option class: encapsulates a move/result pair
Merge branch 'master' of https://github.com/marminthibaut/artificial_consciousness
maj des fautes
maj des fautes
maj des faute
maj des fautes
maj des fautes
maj des fautes
maj
Merge branch 'master' of github.com:mat4487/Gestion-de-machines-virtuelles

Conflicts:
	rapports/parties_rapport/conclusion.tex
	rapports/parties_rapport/ganeti2.tex
Tags work better when you close them
update chunksize min value, set as 2
fixed memory issue on C_TEXT, ARRAY_TEXT (win)
updated memory allocation for C_TEXT and ARRAY_TEXT on windows
マルチスレッド化
Prefilled cart: CSS: changed link style, added hint, required fields, etc
Merge branch 'atwix_feature/prefilled_cart' into env_atwix

Conflicts:
	skin/frontend/carpartkings/default/css/styles.css
Translate one more.
Nye dager.
Translate a few more.
Translate a bit more.
Correct "inner" quotes for nb.
Updated to current version.
move style stuff from index page to css file
Joshuha Rebuild

Project work from Joshuha's rebuild
Started folder for documentation
Merge branches 'feature-Documentation' and 'hotfix-JoshuhaRebuild' into develop
theming of fixed menu
more jekyll work, cname entry
make append higher, hopefully making it happen
Site updated at 2012-12-16 23:02:26 UTC
worked on objective function section, reorganized a bit
Make clicking on images take you to their parent href, if any.
Change sidebar default side to be 'right'.
Merge pull request #94 from terrycojones/fix-close-icon-in-sidebar-92

Clicking the Fluidinfo logo or your avatar now navigates the tab to the right place.

Reviewers: ntoll, paparent

Fixes #92
TRIVIAL: resolved version number conflict.
Resolved trivial conflict in sidebar.js.
Missing the cocktail images partial.
user agent commit added
Updated recent posts
Updated recent posts
Updated recent posts
Updated recent posts
Fixed code highlighting
added post on using drush sql tools to del spam
Added support for sqlite database
Commited second problem from first task.
uhhhh maybe no line height
Fix bug in LTR propagation of DSR values.

* Update dsr[0] only if new value is smaller than existing one.
* Fixes regression on both examples from commit message of
  3b676e5.
* One more wt2wt test green (regression from 3b676e5 -- we missed
  this somehow)
* But doesn't seem to fix all rt test pages (to be investigated).

Change-Id: Ib2051d2a264aaa7bf653513bb330e6c9e2f56197
Added meta information, projects link.
Added PropModder & zRam Settings to overlay

Change-Id: I95041850fa4c63862222dd8205ca132c248a4512
new file:   flavor_text_reame.docx
Phone: updated romanian translation

Change-Id: If89e95cbf82d1a74070c8e2068f86f463f581ae4
Merge "Phone: updated romanian translation" into jellybean
Root access for adb

Change-Id: I18d0ac282bc9725a600473b74e05cdfa1a200879
Try and confirm pre release exists.
Telephony: Allow use of BearerType in Dual-IP retry

This change accomdates the use of bearer type when configuring APNs when
Dual-IP partial retry is required. Before this change, there cannot be
multiple APNs with bearer type as the differentiator.

Important note:
Dual-IP partial failure retry will only occur using the same APN on
which the original data call was established. For e.g: if LTE-APN and
EHRPD-APN are both configured as the default APN and the UE originates
the initial call on LTE-APN and then goes through multiple IRAT
handovers, any partial failure retry will take place on the LTE-APN.

CRs-Fixed: 343088
(cherry picked from commit 0cc44e8ac1b32b44e624bc19f67aaf6b02455f37)

Change-Id: I57440ee9c337370789ce6d12bf4b0a1c5b430892
Signed-off-by: unknown <Jean-David@Jean-David-PC.(none)>
'mejorascomentarios'
Merge branch 'master' of https://github.com/JoseTong/DEW-2012M2-TrabajoFinal-Sabios
reversing tilt has broken mouse movements and buttom clicks on pong - fixing this up

Signed-off-by: Aidan Casey <aidancasey@gmail.com>
MediaElement.js v2.9.5
2.6 Alpha7
m & h rate vars match between neuron mod & nml2 impl
Minor edit to CaLVA.mod to expose taum, tauh for testing channel
Update notes for submitted changes

* New approach for navbar transparency
ignoring a bunch of files
Add ruby notes
Make recent entry consistent with the others
Should be able to succesfully damage enemies
Merge branch 'master' of https://github.com/Ymabob/IMT3601-Game_Programming_Project
fleshing out the preface further
Cucumber Test
Cucumber Test
Merge pull request #14 from ajstanley/master

Added missing load statement
Updated version number for 12.1-RC2.
Merge pull request #15 from ajstanley/master

Added missing load statement
Updated version for RC3
Merge branch '6.x-release' of github.com:Islandora/islandora_solution_pack_audio into 6.x-release
Updated version number for 12.1.0
Merge branch '6.x-release' of https://github.com/Islandora/islandora_solution_pack_audio
telefonbok-servicet svarer med noe mock-info
An index html
bygger telefonbok-entries med backbone.js og underscore
service for adding new entries
fixed return values.
added method(CLEAR, SCALAR, FIRSTKEY, NEXTKEY) and tests.
version++;
wrote Changes
added .travis.yml in MANIFEST.SKIP
[POST] SVN -> GIT
Use RobotoMod speed/batt hacks.
constant contact generator
Removed auto brightness tweak and scrolling tweak
Forgot to bump version in readme
restructured to support add ons
envrioment settings
Travis CI does not like one of the tests. meh.
traverse view in non-anonymous mode or if no endpoint was found
should show folder_contents
Lint cleaning of animation view
Only increment score on incorrect match
Clicking reveal no longer counts as a move when successful

... so don't include it as part of the target moves.
Fix freezing problem in some browsers
Whitespace adjustments
New art for the login page
Give some feedback that we're attempting to log in
Added IFrame control

Added iframe control. basically a copy of Adam's iframe control, but
with some changes and cleanups to also make it work with the installer
program that's in this solution. It's also not using the textbox.

The internalcontrols are also moved into an internalcontrols namespace.
The installerprogram now sets nearly all the 'default' options. This has
to be improved with a property of somekind. Maybe have a property that
defines name, friendlyname, group and controltype methods via 1
attribute?
Play with bandcamp type
Fix link to plugin docs
Added another js function
Use redirect rather than render when a user is disabled
Colors for bookmark+.
Less noisy org agenda faces.
Helm colors.
Monospaced font for auto-complete.
Italic works better with var-width font.
Don't underline some org fonts and add specialization for agenda-date-today.
updated op_plotter (labels), added plots
removing shitty directories
names
more names
Small Fixes!!!
Bumb version of 0.2.1.3. Add spawnLocal (and co)
TH support: functionTDict. Bugfix in NC.

The node controller maintained its own connection map. This is incorrect: for
once, when process A on node N links to a process B on node M, it sends a
control message to its local node controller, which then forwards the message
to M's node controller. When N forwards the message, it looks up a connection
to N in its own table -- i.e., it's using a connection (N, M). Now suppose M
dies, and restarts, and another process A' links to (possibly) another process
on the new M'. If the local node controller looks up a connection in its own
table, it finds that (N, M) has been blacklisted. However, actually, this is a
message from (A', M) and hence should be using a new connection.
Improve documentation of C.D.P.Closure
Satisfy hlint
Bumb version number to 0.2.1.4
fixed up a few problems
2012.08.12
* Fixed hostname detection so it can parse out names and IPv4 addresses from the "host" field instead of _raw.  It hadn't occurred to me that people can change their syslog settings until I needed to.
Wrapped paths to handle spaces
v1.0.9a1: Fixed a problem with YUI dataSource in ping_ajax.js
Signed-off-by: jfederico <jesus@123it.ca>