labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed issue when creating a new Artist with a new song at the same time
Added the twitter bootstrap rails gem
Modified layout to include navbar and footer
Modified home view to improve the look of the table
Modified Artists index view to improve the look and feel
Modified Artists show view to improve the look and feel
Modified create and edit views to improve the look and feel
Modified songs form to display as a table
Added votes to Artist show view
Modified Song show view to improve look and feel
Updated songs form to allow adding and removing rows dynamically
galery fixing
Updated for resize re-draws
Removed _general funcitons.  Added bsearch_custom_pos.  Added tests.  Prepared version 0.07 for CPAN.
One more time for giggles
New version of cassandra_object supports consistency:

  CassandraObject::Base.default_consistency = 'QUORUM'

or

  CassandraObject::Base.with_consistency 'QUORUM' do
    ...
  end
Removed explicit dependency on zope.browserpage.
Script allowing only numbers in some inputs
Test commit
forgot to call some methods
added a module in the lib folder
Hpricot is not compiling on Travis.
Change .rbenv-version
Site updated at 2012-04-25 08:59:12 UTC
Site updated at 2012-08-05 15:11:08 UTC
Task #67493. Add Validation in Adding Holiday
Add 'MMA actions' to fighter.rb
Improve fight.rb and fight_game.rb
Add Baidu bot to blacklist. Bumb to 0.2.1
Add an argument for the max_clients line.
Add a README.
move from svn to git

move this repo from svn to git
back button 4
svn merge -c 1293012 from branch-1 for MAPREDUCE-3583.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1293014 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1293490 from branch-1 for HDFS-3006.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1293492 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/branch-1.0' into branch-1.0

Conflicts resolved:
	ivy.xml
	ivy/libraries.properties
	src/contrib/capacity-scheduler/ivy/libraries.properties
	src/contrib/gridmix/ivy/libraries.properties
	src/contrib/hdfsproxy/ivy/libraries.properties
	src/core/org/apache/hadoop/security/SecurityUtil.java
	src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java
indented some more
Projekt umgestellt. Jetzt muss ich noch die Html5-Geschichte noch entfernen
confidential file gone
adding twitter.js - displaying links associated to tweets filtered by keyword
Docs + Build
Tweaked the snips some more.
Remove manual HTTP code; dzilify; code cleanup; add a functional test

  - Use HTTP::Request::Common to build a request, instead of manually
    building the HTTP POST body. This greatly simplifies the code.
  - Use Dist::Zilla for managing releases. This also gives us Build.PL.
  - General code cleanup.
  - Add a test that actually uploads to the Google Code server, if
    given the appropriate credentials in environment variables.
Enable OO-style usage
Allow setting a description for the upload
Add new maintainer note
Update meta files
Fix synopsis
Die on failure to upload, rather than returning a tuple

Calling code shouldn't need to know about HTTP status codes,
so now we die when the upload fails (the exception is still
the HTTP status line), and return the URL if successful.
Fix dist name
added how to adding an update
add hitch-hikers guide to the galaxy reference
Updates to deploy to heroku
Stuff
Update statusEnforcer/statusEnforcer/templates/server/index.html~
make changes to allow export to be a button instead of a menu item.  This pattern will AUTOMATICALLY create buttons for export on the export page.
Merge pull request #4 from cloudedge/pull-req-master-0924bac9df

Fix naming convention & move export buttons [2/6]
DE782 Export Page hangs after export of Chef
Merge remote-tracking branch 'origin/master'
Merge pull request #6 from cloudedge/pull-req-master-ee09d73858

DE782 	Crowbar UI: Export page with new buttons do not render [2/6]
- adding kie commons to form-builder-ng
Changed location of channel.html
runlevel2iptables: solo web Hotfix name device eth0 eth3
wro clients can provide their own model transformer and group extractors #29

* Model Transformer and GroupExtractor can be provided by clients
* A simply but effective cache was added for WildcardModelFactory
Moar tidy up
Correct offset is decimal 64 (40h)
Move canned data view to a class-based view
abs vis, cleanup and formatting
formatting
depth plot has number of missing earthquakes
update cache
removed gitstat documentation
added gitstat output in its own folder
added quake code in pdf
continued implementing BayesMDP

Change-Id: I1a1c1b966d35b0e44eaad42740d4a6441bc7ba91
Updated color vertices export to work with Blender 2.62.
new compiler build 8249 without frog compiler
error page: if error code not correct, redirect /home
solved issue #29
change 'my items' in sidebar to 'my account' (issue #30) + items in userprofile should appear before boring account settings (issue #31)
Resetting accepts now downcase/upcase

Whatever :) Supermario and supermario are accepted now
Merge branch 'bsmw' into production
Added rounded corners to the new header, made it marginally shorter so it
doesn't reappear below the status bar

	modified:   trade/app/public/css/style.css
Played arount with javascript

	modified:   trade/app/public/styles.css
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/login.haml
Profile shows User Description

	modified:   trade/app/views/profile.haml
added test_item_editable?
Added install and run scripts and a proper back button to error page

	new file:   install
	new file:   run
	modified:   trade/app/views/error.haml
Merge branch 'jvfwb' into ugwb
Added word break to content div, user description now shows 'no description available' if there is no user description

	modified:   trade/app/public/styles.css
	modified:   trade/app/views/profile.haml
	modified:   trade/app/views/register.haml
Merge branch 'ugwb-experimental' into ugwb
Added javascript handler for form validation. Now if the user leaves any field empty, an error string will appear and the field will be highlighted red

	modified:   trade/app/public/styles.css
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/partials/item_edit_form.haml
	modified:   trade/app/views/register.haml
Merge branch 'om' of github.com:ese-unibe-ch/ese2012-team6 into ugwb
added rcov to gemfile (test coverage)
Updated gitignore file to ignore all project related files

	modified:   .gitignore
Fixed item and user description, can now be multiline.

	modified:   .idea/ese2011-web-ui.iml
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/public/styles.css
	modified:   trade/app/views/all_items.haml
	modified:   trade/app/views/item.haml
	modified:   trade/app/views/partials/item_edit_form.haml
	modified:   trade/app/views/profile.haml
Merge branch 'jvfwb' of github.com:ese-unibe-ch/ese2012-team6 into ugwb
Included gem file by jonas (now with rcov) and readded relative paths in tests
Also made page height dynamic, now content will not overlap borders

	modified:   .idea/ese2011-web-ui.iml
	modified:   trade/app/public/styles.css
	new file:   trade/test/database_test.rb
	modified:   trade/test/item_test.rb
	modified:   trade/test/password_handler_test.rb
	modified:   trade/test/user_test.rb
New feature: Upload an image for an item.
Agrego un assert para el campo date del report.
Agrego chronic como dependencia.
Agrego chronic como dependencia.
Agrego date pero parseado por Chronic para arreglar el problema con el String#to_time. No queremos esa dependencia.
Cambio el nombre del attribute a date en vez de fecha, para seguir la lógica de nombres de attributes (en inglés).
Bump de version.
New Footer Code Fixed
test raw with example from liquid docs
Update installer/Greek.lproj/welcome.rtf

Updated welcome message.
Rename README to use Markdown.
Correct Github repo URL in README. Tidy up Markdown formatting.
Populate epic from network

Basic code to fetch epic data over the network.  We aim to keep the
client simple in that we'll use the client side model as the json
string from the server and create the hierarchy of epic-story-task just
in memory for the client.
This code does not handle the network lost case.  We just return false.
 Need to have a last good fetch saved to disk approach.
Parsing support for model

Improved the structure so that once a json string is fetched, the
model.m code will build up a proper in-memory structure to reflect the
epic-story-task relationships.
updates include thumbnails for posts and inline editing start of coding
Implement individual server pipelines

This commit adds the ability to specify
individual pipelines per storage server.

This allows users to specify their own custom
pipelines to determine how they implement the
middlewares for their storage instances.
Reimplement concurrency to be per process

Previously, concurrently was implemented per
storage server type as a global setting.

This commit reimplements concurrency to make it
per process (replicator/updater/reaper)

This is intended to allow the end user more
flexibility over how they implement their
swift cluster.
Reimplement keystone pipeline

This commit removes the keystone::client::authtoken
class from the swift::proxy::keystone class.

This has been done to  map the classes more cleanly
to the pipeline specication.
Implement additional proxy middlewares

This commit implements additional proxy middlewares
  - catch_errors - handles errors
  - ratelimit    - limits incoming requests
  - s3token - misddleware for s3auth
  - swift3 - implement swift APIs

These middlewares needed to be modeled b/c they
are configurable interfaces that needed to be
configurable via Puppet.
Expand supported storage middlewares

This commit expands the supported storage
middlewares to include:
  - healthcheck - used to be able to perform
healthchecks on a storage node
  - recon
Update swift proxy example

This commit adds a usage example of creating
a swift proxy with keystone as the auth middleware
and a large number of configured middlewares.

This example encapsulates the latest and greatest
deployment example of swift proxy.
Add test for keystone auth

This commit adds an integration test for swift configured with
keystone.
Merge remote branch 'bodepd/middlewares' into prod

Conflicts:
	manifests/proxy/keystone.pp
	manifests/storage/server.pp
Merge branch 'prod' of github.com:fcharlier/puppetlabs-swift into prod
Add initial version of the PDF stream anatomy
Add sample documents for the 'PDF anatomy' post
Update the 'PDF anatomy' post
fixed bug with create group command
use scss. ui style refresh.
03Jul12 Release
Release 0.0.21.
customize the cell according to the item
make clients more aggressive
Added mipmap level calculation to OpenGL
Added Cg shared parameters.
export correct camera fov (fovy) from blender
when 'dislike' isn't enough
Se agregó Retro-alimentación de "compañero ha contestado" (se modificó nodeserver y cliente js)
it seems to work in Puppet 3.0.0
Updated hiding of 'get started' message popup.
added test for deletion of group that is used in a subscription
Merge branch 'core-417' of github.com:frontlinesms/frontlinesms2 into core-417
Fix to change-log 0.3
Fix to change-log 0.3
message count warning shown/hidden appropriately when magic wand disappears in poll autoreply tab
ticket:4
Fixed bug with TEMPLATE_CONTEXT_PROCESSORS
Merge branch 't4_template_context_settings'
Update easymed/src/com/easymed/MainV2.java

test 2
removing a tag
Sooner or later everyone has to deploy to heroku
Refactor DB connection
EM::Mongo connection to MongoLabs requires some URI trickery
Maybe don't be quite so noisy in our logging...
bashrc: support SunOS
Increased-WIFI
reverted-gpu-oc
resetting to new dir
Merge branch 'master' of https://github.com/bouchon/TarHeelReaderTheme into paul2
Some of Paul's changes broke book pages.
Use ems as often as possible.
Make back and next links appear at the bottom of book pages.
shrink and square up the icons.
Handle page settings properly.
Appearance tweaks.
align the buttons.
move the focus off the submit button after it is clicked.
simply design
bump geocammapset
adds manage convenience script
Merge remote-tracking branch 'origin'; commit 'master'
Pointer reductions
std::unique_ptr implementations
More C++11 implementations
Site updated at 2012-07-13 13:56:54 UTC
screen: getWidth,getHeight, conf.lua before main.lua and josefnpat demo link, but not in git
Add date hacks for ordering events
Merge pull request #58 from github/date-hacks

Add date hacks for ordering events
initial
Merge branch 'master' of github.com:gjedeer/django-twocheckout
Add check to make sure Magento is installed
Update README
Add APC check for expunges
added findbugs plugin to pom.xml

-Glen
Merge branch 'findbugs' into development
Site updated at 2012-09-07 04:05:47 UTC
Added new n-appels-par-periode stats
README.me formatting updates.
Defects fixed as per GDoc excel
Site updated at 2012-09-17 12:56:06 UTC
dhcpcd: optimize for the majority case

If you really really need to claim your address by ARP, you are the
minority.
radvd: remove unit, now provided by upstream
microcode: remove service file

Users should add the microcode module to modules-load.d instead.

Closes issue #115.
clamav: move pidfiles to /run/clamav, add tmpfile

clamav drops privileges too soon and tries to write its PIDFile as
the clamav user, rather than root. Because of this, we need a clamav
owned directory in /run to store the PID.
hal: remove service

This is ancient. If you're still using it, I suspect you aren't using
systemd.
ufw: fix path to ufw-init

FS#28867
prosody: add servicefile, tmpfile
banish tmpfiles fragments for files/dirs that root owned

This is far more trouble than its worth. If this isn't some known good
user (aka root), I don't want it. systemd-tmpfiles will try to resolve
even numeric UIDs and GIDs and fail when they don't exist. Convince the
package maintainer that they want them, because I don't.
add i8kmon.service

i8kmon is a tcl script which uses a common idiom: it begins as a shell
script and then calls "exec tclsh" on itself.

The script does not behave gracefully if the i8k module is not loaded.

[dave: shorten description]
install units to /usr/lib/systemd/system
laptop-mode-tools: /bin/install, /bin/touch moved
Merge pull request #120 from grawity/usrmove

laptop-mode-tools: update hardcoded paths for /bin → /usr/bin move
remove root group from lvm lock dir
Refer to scripts in /usr/lib

FS#29321
rpcbind: now provided by Arch package

Added to rpcbind 0.2.0-7 along with socket activation patch:

https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/rpcbind&id=02094e4919772867637900748ab4a7399da23137
Game is mostly portrait, now to simple adjust victory screen and pause screen slightly
putting windmill in voidzone is working. Code is very slow though
Added support for all services except load balancer
Bounced the Router. Now all is green!
Actually publish artifacts, fix readme syntax
Fix missing package statement
Site updated at 2012-09-28 00:38:27 UTC
added stats for quotes
stats refactoring - show top three and use orm anstead of sql
use spaces instead of tabs
Merge pull request #54 from theScythe/master

stats for quotes
Lagaði villu í build scriptunni sem varð til þess að hún keyrði rangt á windows
Install settings in the proper place.

Find out what's the glib schemas directory and install the file
there.
Move away from VStandardDirectories.

Now that Maui abandoned its own file hierarchy standard we must
use QStandardPaths instead of VStandardDirectories.
Remove CMake module.
Site updated at 2012-10-20 19:08:02 UTC
minor print refactor
Added other Anonymous Pro fonts.
Removed cloned vim plugins.
Merge pull request #1987 from rengolin/dataset

Replacing TAKtemptable for TAKinlinetable

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-7948 Add CsvEscape option to EclWatch UI/dfuwu/ftbase

HPCC-3092 has added ESCAPE option to CSV dataset. ECLWatch needs to
collect the CsvEscape option from Spray CSV file page and the input
has to be sent to dfuwu.

Based on request, I also add the CsvEscape option to ftbase.cpp.

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
HPCC-7948 Display CsvEscape option in logical file page

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Merge pull request #3479 from wangkx/h7948

HPCC-7948 Add CsvEscape option to EclWatch UI/dfuwu/ftbase

Reviewed-By: Renato Golin <rengolin@hpccsystems.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
finished required fields on ok
modified output and execute
fix include
Merge remote branch 'upstream/master'
removed testing code, fixed glitch that provented execution in certain responces from eclcc
Merge remote branch 'upstream/master'
changing case of folders
Revert "removed testing code, fixed glitch that provented execution in certain responces from eclcc"

This reverts commit edf495f4c69c9edcb00a150ffa8f9d323476c07a.
Revert "Merge remote branch 'upstream/master'"

This reverts commit 47bf8e4bb8dfb21704999646cfaa1c8eb7ff7cb5, reversing
changes made to edf495f4c69c9edcb00a150ffa8f9d323476c07a.

Conflicts:

	job/eclError/.classpath
	job/eclError/.project
	job/eclError/.settings/org.eclipse.core.resources.prefs
	job/eclError/.settings/org.eclipse.jdt.core.prefs
	job/eclError/.settings/org.eclipse.m2e.core.prefs
	job/eclError/pom.xml
	job/eclError/src/main/java/org/hpccsystems/pentaho/job/eclerror/ECLError.java
	job/eclError/src/main/java/org/hpccsystems/pentaho/job/eclerror/ECLErrorDialog.java
	job/eclError/src/main/resources/plugin/icon.png
	job/eclError/src/main/resources/plugin/plugin.xml
	job/eclLimit/.classpath
	job/eclLimit/.project
	job/eclLimit/.settings/org.eclipse.core.resources.prefs
	job/eclLimit/.settings/org.eclipse.jdt.core.prefs
	job/eclLimit/.settings/org.eclipse.m2e.core.prefs
	job/eclLimit/pom.xml
	job/eclLimit/src/main/java/org/hpccsystems/pentaho/job/ecllimit/ECLLimit.java
	job/eclLimit/src/main/java/org/hpccsystems/pentaho/job/ecllimit/ECLLimitDialog.java
	job/eclLimit/src/main/resources/plugin/limit.png
	job/eclLimit/src/main/resources/plugin/plugin.xml
	job/eclLoop/.classpath
	job/eclLoop/.project
	job/eclLoop/.settings/org.eclipse.core.resources.prefs
	job/eclLoop/.settings/org.eclipse.jdt.core.prefs
	job/eclLoop/.settings/org.eclipse.m2e.core.prefs
	job/eclLoop/pom.xml
	job/eclLoop/src/main/java/org/hpccsystems/pentaho/job/eclloop/ECLLoop.java
	job/eclLoop/src/main/java/org/hpccsystems/pentaho/job/eclloop/ECLLoopDialog.java
	job/eclLoop/src/main/resources/plugin/loop.png
	job/eclLoop/src/main/resources/plugin/plugin.xml
Revert "changing case of folders"

This reverts commit 26c2e596e7a3218d2ad04621fc989df88d672437.
Revert "Revert "removed testing code, fixed glitch that provented execution in certain responces from eclcc""

This reverts commit f26edbcdbd7f101c8be3cf96ccd7dc680c891f77.
updated autopopulate so that when selectin a dataset within a join the condition field gets populated.  This currently onlyworks for the dataset/recordsets defined within a jobentries type of dataset.  We will need a function in autopopulate that looks up the chain and recursivelly calls the up the chain until it reaches where the record definition is defined.
Merge pull request #23 from jchambers-ln/master

updates to autopopulate functionality
test GameQuery
deleted class files
gitignore class files
20121108 longest tree line (exercise 07)
greenfoot metainformation
added mirror / copy exercise
delete extra class.
Merge branch 'master' of https://github.com/huangbowen521/BetamaxSpike
Merge branch 'master' of https://github.com/huangbowen521/BetamaxSpike
specified test plugin in pom.xml to solve the errors of running tests via maven.
update clear cache logic
Fix Grid Header Text
Added Apply All button
added 5 render
print out of changed files
Site updated at 2012-11-03 11:16:20 UTC
Site updated at 2012-11-02 13:01:31 UTC
Additional implementation of trolley for military shop
Additional implementation of trolley for military shop
Merge branch 'issue/16' of github.com:icehockeystar/militaryshop into issue/16

Conflicts:
	src/main/java/com/euroit/common/bean/impl/TrolleyImpl.java
Code clean-up
Trolley implementation on generics
Unit tests
Showing total price added
Show warning when no properties selected
Add to trolley
Merge branch 'dev' of github.com:icehockeystar/militaryshop into issue/16
Add item from main page
No db query in trolley bean.
Merge branch 'issue/16' of github.com:icehockeystar/militaryshop into issue/16

Conflicts:
	src/main/java/com/euroit/militaryshop/bean/impl/TrolleyImpl.java
	src/main/java/com/euroit/militaryshop/dto/MilitaryShopItemDto.java
	src/main/java/com/euroit/militaryshop/dto/ProductDto.java
Default product workaround
[maven-release-plugin] prepare release militaryshop-0.0.4
[maven-release-plugin] prepare for next development iteration
Merge branch 'dev' of local repository into issue/17
Merge remote-tracking branch 'origin/issue/17' into dev
Merge remote-tracking branch 'origin/issue/16' into dev

Conflicts:
	src/main/java/com/euroit/militaryshop/service/impl/ProductServiceImpl.java
	src/main/java/com/euroit/militaryshop/web/controller/TrolleyController.java
Merge branch 'dev' of local repository into issue/17
Loggin raw response instead parsed JSON
buildout overwrote our README.txt
Added meta tag to render with Chrome Frame in IE if available
Merge pull request #16 from wilkinson/master

Preliminary support for IE via Google Chrome Frame
fixed issue with self association
trashed things we dont need
update setup_vhost action
Validation data and readme
Site updated at 2012-07-27 08:43:56 UTC
show error on forms
ignore
test
tt
tt
t
remove code bgcolor
GCJ 2010
KUPC 2012 Practice
FirstPErson Camera implemented
File from blender serializer added to the project last commit
Merge
show newly added level
show related posts based on groups
adjust left padding on related posts
Add js version of the program
more info on how it works
added link to pre-compression compilation for django-compress
handle combinator after pseudoclass
This ports two active_record patches over that deal with database thread pooling
Force http_version to always make a new request, even if the information is in the DB
Bump up the wait_timeout (works with the recent AR patch) and fix a typo in the http_version commit
Fix up Net::HTTP usage so that it works with newer ruby as well
Patch this with a newer/manually built extension
Permission change, ignore
Patched with a small tweak to avoid a raise
Lower the rank a little to favor other modules in BAP
Fixes #6689 by moving to 7za which is included in the installer
Fixes some msyql issues by forcing read/write timepouts on the
connection object
Fixes #6297
Add the fixed nokogiri gems (corrected rpath)
Add function check_ref_identifiers
Add a maxver for the safari_metadata_archive exploit.
* Apple Security Update 2006-001 (http://support.apple.com/kb/TA23971)
* Update applied to 10.4.5, where safari 2.0.3 is default browser.
* Because update did not bump Safari version, not all 2.0.3 browsers will be affected.
Ignore refs commented out
Merge branch 'refs_check' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-refs_check
Remove return
Merge branch 'refs_check' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-refs_check
Merge branch 'master' into bug/safari-metadata-version
Just show the relevant part of the error message

The full error is already in elog/dlog
showing completed assignments
init grades
added dell log which was miss commited
Merge pull request #31 from jhotta/master

added dell logo which was no pushed at the last pull request.
Added resource layout files
warning for obsolete code - see #36
renamed .effectByName( in .effect()
Intro screen works
Change wrong data on methodology
link CSS
Add links to user and post pages on report
Don't show add / edit / delete links unless user is an admin
comment, post, user, session redirect and notice enhancement
Some other little details at README
Site updated at 2012-12-17 20:00:12 UTC
Added requirement editing
Move kxml2 to prebuilts/misc

Change-Id: Ic4c935f9b67c30ce67cc738959cfccf4550932c4
Merge "Move kxml2 to prebuilts/misc"
Merge branch 'master' of https://android.googlesource.com/platform/prebuilt

Change-Id: Ib9316969d91090a2c5ec697ffe6def998ad74eb8
prebuilt: Yuxon 4.6.3 06262012 toolchain

Toolchain based off Linaro GCC 4.6-2012.01 by eXistZ

GCC Base:
    * Linaro 4.6-2012.01

Changes:
    * PR target/52129
    * gmp 5.0.5
    * gdb 7.4-2012.06
    * binutils 2.22.52.0.4
    * Disabled simulator target and tui

Change-Id: Ie501fbe874c8e1b2b93b777487f7013b5f967f90
prebuilt: Yuxon 4.6.3 06282012 toolchain

Changes:
  * Backport from mainline: Fix LP 879725
  * PR tree-optimization/51799
  * Backport from mainline r182561
  * Backport fix for PR target/51819
  * Use umull and ctz. Enable for thumb2 as well as ARM
  * Backport from mainline r186859
  * Implement Neon-optimized version of search_line_fast
  * PR tree-optimization/52686

Change-Id: I525d212a532737edf73a5093a745d57f704fc397
Merge branch 'ics-devel' of git://github.com/aospX/platform_prebuilt into 4.6.3

Conflicts:
	linux-x86/toolchain/arm-eabi-4.7.1/lib/gcc/arm-eabi/4.7.1/install-tools/macro_list

Change-Id: I0806bb00ccab600ca30bdac3251e9d7a467f898b
test_dir_tree: Wrap test paragraphs to 79 characters
google charts playground
safer way to access filetype
Added addGoods and subtractGoods methods.

They don't actually work yet, because some methods haven't been created
that they need. But they're more or less there, and should work when
those methods are done.
Added database test resources.
Site updated at 2012-09-30 22:31:09 UTC
Added stores to visit
paid amount field changed to only accept numbers for receipts
external IP
Merge branch 'master' of github.com:joshuaevenson/spicerackdev
Tweak some text
Substituting PluginService / PluginsModule with the new AppService / AppModule
created coaster.cpp and coaster.h files, added into make file
Update po/fr_CA.po

Added string for issue #62
Remove navurl from options; set as jquery object
Added new BuiltInSessionStrategy.php
desurium update
use jquery for flash message display
small typo in SimpleDBManager

Signed-off-by: risa <risa@ubuntu.(none)>
Site updated at 2012-10-12 08:50:17 UTC
(#10136) Add get_scope_args function for getting access to parameters passed to a resource or class

This will return all variables passed to a class/resource for use by
the kwalify function for validation.
Merge branch 'ticket/10136-get_scope_args'

* ticket/10136-get_scope_args:
  (#10136) Add get_scope_args function for getting access to parameters passed to a resource or class
Added #find method. Updated docs.
Added Glen's email address to FROM field, but it appears to only use the first one.
Updated per normal operations.
Merge branch 'master' of github.com:kefo/NAF-CDS-Quality-Check
runnerの設定を追加
ranking生成のバッチファイル
add nuget project
Update caro.js
Removed -auxbase as it cause compilation errors when the make.conf was used from emerge
./features/git.sh is ready for testing
Update grub2 to follow http://en.gentoo-wiki.com/wiki/Grub2
Update description for scenarios
finished problem 102. 100th problem
More appy
Further eradicate MTA branding and UI design from ACTA webapp.
Actions for Overview Emails Sent
Explicitly added node modules to npm install call
fancy symbols in hotkeys description
google verification
Merge branch 'master' of github.com:lbosque/lbosque.github.com
Moved ftplugin out of own folder as it only does one thing at the moment
try vm.(Not yet complete)
A whole heap of bug fixes and tweaks.
__alloc_skb
Added html color to Supplier
Preparing release 0.51
Back to development: 0.52
commit missing calendar file
Store user-supplied lat/long for new rooms.

Also, this diff fixes syntax issues in room_views.py when catching multiple
exceptions (exception types should be parenthesized).
Included owners nickname to the calculation of the hash. Closes #28
Changed id for location name. Clears location name when extent changes. Closes #27
Locations are ordered by date descending. Closes #25
Add guest machine virtio support
Fixed preprocessor macro for linux and BSD packets
more changes
made change in master
Merge branch 'branch1'
changed something
Some minor changes
	modified:   src/fsm.cc
	new file:   src/fsm.h
	deleted:    src/fsm.hh
	modified:   src/main.cc
	modified:   src/nodes.cc
	renamed:    src/nodes.hh -> src/nodes.h
new chapter about building, deployment and CI
added chef and capistrano to deployment chapter
line wraps for easier read
make chapter topic based instead of product based
add information about ant and maven
capitalise bullet points
Fixed misspelling
Merge pull request #213 from rhynodesigns/gh-pages

Misspelling: whith -> with
Merge pull request #198 from markushausammann/add-information-about-phing

new chapter about building, deployment and CI
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Changed some UK subdomain-specific php.net links to be language-agnostic
Grammar/Spelling corrections
Merge pull request #169 from elazar/gh-pages

Changed UK-specific php.net links to be language-agnostic
Merge pull request #168 from telephone/basics2

Grammar/Spelling corrections
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
assignment #7 task #3
Introduced french translation
Merge pull request #31 from gfavre/master

Added french translation
Add pointer cursor on directory and file.
Bump tag to 2.0.6
Merge pull request #273 from ryanmaxwell/master

Update tag in podspec to 2.0.6
Added analytics script and made minor html changes
Drop some bogus logic from Office OpenCL formats. I confused local
work size with global ditto.
Merge branch 'unstable-jumbo' into bleeding-jumbo
Enable incomplete dir on transmission
Sync command
fix CEBUI UI and now can change client background
Add DP3-Extruder theme
multilingual bug fixes. Added t() function at several places.
Changed vid embed parsing.
Press/Crumbs page filtering works now.
Models updated and syntax
- models and properties updated
- latex syntax description added
Last saturday changes
add video resolution dialog
Add simple examples
relationship between entities, Tests
Migrated to require.js, added templates externally, set up sass workflow, added structure to files. Also editing is possible now
Site updated at 2012-04-14 16:22:33 UTC
I fail at git. Starting over, copying original source back into branch master, and creating branch experimental for my ongoing changes.

Signed-off-by: Matthew Blissett <matthew.r.blissett@gmail.com>
reset init commit
Download Image Tool fixes. #709.
multi touch fix
Site updated at 2012-05-04 00:50:18 UTC
another update on both install-nagios and install-monitor scripts
Update to Bootstrap 2.2.0
fixed a few changes, cleaned up
appearance improvements for chat client
_posts: added link to HyperDex site.
Kapitel 4 modifiziert

Signed-off-by: mikescho <mbarkmin@gmail.com>
Added component wrappers for pubsub primitives
Changed Sort
Proxy bug fix
Changed init to start so it isn't confused with ini
small refactor
import plot and trivia, strip() fix
fixes #20: follow GPS position changes
Support Layout API, close #5
Added completion setting

Newly installed programs can now be accessed immediately with
command completion.
redirecto to new URL
remove RSS
nomenklatur fix
added an explanation on why we wrote powerhose
Fixed auto width adjustments
Make a basic User model with secure pws
core find by kind
Added 'comment plz' to post.
gchroot add key -j
Change weather request to jsonp
10299: review work flow

- re-change project from Non-ARC to ARC
- remove dealloc method
- review work flow when new data were updated
10299: review work flow

part 2:

- review work flow when new data were updated
10299: review work flow

part 3:

- fix error on CustomPopup
10299: review work flow

part 3:

- show alert if do not has wiless
Merge remote-tracking branch 'origin/10299' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	SGN_Movie_v2.xcodeproj/project.pbxproj
	SGN_Movie_v2/iPhone/Controllers/Detail Cinema/CinemaDetailController.m
	SGN_Movie_v2/iPhone/Controllers/Detail Movie/MovieDetailController.h
	SGN_Movie_v2/iPhone/Controllers/Detail Movie/MovieDetailController.m
	SGN_Movie_v2/iPhone/Controllers/Gallery Cinema/CinemaGalleryController.m
	SGN_Movie_v2/iPhone/Controllers/Gallery Movie/MovieGalleryController.m
	SGN_Movie_v2/iPhone/Controllers/List Cinemas/CinemasController.m
	SGN_Movie_v2/iPhone/Controllers/List Movies/MoviesController.m
	SGN_Movie_v2/iPhone/Controllers/Map/MapKitDisplayController.m
	SGN_Movie_v2/iPhone/Controllers/Trailer/TrailerController.m
	SGN_Movie_v2/iPhone/Views/Detail Movie/MovieDetailView.xib
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
merge code
Added type_detection directory to correspond with my blog post 'Type detection with the toString method'
Toning @unityMono1 down for default buttons.
Re-get the list of tenancies after creating one.
Remove unused keystone arg to create_cred_file.
Merge pull request #1 from devkev/master

Simple fixes
fixed regular expressions in parseAccessToken for some adapters
Merge branch 'master' into local-storage
add a .gitignore for fileupload/
Test commit

Capital in style.css
another test

no capital anymore
Template.cs: Clean line ending, remove unused "using".
Fix line endings, remove unused "using".
SelectFragment.cs: Remove use of non-generic HashedSet.
StatefulPersistenceContext.cs: Remove use of non-generic HashedSet, and also fix what appears to have been the intention (code is untouched since initial porting from Hibernate).
QuerySelect.cs: Replace private use of Iesi.Collections with SCG.HashSet<>.
Remove NHibernate custom Tuple classes (NH-3343).
better error handling when downloading localisations
update locliastions
modified git ignore
modified git ignore
Update TD Ports
Sort by order volume, and tweak the culling.
refactor ace editor
allex bis zu den Körperaximoen getext

Zusätzlich Umstellung von document auf book
Analysis Vorlesung bis einschließlich 15.10 getext
add git config

git config --global http.sslVerify false
Updated README
 - Added new output() method to add JS to the head, or the RequireJS callback (if installed).
Updated README
Universalize postinst scripts

- Use contents of /etc/lsb-release to distinguish between hardy and others.
Merge branch 'master' into oneiric-backport
changing weight of h1 in team section on about
update demoserver in readme
Added dependency for admin_menu
Added make files
fix build server code
replace cg call class FAR macro by more safer FAR_CALL
Spelling
Merge branch 'master' of github.com:openeyes/OphDrPrescription
update to new method name in spec
Update notes for submitted changes

* Add greenthread local storage model from nova
Add nosehtmloutput as a test dependency.

Adding nosehtmloutput as a test dependency allows nose to output its
results to an html file. This will be used by Jenkins to save logs on
a different server.

Change-Id: I7fcce74b358e27901b74922af35d4ea529366c81
Merge "Add nosehtmloutput as a test dependency."
save

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@29120 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
[josm_utilsplugin2] fix #josm8237 - split object throws IOOBE

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@29121 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
save

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@29123 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
fix #josm7341 - circle arc: problem when a way and three nodes are selected not in the way order

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@29124 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
UIWebView bounces setter
Added shine animation
added support for hooks on MongoStore, added RealtimeAction organel for executing custom actions
akeba you are beautiful
Update build script.
Remove all but Autofac.
fix signup form to display agency.mailee.me
Issue #1471178 by sun and hswong3i: Increases security by escaping shell arguments.
Issue #1471178 by sun and hswong3i: Increases security by escaping shell arguments (Part 2).
completing topic dynamic add and delete
Remove 'debug()' in line 665
foo.php
replaced directories in example/flash/libs with swc's in the grapefrukt directory.
updated the robot example to point to the new swc's.
library cocos2d-iphone will be a submodule.
adding cocos2d-iphone submodule.
README & example FLA updated per new libraries.
Hack hard code parallel.
Fix for access rights regarding gamelist.xml files
updated home page slightly
Merge pull request #63 from havvg/feature/session-flashbag

use session flashbag in template
Created folder structure
Created header,footer, index, js and css files
Added css files, js and gitignore
Merge branch 'issue-1' into develop
Base template created
Merge branch 'issue-2' into develop
Added navigation menu in header
Merge branch 'issue-3' into develop
Home page design completed
Merge branch 'issue-4' into develop
Image added to homepage
Solved .gitignore conflict and merging
Prevent long words (such as URLs) spilling out of comments at small screen widths
Added basic database functionality.
Fixed bad #ifdef
Added .gitignore
Fixing build issues.
improved SettingsView extensibility
"Real Commit"
Remove plone keywords, have been moved to plone.act.
Cleanup Test Relative Location Criterion
Restoring previous commits manually
add concatNlsInLayer, fix missing dojox/mobile/ loose modules
added groups to user
Update plan_id to id for subscription settings
stack logo
About me page was added to exestent tamplate.
validator spreadsheet datacenter
booking form changes
delay ads display time
Merge branch 'Release-0.7.0' into develop
Added migration to db version 2 plus tests.

This ensures that there is a supplier record for C.A.T.9 as this is
required for the Part Kits to function properly.
Bump version number to 0.7.1
Corrected migration interval to use current+1 -> new version
Updated migration response checking to print warning for bad version
numbers and errors for actual errors.
Updated plugins config to use current versions of sbt-eclipse and
sbt-idea.

This was mainly driven by the update to sbt-0.11.3.
Updated project config.

* Removed unused `lift-json` dependency
* Added check for test target in `sbt` script to add the `-Dtesting=yes`
option when tests are run.
Extracted database migration code into own function in `Boot`.
Merge branch 'Release-0.7.1'
Merge branch 'Release-0.7.1' into develop
Corrected scaladoc error in `Vehicle` class.
Merge branch 'Release-0.7.1'
Merge branch 'Release-0.7.1' into develop
Updated version number to 0.8.0-SNAPSHOT
re #110: Removed transaction `shortName` field and replaced with a`lazy
val` to still provide access.

The short name now uses the `documentNumber` of the **Quote** that was
used to create the transaction.
re #110: Resolved compilation errors from removal of transaction
`shortName` as a field.
re #110: Changed transaction short name to use the quote document id
number with **TRN** as a prefix and added test for this.
re #110: Removed or changed use otransaction short name in lift part of
codebase.
re #110: Removed Transaction Name section from Quote Generation page.
Removed gui output switch from test configs.

Now rely on installing an ANSI console plugin in eclipse to get pretty
output.
add runtime dep for python-support, for update-python-modules in postinst
video von Paperprototyping
Switch to canonical front side URL for /r/postcards.
adding the logback config listener and web-fragment.xml
some extra entries in git ignore
Zoom variável, e reset implementados
Removing `require`s from code, depending on autoloading instead (fixes #3).
Swing components or data objects
Sorting for FGDB
Fixed to work with rails >= 3.1
Removed upcoming results
Merge branch 'master' of github.com:rfdrake/xbmc-plugin-day9tv
Got rid of the "page" variable and grab it from the website now.
Might come back to haunt me if it ever becomes hard to guess what page you're on
using vim to ammend git commits
Optimizando el código para el manejo de los escuchadores del evento
click para el caso de ayuda y acerca de en la aplicación.
add photo-auto-orient.sh
collapse on academics
Site updated at 2012-04-19 05:05:03 UTC
altered main dish opacity
readjusted main dish background opacity
added jmzq and zoo installed
fixed bug with content behind sidebar not clickable
Adjusting plugin macro on Qt5

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
wip script
Rebase from 'release/moveit_ros_planning' @ version '0.1.13'
Generated debian files for quantal
Rebase from 'release/moveit_ros_manipulation' @ version '0.3.3'
Generated debian files for precise
~ Forum page modifications.
[maven-release-plugin] prepare release sauce-grid-plugin-1.0.1
ST: Refactores gem into Alertify::Rails namespace
Version bump to v0.1.0
remove about and index add index
image styles
more product styles
sticky add-to-cart
Add PECL Memcache
Hopefully themed?
Config:Switch XZ kernel
Merge pull request #3 from HomuHomu/android-2.6.35-v1.7

Switch XZ kernel
- Added PowerManagement plugin for Qt port of PhoneGap
Merge branch 'master' of https://github.com/phonegap/phonegap-plugins
Merge branch 'master' of https://github.com/phonegap/phonegap-plugins
add isShoing function to Android SoftKeyBoard plugin
add isShowing function to Android SoftKeyBoard plugin
Merge branch 'master' of https://github.com/phonegap/phonegap-plugins
Add AppiraterPlugin
Update iOS/AppiraterPlugin/README.md
Replace PGPlugin interface with CDVPlugin
Merge branch 'master' of https://github.com/phonegap/phonegap-plugins
Initital version of new bluetooth plugin for cordova / phonegap
Manual merge per https://github.com/phonegap/phonegap-plugins/pull/447
Added a ApplicationPreferences (iOS) plugin note to ReadMe.md
Adding enable / disable functionality for bluetooth
Added Cordova support for `iOS/MessageBox`.
Merge pull request #453 from mgcrea/ios-messagebox

Added Cordova support for `iOS/MessageBox`.
Updated `iOS/ActionSheet` for Cordova-1.6.
`iOS/MessageBox/README.md` tweaks.
Merge pull request #455 from mgcrea/ios-actionsheet

Updated `iOS/ActionSheet` for Cordova-1.6.
Added new `iOS/PickerView` plugin for Cordova-1.6+.
node-simple-server included in npm
Revert "my site first upload"

This reverts commit 99dbbcd726aea7d7732913d72a5c2cb5a79a8585.
Converted exer to ipynb
with status, and increased interval
-changed socket.io vote response to reflect changes to script.js
changed vote message to voteUp/voteDown from numeric
first commit ROR blog
CustomerRegistration Functionality
add Google Analytics, allow comments
Use Instrumentation to estimate object size.
added unsetloadingstate when creating a new query connection
updated module documentation
Merge branch 'master' of github.com:simondean/puppet-net_share
Initial Code Submit
fix homepage friend links
modified bake template
testimonials page added info
fixed expanded view enter/exit bug
Site updated at 2012-07-28 21:07:08 UTC
new post: /2012/07/12/functional-programming
Added simple facebook support.
Working on the authentication issues...
Update OpenSSL, spdylay and check in a copy of libSPDY.a
[TASK] Remove EXT:forum and add EXT:typo3dk
JS lin version updates, minor JS fix and cleaner HTML
adding eagle temp files to gitignore
ripped out base 64 encoding/decoding. got most of the tests to pass except cbc.
Merge branch 'master' of github.com:spencerroan/aes_encryption
German translation fix
Merge pull request #75 from laurens/1-1-stable

German translation fix
Add a more complete README.md
1. Added some background and text colours to the reset styles, only for certain tags likely to have content in the auditor.
2. Monospace font is being overriden by the reset style for the "strong" part of code snippet. Re-add monospace font on that strong tag.
Rework of previous fix for code snippet font - by moving the font reset to the new "text container only" reset rule.
Merge pull request #56 from lwright-sq/master

Add some more reset styles to auditor
Taking advantage of smartypants . . .
Removed unescessary closed css state
Updated example in implementation section + minor corrections.
Adds duplicate formula for libpng 1.2 as a keg-only formula, to allow compilation of programs in Lion that do not support libpng 1.5, (e.g. matplotlib)
Changed another faulty error handler on the server.
SD
- Added flight info to conformation page
- Some styling bugs
- Set up to add new ticket (not done yet)
SD
- Small fix
modif pour passage par rails
Adds steps navigator to birds transcriber
Smart tooltip positioning
Adds code validation
Close tooltips clicking in any place of the screen
Test for pivotal #33702407
Fixed string splitting
Added check for Breadcrumbs
Test for Pivotal_33702365
Fixed locators to align them with code style
Fixed PEP 8 violations
Fixed assertions
Updated locators for edit_app
Fix for TestDeveloperHub.test_that_checks_required_field_validations_on_basic_info_for_a_free_app
remove Xfails
Merge pull request #101 from bebef1987/master

Remove Xfails
Updated locators
Merge pull request #98 from sashakruglov/pivotal_33702365

Test for Pivotal_33702365
xfail test_that_header_menu_has_expected_items
Merge pull request #102 from bebef1987/xfail_mac_issue

xfail test_that_header_menu_has_expected_items
Merge pull request #97 from sashakruglov/pivotal_33702407

Pivotal 33702407
Update locator to fix fails
Merge pull request #100 from teodosia/update-locators-edit-app

Updated locators for edit_app
Improvements to directory watcher
Refactored file watchers
Octopress init
Site updated at 2012-03-13 23:34:09 UTC
画面をクリックしてもフォーカスが得られなくなったので修正
M  img/bad.png
M  img/good.png
M  index.html
Added new classes and interfaces

Prep for new Monitor App Integration Tests.  Also renamed the Worker
App's Integration Tests file for clarity.
Minion_Migrations exceptions fix
--db-group support for run and status tasks
Tests un-mysql'ed,apppath instead of hardcode
Added spring based application
Issue #1 time formatted as Minutes:Seconds

Add .gitignore
wrap text with span for block elements
Recursive hash added: DepHash
Backup for 5/2/12
Merge pull request #12 from theCompanyDream/master

Commit before exam
having problem with delete function
ajout d'une deuxieme fonction recursive
Updated flood light tags
Add taobao support
Removed unintentional 0 from docs.
Tried to improve formulation of how to get started with Maxima in Authoring.
Minor doc changes.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
Merge pull request #3 from alcarola/master

Again some tiny doc changes.
First partial translation into Swedish.
Merge pull request #6 from alcarola/transtemp3

First partial translation into Swedish.
STACK questions now use interactivecountback for interactive.

Note that the grade calculation is not yet correct.
Unit tests to define the correct interactive scoring.
Correct score computation for interactive behaviour.
Make stack questions work with more Moodle behaviours.

1. Unit tests and changes to make it work with deferred CBM.
2. Unit tests to prove that immediate feedback behaviour works.
3. No unit tests for immediate feedback with CBM, but I am pretty sure
that works too.

Sadly 1. means that stack now requires another qusetion behaviour to be
installed.
update: delete core-samples
cm: add CMFileManager, Apollo, and DSPManager back to the build

Change-Id: I7de08687205685a73ed18b7b060d2ddb4344f20a
Modified set param to write raw for kestrel to remove prefix/suffix.
No longer create mod.d on RHEL based OSes.  Also remove redhat.rb from a2mod
since it's no longer necessary.  Additionally make the conditrional around
a2mod and the creation of the mod.d directory a conditional based on
osfamil.  This requires a chance to mod_proxy_html as well.  (It didn't
appear to work correctly on RHEL hosts as it was anyways.)
Added patsy to the installed dependencies

this is needed for the latest statsmodels version
file upload???
Add tips for self-pub authors.
Site updated at 2012-06-28 23:33:23 UTC
htaccess redirect to main page
ajusting css, creating new features in processing
test
selected fixed for JUGEMENT on modif
Locally compiled version
Make sure the superdirectory for a user's home exists.
Add load balancer acv check
Site updated at 2012-11-05 22:28:23 UTC
Tweaks and bug fixes to get stuff running in our environment
Updating some FragmentManager features (backstack didn't work
propertly)
amazon aggregate method updated
AXAESOD-689
this is what I get for not checking typos while using sed