labofsahil/github-event-dataset-2012 huggingface dataset:
Added REST support for create, update, delete and show of product properties

Fixes #2132
Destroying a product returns no data, therefore 204 status is better
[api] Admin requests MUST now use a token, even if requires_authentication is disabled

Fixes #2140
[api] Fix response.status for ProductsController#destroy
[api] Variants API is now paginated and scoped correctly

Responses were previously returned as:

[ { variant: <attributes> } ]

But are now returned as

{ variants: [{ variant: <attributes> }] }

Just like products are.
[api] Only show deleted variants when 1) the user is an admin and 2) when they pass through the show_deleted parameter

Fixes #2141
[api] /orders should always return an :orders key, even if there are no orders
[api] Allow an order to be created without parameters
[api] nested_params does not need to define an instance variable
[api] OrdersController#create should respond with 201
[api] Fix orders_controller tests
[api] allow an order to have either its shipping address or billing address updated
Do not allow void_transaction! to take place if payment is already voided

Fixes sub-issue from #2119
[api] Always include a :payments key in payments response
[api] Fix ProductPropertiesController to use ID, rather than name

Fixes #2143
[api] Add capture endpoint for payments
[api] Don't use deprecated syntax in ProductPropertiesController
[api] whitespaces in ProductPropertiesController
Fix product properties API to not show properties for unavailable products
[api] Ensure there is always a :product_properties key returned by /products/:id/products_properties
remove pet.R
update gitignore
group CBLAS options into utility/cblas_op.hpp
forward declaration of some additional classes
Bugfix: method used in TaskFlowClient.setOrder
Moved SliceResult classes to common

The weren't accessible by the clients.
Merge branch 'rest-devel' of github.com:zibhub/GNDMS into rest-devel
Bugfix: member access of DMS... methods
add SwitchOptions.bak and README
phpServerPart
bugfix: catch exception when using equals instead of text equals
added icons and help link
Install syntastic.vim as a submodule
commit
Merge branch 'master' of github.com:4lk4tr43/Test

Conflicts:
	main.cpp
random corrected
Added quicktest make target
Made quicktest less verbose
Added --stop to quicktest
Added shorthand for quicktest, took too much time to type
Fixed import error in experimental plugin
Marked more slow tests
Fixed import error in experimental plugin
Tweaked quicktest and it make targets
update unit test
pep8
rename configurable_impact_functions_dialog_base.py to function_options_dialog_base.py in jenkins-pep8 rule
In progress updates to multilayer keyword support
Reindex task uses sunspot:reindex instead of sunspot:solr:reindex
Level 8 + 10 butt blocks
Added support for bukkits world-container property.

Fixes ticket #8 not finding players dat files for offline edits.
Added support for bukkits world-container property.

Fixes ticket #8 not finding players dat files for offline edits.
Merge pull request #1 from a3dbox/master

Added support for bukkit's world-container property. Thanks a3dbox!
Add analytic
Update Logo
Add zIndex in customer text
remove script tag
:D
SlowTimePainter rafactoring.
add insert_pic.sh
add insert_pic.sh
ARELLE-181, concept.niceType, return None if no valid type
EFM.6.3.3: add detection of empty ext link to report invalid file name
fixed syntax errors. It was the type declarator
Updated the uaa connection pool to use tomcat jdbc connection pool

dbcp is an older inferior connection pool and a bug in it's
implementation may be causing the uaa to hang.

[#37821245]

Change-Id: I419b57b4e88fa2c3e30ab001c169fa19db7605b7
Bumped the version of the uaa to 1.2.4

[#37875491]

Change-Id: I51c0724a801bdd8d6689476c224880d51193c3ea
Merge branch 'hotfix/1.2.4'

Change-Id: I3543026721802bb999083918d60c292c403da8f8
- fixing horoscope
- injecting logger instead of using static call
Public Update

Doing some design for the company while working with the management
system, updated design files.
[MOD] GUI, Editor: indentation (via TAB) revised to only insert spaces
[MOD] GUI, Editor: TAB inserts spaces if typed before first char in line
fixed style guides of dumper
renamed Dumper to Dumper\GherkinDumper
test added

Signed-off-by: Buddhima Wijeweera <buddhimawijeweera@yahoo.com>
seccion de mensajes
Merge branch 'master' of http://github.com/byroncorrales/cafod
Moved class to CHH namespace
Added timeout feature to Problems.
Removed .swp files and added them to .gitignore
* restructured the entire source code directory tree.
Catch parser exception in the correct scope
Update version to 0.8.2-cdb-dev-3
Update JavaDocs for isInPartyWith()
improve 192 description
improved Lore description
readded point on the job database for the DP
update Labs section
add bit on analytics at Lore
improve copy for 192
replace school project with more personal projects
Merge branch 'master' into alexey
Add writing section to skills
'Other Projects' -> 'Mini-projects'
Rearranged sections to be more relevant to readers
remove parens on links
add index
removed change publish script and altered session variable during user email change
Fix get closest staff typo

copy paste error that resulted in wierd staff finding.
Update neon test template

to include compiled neon.min.js
Page Model testing complete

tested all major functions in the page model
Clef Unit Tests

Almost complete, just need to test pitch shifts when changing clef shape
or position.
QUASAR: Make honeyd log to file and add ability to view honeyd log webui
Merge branch 'master' into integration
LIB/NOVAD: Fix for while-sleep kludge to keep novad's main thread running

- Made StartServer() a blocking call, which now functions as the main loop
   for novad.
MapChunkS bugfix and sideway tree logs!
moved few enums into brala.dine.builder.constants
frustum culling works (almost)
change the log level from ERROR to INFO for log messages when the destination for a message cannot be found.
Finding an Mp in the container no longer locks the entire container.
removed debugging
Merge branch 'master' of git@github.com:Dexels/navajo.git
New functionality: get total fields from 1 cvsentry and option to skip
the first row
incremental update
clear warnings
Release of com.dexels.navajo.resource.test version 1.0.3
Development stream of com.dexels.navajo.resource.test version 1.0.4
[enh] lots of polish in an ugly commit
Sukisau registrus i paketa. Pradedu keisti atminti.
updating config data to make sense
hydrate fields fixed
added teamspeak status to main page
Added simulation file that computes superoperator spectrum for Spin 1 model
BookTest passed
Added TextManagement

Added a text management class.
Deleted useless file
ffprobe: avoid potentially lossy long long int -> double cast in value_string()

Previously the cast long long int -> double was always performed (and
then the double was converted back to long long int) even when it was
avoidable.
ffprobe: kill initializers with nested union field definition

The c99-to-c89 converter (for MSVC support) doesn't currently handle
designated initializers or compound literals with nested unions or
structs.

This is apparently the only place where this construct is used in the
FFmpeg codebase.
lavfi/avcodec: apply cosmetics style fixes
tools/graphdot: unbreak syntax

Fix regression introduced in f054dbee6cc5195ba8f37823a494dab2d26e7cca.
+10.23l.
Fix dependencies for the atempo filter.

Found, analysed and tested by trac user Jamal.

Fixes ticket #1465.
mov: use designated initializers for AVClass

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avidec: use designated initializers for AVClass

Signed-off-by: Paul B Mahol <onemda@gmail.com>
x86/intmath: fix type of FASTDIV

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Changelog, split next from 1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
One little comment for DEBUG-Mode.
Update plugins/fabrik_form/juser/juser.php
Update plugins/fabrik_form/juser/language/en-GB/en-GB.plg_fabrik_form_juser.ini
Merge pull request #507 from jfquestiaux/master

Fix for the autologin function of the JUser plugin
fixed: missing group intro textarea field
fix a bug: each function should have its own space to store time information as one function could call another
main

reformatting
Amélioration du template
Amélioration du design du site
Quelques corrections sur la connexion et la gestion des pages
Create .gitignore
pull de develop. primera vez
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo
yi
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo

Conflicts:
	.gitignore
	.settings/org.eclipse.jdt.core.prefs
	project.properties
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo

Conflicts:
	project.properties
modificado project.properties a android 17
pull projet properties api 17
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo

Conflicts:
	src/com/adm/findme/Group.java
	src/com/adm/findme/MainActivity.java
	src/com/adm/findme/Settings.java
integrada activity contactos
integrada contacts
We can also omit pointer stacks for the common case of fytheTableInit.
auth token front end fix
added some js dependencies to make the app work on linux
fixed the user.collaborator_decks and the deck.users associations
missing test for user.collaborator_decks association
added to README.md, gathered up some common code in builtins
First throw at some fluent type builder api
[DEV] create the basic gravity equations
more exception catching... ugly...
display remaining charges in the inventory, and fix the 'can use' highlighting for potions and items
auto rendering views
Merge pull request #2 from CakePower/master

auto rendering views
zhai
ceshi
Removed unneeded import of process
hide/show spotlight animation
emits im client hinzugefuegt, in header emits erweitert
Models are forced to have the name in lowercase: user_model.php -- avoid capitilization confusion with linux
Initial commit for Gradient class.

Made some module level functions static methods in the Vector2D class.

Sprite constructor now takes a position as an optional parameter.

Created a Gradient static class for helping with creating gradients.
Currently it just hands you back a surface, and you can use that
anywhere you like.

Created a demo for the Gradient class illustrating usage.
All files up-to-date for both Gold and Bronze app.
First Commit

Signed-off-by: Jodred James Puno <triklish1387@yahoo.com>
simplifying findInSelfAndDependencies() method (removing additional parameters from there)
avoid calling same parent class loader twice.
Merge remote-tracking branch 'origin/master' into idea11_1
fix diff on server (in each pair of nodes with the same name rename on of them)
output files in compressed format .gz
Add autojump wrapper
Prepping to move result access to Example
Clarify a comment.
Moved running to run and away from Examples.
4
55555
update to 1.2beta
Advance t.txt on cloud before client.
Reader: fixed problem with quote ambiguity.
list command: error on too many arguments

SORT, REVERSE, and REMOVE_DUPLICATES can only operate on exactly one argument.
Until now all other arguments were silently ignored. Give an error instead.
Merge topic 'list-command-argument-fixes' into next

52d9c38 list command: error on too many arguments
Set anime_is_ongoing variable if the ending year isn't set
Merge branch 'feature/is_ongoing' into pu

Conflicts:
	kadr.pl
Add ebuilds for multicorn beta1
Merge branch 'master' of github.com:Kozea/Overlay
Added a call method in the ctrl class and some other changes
implementing part B
Uploaded all .. moderate progress.
Restructured directory tree, ...

Restructured directory tree, cleaned some code, switched to flatiron.
Fixed some bugs, optimized
Some bugs fixed
Update .gitignore
removed config.js
Removed platform and region enums; any values are now acceptable. They will instead controlled by the schema file.
adapted Marschal>>serialize_float_thing and Marshal>>serialize_integer, because String>>[]= expects now String and no longer Integer
Functional toggle/close all buttons.
Set initial layer opacity to 50%
Including default songs
some more tests for complex iee and predicates
is_real.hpp
lapack interfaces for qr
qr details
Shuffle altivec
Added an auto-maximum feature to graphs
fixed the slider value issue
Merge pull request #125 from ciprif/ThreeZeroOne

Three zero one
Fix for MOSYNC-2266 "too big font size in templateCNativeUI on iPhone"
Merge pull request #215 from grigaci/ThreeOneOne

Fix for MOSYNC-2266 "too big font size in templateCNativeUI on iPhone"
just for internal sync between pc and laptop -_-
hw
Merge branch 'master' of github.com:Mobots/mobots
Create Maui, start putting back standard Views and get pages working with Theme
Change Trigger to Plugin (except in JS)
Name changes
Config
Merge branch 'master' of github.com:Molajo/Molajo
Minor changes
Merge branch 'master' of github.com:Molajo/Molajo
Added ability to define where clasues to model (in addition to standard joins, common parameters, and FK's)
Fix home redirect madness
_mlt endpoint supported directly (mlt queries were already possible) added simple integration test for it on top of all the unit tests
Make translatable MythTranscode strings which should have been
translatable.

Closes #10972

PS: The other problems are local.
Fixes #11151 by correcting a float-to-integer truncation problem.
Fix 32 bits compilation on mac and Quartz playback
Un po' di traduzioni.
Update 2/0000/0056.txt
Merge pull request #1070 from turex/patch-172

Update 2/0000/0056.txt
Update 3/0000/0154.txt
Merge pull request #954 from C418/patch-3

Update 3/0000/0154.txt
tradotto interamente
Merge pull request #5 from marchetto96/patch-1

Posso tradurre dall'inglese
Corretti alcuni errori e finito di tradurre. Launcher è lancio?
Merge pull request #235 from fede-dot-97/patch-3

Corretti alcuni errori e finito di tradurre. Launcher è lancio?
Add triggerNoRepeat to SoundManager
Gradle Release Plugin - new version commit:  'priam-root-1.2.0-beta4'.
Fixes #979
ändrar deadline
Update default Haskell environment to Haskell Platform 2012.4.0.0.

The most significant change brought by this update is that we now use
GHC version 7.4.2 by default.
Fix Agda build.

Agda won't build with recent versions of QuickCheck
Fix haskell-testpack build.

Testpack won't build with recent versions of QuickCheck
Fix git-annex build.

git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
smaller fixes in specs: parameters changed a little bit
Refactor ALL the things!

This is a cleanup commit to organize the code into a better hierarchy. Now
that the project is more than 10 lines, is is more clear what the hierarchy
should look like. I hope.
Remove other-modules: from cabal file from now.

I could be wrong, but it appears executable projects don't need it. Will
check later.
Updated asynchronous Event: replaced function pointer by std::function. Updated Map: added collection of drawables.
Added base classes for I/O visitors. Added CenteredCameraController for basic moves. Added Packet class.
fix #239 - fix typo in new folder dialog
Fixed UI states in special keys
vArch-2.0: fixed storing and saving of displacements with negative sign

Signed-off-by: Nicola <ben.vighy@gmail.com>
vAsm-2.0: some more C++11 porting

Signed-off-by: Nicola <ben.vighy@gmail.com>
vAsm-2.0: Added Frame Pointer usage for local variables in functions

Signed-off-by: Nicola <ben.vighy@gmail.com>
vArch-2.0: fixed some warnings and moved some old code to the proper style

Signed-off-by: Nicola <ben.vighy@gmail.com>
PIMS-1929 Download PDF > Can't load the XML resource (using TRaX
transformer). Also made some improvements to the shipping reports.
Reverted back to the original version
Data.isDependentPi
hide inferred args
Revert "DefinitionEdit has no inferred types displayed"

This reverts commit 88bca961c13d3d86cc31ae71e951db51e6738581.
Show DefinitionEdit inferred type errors
Add for ResponseCode RC_000
fixed PiMaster`s stupidity in database.py :P
Updates and optimizations.
Updates to TimeMetadataProvier.
ENH: add badexternals holder for statsmodels (and pandas and skimage just for future ;) )
BF: do not import statsmodels GLM wrappers in test_stats where not tested

leads to import failure for badexternals test
Fix #103 : Autocomplete widget escapes provided values
Merge pull request #122 from tonthon/issue_#103

Fix #103 : Autocomplete widget escapes provided values
slightly better coverage
use new ordered api
Ecriture des attributs et méthodes pour Loft Case
Introducing Redis MapEntityStore
Merge pull request #106 from RanjitK/master

Moved all configs and csv files to the new config folder 
Merge branch 'fix/config_file_path_modification' into development
a lot of commits
a lot of commits
Merge pull request #109 from ssikka/master

new changes
added fristons 24 parameter model
added fristons 24 parameter model
Merge branch 'feature/version_0.1.4' of https://github.com/FCP-INDI/C-PAC into feature/version_0.1.4
removed HEAD
removed HEAD
Merge pull request #110 from FCP-INDI/feature/version_0.1.4

Feature/version 0.1.4
added FristonModel to generate_motion_statistics
Merge pull request #111 from FCP-INDI/feature/version_0.1.4

added FristonModel to generate_motion_statistics
category, posts controller and view
Fix require(s) for change in dir structure from core -> frame.
Loading of tab delim files containing Numeric or Categorical Series.
Post: OOP with Javascript
New plugin for sound triggers; also specify how and where plugins should store config files
submit btn color: warning-orange for admin actions
remove functions in cljain/sip namespace that just call into cljain/core
Added links back to player to load video selected
Added classpath handling on start and the corresponding shell to start the program
[11995] Fix following for guid linked npcs on evade

Thanks to grz3s for pointing

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11996] Fix targeting for spells like 53022

Thanks to Inquisitor for pointing

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11997] Add spell support for 54092

Thanks to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11998] Implement fail chance for spell 54732

Ths to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11999] Implement spell 45204

Original author Wowka321, thx to stfx for porting

Signed-off-by: stfx <stfx@hotmail.de>
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/SpellEffects.cpp
[11999.5] Support loading tables with default filling into SQL-Loader

* Add special field markers to fill a column in SQLStorage with default values
* Add a safeguard to DBCStorage::EraseEntry, Add helper function DBCStorage::InsertEntry to store content

Note: If required similar adjustments to DBCStorage might be reasonable if required
[12000] Implement server side spells

Add exemplarily support for spells 21387(used with Ragnaros) and 62388(related to Demonic Circle)
Further table columns can be added as required.

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12001] Implement target limiting for spell 47669

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12002] Implement spell 59789

Thanks to stfx for porting

Signed-off-by: stfx <stfx@hotmail.de>
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12003] Implement script-effect for spells 47703, 47724 and 50252

Thanks to stfx for porting

Signed-off-by: stfx <stfx@hotmail.de>
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Fixed typo.
[12004] Fix spell 48385
[12005] Implement spell 48590
Code cleanup
[mr2023] Fix Reset of Mobs
Home-Movement must have a higher Priority as Chase Movement. If not NPC's will never reset and walk "Home" :)
[mr2024] create possibility that Point-Movement can be overwrite from Chase-Movement.
Very Useful for Point-Movement in Scripts.
Without patch: Creature finish at first Point-Movement (maybe run away from attacker)
[12006] Implement Aura 304 as SPELL_AURA_FAKE_INEBRIATE

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[mr2025] remove dublicate string
[mr2025] some code corrections for possibility utils compile in in MINGW32/MINGW64 environment. add bash script for automation compile (required in MINGW32/MINGW64 installed and also some libs compiled under this environment).
switch/nrt remove instance count support using parenthesis after protocol type

If multiple network instances are required, then use the instance=#
option rather than parenthesis after the protocol name. This is far
simpler especially if someone specifies different prococols with
difference instance counts or specifies an instance count in both
places (after protocol name plus using instance=#).
BLUEGENE - More updates to docs
Update RELEASE_NOTES with additions for v2.5
NIMROD loading
review actions
Merge pull request #54 from bblay/nimrod

NIMROD loading
Remove python extend from lamp stack
Allow to use LAMP applications without configuration
update joomla and add configuration file
upgrade md5 instance-mariadb
Merge remote-tracking branch 'origin/joomla' into wordpress
Make mydumper compile
Update to mydumper 0.5.1
Update egg versions
Fix 'execute' function
Merge branch 'master' into wordpress
Pin version of wordpress
Update egg versions of LAMP stack
New promise to check page content for lamp
(cherry picked from commit 937fcca5fe1051a78a1e142aa06e9ff5cdb08d42)
Update MD5 in LAMP
Update md5sum in LAMP stack
Cleanup
Fixed a restart loop with new versions
Well now the loop of messages is back, reverted
Added Json api for external party's
Added overwrite htaccess for api
Added auto refresh on main server overview
added pagination adminlogs, notifcation of refresh in main window
Servers overview still has 1 minor bug, need to find some more time. Use this instead
Extensions didn't get removed correctly, fixed
Fixed dbplugins
Fixed notice closure error
Added option to show registered servers for TF2
Added even more facepalm text
Fixed servers updating while setup of that server said no
Fixed typo, made full servers now green and empty ones red
Added steamrep to player list on live servers
Added icon for steamrep
Updated legenda for steamrep icon
Removed daily restart options on l4d and l4d2 since those are never used
Added multi console, run commands on multiple servers at the same time
Fixed ending of page layout not ending correctly
Update a bunch of the code, remove things, change project name to corona
Update to include gitignore and tpl directory
Newlines at the end of files... come on
Updated Library file
Merge branch 'parmesan2corona' of git://github.com/ChinggizKhan/Aurora into ChinggizKhan-parmesan2corona

* 'parmesan2corona' of git://github.com/ChinggizKhan/Aurora:
  Newlines at the end of files... come on
  Update to include gitignore and tpl directory
  Update a bunch of the code, remove things, change project name to corona

Conflicts:
	compass-aurora.gemspec
	lib/aurora.rb
Added Singularity behaviors
Updated Toolkit version in gemspec
Updated rb file
Merge branch 'master' of github.com:Snugug/Aurora
Added some templating for the category selector
also jeff.png for placeholding, and some orange accents
Renamed 'command' as 'hoop' since that is what they always are
Added motion blur behind moving hoops
Added monkey pet
Added sheep pet
added fish pet
! 0004750: Editor css files need version-specific suffix

Signed-off-by: Spuds <spuds@simplemachines.org>
Implemented setScissorRect (w/ examples) to RNObject, RNText, RNBitmapText, RNButton, RNGroup, RNMap, RNPageSwipe, and RNListView.

Signed-off-by: Sylvia Wei <trinary@gmail.com>
Fix the pie chart
Merge pull request #20 from JacksonTian/butterfly

Fix the pie chart
Update munin cookbook
new wms transformation
Adding a flag to 'ino serial' to allow setting of picocom escape char

I've add the '--escape' flag to 'ino serial' to allow users to
change the C-a escape char (C-a conflicts with tmux escape char :) ).
Smaller earth background image, sidebar contact info text bolded
Fix tire sigma_hat, alpha_hat interpolation. Use max tire load to when calculating sigma/alpha_hat LUT.
add inline-ls-lastarg keymap
replaced sqlite gem and placed pg gem checking for mobil screen size
fix render issue with bootstrap
taking out images for Heroku nonsensery
Fix the (non-compacting) memory allocator in Pool.hpp to enable large allocation (without bad memory accesses).
Merge branch 'master' into pool_patch
Merge pull request #254 from VoltDB/pool_patch

Fix the (non-compacting) memory allocator in Pool.hpp to enable large al...
ENG-3732 New compiler working - all examples and tutorials updated.
add epileptic.sh
Instructions to configure Linux/MySQL to read files from local file system.
#67
changed date format after reverting
Fix link to Order from Validate page
Fix wrong error dispay #437
Fix link to order in Validate view
Fix incorrect "Show Error" and red highlighting in Validate #437
Merge branch 'master' into Add-Fields-Receipt
git属性文件

添加.html为文本文件
激活服务说明添加Win 8
Sync code.
Mesh::bindAttrib
Added documentation to the CheeeenSec library.
add name attribute to metadata
increment version for development
Correct name for the `keyserver` attribute of the `apt_repository` LWRP.
Merge pull request #22 from Youscribe/removeSource

[COOK-1894] Remove "-source" from file
change filename from new_resource.package_name to new_resource.name

With this change we can manage "*" package
Same thing for repository provider
Merge branch 'COOK-1893'
[COOK-1682] - use template instead of file resource in apt::cacher-client
servers are node objects
[COOK-1875] - cacher-client should be Environment-aware
[COOK-1682] - use template instead of file resource in apt::cacher-client
servers are node objects
Merge branch 'COOK-1682'
merge conflict resolution
[COOK-1914] Fix /etc/apt/preferences.d/ permissions

This directory was missed by e1ba5f8dce526e458e4c309a70499a47481cf60d.
Merge pull request #23 from tmatilai/COOK-1914

[COOK-1914] Fix /etc/apt/preferences.d/ permissions
Merge pull request #24 from mpasternacki/master

Documentation fix for COOK-1942
Merge branch 'master' of git://github.com/opscode-cookbooks/apt
Merge branch 'hotfix/0.6.1'
Fix error when data is null
Fixes multibyte utf8 parsing error
Merge branch 'master' into develop
Better support for multiple sites.
Moved OPPO sites from separate branch to the main project.
Fixed manage.py to allow different settings.
Finished OPPO base template.
Improved message when the user has uploaded the required document, but it's not approved yet
libata: acpi: set can_power_off for both ODD and HD

Hard disk may also be runtime powered off, so set can_power_off flag
for it too if condition satisfies.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
scsi: pm: add may_power_off flag

Add a new flag may_power_off for scsi device, it gives the user a chance
to control when the device is runtime suspended, can we remove its power
if possible.

I'm planning using this flag for sr and sd.

For sr, if user set 0 to may_power_off, we will disable runtime suspend
for ODD, since runtime suspend for ODD is wholly for zero power ODD, if
we can't power off the ODD, there is no meaning to do runtime PM on it.

For sd, if user set 0 to may_power_off, we will not power off the device
when it is runtime suspended.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
libata: pm: differentiate system and runtime pm for ata port

For sata port, only runtime pm needs to be taken care of;
For IDE port, only system pm needs to be taken care of.
Currently, we use PMSG_SUSPEND for both system suspend and runtime
suspend and PMSG_ON for both system resume and runtime resume.

Change this by using PMSG_AUTO_SUSPEND for runtime suspend and
PMSG_AUTO_RESUME for runtime resume.

The ata_acpi_set_state is modified accordingly. And the sata case and
pata case is seperated for easy understanding.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
libata: acpi: respect may_power_off flag

If user does not want the device being powered off when runtime
suspended by setting may_power_off flag to 0, we will not choose D3 cold
ACPI D-State for it in sata_acpi_set_state.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Added new ideas :)
I realize i previously committed code where I malloced without freeing, so i fixed it
Using sets to manage disk format compatibilities
Merge branch 'issue3515'

Conflicts:
	api/src/main/java/com/abiquo/api/exceptions/APIError.java
Added guava
Merge branch 'issue3515'
Merge branch 'master' of github.com:abiquo/abiquo

Conflicts:
	api/src/main/java/com/abiquo/api/exceptions/APIError.java
Disable host by HA in HACheck
Merge branch 'disable-ha'

Conflicts:
	server/src/main/java/com/abiquo/abiserver/commands/stub/impl/VirtualMachineResourceStubImpl.java
only message ops with alerts
Don't delete paths that have exclude or strSettings set and
don't delete paths that are refered to by other tables as parentID
AddonBrowser: check if dialog was confirmed instead of checking if it wasn't multiselection and if anything was selected. We might skip CGUIDialogSelect::OnBack when we close dialog (for example when we reload skin).

Fixes crash when we reload skin while in skin selection dialog. GUIWindowSettingsCategory didn't catch that we in fact canceled dialog and tried to proceed with changing setting (that we already deleted when closing settings window) causing bad memory access.
change CGUIDialogSelect::SetItems() to create copy of list instead of just setting pointer to it
fixes crash when reloading skin while select dialog is active
GUIDialogSelect: get rid of not needed m_vecListInternal and just use m_vecList (we don't store pointer to external list anymore)
Correct the GUIDialogKeyboard class to ignore non-printing unicode values
don't group movies into sets in files view
Ensure that the previous menu action is not handled in a list/panel container - it is handled at the window level
library: use userdata/library/ instead of userdata/Database/ for custom video library nodes
don't blindly add slashes at the end of sources. fixes #13550
Merge pull request #1777 from Montellese/dont_group_in_files_view

don't group movies into sets in files view
[osx] fixed build
make sure we setup the visualisation preset list prior to init'ing the window. part of #13556
make sure we setup the picture info dialog prior to init'ing the window. part of #13556
make sure we setup the peripheral manager dialog prior to init'ing the window. part of #13556
Merge pull request #1785 from Montellese/custom_nodes_location

custom library node cleanup
DialogSelect: autoselect first item if no item was preselected
fixes focus staying on same item when we show dialog next time
reset m_focusedControl in CGUIControlGroup::ClearAll()
fixes focus staying in middle of setting list when jumping through setting tabs
settings: fix default values of "locale.language" and "locale.country"
fixed: no need for RunLimiter prototype in IAEStream
remove broken slideshow screensaver

check for slideshow setting in order to be backwards compatible

check empty() in case the screensaver was uninstalled
Changelog, authors added
Removed target and classes directory
more web service testing. Commits on post to support server based dates
Remove an unused private.
Cope if loadEntry immediately blows up.
Web Audio API support.

If Web Audio is available, Flambe will use that, and otherwise fall back
to HTML5 audio (or just silence if that isn't available either).

Only tested on desktop Chrome so far.

Part of issue #19.
Instead of passing null to Stage.lockOrientation(), use unlockOrientation().
Some internal renaming.
Document flambe.script a bit.
Way less fragile start command.
Merge pull request #2 from jamesgolick/master

Modify the README to include a way less fragile start command.
Cast ADC_VREF to double (be specific)

- http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&p=998242#998242
Modify ADC by removing the dependece to PM module

- Unnecessary error checking removed. In future Driver Classes take
  responsible of those.
- Added aery::adc_is_enabled()
- Added new example that uses hd44780 example to print a/d conversion.
(Bug 4624) Fix ambiguous things that yuicompressor chokes on

- don't use "public" unquoted. Reserved word
- don't use "throws" unquoted. Reserved word
- close an unterminated string
(Bug 4624) Handle deletion of compressed files

We had to copy these over manually; we also have to delete them
manually.
alteração no título da página inicial
Все поправил, добавил комменты
do dates the way saasu likes
Moving Gemfile locks into the Gemfile itself instead of a local lock file.
Merge pull request #1 from seryl/gemfile_fixes

Moving Gemfile locks into the Gemfile itself instead of a local lock file
iframe fullscreen
[Dev] Added a method to copy object in the factory dedicated to Bom creation (useful for the build of partner inventories).
[Dev] Added a routing leg key (composed of the operating airline code, the operating flight number,  the departure date, and the leg key) in each leg date and a list of them in each segment date object.
[Dev] Added useful Bom retriever methods (to retrieve a partner inventory, a partner segment date, ...).
[Dev] Deleted the partnership link creation within the clone process (now fully automated in Airinv).
[Dev] Deleted the partnership link creation within the default Bom tree (now fully automated in Airinv) and added routing leg keys list within each segment date.
[Dev] Added missing LegDateKey retrieval in the BomKey Manager command.
Merge branch 'trunk' into releases
Metido el codigo del generador en Hazi/Lib/Generator
last fixes for fbdev
Some code and make file reorganization

- Create include directory
- Fix some makefile dependencies
SHMEM -> MMAP
2450
[#27515615] Add Goal model. Add migrations to support Goal
[Fix #27515615] Template and admin fixes to support Goal model
v2.0.12, README
minor space fixes
Merge pull request #2 from deian/master

nop (fixing whitespace issues)
Do not store normals and save a lot of memory
Merge branch 'dev' of github.com:vi4m/ralph into dev
Merge branch 'master' of https://github.com/allegro/ralph into dev
Merge branch 'dev' of github.com:vi4m/ralph into dev
Merge branch 'master' of https://github.com/allegro/ralph into dev
Report a bug moved to top. changed label, predefined url for direct creation of issue
Create issue url instead of list issues
Merge pull request #231 from vi4m/dev

Changed link to bug list, to report a bug
refreshing image added
prevent non gpen admin from renewing membership for org
Merge branch 'master' of github.com:amina196/gpen
Merge branch 'master' of github.com:amina196/gpen
Merge branch 'master' of github.com:amina196/gpen
Merge branch 'master' of github.com:amina196/gpen
Merge branch 'master' of github.com:amina196/gpen
fixed bug in renewal
added a story about connection creation and a user picture
working through deferred error messages
don't duplicate default values in text helper
Remove obsolete code
Extract clusterfuck method for surgery
refactoring
we don't need to test that constant assignment works
we have no need for the ASSOCIATION_METHODS constant
Allow Relation#merge to take a hash
assert valid keys
Add Relation#merge!
Make Relation#extending work like other value methods
remove apply_finder_options call from AssociationScope
doesn't make sense for select! to take a block
Merge pull request #5823 from avakhov/ac-test-case-remove-obsolete-code

Remove obsolete code
use a hash to store relation values
now we can just manipulate the values hash in #only and #except
Fix wrong return value from reset_sequence_name method.
Merge pull request #5814 from lest/patch-4

don't duplicate default values in text helper
move some of the update_all implementation to active_record_deprecated_finders
Merge pull request #5832 from kennyj/fix_5267

Fix a wrong return value from reset_sequence_name method.
final draft of analysis paper
initial compiling version of RioParser, with OWLRDFConsumer as RDFHandler
update parent pom artifactId
remove reference to file repository
remove pellet-owlapi and dependencies modules as they are no longer required
Print milliseconds of the current second in log lines timestamps. Sometimes precise timing is very important for debugging.
SLAVEOF is not a write command.
Update to remove xpath errors
dah bisa join dan binding ke gethub server
AOSP x86 4.6 toolchain

Change-Id: Idec3791d68099ca31cd1033a81e20dabfdf99e95
rebuild class
FIXED: Feign death should now cause the attackers to disengage. fix #207
Обновление yii-bootstrap-0.10.0.beta.r244
Работа по теме bootstrap и не только
Еще правки по теме и без темы :-D
Error in test 0
update options list per cmd
Adapted `tests.integration.states.ssh` to use `SaltReturnAssertsMixIn`.

* Two new methods were added to `SaltReturnAssertsMixIn`, `SaltReturnAssertsMixIn.assertSaltStateChangesEqual()` and `SaltReturnAssertsMixIn.assertSaltStateChangesNotEqual()`, in order to be able to test salt state returns. These methods, besides asserting that the state was correctly applied using `SaltReturnAssertsMixIn.assertSaltTrueReturn()`, are also able to test for what's in the `changes` key of salt's return, it can even "go inside" the `changes` dictionary, just have a look at what was done in `tests.integration.states.ssh`.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #2825 from archtaku/develop

Add multiple version support (pacman)
Migrated `test.integration.states.file` to use `SaltReturnAssertsMixIn`.
Migrated `test.integration.states.git` to use `SaltReturnAssertsMixIn`.
Migrated `test.integration.states.host` to use `SaltReturnAssertsMixIn`.
Migrated `test.integration.states.pip` to use `SaltReturnAssertsMixIn`.

* Added `assertSaltCommentRegexpMatches()` to `SaltReturnAssertsMixIn` to add the ability to match salt comments using regular expressions.
Migrated `test.integration.states.rabbitmq_*` to use `SaltReturnAssertsMixIn`.
Migrated `test.integration.states.supervisord` to use `SaltReturnAssertsMixIn`.
Remove deprecated tests functions.

Removed `ModuleCase.assert_success()` and `ModuleCase.state_result()` which are now better tested using `SaltReturnAssertsMixIn`
Add `integration.SaltReturnAssertsMixIn` where it was lacking in previous commits.
Merge pull request #2829 from s0undt3ch/develop

Adapted `tests.integration.states.ssh` to use `SaltReturnAssertsMixIn`.
Move result out of code block
Merge pull request #2834 from UtahDave/fix_docs

Move result out of code block
Migrated `test.integration.modules.state` to use `SaltReturnAssertsMixIn`.
Don't switch assertion case. Fix test.
Merge pull request #2832 from s0undt3ch/features/SaltReturnAssertsMixIn

Migrate states tests to use SaltReturnAssertsMixIn
Merge pull request #2831 from seanchannel/develop

update options list per cmd
Fix exception thrown when symlink target is missing

os.stat() follows symlinks to their targets.
If the target is missing, os.stat() throws an exception when it tries
to stat the symlink.

Switch to using os.lstat(), which works on the actual symlink and acts
on files and directories as usual.

I believe this also closes a potential security issue where someone
could slip a symlink to /etc/passwd, for example and change ownership.

The current behavior will cause file.directory to ONLY do work
on the directory structure specified. Symlinks to files outside the
specified directory are not followed.
Bug 798679 - Reduce preview pause after photo taken. r=djf
Bug 796082 - [music] add cached album image to metadata
Bug 804328 - Fix setScreenBrightness() assertion failure because
ScreenManager._savedBrightness is undefined. r=vingtetun
[Bug 796238] understanding the difference between a swipe and a touch [r=timdream]
Bug 800446 -  [email]'load more messages from server' box gets stuck under the toolbar.
Bug 804610 - Fixing wrong class name changed when applying BB
Bug 804682 - Fix a couple of JavaScript warnings in Gaia
Merge pull request #5961 from albertopq/contacts-804610

Bug 804610 - Fixing wrong class name changed when applying BB r=arcturus
Merge pull request #5963 from ttaubert/general/bug-804682-fix-js-warnings

Bug 804682 - Fix a couple of JavaScript warnings in Gaia
Bug 798232 - Don't allow setting up a mail account with an invalid email address
Merge pull request #5966 from mozsquib/validate-email

Bug 798232 - [email] Don't allow setting up a mail account with an invalid email address, r=asuth, a=blocking-basecamp
Bug 804494 - Returning a dataURL instead a filename in the camera

Revoking URL
Merge pull request #5860 from steveck-chung/email-load-more-message

Bug 800446 -  [email]'load more messages from server' box gets stuck und.er the toolbar. r=asuth, a=blocking-basecamp
Merge pull request #5964 from albertopq/contacts-804494

Bug 804494 - Returning a dataURL instead a filename in the camera pick activity
Merge pull request #5929 from dominickuo/music-fix-796082

Bug 796082 - [music] store cached album image to metadata
Merge pull request #5960 from michalbe/card-view-swipe

[Bug 796238] understanding the difference between a swipe and a touch [r...
Bug 804086 - Prevent System app from being launched by window manager
Bug 799829 - [email] implement move/trash 'do' implementations and supporting infrastructure. r=squib, a=blocking-basecamp
Merge pull request #5974 from asutherland/land-move-delete

Bug 799829 - [email] implement move/trash 'do' implementations and supporting infrastructure. r=squib, a=blocking-basecamp
Bug 802359 - [email] when email is sent, a copy of the sent email doesn't get saved in "sent" folder. r=squib, a=blocking-basecamp

Test in gaia-email-libs-and-more
Expires is time.Time
cleanup project dir
upgraded to bootstrap
upgraded to bootstrap 2.x and django 1.4
progress on task processing
Expose tolerant option in parsing demo.

https://code.google.com/p/esprima/issues/detail?id=381
Document tolerant parser option.

https://code.google.com/p/esprima/issues/detail?id=381
Change "Stream" text shadow
VM::Interpreter: explanatory comment
unglaublich tolle dinge eingefuegt
new states for infected bunny
revert
continue from earlier
everywhere: ensure fnc_sts() is const-correct. (ref #60)
fixed filestore page
Merge branch 'master' of https://github.com/atk4/atk4-web
default to 1.9 now, /cc #16
Rewrite of properteis from maven
Manifest rewrite from maven.
Added updated distribution management
[ProcessPool] finalize on __del__ + kill every X seconds the average idle workers
Sync with upstream/integration
Merge pull request #699 from atsareg/fix

Bugs, bugs, ...
FIX: Set the proper path search in ops
Merge pull request #698 from acasajus/lr-stuff

ProcessPool + Operations
BUGFIX: consequencies of a badly resolved clash
v6r4
pass quote setting through to value when the parent element is an array
minor problem with indexing.. fixed
remove atsoaces customizations
Start working on user authentication in Mongo.
Logins work a bit better now.
Disable mixpanel analytics. It's pointless and I'll probably switch to GA at some point.
1. Durchstich; restructuring
Fix broken XML
Run "make pretty" (from BleachBit; calls xmllint --format)
finished basic logic for the contribution section, added chrome for questions
implement commands for get_marks and get_bar_config
Nicer documentation.
Docas.io synced with 8c0274a
wrap around test program instead of runner to prevent test discovery failures.
Avoid a badarg in crypto:rand_uniform when N=1
Merge pull request #453 from basho/adt-fix-preflist-randomization

Avoid a badarg in crypto:rand_uniform when N=1
Properly handle file the location for the case 'class MACRONAME { ....}'


git-svn-id: https://root.cern.ch/svn/root/trunk@47712 27541ba8-7e3a-0410-8455-c3a389f83636
Implement the "f" legend option (fill pattern in a box)


git-svn-id: https://root.cern.ch/svn/root/trunk@46871 27541ba8-7e3a-0410-8455-c3a389f83636
some renaming in comments CINT -> Cling


git-svn-id: https://root.cern.ch/svn/root/trunk@47926 27541ba8-7e3a-0410-8455-c3a389f83636
no parents for data members in namespaces; probably a Cling inconsistency (?!), but does not matter here


git-svn-id: https://root.cern.ch/svn/root/trunk@47927 27541ba8-7e3a-0410-8455-c3a389f83636
lookup data members in namespaces explicitly instead of relying on
GetListOfAllPublicDataMembers(); this is different from the CINT-world, but
technically superior as data members in namespaces can be scattered over
multiple files


git-svn-id: https://root.cern.ch/svn/root/trunk@47928 27541ba8-7e3a-0410-8455-c3a389f83636
Silence -Wcovered-switch-default


git-svn-id: https://root.cern.ch/svn/root/trunk@47853 27541ba8-7e3a-0410-8455-c3a389f83636
build clean up

remove query and quint from build libs (not used)
new

Signed-off-by: Brandon <bcmerr01@live.com>
Update suite.js

Needed for the new test syntax to work.
Attach metadata to the right function
Update test
Make array#chunk test work
Merge branch 'server' into node-deps-refactoring
deps.js: Read every block deps.js file only once

Close bem/bem-tools#152
Merge branch 'master' of benjamin.no.de:repo

Conflicts:
	README
Always showing reference triangle
RNG functionality as modules.
convert(Float64, x::Bool): use zero extension not sign extension

fixes #1286.
small codegen improvement for elided type annotations
extras/icu: split out utf16.jl
LOAD_PATH: julia, julia/base, julia/extras, julia/ui.

Including julia allows loading examples without needing ".." in
the file path. One should also be able to load things in base/
without special effort. Now only examples/ needs a prefix.
Create Distributions module

And move `mustart`, `deviance` and `devresid` for glm families to
`distributions.jl`.  Update tests to use the module.
Export additional functions and types from Distributions module

Move `test/distributions.jl` to `test/dists.jl` to prevent infinite loop on `require` call.  Adjust `test/Makefile`.
doc/helpdb: allow '!' in function names
fix #1223
doc: recognize 'type' directives
fix oversight of type inference inside let
Merge branch 'master' of github.com:JuliaLang/julia
0b prefix for binary literals (closes #1280)
adding json parsing to perf2
Merge branch 'master' of github.com:JuliaLang/julia
Lapack and BLAS modules

Create Lapack and BLAS modules, rearranging several other linear
algebra source files.  Update and expand tests.  Add documentation
for the BLAS module.
Use Bunch-Kaufman factorization for Hermitian matrices in \ polyalgorithm.
Merge pull request #1290 from dmbates/LapackBLAS

Lapack blas
repl-readline: fix vi editing-mode bug (closes #1212)
doc/manual: squeeze out unnecessary ':\n\n' tokens before code blocks
included Thunderbird 15 to install.rdf
Add fugitive plug-in
add markdown to liquid bundle. most files are both.
adding php and rspec snippets
update command-t to latstest version.
Update and recompiled command-t
Поправки за PHP5.4
Removed mention of `getopt` from `package.json`.

Closes #116.
Merge branch `package.json` into `master`.
comment the content of _config.yml in order to find errors
kalua: S69checker: do not check olsr, if we have marked that
kalua: S69: disabled some old checks
kalua: wget: implemented --continue
kalua: firmware: wget() use _wget do() abstraction now and continue
kalua: firmware: wget() raising maxtry to 1000 but make it configureable
kalua: firmware: update_pmu() use wget() for download now
kalua: scheduler: added a hack to autoreconfigure all installation to timezone berlin
kalua: net: inet_seems_stable() practically disable max_cost
kalua: weblogin: sms: safe phone-number in db/login
remove base from gh-pages
remove machine specified alsa setting
mpd: change port, add spdif output, add streaming
Fix testsuite bug w/ Net::DNS 0.68
Created a ButtonRenderer to draw X-COM style buttons
Modified XcomEditorImpl to display the three buttons from the main menu
Converted dictionary to pair/list and/or pair/array, so dictionary can be processed trivially, eg, printing
Added fancyheads in source code files for robot, actuators, sensors, tools and ihm
Merge branch 'master' of github.com:bmael/I-rover