labofsahil/github-event-dataset-2012 huggingface dataset:
httpd config files should get recreated on move/post-move
Bug 833697
reverse check on colocate with
Merge pull request #153 from danmcp/master

Bug 833697
fix for build break - configure order is not random anymore (picked up from requires)
Merge pull request #151 from rajatchopra/master

Fix for bug#833340
remove duplicate source
Merge branch 'master' of https://github.com/openshift/crankcase
Updating gem versions
Automatic commit of package [cartridge-jbossas-7] release [0.94.9-1].
Automatic commit of package [cartridge-jbosseap-6.0] release [0.1.10-1].
Automatic commit of package [cartridge-jenkins-1.4] release [0.94.4-1].
Automatic commit of package [cartridge-mysql-5.1] release [0.28.7-1].
Automatic commit of package [cartridge-mongodb-2.0] release [0.21.6-1].
Automatic commit of package [rubygem-stickshift-controller] release [0.12.12-1].
bump_minor_versions for sprint 14
Updating gem versions
Automatic commit of package [cartridge-jbossas-7] release [0.95.1-1].
Automatic commit of package [cartridge-phpmyadmin-3.4] release [0.16.1-1].
Automatic commit of package [cartridge-diy-0.1] release [0.29.1-1].
Network ликвидирован
change the way to activate side menu class in javascript
Renamed Git "refresh" alias
Added "amend" Git alias
Updated default project directory list
Fixed help
revoved index from repo
Adding license boilerplat text to top of bash completion file
hopefully I fixed it
Clean routes upon startup.  Added some static route examples.  Allow sending of content with any response types.  Moved the validation of supported methods (except for HTTP/0.9, which allow only GET) into the route handlers.  Support content in request.  fixes #6
Create Regexes
Add constant to Regexes
Add constant to Regexes
Create test
Add constant to Regexes
Deleted files that were copied out of clojush/pushgp.
Removed fast-lexicase-selection.
Removed duplicate files and (not really) fast lexicase selection.
Use correct macros for endian handling code
Implement shared swap32(yes|tole|tobe) function to handle endian flipping 32-bit chunks in blocks
Merge branch 'bigendian' into bfgminer

Conflicts:
	miner.c
Working on the arduino set-up
Foocommit
Don't need goog events in todo core.
Don't pretty-print advanced optimizations.

Shouldn't this be a lein cljsbuild default?
exception generator
scripts
adding colourpipe.javac
Did it the right way this time
siblings fix
MDL-28616 wiki: html format toc rendering should match nwiki and creole
MDL-28616 wiki: use class variable for toc header depth
Added board/move/stone
Merge branch 'master' of github.com:madisp/gapbammon
Include ‘mate’ in application ressources.

Previously we installed this from the Bundle Support bundle’s support path.

While the Bundle Support bundle is a requirement to work with TextMate, including mate in the resources section should ensure we always get the latest build and address issue 53.
Upload to GitHub instead of S3.

Technically GitHub is backed by S3 (shielded by a CDN), but now all releases also go to the Downloads section of GitHub.
Add support for ^ $ and > in scope selectors
Fix bug with > in scope selector. There was an implicit > after path
Fix ^, previously it failed immediatly if last rule in scope selector, wasn't tested against last scope part. Fixed by giving ^ additional chances
Accept HTTP/1.1 response in network tests

GlimmerBlocker (http://GlimmerBlocker.org) and other proxies may intercept the web data and replace the HTTP/1.0 response with a HTTP/1.1 response.

Modified test to accept either.
Rework path::is_local to support disk images.

This enables SCM badges for disk images. The check is done using the new (10.7) kCFURLVolumeIsLocalKey.
git: show modifications in upstream folders
Opening txmt URLs with escaped spaces no longer fail

Example: previously it was not possible to open a URL like

	txmt://open?url=file:///Library/Keyboard%20Layouts/
Use current document when no URL given in txmt URL

Brings TM2 in line with the promises in

	http://manual.macromates.com/en/using_textmate_from_terminal.html

Could probably be written nicer, I just don't get C++!
If opening an already open folder, bring window to front

This is mainly for calling ‘mate «directory»’. Reference http://lists.macromates.com/textmate/2012-August/035164.html
Merge branch 'master' of git://github.com/textmate/textmate
Added general file structure unit tests
Clean up single database working

Fix  moveing to a single database and some code comment cleaning up
Second part of database fix

Database upgrade is required to finish the fix
Add list of readings for IS

As there can be many readings taken for IS list all of the previous
measurements that have been taken below the current ones
bug944708: copy-past removed
Refactoring: add space.[hm].
Code cleanup.

Cherry-picking code from txn-refine.
Remove an extra member in struct box_txn.
Rename txn->tuple to txn->new_tuple.
Cleanup: move replace/delete cycles to helper functions in space.m
Move 'validate_indexes()' to space.m.
Document more box flags.
Separate Box IO API into a separate header/body.
bug993476: master_pid is set from create_pid (i.e. from the correct process)
bug993476: added comment explaining pidfile unlink checks
Minor cleanups.
Merge branch 'master' of github.com:mailru/tarantool
Refactoring: move INSERT/UPDATE/SELECT/DELETE impl. into request.m

Move out from box.m INSERT/UPDATE/SELECT/DELETE/CALL
implementation.
Merge branch 'master' of github.com:mailru/tarantool
Final touch-up: separate transaction logic into txn.m.
Follow up on split of box.h: rename functions in txn.m, request.m.
Merge branch 'master' into net-split

Conflicts:
	include/tarantool.h
	src/admin.m
Moving package Constants to common subpackage. Part 2.
renamed:    libsam3s.ld -> link.ld
Added line to explain how to fix native issues on NodeManager startup
is_divisable
final-without-rule-1.4
changed libraw version to 0.14.7
Tagbar plugin modificado en vimrc configuracion autoclose
Using correct slash (doh, tired!)
Remove flags that less accepted
Save sent messages in Sent
Apparently latin-1 is not welcome in the grammar
a new constructor taking MathContext as a parameter
Added capistrano to the mix
Merge pull request #229 from jmonteiro/capistrano

Added Capistrano to the mix
Add gravatars to comments
Add config example
Merge pull request #232 from BlackFoks/add_gravatars

Gravatars
Set static gravatar size, made gravatar enabled by default, changed comment design to show delete 'X' at right, and gravatar at left
Show gravatar on users index table, and in heading bar of users show page
Fixed error helper and user show specs
use ruby hash rockets in migrations

closes #235
set Rails logger as Omniauth logger

closes #217
added a spec to ensure that you can post a notice with the XML in a data param
Merge pull request #236 from concordia-publishing-house/add-spec-for-post-xml

added a spec to ensure that you can post a notice with the XML in a data param

closes #154
don't break when running all migrations if using a newer Errbit
Merge pull request #237 from concordia-publishing-house/fix-migrations

don't break when running all migrations if using a newer Errbit
Add enforce_ssl as a Heroku config option
Merge pull request #241 from 12spokes/heroku_ssl_option

Add enforce_ssl as a Heroku config option
update rails to 3.2.8
Merge branch 'master' into api-2.3
Add dotfile for synergy
Merge branch 'master' of l.tar.io:git/dotfiles
Merged r9831 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9843 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r9836 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9845 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r9837 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9846 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r9830 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9848 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merge r9750 from trunk

scm: git: skip Latin-1 path tests on Git for Windows above 1.7.10

Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10.
http://code.google.com/p/msysgit/issues/detail?id=80

So, Latin-1 path tests fail on Japanese Windows.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9851 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r9853 from trunk (#10688)

fix PDF export tables problems.

Contributed by Jun NAITOH.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9854 e93f8b46-1217-0410-a6f0-8f06a7374b81
Resolve class inside module.
added class selector to the link_to so that it can be styled just for the instance on the index page and not site wide
Remove junit because new scalaide has scalatest plugin
#23 More accurate route event matchers
BUGFIX: Added double quotes to column names in automatically generated indexes for many_many relationships (this time in the right place, should not interfere with index name - all tests pass)
BUGFIX Ensure that enum values with a single quote are escaped correctly for PHP coming out of MySQL ('' to \'), otherwise dev/build shows these as changed all the time.
API CHANGE: Added DataQuery::aggregate() to allow for aggregates beyond Min, Max, Avg, Sum.
API CHANGE: Added GridField::addDataFields() to allow the definition of custom callbacks to be used by all GridField components.
API CHANGE: Added GridField::getDataFieldValue() to encapsulate field lookup for all components.
API CHANGE: Allow 'callback' key to be specified in a GridFieldDataColumn column info.  In this case, title should be put as the 'title' key of a map rather than simply the column info.
API CHANGE: Added DataList::filterByCallback() to allow filtering by PHP code.
BUGFIX: Ensure that DataList::filter() doesn't modify the original object.
API CHANGE: Added $value argument as the first argument of a gridfield formattting callback.
BUGFIX: Fix JS bug that was preventing passwords from being changed in 'hidden by default' ConfirmedPasswordField instances.
MINOR: fixed opera vendor prefix for @mixin hide-text-overflow
ENHANCEMENT: Point userhelp link at a new userhelp instance. (#7430)
Merge pull request #509 from Zauberfisch/patch-2

MINOR: fixed opera vendor prefix for @mixin hide-text-overflow
Merge pull request #506 from halkyon/sapphire

---

In the example, if you have an enum of Enum("Something,Don\t know") in your `DataObject::$db` array, then dev/build will *always* say this field has changed, because `MySQLDatabase::showFields()` returns the escaped string specification of the field with  instead of \.

This converts the field spec so that  is escaped to \ correctly so the change detection in `Database` is correct.
Merge pull request #508 from sminnee/fix-change-password

Fix JS bug that was preventing passwords from being changed
ENHANCEMENT Updated tutorial documentation (thanks to Cam Findlay and Andy Adiwidjaja)
Merge branch '7023-tutorials'
BUGFIXES: File Uploads

* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
MINOR Labeling in HtmlEditorField
MINOR Hiding "insert media" tabs when editing an image (wrong selector)
MINOR Cache oEmbed results for a week (rather than an hour) by default, to avoid synchronous querying of potentially slow and unreliable external services upon page rendering
ENHANCEMENT Oembed.enabled config property
edit antenna
working root
adding utf8 capabilities to netty bytebuf
moved the files directory name over to avoid confusion
Documentation Update

Updated Documentation of Serval Classes

Convereted some classes to ARC; issue #27
Merge branch 'hotfix/rubygems-1.8.19' into stable
1.11.0
Merge branch 'release/1.11.0' into stable
Merge branch 'release/1.11.0'
fix creating environment file for gemsets
fix globalcache gemset create
Merge branch 'hotfix/1.11.1' into stable
Merge branch 'hotfix/1.11.1'
simplify get - just route everything to installer
do not load project .rvmrc when runnning via binary, fix #845
protect against compiler not found, fix #826
improve support for solaris, closes #849, update #719
fail early, do not mess environment if ruby not found, fix #811
improve xcode version detection, fix #846
1.11.2
fail early, do not mess environment if ruby not found, fix #811
Merge branch 'hotfix/1.11.2' into stable
Merge branch 'hotfix/1.11.2'
fix quoting in cli, fix #778
upgrade xcode detection to find Xcode 4.3+ first
Set up Challenge143 and set some other classes to final
Cherry picked Rule Mockery fix from master.
Really slow implementation of 143 and messy but works.
Sped up Challenge 143 using advice from pe website
Merged Challenge143 into master. Some conflicts in imports, moved files and class declarations changed to final.
fixed connection with foreign DB
ApiUserRef загружаем в CommentPrepareService
black&white: Droid Sans Mono for textarea
* Factored out log emission logic into Spitter.pm and sub modules.
* Added Log4perl spitter
Update AModel.js
ready to add stats
Remove battery debug code
acpuclock: Turn off FIH's CPU/AXI 480/160 MHz threshold
uv wifi adapter
vfp
hacked qtclient so it knows which doctypes in the answer fits to which request
added nojekyll file to get filenames with leading underscores working on github
close to fixed, script tag right after open tag is still fucked
moving along at a steady pace. 2 hours left
added some more util classes
Initial support for auto join channels
added README with some installation details, and updated the test script
possible fix to address upload problem, thanks Marin
more varquote(s) but this is a temp solution
bootstrap 2.1.0
bootstrap 2.1.0
make consolas default font and zenburn colorscheme
Fixing PHP notices, cleanup.
Like it mechanism.
committing
commitar
hej
heh
hej
fixed load command
Added WebViewController to open links in, instead of going out to Mobile Safari each time.
Removed iOS 6 auto layout code.
Removed toolbarBg original images.
next try for rescheduling
Stable version with fixed disk read and write.
Verified block program block count + index block.
Cambiado el diseño del Readme. Close #21
Había mas problemas... inicialización de objetos para las dll
moved zenburn
A test for embeddedJars feature, which runs an actual build and checks the resulting bundle headers and content.
[ADD] Definitions area now collapsed by default
bbb
mbmbmb
Fixed statistics up. Added SUGNEDUP statistics.
Merge branch 'bug/485-Stats_does_not_work' into development
rounded hp corners
rounded hp corners
rounded hp corners
rounded hp corners
netneutrality to net neutrality
Added intent link for directory to DesktopFragment. Changed DirectoryPeople to extend ListFragment instead of Fragment, and added a temporary list of people.
Merge branch 'master' of github.com:mikael2/Muldvarp.git
Add streaming of user defined data type declaration and values.
Fixed / tested VPN scripts
Merge branch 'master' of git://github.com/boxeehacks/boxeehack into development
update package.json to allow 0.7.x releases of jshint.
Adding a -V alias for --version, and updating the bash completion instructions slightly.
Merge branch 'deps-patch2' of https://github.com/ctalkington/grunt into wip

* 'deps-patch2' of https://github.com/ctalkington/grunt:
  update package.json to allow 0.7.x releases of jshint.
fixes #187, lint task has an error when JSHint finds an error at character 0.
fixed the cap of a slice: http://play.golang.org/p/H-OdvnTQ3V
Merge pull request #7 from mikespook/master

issue fixed: the cap of a slice
Tell about Go1
More stuff for Go1
Add mike
sort it
Fix the intro and stuff for Go 1
Fix chap 1 for Go-1
Add some translation links
version 1.0
fixed some typos, repleased my nickname to the real name.
Removed disticntions between create and update, create will update if existing
Friend picker works 100%
Merge commit
issue #6 Adjusting windows Jamroot
MyCrawler class added.
[template] modify AppController, add viewController & window variant. all Xcode template modified.
Revert "[template] modify AppController, add viewController & window variant. all Xcode template modified."

This reverts commit b6780b233216c2afe14ccd29e601baeeef97dc77.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
[lib] New libcurl.a, armv7 & armv7s & simulator Supported.
Merge pull request #1371 from minggo/gles20

revert modification of AppDelegate.cpp
fixed cocos2dx linux makefile to link libfontconfig
revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136.
Merge pull request #1374 from walzer/gles20

revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136.
update copyright to 2012, update cocos2d version to 2.0.3

1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
Merge pull request #1375 from walzer/gles20

update copyright to 2012, update cocos2d version to 2.0.3
Minor memory-logic error.  textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it.  Also, an init method called release outside the proper scope (the do{}while(0); block).

If you don't like the autorelease pool, it's easy enough to change this fix.

Aside: someone pulled tools/cxx-generator again, not me(!) :-)
Merge pull request #1373 from ByungChoi/fontconfig_link_fix

fixed cocos2dx linux TestCpp build break
Merge pull request #1360 from jzgenius/NEWplatform-third_party-ios-libraries-libcurl

Ne wplatform third party ios libraries libcurl
Merge pull request #1377 from minggo/gles20

fix auto building error
Spidermonkey headers are not used for generation
gendbings.sh generates userconf.ini

 * ... and reads userconf.ini from current working directory
 * ... also specify that this script is run by /bin/bash
Jenkins script to generate JS bindings
Update cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java

Comment some debug codes, because it will cause auto-building fail.
Merge pull request #1378 from folecr/jsbindingsscript

JS Bindings generator script for Jenkins
fix compile errors of TestJavaScript
Player#can_play?: don't try to downcase if nil
Fix Paula::LoadError definition
Paula: add split_filename helper method

Also replaces Player's logic with the Paula version.
Paula.plays: return nil or array dup

Returning an array dup allows users to freely #pop, etc. without
changing the copy on Paula itself.
Add Paula() constructor method
Checking in changes prior to tagging of version 0.3000.

Changelog diff is:

diff --git a/Changes b/Changes
index 5164014..d14f67e 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Starman

+0.3000  Mon Feb 20 16:31:44 PST 2012
+        - This be a 0.3 release
+
 0.29_90 Thu Dec  1 19:40:52 PST 2011
         - Changed the way server handles HUP and QUIT signals
           HUP will just restart all the workers gracefully
Merge branch 'master' of github.com:miyagawa/Starman
Japanese version of "Running the Pig Scriptsin MapReduce Mode"
[#1814] Fixed CSS styles. Enabled width adjusting for Thought/Speech
[#1433] Renamed Image2 plugin to Image
[#1905] Scrollbars only show now when needed and a scroll event takes place
[#1808] Fixed current tests. Added own for createStartEndInputs
QUITAR BIN SI DEJA
Use Clp module
heroku 110
pure_parser_done
[maven-release-plugin] prepare release gitbox-0.1
Add support for prerendering open nodes
Added a .gitignore file and the basic PhoneGap ios project
added getopts

Signed-off-by: mobjack <ericparker4@live.com>
adding terminal config to links
Added openpyxl as a requirement for xlsx export
add missing code tags
Updated routes & what not. Now using Capybara. Now using Sassy CSS. Now using Bootstrap
Finished layout & routes
Improvement of notifocation. Refs #1332.

Use emesene logo as contact image instead of message-im.
Make the option in Preference works.
get the redo printf foo
Use custom assembly reader to fix 'Bug 8000 - MonoDevelop runs out of
memory'.
bumped version-checks for bug #8281
[Debugger] Handle keyword types in addition to global types

Fixes bug #4795.
[Core] Improved completion match rank calculation.
fixed nasty concurrency issue in HeaderContextExtensions
Updated for new Mountain Lion path
zmiana notice i dodanie create_at oraz update_at
users can now favorite posts
added stats on posts [ci skip]
added styling & color to text posts [ci skip]
DC MS infinite scroll with isotope on new profile page. boom!
specifiy masonry width [ci skip]
fix some pixels [ci skip]
make line height a bit better on yellow notes
put date formatting in a mixin
Merge pull request #3168 from diaspora/format-date-mixin

put date formatting in a mixin
fix favorite migration for postgres, thanks [JT] [ci skip]
markdownify profile in new profile view
more color [ci skip]
reLayouts when something is favorited, whoa
tweak profile top layout [ci skip]
DC MS reworking newprofile grid WHOA
MS DC MOAR profile tweaks, show cubbies posts
Bug 816927 - Remove Cost Control background service
Merge pull request #7159 from vingtetun/costcontrol-remove-2

Bug 816927 - Remove Cost Control background service
Auto-merge from branch 'master'
[Bug 814183] User Guide link doesn't load support page
Bug 804544 - [Clock] Alarm should respect time zone and time change r=timdream
Bug 802383: dynamically build the list of available locales
typo
fix linter errors (STK)
typo in icc.js (STK)
Bug 814076 - disable prompt aniamtion when unlock and vice versa
Bug 813902 - remove the workaround for 791920 to blur and refocus the
inputfield. r=Evelyn, a=Vivien
Merge pull request #6568 from RudyLu/settings/remove_workaround_simPin

Bug 813902 - remove the workaround for 791920 to blur and refocus the inputfield
Bug 813490 - FB Import needs to support edit mode [r=jmcanterafonseca]
Bug 813925 - Add missing plural cases to all apps. r=kaze a=vingtetun
Merge pull request #6549 from stasm/813925-plurals

Bug 813925 - Add missing plural cases to all apps. r=kaze a=vingtetun
Bug 813898: use 'top up' and 'top-up' appropriately. r=kaze a=vingtetun
Bug 814339 - [Gaia][SMS][DIALER][BB] Update building block from shared with latest UX specs [edit_mode.css]
Merge pull request #6546 from stasm/813898-top-up

Bug 813898: use 'top up' and 'top-up' appropriately. r=kaze a=vingtetun
Bug 812983: Security & Privacy should be Privacy & Security. r=kaze a=vingtetun
Merge pull request #6486 from stasm/812983-securityAndPrivacy

Bug 812983: Security & Privacy should be Privacy & Security. r=kaze a=vingtetun
Merge pull request #6550 from crdlc/import-edit-mode

Bug 813490 - FB Import needs to support edit mode [r=jmcanterafonseca]
Bug 814616 - Bookmarking the same app from search several times in ev.me [r=vingtetun]
Merge pull request #6573 from basiclines/building_blocks-edit_mode

Bug 814339 - [Gaia][SMS][DIALER][BB] Update building block from shared with latest UX specs [edit_mode.css]
Bug 809675 - fixes display of trusty ui frame, despite ssl errors
Merge pull request #6269 from zaach/trusty-ui-css-fix

Bug 809714 - fixes display of trusty ui frame, despite ssl errors
bluetooth 110n cleanup; and translate zn-Tw strings
Merge pull request #5282 from evelynhung/bluetooth-l10n

bluetooth 110n cleanup; and translate zn-TW strings
bug fixed wrong effect when user drag an icon to another page
Merge pull request #2972 from crdlc/bug-dragToOtherPage

[Homescreen ] Bug fixed wrong effect when user drags an app to another page
update xpcwindow
update packaged xpcwindow to latest version
isolate integration test helper stuff to its own file
update to latest version of marionette js client
fix failures in system tests related to various gaia/gecko changes
remove xpcwindow's vendored files - we don't use them in gaia and its a bunch of code
add git ignore to tools/xpcwindow/vendor/ just in case
Merge pull request #4065 from lightsofapollo/integration-fixes

Integration test fixes & upgrades for marionette_js_client / xpcwindow
isolated getting origin from app objects
some new icons
added icon for marketplace
Merge pull request #1875 from crdlc/feature-isolationGetOrigin

Feature isolation get origin
Fixing regression in start screen
Addressing review comment
Merge pull request #2758 from benfrancis/browser-settings

Fixing regression in start screen
Names changed
Added/removed images and CSS
Basic CSS structure
Hash working
Stabilization
Stable slide transition
Linting CSS
Adding Steve code
Stable and linted UI version
Mark as unread working
Linting
HTML title changed
botio fixed
Fonts removed
Vingtetun suggestion included
Desktop working properly. Merge ready
Merge pull request #2471 from borjasalguero/sms_refactor_step1_5

SMS Refactor. New layout and funcionality
add SIM PIN configuration
fix conflicts from master
fix conflict and comments from reviewer.
apply new dialog UI, but got some style problems.
merge master, fix conflict, and resolve style problem
fix unlock sim card style and reuse code in simlock settings
update according to comment from review feedback
Merge pull request #4906 from evelynhung/simpin-v2

[Settings] add SIM PIN configuration
Replacing ContactField values
Replacing number by value
Merge remote-tracking branch 'upstream-gaia/master' into contacts-contact-field
Replacing missing number
Merge pull request #3513 from albertopq/contacts-contact-field

[Contacts] Replacing tel.number and email.address by .value
Inside of runner, do not 'import *' from utils, so we can more easily tell where functions come from
Fix "import *" and resultant new things detectable from "make pyflakes"
Fixup the code that allows facter/ohai/other data to bubble up and be used in future action lines.  It's a niche
case compared to usage in templates but it should work and will be wanted later for conditional support.
using thumbnails on main page, sooo much faster now
Various CPP fsm fixes/changes.

-Support full L4 warning free compilation
-Various GCC fixes to do with preprocessing/templates
-added guards against interface commands coming from within the FSM
-added ability to queue a state change from within a state update.
-guarded against state changes from within an update.
Purged everything now that there is a devel branch
Make couleur work on everything from Python 2.4 to Python 3.3!

```
$ tox
- tox test summary
  py24: commands succeeded
  py25: commands succeeded
  py26: commands succeeded
  py27: commands succeeded
  py30: commands succeeded
  py31: commands succeeded
  py32: commands succeeded
  py33: commands succeeded
  pypy: commands succeeded
  jython: commands succeeded
  congratulations :)
```
add analyzer interface
Thanks to Hokoshi
Insert translation as option in windows contour reductions
removed logging
added support for sending queries in plain text as well as JSON
needed for scroll
add support for formatting scroll parameter
actually return error
only try to read response if there was no error
* MoneyクラスをCalculationクラスに変更した。
* リファクタリング
I kolejny bug, z tym where = 1 + qrand() % ( howmany - 1 ) - wywalalo
sie dla slow jednosylabowych.
Background image for game (subject to change)
Start of details
Fixed failure rate, updated styles
clk.c: remove prepare_lock and try to make regulator_set_voltage work with lockdep
omap-cpufreq.c: re-enable clock notifier registration
added order from crap
Merge branch 'master' of github.com:muellmax/BuhrInc
Added INDEX and COUNT fields for files, COUNT field for folders
Made projects visible to only users who had permission to see them.
swapping column order
fixing some stuff
switching from will_paginate to kaminari
working on ajax empty cart still buggy
added requirement (request) to the libs dir, also fixed bug in actual file (request body interpreted as string, not as JSON object)
新しいライセンスの書き方
deleting the answers before the answers insertion
repair error method
2nd-boot cleanup

Removed Freescale stuff
Added configurable UART3 to hbootmod
hg -> git
Removed unneeded images in hboot
Reworked hboot makefile
Added example to README
Deep constraints

Added `treec`. `treec` takes a term and a constraint and form to
display upon reification. `treec` will ensure that when a term becomes
ground that if it is a tree term that none of the sub terms violate
the constraint. Added an initial test.

Related to this change, fixed some constraints that didn't implement
`IConstraintId` which results in a space leak in the constraint store.
fix typo
note about `treec` limitations
expand note a bit
simplify `treec` code
simplify `treec` yet again
First push
Merge branch 'master' of https://github.com/nammer/jPyMD5Sum
con alas
again testcase preparation for livestatus authuser
unpickel brok in  livestatus and remove a weird b_raw line
Added facebook sdk
Merge branch 'master' of github.com:nareshsvs/mugapp
enhanced local repo creation
Store mers in strings in preperation for very long mers
Add flag to allow ambiguity codes
Store mers as bit vectors
changes to minimus examples
 edited minimus pipeline description to be match paper
Remove debug prints
Add helptext, added options for printing iid, printing ungapped coordinates
Updates for suspiciousfeat2region to work off IIDs, require multiple (>2) colocated signatures
Report on fixed breakpoints
Updates
Update so dumpFeatures can use AMOS Foundation
Update install procedure
Set to version 2.0.1
Handle case where there is no fragment bank, and thus no mates
Switch to using iids, reformat commands for os x
Switch to the AMOS_ENCODE macro instead of the AMOS::Encode function to make OS X happy
Bump to 2.0.2
First version of code to compute deBrujin Graph
Allow multiple edges between nodes
Minor cleanup
Adding new aliases
Updating submodule
Using bundle instead of a raw install
New dropdown menu colors
New path for facebook
updated hallo source
mv common.py here from rootpy
bash: Rewrite installation/update script

* Use git-free installation
* Automatically install Homebrew and git
* Provide more information in the terminal when running the script
* Optionally suppress package/repo updates
* Move the init/update script into 'bin'
update documentation
add get_feature_type() and set_feature_type()
update comment
update comment
update documentatio to version 1.3.0
update to version 1.3.0
correct a bug in the example in the README file
update documentation to version 0.8.1
be less aggressive at writing special files into exising views.txt configuration
tiddlyweb fs driver works in read-only mode
better layout for demo
minified plugin JS via YUI compressor
better looks for demo page
minor doc change
Update LICENSE.txt
added stop(), updated demo, changed data() attributes to public functions
changed LINK to F77LINK for building .so in Makefile.in
tweaked plot panel size, better for 2 axes
better handling of setting text labels
added example with both left and right axes
@nfisher: Remove IRC password.
@nfisher: Prevent config changes from dropping all active users.
@nfisher: Fix swap not recording.
se agrego .rar con funcionalidad de login con twitter y facebook
bug fix in sentence variation checker
Merge branch 'master' of github.com:ngokevin/engrish
update subject document
remove emacs directory
Added Python bindings and associated tests.
Role Module Copy Button add.
Fix bug where another tab is closed if you click on an [x]
update ruby
prime factors kata template
first try at prime factors kata
Download Track features implemented.
Added ability to mark damaged ships on field
Updated server logic (making client steps)
freeing allocated get buffer on Datablock_get_data failures
TimeSet structure
utimes method
cleaning up servedir.h
add missing includes to server/main.c
Merge branch 'master' into attrcache
Merge branch 'attrcache' of github.com:nmandery/rhizofs into attrcache
Fix error reporting on missed params
updated dependency
0.1.1 released
[ADD] IE6 Chrome Frame
Spieltheorie: ex7 and ex10
Small GetPasswordDialog restored.
Fixes missing method error
note_detection: started
Case in CCfits is important
Merge branch 'master' of github.com:npadmana/nputils
index on GroupedQues: 59fab24 Bug solved: Grouped Question groups selection and insertion in question_mapping
WIP on GroupedQues: 59fab24 Bug solved: Grouped Question groups selection and insertion in question_mapping
Adding to gitignore: data/results*.xml
Merge branch 'CodeTreeChanges' into GroupedQues
Extended Question Groups feature to Practice Session
Also fixed some logical bugs
To Do: Move code from testScripts to mainline
L::C::Binary: Replace is_transition with is_pkg_class

Replace is_transition with the more general is_pkg_class, which can
also determine if a package is a "meta package".

Signed-off-by: Niels Thykier <niels@thykier.net>
python的包管理pip安装
django ...
删除任何旧版本的Django
<<NuoErlz Blog develop notes (Use Django)>>
ne loger qu'une seule fois chaque erreur de table non lisible
We are not making use of literate haskell; you'd better use haskell
NXP-9910: test doctype unregistration must not NPE if still pending
Up the version to 1.0.6.
Fixing some problems with paths, logging and etc.
Fixing score colour.
First book frontmatter has prev_chapter ../
logoutContext was applied.
Adicionei paginas
Paginas staticas prontas
Comment feed field: rename
IE specific tests
Debug asset manager upload
Remove duplicate DOCTYPEs
Remove duplicate DOCTYPEs
fix mixed-quote string in BOOMR.init() that would lead to a syntax error in Javascript if copy/pasted.
set undefined and null values to '' in the beacon

encodeURIComponent will encode undefined and null values to 'undefined'
and 'null'.  This isn't what we want in the beacon and is
indistinguishable from a string with the same value.  It's better to send
an empty string and let the back end service determine the data type and
range of the parameter
window.performance.domContentLoaded is undefined in Chrome 16 & Firefox 10. Use window.performance.domContentLoadedEventStart and window.performance.domContentLoadedEventEnd instead.
do not overwrite rt.start if it is already set
it is possible for gtb or old chrome to have start time set to 0
be consistent with quotes around undefined
IE <= 8 does not like objects ending with commas
measure time it takes boomerang to load
add plugin that sets time when boomerang finished loading
beacon boomeran start timestamp and t_done timestamp as well
missing parens
Update Japanese document based on latest English document
if there are already url parameters in the beacon url, change the first parameter prefix for the boomerang url parameters to &
replaced spaces with tabs
added paramPrefix to be included into the url creation
Merge remote-tracking branch 'dguzzo/master'
Merge remote-tracking branch 'dguzzo/patch-1'
Merge remote-tracking branch 'okuryu/master'
Merge remote-tracking branch 'xzyfer/master'
Merge remote-tracking branch 'edgarklein/master' into param-prefix
Upgrade libgum and bring byte array support to cloud-spy
Add manifest_version to Chrome extension
Spice up the cloud-spy test app a bit
summary table styled
layout improved (nav fixed top left and content shifted four cols left)
Fix omero version number in the patch
Merge pull request #7 from sbesson/master

Fix OMERO 4.4. version number
Adds tests for hdfs placements
Merge branch 'master' of github.com:omidaladini/barn

Conflicts:
	server/build.sbt
Make sure permissions lets commands get executed from the Console
Hopefully protect flatfile access from corruption when multiple threads try and communicate with the economy. Added Semaphore protection in the MiniDb file access class. This is to fix the problem reported by Vault when it loads iConomy6
Changed x::xs to head :: tail
s
task
[cdstk] rebuild --all すると fav 設定が消えてしまう問題を修正
[cdweb] パッケージ検索を正確に
[cdweb] ファイル名表示でソート
[cdstk][cdweb] MilkodeYaml#match_allを追加, Database#convert_packages もそれを使うように
[common] '\n' -> '$/'
[cdweb] キーワードがパッケージ名にマッチしなければ検索しない
[cdweb] パッケージ指定時は現在位置をfpathsに含めないように
文言調整
[cdweb] DEL:Database.remove  -> NEW:Database.remove_fpath

MilkodeYamlへの依存も無くした
removed orgtype from data model - gives much better results
speed up test
Merge branch 'master' of ssh://github.com/openSUSE/artwork
add a link to a test/live instance to the README
Drop duplicate sqlalchemy db api methods

Several methods were redefined at the bottom of
cinder/db/sqlalchemy/api.py. They have been removed:
- quota_get
- quota_get_all_by_project
- quota_create
- quota_update
- quota_destroy
- quota_destroy_all_by_project
- quota_class_get
- quota_class_get_all_by_name
- quota_class_create
- quota_class_update
- quota_class_destroy
- quota_class_destroy_all_by_name
- quota_usage_get
- quota_usage_get_all_by_project
- quota_usage_create
- quota_usage_update
- quota_usage_destroy

Fix bug 1070033

Change-Id: I64b0b0045af7251853da97a8a8c4b2cb09b1dd53
Update volume and snapshot status on delete

Change the status of "deleting" resources at the same time we update boolean
flag for deleted.  Makes dumb queries looking for stuck statuses a little
easier.

Change-Id: Iaf3386526a369f9bf281eb4be42eb11277038c92
Merge "Update volume and snapshot status on delete"
Include volume_metadata with object on vol create

Fix for Bug 1029762

The symptom of this bug is that the response data of an
OSAPI create call always shows and empty dict for volume_metadata
regardless of what was passed in to created and actually used.

Upon the db create_volume call a reference to the volume
object is all that was being returned.  Since metadata is
specified and set, it should also be returned with the
create reference object.

This will result in the the osapi create call returning
a body with correct metdata info rather than always showing
and empty dict as it was previously.

Change-Id: I9ae9c737bd2aa5bfa14c19fe8b8b2a7a5aa4d43a
Merge "Include volume_metadata with object on vol create"
Update notes for submitted changes

* Fix None being passed into as_int().
Update notes for submitted changes

* Move glance.registry.db to glance.db
revert tabs scripts
entries_list_template
fix tests for NewsItemPart
fucking mocks in tests
Add right_side and sitemap for vateran
Add pass phrase argument to certificate Makefile
show tasks in users page
Fixed haskell cabal dir, for vim.
Change network location
Merge branch 'master' of github.com:oschrenk/scripts
use uname -m when uname -i fails

fixes arch detection with Linux/x86_64
-fPIC is necessary on x64_64
fix build with gcc 4.7

otherwise gives error: taking address of temporary array
Merge pull request #276 from jmakovicka/64bitfix

minor fixes for 64 bit linux build
monitor.py comm with coordinator test
1) Items edition support
2) Better privileages control (you can edit only what you own)
3) Sold/available item status added
4) LSD effect on cat's hat
5) New README!
better classification with bi-grams
Added entity frameworks to frontend
Fix header from displaying funny on iOS (only browser that had a problem)
Merge pull request #501 from thezoggy/dev_ios-fix

Fix header from displaying funny on iOS (only browser that had a problem)
Fixed the config page for windows builds
webserver: change saveSearch() to pack arguments into a dict

it is cumbersome for forks / future development to manually add variables to this function
webserve: change the way sab_host is normalized into a / terminated URL

this will lessen the amount of work forks / future development will need to do when adding new URL options
woops: didn't quite get this right when backporting

these functions need to return a tuple and we need to check return value before appending a message
The regular expression pull_regex did not reflect the fact, that Git
could have been translated.
Merge remote-tracking branch 'midgetspy/master'
(no effective change in code, midgetspy just caught up with the iOS
changes we had already made)
Merge pull request #511 from alenzen/master

pull_regex should consider Git translations.
Merge pull request #509 from bradallred/master

rewrite of saveSearch()
Merge remote-tracking branch 'midgetspy/master'
Merge pull request #1 from bricky/master

update?
テストケース（なにもしないシグナルハンドラを設定すると）を追加
Makefile.PL: add custom build parameters

This patch introduces three custom build parameters

 * PERL_SHEBANG
     Configure the #! line in the installed perl scripts.
     May be needed on some passwords, in case MakeMaker
     does not get the installation right
 * TAR_PROGRAM, XDELTA_PROGRAM
     Set a custom name (or location) for the required (GNU) tar and
     xdelta programs, in case they are not callable through their
     default names from the $PATH

If set, the variables are used to munge the corresponding parts of
the scripts.  The $tar_program and $xdelta_program variables in
pristine-tar are now marked as such.

The patch itself extends the "macro" section of the MakeMaker generated
Makefile.  To call the inherited function, the package needs to be set
explicitly.

This patch is an updated version, incorporating a spacing fix when
using multiple replacements, as discovered by Torsten Maehne during
his review.

Signed-off-by: Philipp A. Hartmann <philipp.hartmann@offis.de>
Reviewed-by: Torsten Maehne <Torsten.Maehne@gmx.de>
Makefile.PL: add message about custom parameters

Since adding custom parameters to Makefile.PL scripts is not
transparently supported by MakeMaker, recent versions print a
note about unknown options given to the script.

Nevertheless, such parameters are handled correctly and are
passed through to a reinvocation in case of a changed Makefile.PL.
A message is printed to inform the user about this fact.

Signed-off-by: Philipp A. Hartmann <philipp.hartmann@offis.de>
Improve INSTALL instructions.
fuse fix sandbox violations
rsyslog version bump
update from git snapshot
Merge branch 'master' of github.com:pardus-anka/2013
revision git
Merge branch 'master' of github.com:pardus-anka/2013
lxrandr: i think autoreconf is not really needed
kdevelop dep silindi
add suporte a resultados com diversos nrainhas
changed genome_build_to_species so that it will do an inexact search for the genome build
Merge branch 'develop' of https://github.com/parklab/Refinery into develop
Поправка (пропушены кавычки);cmd = gcnew MySqlCommand;
Keyboard functionality

WSAD movement
Added new utility to handle IPv4 and IPv6:
* Two classes of IPv4 and IPv6 with support for CIDR notation
* Updated IPFilter
* Updated Configuration
* A helper class (IPUtils) for common tasks
Added new utility to handle IPv4 and IPv6:
* Two classes of IPv4 and IPv6 with support for CIDR notation
* Updated IPFilter
* Updated Configuration
* A helper class (IPUtils) for common tasks
Modularized ServerManager
Merge branch 'master' of github.com:pausb/Winterface

Conflicts:
	src/main/java/freenet/winterface/core/Configuration.java
Trivial changes
Corrected typo
* Added cookie adding functionality
* Add missing java docs
* Corrected old java docs
Necessary changes according to Fred api update
Added Freenet english translation.
All keys and values are left intact.
A new utill class to take care of peer adding operations (read from file/string/url, parse, etc)
A new page to add darknet peers (friends)
Missing delete icon for AjaxFallbackCssButton
Added A page to show user alerts. Moreover added a util class to ease
working with UserAlertsManager in Winterface
Removed mutable static fields in Configuration and turned it into a proper object. Following changes were side effects:
* Config should be passed as param to ServerManager
* Config should be put in ServletContext so it can be retrievable by Wicket application
Merge branch 'master' into dev

Conflicts:
	src/main/java/freenet/winterface/core/Configuration.java
	src/main/java/freenet/winterface/core/ServerManager.java
	src/main/java/freenet/winterface/web/core/WinterfaceApplication.java
A couple of changes:
* Added coockie util to the WinterfaceApplication
* Updated fields in freenet.css
* Updated translations
dropped test proj,clean up copy info

test project removed until a better unit tsting appraoch is devised.
cleaned up license/copyright info across several files
Restrict log preview to the last 1000 lines.
Use set of IpAddresses internally making removeIpAddress easier to implement
Removed ICMP6 code - Linux handles that automatically for us
When changing languages, if we have an active transcript plugin, scroll to it.
#1782 Fixed html formatting on diff views (both email and revision diff), for https://unisubs.sifterapp.com/issues/1781
Merge branch 'dev' of github.com:pculture/unisubs into dev
updated new fabfile (builder media compilation)
Document tasks API
Enterprise page: Fix mislabeled content; Scroll up when tabbing

https://unisubs.sifterapp.com/issue/1042
Added config files: global.conf, benchmarking.conf, clouds.conf
Added lib/config.py with classes that retrieve and store options from the config files
Implemented classes Cloud, Clouds, Cluster, Clusters

Update #1: changed Log.info to Log.debug
Update #2: removed etc/automaton.conf
Update #3: added a check before registering a key
Update #4: replaced string concatenation in %s
Update #5: added file default locations in the help for command line arguments
Update #6: replaces old function names with log_info and get_fqdns
Merge pull request #3 from dmdu/read_config

Added config files: global.conf, benchmarking.conf, clouds.conf
Changed LC authentication logic
Cleaned imports to remove dependencies on rhino jar files
Clean up
link contract now hanging off message context directly, rather than the
$do
sub-context
Merge remote-tracking branch 'animeshc/master'

Conflicts:
	messaging/src/main/java/xdi2/messaging/Message.java
upgraded rhino dependency
Add .gitignore_templates and .gitignore_template

Add support for the new /gitignore/templates and
/gitignore/template/{template/name} api endpoints. Closes #183.

See http://developer.github.com/v3/gitignore/
Fix for MONDRIAN-1030. When performing in-memory rollups, if a cell value was null, the code would throw a NPE. If the first value of the list was null, it would throw an IAE. The code now checks for both these cases.
Fix crash when getting the version list isn't successful
Temp fix for instance list reload crash
data + first tilemill project
Setup the sandbox site. Switched the js files and some minor stuff
updated Hitch CLI Tool to v1.1.0
modify rope.png image
Fix progressbar rendering
More here, less there.

I realized that less of the script could be in the distant sub-shell.
Added URL output to applet/object tags
Cleaned up some whitespace
fix convolve bug
Added DataModel class
lib: ListModelItemData: textPtr should be const.
- cleanup; 64bit note
introduce node::detail::uv/net/http
clean up type of bloom->hashes and hash_func()

(original changes by Vicent Marti, pulled out and rebased by
Pierce Lopez)
add pub date to video listings
no related reading
Base classes to manipulate AD password policies
MIT MOTOOLBOX - ADDED BOOK CONVERTER
add ringbuffer reset method
don't build lua interface till JACK is running
add fader
Better test for measure_helper
[tests] exist -> exists
new file:   albumcoverfetcher.cpp
	new file:   albumcoverfetcher.h
	new file:   albumcoverfetchersearch.cpp
	new file:   albumcoverfetchersearch.h
	new file:   albumcoverloader.cpp
	new file:   albumcoverloader.h
	new file:   albumcoverloaderoptions.cpp
	new file:   albumcoverloaderoptions.h
	new file:   amazoncoverprovider.cpp
	new file:   amazoncoverprovider.h
	new file:   coverprovider.cpp
	new file:   coverprovider.h
	new file:   coverproviders.cpp
	new file:   coverproviders.h
	new file:   coversearchstatistics.cpp
	new file:   coversearchstatistics.h
	new file:   coversearchstatisticsdialog.cpp
	new file:   coversearchstatisticsdialog.h
	new file:   coversearchstatisticsdialog.ui
	new file:   currentartloader.cpp
	new file:   currentartloader.h
	new file:   discogscoverprovider.cpp
	new file:   discogscoverprovider.h
	new file:   kittenloader.cpp
	new file:   kittenloader.h
	new file:   lastfmcoverprovider.cpp
	new file:   lastfmcoverprovider.h
TERYT.
fix for only 20 'post' quizes & pep8
.aliases: Add `map`

Ref. #157.
.functions: Make `gz` more awesome
Merge branch 'master' of git://github.com/mathiasbynens/dotfiles

* 'master' of git://github.com/mathiasbynens/dotfiles:
  .functions: Make `gz` more awesome
  .aliases: Add `map`
add virtualenv