labofsahil/github-event-dataset-2012 huggingface dataset:
Initial removal of all of the inventory-related classes from core. Integration tests currently failing, compilation errors in the admin
Removed inventory classes from BLC admin
ValidateAddRequestActivity should include a check for a Sku being inactive, remove the InventoryUnavailableException reference from integration tests
Remove all the inventory admin messages
Add some better documentation to adding bundles to an order, added some update order item integration tests
Merge branch 'develop' into inventory-refactor

Conflicts:
	admin/broadleaf-admin-module/src/main/resources/org/broadleafcommerce/admin/client/MerchandisingMessages.properties
Merge branch 'develop' into inventory-refactor
Merge branch 'develop' into inventory-refactor
Remove inventory persistence handlers and entity bean definitions
Merge branch 'develop' into inventory-refactor

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/client/presenter/catalog/inventory/InventoryPresenter.java
@Deprecated classes RichTextCanvasItem and RichTextHTMLPane
add extra inherit

Change-Id: I3c9b8354c4cbb56600b8c0cc5fa45c838d18ed4f
Started to replace Digest Auth with Spring Security
Select series list working now, everythin else has to be done
Fully replaced Digest Authentication with Spring Security
Ajout filtre (tout/retard/complete)
vivo: disabled Webkit acceleration

Change-Id: I2daf413926dbb045406d6f265722a63f565f4ec7
vivo: update prebuilt kernel

Change-Id: Ia0ce0849a2d4d0656fe328d51332fb5d7da64efa
Merge "vivo: update prebuilt kernel" into gingerbread
Update notes for submitted changes

* e739: update prebuilt kernel
Update notes for submitted changes

* e739: update prebuilt kernel
Sensor: Add RotationVectorSensor2

Some ICS apps (namely, Google Maps) expects a rotation vector to be
available. Newer devices, this is provided by either Android's
sensor fusion (requires Gyro) or by hardware sensor fusion (MPL).

Older devices will lack this virtual sensor and compass in Google
Maps will not work. To fix this, we can provide our own rotation
vector sensor by converting the values from the orientation sensor.
(They are basically the same information in different formats.)

Thanks to Unhelpful for the help with related math.

Change-Id: I596f5dc44f8797bc280ae5d1e110bb92387c79d1
Merge "Sensor: Add RotationVectorSensor2" into ics
Update notes for submitted changes

* Framework Base: Fix some korean translation
Merge "Profiles: add sync and mobile data override (1/2)" into ics
Note to self: Do not name action call methods Partial. Fixes the content extension rendering issue
maze background
Using ASL
chapter-1 fichiers par defaut de rails
Update device.mk

Dumb Ass
Merge branch 'master' of github.com:DxTa/-SP-Elevator-Controller-System
Merge branch 'dungnguyen'
Merge branch 'master' of github.com:DxTa/-SP-Elevator-Controller-System
Merge branch 'master' of github.com:DxTa/-SP-Elevator-Controller-System
Merge branch 'master' of github.com:DxTa/-SP-Elevator-Controller-System
fix checkOnFloor
Merge branch 'master' of github.com:DxTa/-SP-Elevator-Controller-System
msm: vidc: Remove endianness change for 1080p firmware (Deepika Pepakayala haxxed for HTC)
vidc: Add extra cases for error handling in vidc init

Currently error conditions are not handled properly
if failures occur during irq request or while creating
work queue. With this commit these error conditions
are properly handled.

Change-Id: I618ca5c2a4f6bd09a3edd164a7867a90a9ed9f9a
CRs-Fixed: 355753
Signed-off-by: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
(cherry picked from commit c9a9332a743459e44744e630f3e734e7788c477d)
vidc: Send port reconfiguration for interlaced clips.

Component is not getting port reconfiguration request
from driver for an interlaced clip. Fix it by
modifying the condition for triggering the
reconfiguration request.

CRs-Fixed: 352456
Change-Id: I65ce5987f31915f45a13767965918b61e32db7a7
Signed-off-by: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
(cherry picked from commit c264eed1e7debb50c97159784307de23bdfc3a3b)
cpufreq: Add cpu utilization statistics to aid decisions made by userspace.

Understanding system load as seen by cpufreq can help userspace
algorithms make better decisions to improve system responsiveness.
One such example would be the MP decision algorithm which mines
various system info to make decisions on hotplugging in/out
the additional cores.

CRs-fixed: 344675
Signed-off-by: Anitha Anand <anithas@codeaurora.org>
(cherry picked from commit cbeef6aafc4964c4a6cfafd26b23eaccd40804b4)

Change-Id: I7b4450ed7b3bf8196870717e1907fd93c5cfbe98
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>
msm: vidc: Fixes bug in handling duplicate frames.

Fixes bug while closing encoder which supports
duplicate input frames. This fix decrements
the reference count of original frames
appropriately.

CRs-Fixed: 366268
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
(cherry picked from commit af4a0ef0c6162e89c063b04da0a037246fcc76b9)

Change-Id: Icf36d82e78588bf4b5becf480bdccd4c7cda94a5
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
diag: Fix data corruption.

Diag uses krealloc for allocating memory if number of client exceeds 15 as
krealloc doesn't initialize memory to 0 resulting in corruption of data.
This fix initializes the memory after allocation.

CRs-Fixed: 347675
Change-Id: Ide504a18adc2e1fc282c5543ec77818f346e4015
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
(cherry picked from commit 6bac272ef9b64f0830af50f1537aa18017711022)
make list of task labels available as Jobs.list
consistent styling if current post == last post
fix requires
abort markdown/hashtaggifying when input is empty
merge urls_resolved + strip_javascript --> post_processing
fix #hyphenated-hashtags
render returns nokogiri.to_xhtml, so pass expected value through nokogiri, too
test for unicode hashtags
New dialog window
Add option for UMS
make start and stop methods public, too; if this object gets created by a provider, it must do the lifecycle manually.
make amqp test run with lifecycle runner
Merge pull request #7 from hgschmie/master

change receiver and sender methods to be public
Initialize Seeds
Feature: Add UserRole seed data
Change: Remove UserRole project validation
Feature: Added Default User Roles.
Change: Remove '!' from create.
Feature: Added defaults for multiple models.
Merge branch 'development' into _development_seed

Conflicts:
	db/seeds.rb
Fix: Remove unused line
Fix: Minor bug fixes.
Merge branch 'development' into _development_contacts

Conflicts:
	db/seeds.rb
Bug Fix: removed bad outline on the edge of the header logo image
Merge branches '_development_functionality' and '_development_functionality' of github.com:New-Media/nu-new-media-film-project into _development_functionality
Update db_connection.rb
Lockscreen weather: added Slovak translations

Change-Id: I3f4e23bfa9a8c2e813732299e3fa06009d5aeace
Define TARGET_ARCH
Add compcache 0.6.2 (ramzswap) driver to staging
Add stable compcache 0.6.2 (ramzswap) driver to staging
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
zram: enable swap notify support
Added surefire plugin configuration for excluding micro-benchmarks
Using System.out.println() instead of '\n' in micro-benchmarks results display

Avoid O/S issues with the surefire grouping plugin
METRICS-2727: Using Maven dependency management mechanism to avoid transitive dependencies versions mismatches
METRICS-3019: generate exteranl resources for SQL queries
WebService updated
Fix compilation error in reboot notifier, in callisto/cooper
Board europa added
v1.5 push popup image fix
Temp file only created if file doesn't exist. Default app opens current view otherwise
Format data functionaly to replace None with Null and quote strings
Update src/main/resources/css/jquery.toastmessage.css

Changing the .toast-item-image position to center it vertically over the toast.
Merge pull request #16 from bdelespierre/master

CSS Change
Crespo4g: include widevine proprietary files

Change-Id: I3db4b7223a038c1b8ceb6f00828ebd1eb4b8c6a8
Merge pull request #93 from burnsra/jellybean

Crespo4g: include widevine proprietary files
d2: Update blobs

Change-Id: I6192291bff6fe42fbabf6c7a02a63fa331fd5ab8
d2: Remove libv8 blob

Change-Id: I3450d4a52af472e721040ec7bf61cabfebf78457
skyrocket: update blobs for jellybean

  * update to UCLF6 blobs
  * add libwvm.so
  * add new JB Adreno drivers
  * hostapd fix (hacked build of ICS hostapd)
  * remove libv8.so
hercules: update blobs for jellybean

  * add libwvm.so
  * add new JB Adreno drivers
  * hostapd fix (hacked build of ICS hostapd)
  * remove libv8.so
  * updated camera libs to UCLF6 blobs to match kernel
Merge pull request #94 from TeamChopsticks/jellybean

Skyrocket and Hercules updates for jellybean
p31xx/p51xx: use ics hostapd
p51xx: LE2 omx
i9300: use prebuilt ics hostapd
galaxys2: prebuilt ics hostapd
quincyatt: Add props for CM10

Change-Id: Ic47d69ca2ece28e7199237377dfdacc9577541cf
quincy: Update Adreno firmware

Change-Id: Ia2b0424b233e8fbad36778191acad1ee4e06b74f
i9100g: prebuilt ics hostapd
i9300: LG8 ril
i9100g: fix typo
d2vzw: update blobs from sprint lg8 update
Merge branch 'jellybean' of git://github.com/TheMuppets/proprietary_vendor_samsung into jellybean
d2vzw: update to lg1 ril blobs
hercules/skyrocket: build hostapd from source
0.15

the version, 0.1, is not right.
Breaking changes to the Repository interface. See #8326
Turn on the download option (see #8188)
Remove usage of removed methods from repository I/F (see #8326)
Import in 2 steps

Upload file then import metadata.
Modify import using fslite.
Remove archived option when importing the file (see #8377)
Parse the binary data during import to generate min/max values. See #8316

This also allows a SHA1 to be calculated but the resulting value might not
be useful unless compared against a SHA1 using the same method.
Merge branch '8118_share_connection' into cls-fslite-cli-import
move invoice from separate form into main
being to make updates for combining ANC protocols
update license header
Reset version, update author
improved editor display style
increased editor width
fixed count position
Alteracao qualquer...
add cache sweeper to your apps
copy minified files to js folder
Removed tests and node_modules in order to get stuff done
Removing file that should have gone in the previous commit
Adds db_create_with_user library routine

* Intended to remove the need for osops-utils::database
* Support PostgreSQL and MySQL and does not use the
  mysql-master chef role lookup
Merge pull request #4 from jaypipes/working

Adds db_create_with_user library routine
Enhace the goal solver view.
Added 'gmagick' as a valid driver in configuration
Merge pull request #67 from benjamindulau/gmagick_driver

Added 'gmagick' as a valid driver in configuration
Readme Fixes

Signed-off-by: Baki Goxhaj <banago@gmail.com>
Allow blank on uniqueness

Closes #335

Credit to Jigar Patel (@jagira) for catching this
微妙にトップページの説明を修正。
Update public/stylesheets/iphone.sass
added a docblock
Remove left over references to scope instance variable
use :root option in render :json

ArraySerializer can now render arrays with no root
@scope seems to be deprecated - updated the readme to reflect options[:scope]
delete identical test
rename test methods so tests run

incidentally test_array_serializer_with_root fails
support different serializations in ArraySerializer

ArraySerializer can serialize arrays of Hash, ActiveModel::Serializer,
or any PORO that responds to :as_json

Each item in the array should not include its type as a root element,
since normal arrays do not do this. If you want "typed" collections,
don't use an Array.
`rails generate` runs correctly under Rails 3.0.x

* Rails 3.0.x does not yield `app` to `generator` blocks in railties.
  Picks a hopefully reasonable default `Rails.application` in that case.
* Fixes #71
Merge pull request #73 from alindeman/rails-3-0-x

`rails generate` runs correctly under Rails 3.0.x
missing and duplicated id
Merge pull request #75 from mauriciopasquier/master

fixing docs
Merge pull request #68 from teeparham/unique-test-methods

rename test methods so the tests run
Merge pull request #69 from teeparham/array-serializer

Array serializer should support Hash, AMS, and PORO
Merge pull request #67 from te-chris/patch-1

@scope seems to be deprecated - updated the readme to reflect options[:s...
Merge pull request #65 from teeparham/array-root

use :root option in render :json
Merge pull request #62 from highgroove/cleanup_scope_instance_variables

Remove left over references to scope instance variable
Add AS::Notifications (thx @twinturbo)
Always add :id to attributes
Fix the tests
Allows serialization_scope to be disabled with serialization_scope nil
Merge pull request #77 from alindeman/disable_serialization_scope

Allows serialization_scope to be disabled with serialization_scope nil
added TiledLoader
Started HTML guide, worked on CSS guide, touched up JS guide

Worked a little on JS guide, wrote a lot on CSS and started the HTML
guide. I'm started to add conventions as well to these guides.
dev-lang/pure-0.55

--HG--
rename : dev-lang/pure/files/pure-0.54-Makefile.in.patch => dev-lang/pure/files/pure-0.55-Makefile.in.patch
rename : dev-lang/pure/pure-0.54.ebuild => dev-lang/pure/pure-0.55.ebuild
second
Merge pull request #2 from taozhen/master

update from taozhen
created .prev-button class to make previous buttons smaller and dark gray
new build_number=120107102 and uuid=020805d673421c794855fa68a3c5f48f1e28e0e0
Added Back button to check out process.
Updated version.
Release 0.2.1.12
Added behaviors to Subarticle.
Update for new method names
Rename method back to connectionDidFinishLoading
initial files for v1.0
Adding AnnotatedTextSource for Pig heldout data.
Pasted in old needs and analysis report, need to convert to LaTeX/Bibtex syntax still
Add remote section to 'Git - Cheatsheet' page
disable mediaprofiles debug
updating generated javascript
Set Cookie value directly.
Introduced convenience class CVIntrinsics
Duplicated the old sequencer2.vhd and prepare for new architecture that match the new clock cycles

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Add another test config
Change the structure to fit the new timing diagram.
Note that although I did write the command to fetch during S4, it's commented out where not used.

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Bessere Fehlererkennung beim Senden von GCMs.
Kontoauthentifizirung fast fertig.
Merge branch 'master' of
https://github.com/fabianonline/geotweeter-for-android

Conflicts:
	src/de/fabianonline/geotweeter/Account.java
Sintáctico casi completo, previo a las pruebas
add FMradio support!
some more fine tunin' traces
Memcache added
Merge branch 'master' of https://github.com/freddy-mercury/Bitcoin-mining-proxy

Conflicts:
	htdocs/index.php
Fixed a couple of QuickMessage issues.
Merge branch 'master' of github.com:frontlinesms/frontlinesms2-improved
Fixed bug, export of messages from radio shows not working
Merge branch 'master' of github.com:frontlinesms/frontlinesms2-improved
drop non-adaptec samples
reduce code duplication
Revert "accpet \ or / in win32 registry path"

This reverts commit ec16d4e9a0d4f7a28b584aae545084dccb29c908, pathes are
now normalized in calling code.
change regexp delimiter
cosmetics
avoid warnings for undefined values
protect '\' in path
fix a regkey path format
use uri_escape_utf8 instead of uri_escape

since string can be in UTF8, we have to use uri_escape_utf8()
W32: encode local filename unicode if possible

if Win32::Unicode::File::open() is available, we use it to create
the file name. This is useful for the rare cases when the computer
name if in a local encoding.

closes: #272
don't reencode if perl flagged string as utf8

If Perl flagged a string as UTF8 internally, there is no reason
to reencode it. A best, this will hide a bug somewhere else.

In my opinion, we should no try to encode string at all.

To know if a string is flagged as UTF8, one can use Devel::Peek.
use the UTF8 internal struct of Perl

the decode("UCS-2le", $buffer) return a string in Perl internal
format.
If the string is in UTF8, it will be correctly flagged. There is
no reason to try to be cleaver, espcially now getSanitizedString()
correctly deal with such string.
see commit:b8d9015d42195a58de6215f7c5ee39f092a053d9
do not overwrite hostname returned by getHostname

Tools::Win32::getHostname() returns a valid unicode hostname
unlike WMI.
fix the build on non Windows OSes
Linux: load edid file directly from /sys

get-edid doesn't work with HDMI screen. This solution uses
/sys directly if possible.
Merge remote-tracking branch 'origin/2.2.x' into 2.2.x
Merge remote branch 'origin/2.2.x' into 2.2.x
Revert "Alternative model for adaptec controller"

Provided data samples lack evidence of interest for this change.
This reverts commit a5214e3cbc2cdf19d57a79a3fd957a7b0efb1051.
dont define function out of usage scope
no need to test outside of scope
updated variable namings
Initial commit
First import.
Added githubiverse template.
Configured githubiverse template.
Deleted module linked to garyhodgson repo.
Added a gh-pages branched submodule to the new template forked from garyhodson githubiverse template.
Deleted template module on master.
Removed source from gh-pages.
Template added.
Merge branch 'gh-pages' of github.com:hcross/hx1-mod-quick-fit-x-carriage into gh-pages
Removed gh-pages generated files.
- Use ibus-tables-chinese quick input method
- Change to Use Quick Classics from ibus-tables
Fix up device_tf101.mk

Change-Id: Ia8942e723f1cb4eedf65792419ef304ecdbf2a77
Modificada para que sea más clara la lógica de número de intentos http por servidor y número de servidores a consultar por cada petición REST
Added document list to participant page (beeing author of document)
Old
More Clean up
Fix these so it will flash properly
pridetas ir sukonfiguruotas extension'as 'Yii-Bootstrap-1.0.0'
Set the caption for action bar buttons.
Set the correct background drawable/color on the entire actionbar, not the main relative view, there is actually a difference here.
CHANGE: The diesel road depot can build bicycles after the coaching stable becomes obsolete, and likewise the trolleybus depot.
Added cubes shader
Gitignore onoooish!
server funcionality
Merge remote-tracking branch 'origin/master'
Remove unused files
Bump to 0.68
Update ondemand - back to stock
drivers: cpufreq: Send a uevent when governor changes

 * Useful so userspace tools can reconfigure.

Change-Id: Ib423910b8b9ac791ebe81a75bf399f58272f64f2
use logical volumes for system and data, bring back datadata

* use lvm to split eMMC into 2 logical partitions
* use entire available space on OneNAND for /datadata

based on information from: http://bit.ly/OMny8Z

WARNING: WILL WIPE DEVICE

Change-Id: Iea6c08f462a88686860e4a1d926a984790378a37
Bump kernel version to 0.70
fix filepath in README

Signed-off-by: Michal Kazior <kazikcz@gmail.com>
wip crud generic
Adding document management facilities for loans
1日目 画像からのリンクはReVIEWで処理できないので削除
1日目 編集
heuristic at line 21-47 and hueritic helper at 292-301... needs help on line 34 and 35
Finished implementation of IO control and usage of shared capabilities struct for LabX TDM audio driver. Added support for dynamic sample rate bits within capabilities registers and shared structs of packetizer and depacketizer drivers.
Initial commit of encode.hs
Add current configuration based on work and testing up to chapter 5
updated README.md with post clone info
Small fixes in how small things work
first commit
Merge branch 'master' of github.com:loopmode/AptanaTemplate_HTML5Simple
added layout xml and phtml file
2012_12_26
sql1
Resolved Merge conflicts on "device_nookcolor". From line "merge remote branch 'origin/gingerbread' into gingerbread". Merged back to master branch A. [meteorrock]
Include sample how to extend the description via a Maven property.
Bug 782739 Handle new mousewheel prefs in browser_fullZoom.js r=smaug+dao
Bug 702832 - solidify strategy to sync mozbase packages to m-c;r=wlach DONTBUILD because NPOTB
Bug 791162 - 'Fix off-main-thread access of BluetoothService::Get'. r=qDot.
Bug 787299 - Device Storage - Filter out mimetypes during calculation of disk usages. r=bent
Bug 788612 - Move bundle handing into nsDOMDeviceStorage to avoid calls to the nsIStringBundleService. r=bent
No Bug. Whitespace cleanup. r=me
Bug 791084 - Device storage - Seperate permissions based on storage type. r=bent
Backout e5af3d785252 (bug 791084), 7ad6e513e114, b040fefd038e (bug 788612), 6996c091767d (bug 787299) for introducing new orange
Bug 788122 - Device storage.  Add an 'apps' storage type. r=sicking
Bug 787299 - Device Storage - Filter out mimetypes during calculation of disk usages. r=bent
Bug 788612 - Move bundle handing into nsDOMDeviceStorage to avoid calls to the nsIStringBundleService. r=bent
No Bug. Whitespace cleanup. r=me
Bug 791084 - Device storage - Seperate permissions based on storage type. r=bent
Bug 791287 -  Device Storage - stat() doesn't always reflect disk usage immediately. r=dougt
Backing out 7653a9cc00ae.  Shouldn't have been checked in. r=me
Merge m-c to inbound.
Bug 785057 - Return an error after js exceptions. r=bz

Return PL_DHASH_STOP if JS_SetProperty fails, and check
the return code of the enumerator to propagate the failure
back to javascript through the return value of mozGetMetadata.

In addition, use JS_DefineProperty in mozGetMetadata so
web content can't intercept and alter our creation calls.

JS_SetProperty() will define a new property if it doesn't
exist, but it will also call any existing setters, in
particular those on Object.prototype. This is confusing
for an object that created by a platform object method
from internal data.
Bug 789645 - Upgrade to SQLite 3.7.14 (SQLite changes). r=mak
Bug 789645 - Upgrade to SQLite 3.7.14 (Mozilla changes). r=mak
Bug 790132 - Add a test to make sure media sniffing occurs only when we want. r=bz
Bug 790868 - Remove duplicated --disable-ion definition. r=njn
Bug 785321 - Replace PRUptrdiff with uintptr_t, prtdiff_t or etc; r=ehsan,jrmuizel
update XmlRpcResult.java
rating fixes
removed debug output
styling (font-size & whitespace)
facility data: finish up re-structuring.
facilitydata: update .project file; and update trunk to 1.6.x
facility data: misc changes + remove old IDEA module files.
facility data: add the new IDEA module file for trunk.
facility data: change project names in 1.5.x-compat branch and trunk.
facility data: make the call to saveOrUpdate() vs merge().
facility data trunk and 1.5.x compat: handle an edge case where if you don't have any sections a hibernate error occurs and other misc changes.
facility data: fix a small error where a boolean was passed where an integer was expected.
facility data trunk: fix a small copy/paste error.
facility data trunk: cosmetic change.
facility data 1.5.x. branch: some refactoring (renaming a method) -- there is still an outstanding bug.
facility data 1.5.x: move a line of code to its original location.
facilitydata 1.7.x branch: remove tld files for spring
facility data: make it so that the jsps run on 1.6.x+ where the spring form tag is imported for us.
Initial steps for refactoring and cleaning up facilitydata module.  This particular changeset aims to clean up a bit of the API, and to make a few changes to the core data model.  It does not address the UI, aside from ensuring that the module compiles.  Thus, the UI is not currently usable.  Further changesets will continue to refine the API, add unit tests to ensure that the API, data modeling, and services are solid, and then finally rebuild the user interface.
Further steps taken to clean up facility data module, including repackaging and simplifying classes.
FacilityData: Nearly complete API cleanup
facilitydata:  Some data model changes that allow multiple coded questions to share the same set of options, and which changes the coded values on facilitydatavalue from text to references to coded option values.  Also adds initial test dataset and initial test to demonstrate successful configuration of the objects an their mapping files.
facilitydata: Rename aggregationMethod to periodApplicability
facilitydata:  Adds in a question type object that a question refers to, which will enable re-using common patterns of questions, for example questions that are Positive Integers, or Number of days per month.  This allows us to define these once and reuse them.
Better exception in coffescript, beautify jst output
Slightly better geocoding logic
consolidated SHARED files 09/25
restored needed textFieldClass for LEGENDITEM, erroneously removed...
updated EnhancedTitleWindowSkin so that only appropriate widgets are
clickable (excluding Chat, Health Focus, Patient Profile...)
Updates from Usability Testing's requests
Fixed issue with Opera browser which showed calendar on the button click.
Merge https://github.com/sectoidman/aperture-vman
Formatted "Register new account" on the login page
Merge branch 'master' of git://github.com/Ruva/aperture-vman

Conflicts:
	sites/all/themes/aperture/css/forms.css
removed debug log
updated bare template with latest changes
duplicate duplicate! argggg!
fix error handling
use cdn on branch as well
mynd gets computed property to explicitize
extract away toPNG function
charts moved to mynd
refer to es5shim instead of local code
codo based docs, link to cdn based Mynd
Merge branch 'd3' of github.com:radekstepan/intermine-widget-client into d3
Encore done as well
Moved all files into a directory
Transaction 40916772 by Hans.
Transaction 37341327 by Biertie.
added print format examples and linked list examples
Rebase from 'release/dynamic_reconfigure' @ version '1.5.25'
Generated debian files for oneiric
catkinize the stack
ADD: chrome client
ADD: auth endpoint.
put it on compile classpath not container
Move PHP_CodeCoverage_Util::getDirectory() to PHP_CodeCoverage_Report_HTML and make it non-static.
Looks like I need proper do end spacing
Settings: PT-BR - Fix translations

By xda member Coruja747

Change-Id: I47677bebc3634b62872b30ca3154eef421abe554
Merge remote-tracking branch 'upstream/jellybean' into jellybean
Settings (Status Bar): Dedup strings

This dedups the strings that were added from the Circle Battery
option and adds back the localized strings that were deleted from
the same commit. ( http://review.cyanogenmod.com/#/c/24735/ )
Also revised some strings as per the request of David van Tonder.

Patch Set 2: Added Spanish translations

Patch Set 3: Added French translations (Courtesy of Chad Cormier
Roussel)

Patch Set 4: Corrected the capitalization of app_security_title.

Change-Id: I2ee1d127d0f8094c1b168a1f08b168fc9d1acd1d
Settings: Fix typo (SMS Security limit)

Patch Set 2: Get rid of the unnecessary dependency.

Change-Id: I52a097cb396ec9357469dc859b5cdbe874c6193e
Merge remote-tracking branch 'cm/jellybean' into tmp
Added base analytics tracking script.
Added pageview tracking to all content pages.
Added events to most map page user events.
Added GA_KEY to local_settings.
Merge branch 'staging' into analytics
Use a context processor for analytics tracking.

* Add 'analytics' context processor that adds the GA_KEY to all templates.
* Move all _trackPageview methods for analytics into base.html
* Update RequestContext to put request object into all templates, for path info.
* Updated settings.py with default + new context processors.
Merge pull request #28 from dzwarg/analytics

Implement Google Analytics
Changes since NSFileManager shared instance is now thread-safe.
Fixes to handle delete of temp file

Added delete of temp file on error if not resuming. Also temp file is now deleted if we were overwriting an existing file.
Removed temp file open during init

Better to create the temp file when the operation actually starts running, not during init.
Smash the session, view, and model packages together

These are superfluous and get in the way of properly protecting the
library's internals.
Make library internals package-private

This requires that we expose a new API to allow direct writing to the
terminal from a TermSession subclass.
Make accessors returning package-private classes package-private
Document the library API with JavaDoc
Fix protection for getTermIn()
Add script to regenerate the JavaDoc docs from the source
Add generated JavaDoc documentation
Catch lack of account support exception
Code formatting widgets.php
Removed space added accidentally from previous commit
Add "The puppet show" presentation
Add FHS 2.3 presentation
updated correct name for server/host value in config
Configuração do mongo
Merge branch 'master' of github.com:tiagosarri/sinatra-drop-file-upload
files for the application
Caching, removing headers, excluding subfolders
Status updated on chat window
Merge branch 'master' of https://github.com/vinayakbhavnani/android_chat_client
Новая фотка для Мезенцева
Предварительное расписание
changed input type to text
changed the url filter
Rebase from 'release/ecl_eigen' @ version '0.50.1'
Generated debian files for precise
Rebase from 'release/ecl_time_lite' @ version '0.50.3'
Generated debian files for oneiric
added onJoin kits, optimized mute listeners
subiendo el script v00
Revert "Fix broken backport for IPv6 tunnels"

This reverts commit 63cf8be5bb015c1b2d6d83aa6febe25a1953c26e.
Fix minor derp and disable ROW IO-SCHEDULER for now

Signed-off-by: AdiPat <adithemagnificent@gmail.com>
Added postprocessing, it's not tested and it won't compile!
Add options and some code formatting
TF101: Update vendor files

Change-Id: I0efb1ee893616683d51483c64e473e91f0cc957b
Preserve existing <CR> mappings in insert mode

Closes #136. Thanks to @pera.
Revert "Preserve existing <CR> mappings in insert mode"

This reverts commit f6ced73ea19457d079550681126f5ed8cf835247.

Combining mappings of different plugins needs further
investigation.
Fix libclang race with clang_periodic_quickfix

Fixes race between WarmupCache and updateCurrentDiagnostics, when the
inital parsing triggered by WarmupCache takes longer then the timeout
before updateCurrentDiagnostics is called and attempts to reparse

Replaces CompleteThread's lock with a global libclangLock that is also
used by updateCurrentDiagnotics
Merge pull request #153 from dave-h/quickfix_race_fix

Crash when clang_periodic_quickfix enabled, race with WarmupCache
Use find_library to locate libclang.
Should work crossplatform, but only tested on Linux Debian.
Revert "Use find_library to locate libclang."

This reverts commit 95ccca1c768991a274feb99078ea4fa805637b39.

It broke clang_complete for too many people.
Improved integration with UltiSnips
Fix integration with UltiSnips

Signed-off-by: smancill <smancill.m@gmail.com>
Merge pull request #161 from smancill/master

Small fix on integration with UltiSnips
Albums a person has.
Asynchronous. FUCK.
3G anyone?

Change-Id: Iaf13dd64d562667eae350f2fdf28e2bb2e8f1e57
Update Vibrant maintainer.

Change-Id: Id2886449fbe4e1dc6e54ee61564a2a076d5121f4
Merge remote-tracking branch 'cyanogen/gb-release-7.2' into gingerbread

Conflicts:
	CHANGELOG.mkdn
	products/common_versions.mk
zeus: fix typo

Change-Id: I158090c062f4762b20a315bae010fcfc1b2aff9f
zeus: update extract-files script

Change-Id: Iaaab6d37475265d39610625abc6ec63caded8b49
Update notes for submitted changes

* dnsmasq: Fix aliasing violations
Update notes for submitted changes

* ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend
Update notes for submitted changes

* net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails
remove calibration xml
Merge commit 'refs/tags/android-4.0.4_r1.1' into 4.0.4-merge
added ability to recognize names like P.moesta by TaxonFinder
volunteers recurring schedule batch jobs progress page
bugfix: zencart made error message "Sorry, your security clearance does not allow you to access this resource." - removed .php extention to make things work
moved funciton into canvas
Implemented handling at the data access layer for uploaded image files bearing numeric identifiers (i. e. database records are now inserted with item indices parsed from filenames where appropriate)
Do not send extra data the client is not consuming.

Bug:6138617

This is to temporarily fix a problem in netd. In case of an error do
not send extra data that the client is not expecting. This causes a
netd crash.

Change-Id: Iadb375e326577857034c2a7d2e962e4242d4735f
merge in jb-release history after reset to master
merge in jb-release history after reset to master
merge in jb-release history after reset to master
merge in jb-release history after reset to master
merge in jb-release history after reset to jb-dev
merge in jb-release history after reset to jb-dev
merge in jb-release history after reset to jb-dev
netd: Insert Android iptables rules on top

Avoid a mix of rules with iptables scripts at boot (init.d)

Change-Id: Id4a3ad7a6fd86b4f106594258f4f4ebc69be19fa
Merge branch 'jb-release' of https://android.googlesource.com/platform/system/netd into aosp
Merge remote-tracking branch 'cm/jellybean' into jb
Changed the Facebook page url
Refactored constructors and PackageGenerator methods
Index about nav changes
Add missing license
Merge branch 'master' of github.com:NessComputing/components-ness-config
Silence warning about serialVersionUID
Complete description of installation.

Following instructions from OSEHRA page:
http://www.osehra.org/wiki/installing-gtm
testing new branch
Merge pull request #1 from OtsList/branch_infister

testing new branch
Added child age to HVReport
Converted all Gender to 'Unknown' level

Isn't NA anymore.
CDO Adjustment
Site updated at 2012-08-11 13:25:43 UTC
Corrected a relative URL link for the Asset Types tab
fixed errors in post about govdat
fixing mIccRecord null issue

Change-Id: Iffee764a7b1a42ac97b8c4ebab0b1004def6f21b
adding S3DFormat.h for hwc

Change-Id: I5ddd41f154a1502d97e46bc574aebf36e4a897f4
adding scroll to tabtext
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Website into events

Conflicts:
	templates/events/events.html
Modify parser.php to take backslashes out from the log text
Merge branch 'master' of github.com:Softcatala/CatalanitzadorPerAWindows
re1

re1
fix keyboard+buttons layout and (possibly) screen rotation when keyboard is open

Change-Id: Ibd04683077b9e0f4ce635074a4258a4522a97f42
Merge pull request #4 from seidler2547/jellybean

fix keyboard+buttons layout and (possibly) screen rotation when keyboard...
display: Add binder interface between hwcservice and its clients.

Add hwc_service.cpp and ihwc.cpp file to enable direct communication
to hwcomposer by the clients to set hwc system wide properties.

Create hwcomposer service singleton object in hwc_context_t structure.

Change-Id: I0d0879475951a618a453a23ee254ea651e8c6b88
Replace &bdquo; &ldquo; &rdquo; with UTF-8 characters
updated to work locally for james, and remove params
v1.1 Supports hobby servo mounting; renders flat.
Updated the binary to match the new name of the code processor module
Merge pull request #8 from bryan-m-hughes/master

Updated the binary to match the new name of the code processor module
Add a test code to compare GPU and CPU, GPU can be much faster
Merge branch 'master' of github.com:arunganesan/hand-gesture-recognition
properly create and populate MailBody instances
Keyring support for openstackclient.

If password is defined in keyring, use it; otherwise, prompt for the
password.

* openstackclient/shell.py
  import keyring
  OpenStackClient.authenticate_user(): Get password from keyring,
  if it is defined; otherwise, prompt for the password. If user
  enter a password, store it in keyring.
  OpenStackClient.get_password_from_keyring(): New method to
  get password from keyring.
  OpenStackClient.set_password_in_keyring(): New method go set
  password in keyring.

* toos/pip-requires
  Define keyring as one of dependent.

Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
font size formatting
add files for domain objects
Get hipchat working with no error
wifi: Allow configuration of country code for wifi

Wifi country code handling is a nightmare - Most retail devices
have region customization in /system for each country a device
is shipped to.

This doesn't work very well for a firmware like Cyanogenmod,
where we try to support all target countries with one firmware
package.  For whatever reason, with newer Broadcom drivers/
firmware blobs, the old trick of using a universal region code
(ccode=ALL in nvram_net.txt) does not seem to work.  Who knows
what the deal is for other wifi chipsets.

The good thing is that wpa_supplicant has a standardized
cross-chipset method for setting the region code, and we
use that here.

Change-Id: Ia9f5133f61f56d89ccb290e37a393f5de507e1cf

Conflicts:

	src/com/android/settings/wifi/AdvancedWifiSettings.java
Added queries subfolder. They are horrible but work.
Merge branch 'master' of github.com:charlescapps/VisualizePerftrackCS533
Fixed a bug with the datepicker configuration when week does not start on Sunday.

The jQuery Tools datepicker needs to always be given the list of week day
names starting from Sunday and passed the 'firstDay' option to control
the first day of week (Sunday=0, Monday=1, ...).
update to Angular-1.0.0rc7
Retocada la introducción
A falta de retocar la descripción de créditos ECTS
A la espera del visto bueno de la descripción matemática
	de clases, propiedades e individuos.
new clone to computer test
Revert "Initial commit"

This reverts commit 8917583b5af98a5b1d3ea8c73594c609cb1baf52.
Add option for switching between UMS and MTP/PTP mode. (1/2)

This adds support for switching between UMS and MTP/PTP.
Framework part (this part) will only enable UMS if the config setting is set.
Standard is to enable UMS if the primary volume supports UMS.

p2: Fix compile error
p3: Some code styling
p4: Fix mysterious bug where USB notification is not fired when switching from UMS.
p5: Revert last commit.

Change-Id: I753b7dd3823958da1b043ca44b50118d67637cc1
Disable UMS splash when phone in locked state

Currently devices which use UMS will display the UMS toggle screen
over the lockscreen. This would allow unauthorised users to access
the contents of the SD card, when plugged into USB, without first
unlocking the device.

Disable the UMS splash if the phone is in a locked state.

Change-Id: Ic18462758344c327e70e6a70d674f08d8ad51cb0
Merge remote-tracking branch 'upstream/ics' into ics
logging fix
safety comit
Site updated at 2012-07-02 02:29:49 UTC
Fixed bug with 2D covar hist / current hist axes sharing
Closed the promotion input popup on click of simulate
Fixing project setup.

Signed-off-by: Nate Steffan <nate.steffan@dynamichorizons.net>
Multiple Fixes and Functionality Additions. Completed Order Printing Functionality.

Signed-off-by: Nate Steffan <nate.steffan@dynamichorizons.net>
Added option action_type to support PAY_PRIMARY delayed chained payments
-Add ExportHtml repo
Tue Apr  3 19:37:08 CST 2012
Updating show.html.erb template to use description lists instead of paragraphs and line breaks
fastq_screen tool: fix error in loc file name in fastq_screen.xml file (still version 0.1.2).
Changed wroclaw picture, gave credit where its due
fixed select menus not responding issue
Replace html links with textile markup.

Slowly surrender to textile in favor of succintness.
New post: Highlights from PyCon US 2012 lecture videos (part 2)
Made visited links darker.
Changing more layout and putting 'loading' waning
With fit-in.
Site updated at 2012-11-20 15:44:56 UTC
Cassandra wide row indexing
removed copyright
replaced Integer.MAX_VALUE with 1000
changed consistency level of read operations to ConsistencyLevel.ONE
added unit tests for CassandraIndexAspect class
changed to fetch only index columns of current row
added unit tests for multiple indexes
changed index type from CompositeType to UTF8Type, use Character.MIN_VALUE as component delimiter, changed scope of hector-core to test.
Merge pull request #1 from phnguyen/master

Implemented using utf8 and delimiter as \u000
Forgot to remove a comment!
Made fix to stop null pointers on LocationUpdater
Prepare for 1.3.0.0 release.

Fixed nuget dependency issues.
Fixed a bug whereby in certain conditions the MultimapByDefault behavior
did not work.
Cleaned up files and assets.
Update java/com-lib/src/no/ntnu/osnap/com/testing/ComLayer.java
A-9 adobeconnect - Handle failing of allow assign if coursecreator/editingteacher/teacher role does not exist. (From: Tim Lock <tim.lock@netspot.com.au>).
Merge branch 'A-9-handle-lack-of-roles_20_STABLE' into WP-R1_20_STABLE
LINARO: Linaro-3.1.1-53.53~ci~20120515233831 shared 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~20120502003506 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.4.1-3.3~ci~20120725002039 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.4.1-3.3~ci~20120526002322 omap only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Update widget code
Task 4 completed, but needs refactoring and some more tests on privacy filter.
adding methods to help importer
Site updated at 2012-12-17 22:18:29 UTC
Add remove functionality from session shopping cart
changed smtp details in production.rb
Added a better schema for the testing
More compiling fixes

Same as the last commit :)
Site updated at 2012-08-19 06:58:15 UTC
local_manifest for sgt7 build
Assignment 2, through 1b: sort movies by column and highlieght the sorted column.
change coding install.php to utf8 without BOM
added chapters 1 through 3
Added links to all articles in the networking series

Signed-off-by: Martin Evans <martindevans@gmail.com>
Fixed problem with groups button menus not inheriting settings properly. Moved display update code into set_config() methods
Course tree group nodes disappear if the parent node is set to hide them
OVerrides correctly prevent workshop from having groups nodes again
Changing the individual groups display settings on an activity now updates that node.
node index is bounced back via AJAX
node index is used for post-ajax refresh operations
Counts update as groups are hidden and revealed
Removed dead code
Fixed ids of count spans so they update properly
Parent node hides properly when all child group nodes are hidden via the context menu
Refactored unmarked_nodes() into smaller chunks
Began ajax node count php and refactored nodes stuff into separate functions
Refactored the config filter for clarity and to remove code duplication
Dead code cleanup
Group counts now update when group nodes are hidden
Updating group counts now updates the main total too
All child node group counts are updated at once
Parent nodes are only updated if counts of child node have changed
Update total is called automatically when bubbling recalculation reaches root node
Changing the groups display option alters the nodes in the tree as it happens
Super-basic PHPUnit test
Proper class name
Proper Moodle class name
Altered the AJAX_SCRIPT constants to only define if not already defined. Stops code coverage from crashing.
Fixed process_data definition
Fixed submission_title definition
Sorted out docblock stuff
Sorted out docblock stuff
Code sniffer
refactored duplicated code in upgrade.php into separate functions
Simplified method
Renamed function apply_sql_config_settings to attach_config_setings
Fixed SQL indent
Merge branch 'feature-phpunit-init' into develop-21
Changed forum SQL to use a more efficient ratings check
Removed defunct includes of output class
Fixed forum alterations
Fixed wrong join table
Switched to a slightly hacky way of getting many contexts in bulk, rather than going through the normal API and wasting a lot of DB calls. Big performance gain.
Fixed missing context
Added a comment (testing).
testing _authors folder
minor fixes to diff and jabber
needed to hang .invokeSync from compileFile
Removed type from private variable.
Synced with Chrome sources
Ensure build from fresh pull.
LINQtoCSV & MahApps.RESTBase reference fixes
Note: NuGet packages must be NuGot.
Extend docs on providers.
Use return_url to return to same page after login.

More helpful to the user to redirect them back to the page they wanted to view
after login, rather than to /.

Prompted by @pwfraley on GitHub - thanks!
Update Changes to reflect return_url (GH #13)
Use uri_for() to build URLs with return_url param
Expect return_url in redirects
add ldap authentication provider
Add the footer insert on the homepage.
http://ontouchstart.github.com/12-06-20
remove bootstrap.zip from repository
Add default image and alter image-style to medium
Remove context_layouts in favor of delta
Add clear_password_field and settins
Site updated at 2012-12-05 17:45:25 UTC
删除target下面的东西again
- Fix datatype for ticket_resolution_time field
- SLA Management:
  Limit of queue's working time now working
- SLA Management:
  Fixed code to allow more then one group with time exception
-- Limit log output
   Wrapped ns_log Notice in check for debug_p to avoid cpu overload
-- DynFields SLA Paramater would not be stored
-- added missing type_category_type in table acs_object_types for object_type = 'im_sla_parameter'
-- added fix for wrong status_type_table
- SLA Management:
  Fixed merge conflict
- V4.0.3.0.0:
  Updated to OpenACS 5.7
- Updated version information
- SLAs:
  Added audit hooks
updated version
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
updated version
Merge branch 'develop'
updating version
Added RHEx schemas and rddls
Updated calendar
Cleaner definition of DPB_PATH inspired by AJ's swag
Oprava po mergovani
small changes to example app
Merge branch 'master' of github.com:rubenfonseca/titanium_pusher_android
initial commit
Test change
Test commit
Fix some dock toggle settings that could cause a FC.

Change-Id: If2f951d58dc9b3a43c2475dce1ac152e9a344ceb
Added test restructuredtext file.
future section of readme
Product code normalization helper
Version bump
Merge branch 'release/1.4' into develop
JBIDE-13330/JBIDE-13331
JBIDE-13331 : fix greeter quickstart name

Signed-off-by: Fred Bricon <fbricon@gmail.com>
remove comments about JBDS re: android/jrebel
JBIDE-13326 add new extras/SR1b site which includes http://download.jboss.org/jbosstools/updates/requirements/eclipse/4.2.1.v20121122-0007-patches/
Site updated at 2012-12-16 16:05:18 UTC
Site updated at 2012-08-15 21:26:03 UTC
Merge pull request #28 from stuforbes/master

Added feature/substeps folders to project preference screen
Merge remote branch 'origin/development' into HEAD
Added checked icon in single value selector
added support for passing listen:false as second param to enquire() to not start listening right away
a bit of cleanup
added ResponsiveView.enquireListen() and ResponsiveView.enquireFire() methods

these pass through to enquire.listen() and enquire.fire()
changed the call to enquire to artificially delay listening until an explicit call to enquireListen()
1.27 bugfix

매번 죄송 -.-;;
Adding a fix for percentages with decimal places
Merge branch 'gh-pages' of github.com:tombye/CSS3-Gradient-image-generator into gh-pages
Fix invisible question number in Chrome CONTRIB-3193
added a page of glyph width report
Disable CSRF on json POST interface
Clear cache at start up.
Localisation updates from http://translatewiki.net.

Change-Id: Ia2fdbc689f8804aa18e936e0e130cd1b6480efea
Added derived pdf file.
Added information on checking the successfulness of release perform
Added information provided from Hector Liu on generating public key from
windows machine.
scraped rtr into the source folder
Improved AlarmMath: long click, other stuff