labofsahil/github-event-dataset-2012 huggingface dataset:
message and active user as member of base controller
merge conflict in main.rb resolved
created a second base controller

BaseController: allows passing of messages
BaseSecureController: subclass of BaseController for all controllers
which require to be logged in.
added title to base_controller
resolved merge conflicts
added images to user edit/register
login and register now working with "new" error messages
fixed change password, using new messages now
removed unused stuff from change_password
added messages to items controller
security fix for javascript injection
added title to every page
Changed some views
main controller using new messages
changed input and textarea font to page font
exception handling for login
password reset fix
added TradeException
resolved merge conflicts
switched active/inactive color in nav
nothing
if an user bid the same value as the highest, an tradeexpression gets thrown.
Merge branch 'om_intermezzo' into intermezzo-development
Users can now be deleted

including test, sinatra, haml
missing: double confirmation
Merge branch 'shirs' of github.com:ese-unibe-ch/ese2012-team4 into gmateo

Conflicts:
	trade/app/controllers/authenticated.rb
Design fixes and fixed a bug that caused no page to be shown if an item is
bought via the user description page

	modified:   trade/app/controllers/authenticated.rb
	modified:   trade/app/public/css/style.css
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/users_id.haml
added padding to the itemtables, they now look kind of acceptable

	modified:   trade/app/public/css/itemtable.css
Add date and time picker for all browsers (IE?)

Fixes #43.
Add new items & images for presentation
We should use square images in the test setup...
Use Slimbox instead of Lightbox for images
Changes to dummy-User & pix
Merge remote-tracking branch 'origin/production' into shirs
more database and search tests
Merge branch 'testing' of https://github.com/ese-unibe-ch/ese2012-team5 into testing
Fixed a few test issues and added more documentation

	modified:   trade/app/controllers/activity_logger_ctrl.rb
	modified:   trade/app/models/security/mail_client.rb
	modified:   trade/app/models/security/password_generator.rb
	modified:   trade/app/models/security/string_checker.rb
	modified:   trade/app/models/storage/picture_uploader.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/trading_authority.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/test/organization_test.rb
	modified:   trade/test/trading_authority_test.rb
	modified:   trade/test/user_test.rb
Fixed user delete error

	modified:   trade/app/controllers/item_ctrl.rb
default rack env is development
7Aug12_rail-ldap

modified form. link to create new.
fixed typo, thanks to @parndt
Add comment count to header
the README actually is markdown
comandos para compilar
footer pimpin
upside down texcoord
removal of footer and credits from settings page

User sees on activation who is the author of the plugin can get to the homepage if he likes to
fixes no-color option on cmdline.

passing --no-compile-scala-color inverts the first flag, so the
or was resolving to `true` not `false` as needed.
Merge pull request #4 from jcrobak/fix-no-color

fixes no-color option on cmdline.
Merge pull request #1 from frankmorgner/master
Reworked extract script a little bit to allow non root folders
Disable Broadcom bluetooth code
Add permissions for gyro
Typo prevented copying of the WLAN modules
Looks like fixed up the two firmware files and librasdioif is not required
Added the lights HAL for menu button background and indicator LED
Added logwrapper for the wirless services to allow debugging
Do not extract blobs that we can compile - audio & lights
Added a relative link.
Added pixel shader to cg_simple
Improved message count in polls when not sending message
Removed print statement for alias code in the pollController
Updated the dropbox deploy script
Merge branch 'frontlinesms2.0.3-maintenance'
Rolled up version for the next release cycle
fixed smslib migration
Rolling up version for the 0.3 RELEASE
Merge branch 'master' of github.com:frontlinesms/frontlinesms2
Merge branch 'frontlinesms2.0.3-maintenance'

Conflicts:
	plugins/core/CoreGrailsPlugin.groovy
	plugins/core/application.properties
comma seperated alias validation fix for values with hyphens
wcf_revision_nr = [328] 'wcf_admin.sql => include_administration_list.php'

Signed-off-by: frostzhenya <sexplay2009@mail.ru>
Adding Ines changes
Reordering APIU reference guides
Reordering authentication guides
Merge remote-tracking branch 'upstream/master'
Deleting default generated pages
Adding support for PhonePad, NamePhonePad and AsciiCapable keyboard types for settings.
Merge pull request #187 from Spidertracks/master

Added support for extra keyboard types that have been available since iOS 2.0

While the settings.app doesn't support them, it should be OK for us.
Changed to new plugin version
Creates Manipulation for DatagridColumn calable parameter
* remove alert
* bump version
Add optional quality flag for MP4 convert script
Fix capabilities xml docs to validate
deleted geoserver, will add as submodule
added geoserver as submodule
fix for layer switcher close #16
Enemies are now loaded correctly
Merge branch 'master' of github.com:gerstrong/Commander-Genius
Bump the version number for the next release.
Unfinished code, don't pull!
Commit for pull from Alex
Merge branch 'pilona' of https://github.com/glek/yet-another-bard-tale into glek
Clean up of errors in NetBeans.
Beginnings of event handling in player.
Merge branch 'glek.stable' into melari.working

Conflicts:
	src/Game.java
Some game commands and ideas from pilona-textgame; game still broken.
Site updated at 2012-09-16 02:15:13 UTC
compression factor is flexible now- the degree to which coeffs should be compressed in the header
receiver demodulation/dewhitening is limited to ofdm_frame_sink
ofdm_sampler has hacks to ensure no one interrupts in a joint transmission (degree 2)
lerp interpolation added to compress the header coefficients
subdomains fix
Added an image smoothing option in the settings.
adding conditional for editor
zip folder issue fixed
Fixed issue when trash bin is emptied, #68.
en: fix path...
No longer need demo keys; they've been retired.
Better handling of image creation (solved DCIM redundancy issue on some devices.)
Deleted unneeded document
appended/prepended itens - fixes #87
Tweak loading div so it isn't transparent.
Merge branch 'loading_indicator'
Added edoc comments for gridfs_file module.
Начал писать js для драг-н-дропа
Merge pull request #14 from harmstyler/skin12

Front End update
fixes chunks in requirements
Merge pull request #18 from harmstyler/skin12

Updates styles on the Session and Speaker index.
Updates the models and views with still not functional frontage scroller support.
Set environment variables to run applications.

Set the PATH to include the programs directory and the default
QPA platform plugin to wayland.
installPrepare()
Implement cyclone driven file upload handler
Site updated at 2012-10-16 01:27:57 UTC
Site updated at 2012-10-20 18:58:15 UTC
Site updated at 2012-10-17 15:01:16 UTC
Update session key and secret
Remove custom logging stuff
Use modern session config syntax
Use database backed sessions
Remove page caching
Rm all expires_in statements
Adjust tests for new mobile system
rylc moved
new base path support
01-01-01 Getting Started  [translated]
added fixed sizes for checkbox and radio button. this will remove extra space around them in IE7
Added the URL to the mistyped address and some nicer styling to the text box and button
Removed dynamic URL
Updated styling to be more consistent and terse
Added padding to the inputs so that they look better.  'look' is always a personal opinion though...
Added the 'px' back in for the things that need it.  Added consistent spacing to the styling.
jQuery minified was still 1.6.4. fixes #852

I don't know why pretty sure I updated it.
Anyway… here comes the latest version.

Signed-off-by: drublic <hans@sa-designz.de>
Send CORS headers if browsers request them. This enables CORS-enabled images (@crossorigin). Closes #797.
Merge branch 'master' of https://github.com/h5bp/html5-boilerplate
Update jQuery from version 1.7.0 to 1.7.1

Signed-off-by: drublic <hans@sa-designz.de>
Merge pull request #871 from drublic/master

Update jQuery to 1.7.1
Removed ' <!--<![endif' from regex search string for adding manifest attribute. Works fine without this segment, and no longer prevents the build script from adding the manifest attribute if the IE conditional comments are removed.
Requests shouldn't fail if the file or directory beginning with a period doesn't exist. Some CMS's will allow for appending ".qr" to a URL to get a QR code.
made .htaccess less restrictive

The rule that made .htaccess restrict access to files (.log, .bak,
.sh, ...) was missing an escape sequence on its dot.

As a result, in addition filtering problematic files, it also filtered
some very valid urls. For example:

    mysite.com/blog        <- satisfies /.log$/ and gets filtered
    mysite.com/hit-refresh <- satisfies /.sh$/ and gets filtered

This change modifies .htacces so the dot is interpreted as a literal dot
character, avoiding those issues.
Added target "copyall" in build.xml for the "dev" environment
Fixes issue with not copying non-optimized .css and .js files into the publish folder. If dev environment is selected, .css and .js aren't minified, thus they aren't copied over with existing "copy" target.
Removed test from copy, because the directory has been removed long ago (0a80ebafd0).
Merge pull request #885 from elexx/master

createproject.sh - removed test
adding mimetype for .webapp, Mozilla's new app manifest type. more:

This content-type is neccessary apparently:
  https://developer.mozilla.org/en/Apps/The_Manifest
Apache Performance Tuning http://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks
Set -SymLinksIfOwnerMatch to avoid Apache extra system calls to check up on symlinks.
force utf-8 for .txt for funsies.
- added option not to use optimized screenshot (retina or non-retina)
Site updated at 2012-04-15 08:12:12 UTC
Added item disclosure code to Groups view
gh-658 Add user option to eclplus

Previously the meaning of the owner option was overloaded to mean both
user and the owner to filter on when listing workunits, etc.

Add support for a user option to explicitly specify the user running
the command.

If user is not specified owner will still be used as the username for
backward compatability.

Fixes gh-658.

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Merge pull request #3225 from afishbeck/eclplus_username

gh-658 Add user option to eclplus

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1889 from richardkchapman/roxie-aggregate-var

Disk aggregate and index aggregate could corrupt memory

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-8223 Added autorestart loop to eclagent

init_eclagent has been updated to function the same as other components
using a loop to do a restart on core.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Merge pull request #3642 from pschwartz/HPCC-8223_eclagent_restart_loop

HPCC-8223 Added autorestart loop to eclagent

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Extend implicit row projection to nested rows

The previous version of the implicit project code only analysed the top
level of fields within a dataset.  If a dataset contained a nested
row field then it was either all included, or all removed.  This
commit extends the functionality so it also removes fields from nested
records if they are unsued.

The main differences are
* Ensuring each set of fields knows the original record structure
* Keeping track of nested fields
* Replacing selectors now also ensures that fields of type datarow are
  mapped if they have been changed.

The advantage is often smaller generated code, and reduced data pulled
from datafiles and indexes.  It also improves the accuracy of an
upcoming feature for describing what data is actually used by a query.

The disadvantage is that this generates more unique row formats - which
increases the size of the metadata classes.  An issue is open to work
on reducing the size of those for the common cases.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Minor clean up of the enumerated type

Add an extra case into the activities enum for rollup and iterate
since it is simpler not to combine them and they have very slightly
different semantics.  (No changes in functionality introduced.)

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Final fixes and minor optimization

The fields used in the rollup condition weren't being included in the
fields required by the output if they weren't qualified with LEFT or
RIGHT.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #2361 from richardkchapman/2281-cherry-pick

2281 cherry pick

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Corrected misspelling in continue/cancel prompt
Merge pull request #36 from mjkrumlauf/master

Corrected misspelling in continue/cancel prompt
'configuration'
Remove unneeded clashing id from button
add link to russian translation
Order button in trolley list
styled home and apply to teach a bit more
added admin unit testing for user model
StupidBackoffLanguageModel is done
modified and refactored state machine
Fixed kundera singleton issue and added testcases
deep copy and deep compare implemented
IDI-99: Sketch of equipment lists.
IDI-99: Sketch of layout of individual category pages. Fix top alignment.
Merge branch 'IDI-99' into development
Updated to version 2012092401
Removed `__unsafe_unretained`.
Convert to coco
Cleanup, fix jakefile, build, test
Add .travis.yml for CI
Merge pull request #1 from isakb/coco

Convert to coco
Code cleanup, made log scanning much more robust
Adding proper python packaging
plugin.xml for 1.6 changelog fixed once again
Support for result's resultMap attribute.
plugin.xml for 1.7
Handle unbalanced braces properly.  Fixes #54.
Use strict checking with readdir().  Closes #56.
Add handler for non-JSON responses from the server.  Fixes #48, fixes #58.
Add ability to ignore hidden folders.  Closes #57.
Update readme, changelog.
Fix version text.
Check if tests are subclasses of PHPUnit_Framework_TestCase. Closes #59.
Fixed tests, implemented allosMultipleSelections
Just another test

Just another test
Fix travis and heroku error
0.1.2-2
Merge branch 'master' of https://github.com/jan-swiecki/node-eoptimist
in game creation, selecting variable home country disables conquering
Site updated at 2012-07-29 15:51:35 UTC
Added empty Week4 assignment
Note about recovering a node in bad state
Moved SST to separate document
Finally reading from the node table, article body table, and the reviewer field table. Rinse, lather, repeat.
Switched back, doesn't drop client connections, problem a bit more complicated, will fix tomorrow, code is funcitonal
Temporal Contracts

All grammar changes are implemented, but commented out.  Still can't get whereby to be seen as a key word
Refactoring of PreviewZipAction
Have to check size of file before encoding ampersand in enclosure url
fixed type intentmedia
LPS-23998 Source formatting
LPS-28340
LPS-28340 Source formatting
LPS-28341
LPS-28341 Source formatting
Source formatting
LPS-28345 Initialize ServiceContext in Friendly URL redirect
LPS-28241 Fix errors on Resin 4
LPS-28241 Source formatting
LPS-28320 Update configuration message in Asset publisher from "display style" to "display template"
LPS-28320 Language keys
LPS-28323 Update manage message in asset publisher configuration screen
LPS-28323 Remove duplicate import
LPS-28323 Language keys
LPS-28318 Export PDT in a separate portlet in the .lar file
LPS-28318 Sort parameters to match order in portletDataContext#addClassedModel
LPS-28242 File handler leaks caused by url connection
LPS-28242 Source formatting
LPS-28353 Add Delay Factor to all DL tests using search
LPS-28353 Source formatting
change footer bahvior again
Ver. 1.2

This version contains a simple source file called main.cpp, it is fairly
simple to understand, and it only aims at verify whether github can
work.
Site updated at 2012-04-03 05:30:56 UTC
Site updated at 2012-04-11 16:57:22 UTC
Added font scaling to header and layout editor titles
Added posts loop
Officially added support for height
Added single view sidebar
Added meta box for post thumbnails and post banners
Made changes to featured widget style
INCOMPLETE - Function support
inital mockup
[package] asterisk-1.8.x: add patch to fix CVE-2012-2186

git-svn-id: svn://svn.openwrt.org/openwrt/packages@33541 3c298f89-4303-0410-b956-a3cf2f4a3e73
[package] tor: update to 0.2.2.39

Fixes CVE-2012-3518, CVE-2012-3519, CVE-2012-4419

git-svn-id: svn://svn.openwrt.org/openwrt/packages@33542 3c298f89-4303-0410-b956-a3cf2f4a3e73
[package] tor-alpha: update to 0.2.3.22-rc

Fixes CVE-2012-3518, CVE-2012-3519, CVE-2012-4419

git-svn-id: svn://svn.openwrt.org/openwrt/packages@33543 3c298f89-4303-0410-b956-a3cf2f4a3e73
Fixed up our user creation page to have Javascript hide/show the fields for proper account
Fixed bug when trying to create new sections

"Symphony Fatal Error: Argument `$value` is not of type `string`, given
`integer`." was given when trying to create a new section.
Re-worked MetricResult and MetricInjector to accept a MetricResult rather than just a Metric
- This allows us to keep the minimum necessary values to represent the full result set,
  and the rest of the Metric's data can be re-claimed
Check we have shared_children before creating dirs
Include configure requirements
Install information is in the README
README update
add clap
Merge branch 'master' of https://github.com/johnsen/drumsandpercussion
Working on validate button
QueryReader now uses full async mode in .NET 4.5
removed any implicit conversions from EnrichmentClasses, then added a pile of documentation
world edit in java, and a bunch of little fixups.
made arcball follow cart
Added footer cityscape.
Added Github Theme URI to support automatic updates.
Simplificado el css destinado a pintar la capa de la pizarra
Added a Pages controller
Dynamic Pages
Hide SDQueue constructors that accept an unwrapped dispatch_queue_t
Added -[SDQueue description]
Remove private SDQueue.dispatchQueue property -- it's not really safe for overriding, so it's just overhead
Turn on fs discard for cache tests
Initial Folsom changes
um, not html5

i'm ashamed, i've revealed to everyone willing to look at the first
commit of a project that wont be that visible that i've shamelessly just
forked the html5 bootstrap stuff and then got rid of all the reasons for
using it. oh well, i dont need it anyway.
Bootstrap javascript that i probably wont use!
Example of a simple AJAX authentication API

You can use this as an example of a simple AJAX authentication API
"library" that you can drop in to your Web app.
A gist of the Javascript to use in your Web app can be found here:
https://gist.github.com/3215194
Allow configuring a redirect to a canonical host.
fixed tweetentry.ejs
Update all ordered lists to use new List subclass
Updated to collapse sidebar
acutally added source... fail
Twilio params are case sensitive.  puke.
Add command to launch Ingredients app for speedy doc lookup
Update documentation
Check for Ingredients before launching
Add greater weight to autocompletion from words in current file
Add gemspec
update .gitignore
Add documentation lookup via Ingredients
Update readme for 0.6
Deduplication, and ensure new packages are made available during update.
Added information about how to contribute.
Revert to 39cadf4; config templates not working as expected.
Added city image
err(), errx(), warn(), and warnx() implementations for MinGW
Merge pull request #12 from balr0g/master

err.h handling for MinGW
All VersionInfo migrations only run once in preview mode.
Merge pull request #1 from kiwiupover/master

I have got the app running on heroku
Merge branch 'master' of github.com:kiwiupover/FacebookContest
made a partial for the text
Fix to work with pyramid scaffolding.
Move reverse and reorder scenarios to separate features
roles in people index
numerous bug fixes / enhancements. working model for tab history
remove trailing spaces that mess up updatepos diff
more portable call to mktemp (Mac OS X)
Bug Hunt for Hangman

I corrected one bug where displays weren't showing.
But, there's one more; described at bottom.
fix README typo
add clojure-jack-in fix to project.clj files
error text, indicator on button
Updated README to display intent
Makefile commands plus vars in titanium.sh to build Android apps
Restoring ipad device type and code clarification
Adding android screenshot to README
Updated image path to graybill's repo
Updating image path to be branch specific
Larger screenshot
Resize screenshot to match iphone size
Resize android screenshot
Check for running android emulator and provide instructions if it's not running
Exit if android emulator isn't running
Merge pull request #1 from kyuwabara/pullRequest

Pull request
Merge pull request from graybill.

Merge branch 'android-support' of https://github.com/graybill/titanium-jasmine

Conflicts:
	SampleApp/tiapp.xml
	bin/titanium.sh
Recreated sample project with new SDK version - 1.8.2, bumped SDK version in .sh runner
Remove SampleApp.

Rename files.

renamed.

Removed file.

Changed directory architect.

Removed files.

Removed SampleApp files.

Renamed file.

Changed namespace.
add SDK version check utility and use it.
Merge branch 'master' of github.com:kyuwabara/titanium-jasmine
now heroku can't find the fileuploads.js (also called from portraits/_form). I am doing something wrong but I't know what.
fix indentation in coffeescript
Selected images are now visible by border
Fix 2 little bugs in data loading example

The current version of ember that I just downloaded from the website
has `addObjects` rather than `loadObjects`.

Also, `this` in the ajax success callback isn't the `App.Contributor`
object so fixed that too.

- If I've missed something totally obvious, and these corrections are wrong I apologise,
but I couldn't get it to work without these changes.
Switch to sinatra
concurrency error handling takes place in the message_failed callbacks
CHANGES, Docs, version bump, and other miscellany for branching RB-1.2.
Renamed to WaterSchadeSchatter
Merge branch 'master' of github.com:lizardsystem/lizard-portal
Implements ConfigurationSpecRetriever.retrieve_meta_info

This commit references nens/vss#96
Removes the injection of the database into a ConfigurationsRetriever

The constructor of ConfigurationsRetriever instantiates an interface to an
actual database. Client code can still inject another database after the
construction.

This commit references nens/vss#96
Updates the doc string of ConfigurationStore

This commit references nens/vss#96
Corrects an error in ConfigurationStore.supply

A call to ConfigurationStore.supply would create only one new
ConfigurationToValidate and updated that instead of creating a new one.

This commit references nens/vss#96
Removes each ZIP for which the ConfigurationToValidate has been created

This commit references nens/vss#96
Extends Database to provide an interface to the Area objects

This commit references nens/vss#96
Makes ConfigurationToValidate.suuply robust for unknown Area objects

This commit also fixes an error with the destination dir to which all
configurations are extracted.

This commit references nens/vss#96
Updates ConfigurationStore.supply to set the type of the ConfigurationToValidate

This commit references nens/vss#96
Added scipy package to system eggs.
Init Template
Added required getName methods and getParent method to EqualType
yet another attempt to rule over pyrus/pear
Add other args.
add path for android
connman: enable client
connman: bump version to 0.80
connman: add more stable patches
Refine description

Remove the duplicate posts, and refine description.
Adding TemporizedSlider.js
YUI Docs
update more branches to ics
Update README
add gerrit url
Add gerrit

Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge branch 'ics' of gerrit:/AOKP/platform_manifest into HEAD
track 4.0.4 tags of all repos we pull from AOSP

patch set 2: remove all master branches not used in 4.0.4

Change-Id: Ibfb2def5878142914a36919d79ddf396c8673811
Fix end of line issue

Change-Id: I384619a70296946ddeb005b4de834f74b9b6ccc6
Fix sync issues.

Based on the pull request placed by pbeeler on github.

Change-Id: Icb8c8662bb5715cd95373a5ffa2b505140ed7764
track our own hardware_broadcom_wlan

Signed-off-by: KhasMek <Boushh@gmail.com>
Adds Bash and fixes init.d scripts

Some of the init.d scripts aren't working because the scripts are
are attempting to use bash. This adds bash binary to all builds and fixes the init.d issues. Comfirmed on Fascinate and Toro.
 Credit Stevespear426 and Efpophis from TeamGlitch.

Change-Id: I852228b6278b1b8a1e0f57046056e9f1b324a636
Bluetooth: Add MAP Profile features. Track own packages/apps/Email and packages/apps/Bluetooth

These both needs to be forked from https://github.com/MarcLandis

Change-Id: I2cb1b578c98a2481f88d827e4f5fefd1af1ef251
Bring in OpenVPN from CyanogenMod
Fix my derpage while bringing in OpenVPN
track our own msm8660-common

Change-Id: I09b4f6bd6c172364ef4a495796773f08b0c9d35f
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
track CM's external/lzo

Change-Id: I99a84d0156ffde503d6b28ee6745055c4a30e68d
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge "Bluetooth: Add MAP Profile features. Track own packages/apps/Email and packages/apps/Bluetooth" into ics
update remote branches to 4.0.4_r1.2 (IMM76I)

Change-Id: I77373af874bf479e63ddfc98e3ce065a2b746f07
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Fixing Acer devices
Revert "Fixing Acer devices"

This reverts commit b23a41a112751882443a292117ca8b479c23c402.
Bring in proper Acer Iconia a500 tree and needed trees
cssselect: introduction to -other
mercurial: version bumped to 2.3.
webkit: make it work again
bison
multithreaded stuff
webkit: 1.8.2 + cleanup
webkit: remove --enable-video from BUILD and force hacky build on everyon
Merge pull request #21 from elangelo/webkit

webkit: 1.8.2 & bison 2.6 patch & "support" parallel build
libedit: Readding to moonbase and bumping the version.
Added fail test to optimal path finder
new file:   fsm.cc
	new file:   nodes.cc
	new file:   states.cc
	new file:   states.hh
Fixed a JS bug that was hiding "Level" table header in Logging tab. It still works OK for Views Rendering tab.
Merge pull request #61 from Naki/master

Fix for small JS bug
Small fix on OOP post
closes gh-133. Handle erratic response either due to permissions or non existent user.
Minor clean up.
HTML refactor

Refactored some HTML. Added "partial_" to the partials filenames.
start to user controller
group controller
AddMemberToTeamController
Uodporniono na puste linie.
Merge branch 'true-pigmaster-road-line' into developer
adding xss.htm
Delete more
Delete more stuff
Add Twitter Bootstrap javascript libs
Add jQuery 1.7.2 for awesomesauce
Twitter Bootstrap image sprites
Pull in Twitter Bootstrap CSS; kill blog posts for now [they weren't compiling]
Config cleanup
Octopress init
Site updated at 2012-06-02 01:22:28 UTC
Change ripaudiocd to use icedax, as it understands CD-TEXT.
Change writeaudiocd to pass -text option to write CD-TEXT.
Rework writecd to work for both cd and dvd.

Also rewrote to be in perl because it's easier to do regexp matches,
etc.
moved from screen to just starting a background process
reorganized
new images from Commons
mc_events_main.xml & mc_events_detail_form.xml added
adjusted reading of etag value
Import Code

Import PHP code used to run edms.org.uk
Octopress init
Site updated at 2012-07-03 13:12:05 UTC
Site updated at 2012-07-03 13:25:32 UTC
done setting up
adding my own solution
Updates for books: Atwood, King, ...
switched theme to hooligan
Moved issues from this readme to dedicated issues. Converted readme into markdown syntax.
Updated 2012-04-01-the-wisdom-of-crowds.md
fixed eearly response.redirect in /nycdata; included location and link data in api calls
no more qtui for slider / spin
relative import
Merge branch 'master' of https://github.com/micramm/HaeffnerLabLattice
bug 768096 and 769575
Handle datetime conversions when filtering values
Octopress init
Site updated at 2012-07-06 00:33:33 UTC
Fixed EmacsOptions random file generation (Issue #13)
Nu de Nuget automatic restore nog
Revert "Clean-up of CDFileTransfer class."

This reverts commit eb4f713adfd2b9a902b4cd88449f641b55c4cef1.
Revert "Change FileTransfer download to not use a blocking call"

This reverts commit 2bf695b0bc7ec47e2ec1f40842035106811e35f2.
Remove extra newlines causing mime header failure in uploads
add solaris2 to usermod fix
bug 803338 - allow reasonable combinations of URLs for topcrasher
Merge pull request #182 from rhelmer/bug803338-topcrash-url-combos

bug 803338 - allow reasonable combinations of URLs for topcrasher
Return on too large value on diagonal.
Added examples for using the bootstrap model.
cleanup
naming
seperate config
comments
relative paths
Added hash to lambda function to remove warning "(lambda (a b) ...) quoted with i rather than with #" that was occuring on ubuntu 12.04 emacs-snapshot.
Add exercise: Fundamental theorem of arithmetic

Reviewers: emily

Reviewed By: emily

Differential Revision: http://phabricator.khanacademy.org/D82
Added an exercise about detachment and syllogism

Summary: Added a capitalize function to word problems that capitalizes a string

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D90
Added simple interest exercises
+Add getopt
Revert "Revert "UUID handling, extended SessionDelegate interface, handling of duplicated resolvers""

This reverts commit e54a5b9f5d88684d3c5f2ce2adc6b0ff9c1cc2e7.
NTP Clock Variables Disclosure
This improves handling of 100-continue responses
Reset this back to master's copy, fixes this pull
Adds the WQL execution module
Merge branch 'upstream-master' into WinRM_piecemeal
minor fixups
Update NTP Module

Changed the branche and remove CR
Revert "Update NTP Module"

This reverts commit 8fd34a4475d14f7020ab7b6e13735e04bb820e00.
NTP Module - Remove [WARNING] Carriage return EOL
Merge branch 'ntp_readvars' of https://github.com/crashbrz/metasploit-framework into crashbrz-ntp_readvars
module cleanup
Add OSVDB-86723 Aladdin Knowledge System ChooseFilePath Bof
Merge branch 'aladdin_bof' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-aladdin_bof
added ie8 target
Merge branch 'master' into bug/handle-100-continue
Update the description about AllowUnencrypted
Fix syntax error
Adds the WQL execution module
minor fixups
Update the description about AllowUnencrypted
changes for saving reminder were made
added a link to marker.html
Ensure we display the arcode detection image on the arcode itself
Linux等
rename trackers, add a new intermediate tracker
rename index view
utils.break追加. utils.apiパラメタ変更など

utils.break追加
exception発するだけだけどけっこー使える．step inとかダメだから他のやり方したいけれど．．

utils.api
パラメタをarray内dictionaryに変更．適用順序をコントロールしたいことがあると思ったので．あとapiコール時に渡して, model
mapping時に利用するparamもarrayに変更．複数使いたい場合に対処するため．

utils.tool追加
今のところbrowserかき分けのみ．
add version to user agent string
Update release + javadoc
Fixes #3052 : allow multiple connections from the agents to the cfengine server
Merge pull request #6 from ncharles/bug_3052/dev/allow_multiple_connections_from_agent

Fixes #3052 : allow multiple connections from the agents to the cfengine...
Reverts 0fe52c3cca7db26306693c5fb0422af83cc2646a for atomic corrections of #3025
want to keep ebin, but not content
add crawler user agent support
add magespeedtest to crawler user agents, fix setting name typo
fix default crawler user agents regexes
fix googlebot and siege crawler user agent regexes
add label.error
add jquery.validation.js
Add validation on all forms
Added the screenshot for the snapshots preview.
Started tidying up the facebook auth logic and packing it away into modules and initializers
Started tidying up the facebook auth logic and packing it away into modules and initializer
adjusted spacing for hand/deck/discard
changing the display
Added JSON error details
Site updated at 2012-03-20 04:08:13 UTC
renamed container to planScreen
More settings stuff. Still a giant WIP. #16 #17 #21
Expose null records and make dimension references have default ids.

Dimension references will now return the default value which is the id
of the first null record of the dimension.
restassurred: unit tests updates, registering more resolver and algorithms classes :)
Raw notes from Bob Lee's Square talk.
Removed further unecessary package installation
Merge pull request #2 from olofsvensson/actorname2bean

Added actorName to UserInputBean, check for null actor in ParameterUtils
Put edna actor pack in plugin not fragment, otherwise you cannot
subclass it. Problem hit by Karl.
Merge branch 'master' of git@github.com:DawnScience/dawn-workflow.git
Added password ability for connecting ICat actors.
Test requires selection of perspective now.
Added close editors as problem with window count on windows.
Added cpsec to bring over test.
Merge pull request #3 from olofsvensson/py4j

Py4j
Site updated at 2012-03-24 17:50:39 UTC
Fixed dashboard update bug
Fixed dashboard update bug
fixed dashboard edit
Merge pull request #67 from openenergymonitor/dev

Dev
i18n update for josm plugins

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@28492 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
Add new Makefiles.
[COOK-1793] - use homebrew go script to install
consistent version heading
Autostart and pwm is up and running on the new software.
We have the same status we had before the port of the code.
Depend on railties, not Rails
removing non responsive styles
python cheat sheet date time
removed spec port from procfile
fix ignore to include test results
Merge remote-tracking branch 'origin/master'
just added action nav bar
refining search of users by address,department,institution ... when assigning roles see http://moodle.org/mod/forum/discuss.php?d=187894
Finish sign in
Finished user edit, update, index and destroy actions
Auto-update in interface
Chaged chacher loading to use ifstream instead of ofFile
push.default set to simple.
almost finished slides
Merge branch 'master' into gh-pages
regenerated
arquivo teste felipe
a few more phrases.
Major refactoring (common profiler, infrastructre namespace).
Code doc.
substituindo os 3 arquivos da lista colections
Add status reports to syncdotfiles
test case fixtures
debian fixture
fixes
added ohloh badget
[FIX] avoid mkdir errors if cannot create destination folder
Added ImageDownloader; RSS Reader without item.description; RSS Manager not save items on database
Corrects the ImportError handling for the override mechanism.

Fixes bug 973836.

Change-Id: Ide849ca230d1e07c7242268d32f06600e09c6746
Fixes lp978896 -- Session fixation security fix

Rotates session tokens on logout, and properly clears sessions
to prevent data leakage.

Change-Id: Id11054e852b8c8a386756e9de980cb5eff64f228
makes api return default endpoint types. fixes bug 994151

Change-Id: I409a5415ffeb21ea81ecf540caa2cd5ac3336d90
This is a backport which fixes the issue with images being marked public
when edited. This is fixed in Folsom by: https://github.com/openstack/horizon/commit/0b94c431ab8e510b5fd4e7d1e8719c7d2055fa0f

Fixes bug 988633

Change-Id: Ia22501c2a3daac7e84c10039dd5857612e5156f4
Change Instance to Image for image detail page.

Fixes bug 985844

Change-Id: Ifc442aa343079c4a332bbea4d306e4cdf700821a
Made quota names prettier. Fixed bug 979417.

Change-Id: Iaf87fa6d18d4c7c9309d1e60c3d8daf77f7ddfca
Merge "makes api return default endpoint types. fixes bug 994151" into stable/essex
Merge "Made quota names prettier. Fixed bug 979417." into stable/essex
Added instance name for volume attachment

Fixes bug 974916.

The instance is displayed in the same way
as it is in volume detail page.

Change-Id: I33ee44befa846767d5556bc56695306951414dc2
Added a new attribute - display_choices
to Column class, for substituting the
display value of the statuses provided
by Nova to some more meaningful ones
in the instance table.

Fixes bug 997374

Change-Id: I18560868435b4cbc42670e3fc9c0bc83ebf9fda4
	horizon/dashboards/nova/instances_and_volumes/instances/tests.py
Add tox.ini file.

Fixed pep8 run, which always return success. And one 1.1 pep8 error.

Change-Id: I2f1dd7c61b7fd0816bf7697f74e306d17f908fa5
Fix stable/essex (2012.1.1) versioning

Fix stable/essex branch versioning that should have been set to 2012.1.1
when the branch was first used (with FINAL=False). FINAL should be set
to True when we want to cut the stable branch release.

Change-Id: Iea07571b7b9175db1176ce629e325ee95947d8e8
Final versioning for 2012.1.1

Change-Id: Ibfd86df27c531ec2b3d0bb4b0a7feeef46a2989d
Merge "Added a new attribute - display_choices to Column class, for substituting the display value of the statuses provided by Nova to some more meaningful ones in the instance table." into stable/essex
Backport of Folsom Glance pagination review.

Fixes 981252.

Change-Id: I9506c0ffa6291ec490857d5afca3f20cce1c27a7
Merge "Added instance name for volume attachment" into stable/essex
Use publicURLs for generated endpoints for ec2rc.sh

Fixes bug 994297

Change-Id: Icbc0b3ca327d87754bac291b0d179faacdabc7aa
Merge "Backport of Folsom Glance pagination review." into stable/essex
Merge "Use publicURLs for generated endpoints for ec2rc.sh" into stable/essex
Merge "Final versioning for 2012.1.1" into stable/essex
Busybox patch update
adjust for omahaproxy site changes
Avoid site error on summary view if some scale generation have failed
updates to db settings
is this an issue with git?
Rowe.Luo
[sync] single quotes
chapitre 12
A better example with 100 spheres and 2 lights.
Fin sous-partie multithreading.
Fin.
- ProjectNewPage:
  Now checks changes of company_id ("Customer") and updates
  custers recursively
- Portlet Components:
  Now cashing the list of portlets per page
- Working on demo server configuration
- Project Nuke:
  Now includes risks
- User Basic Information:
  Fixed undefined variable in very special case
-- new function to return all parent_id of an arbitrary project
-- function searchs from level of project_id up to tree root
-- positioning search button
- Demo-Servers:
  - Fixed issue with Laura Leadarchitect
  - Updated Consulting logo
- Nuke Projcts:
  Fixed issue with programs
- Audit:
  Disabled ns_log Notice statements
- Working on demo-data
- Demo-data:
  - added new logo
- Demo-Data:
  Added timesheet.jpg logo
- Demo Servers
-- removed footer visibility:hidden and changed z-index
find last import or comment
Browser detection patch
Browser detection patch
Add better exception handling around issue creation.
Remove excess logging from create pipeline.
Add global settings for whether to delete unsuccessful emails or not.
Fix emails with bcc only being created.
problem with displaying form in user fixed
Add history_event vmethod signatures for simpler verification in 0.34
Remove globals - don't need them
Added openEXR
Added openEXR
correct Exception namespace
Changed exports names.
Changed callback convention.
Cleanup.
Bumped version to 0.1.5.
CB: CBOrderParser accomplished

modified: CBOrderParser: parser accomplished by callback;
modified: CBXmlParser: callback added;
modified: CBDishParser: callback used;
modified: CBOrder: method for adding disabled tag added;
modified: CBOrderXmlWriter: tag name changd;
Added new project WidgetAlaramManager and updated simpleWidgetExample.
First module - Get Billets

First comment without some verifications
Revert "Start to initialize plugin combiner.rb"

This reverts commit 2c9212197cafc37dd80aece7ccfde1c4bc27d979.
Update site style
Refactored @Confirmed annotation a bit.
Refactored @ResetAuthorities-related staff a bit.
ignore sublime conf & mac temps
Little example of Silex
Fix to find-to-set-alias.
Merge branch 'master' into sisconsultant
Set aliases for sisconsultant.
Remove posh-flow in favor of eventually adding in the newer git-flow.
Merge branch 'master' into sisconsultant
Shread comingled project files into /src/<Project Name> folder structure.
this does not belong here
use on/off vs bind/unbind
allow truncating in the middle of a 'word' - fixes issue 15
add emacs basic config
Site updated at 2012-12-16 22:57:31 UTC
reverted to original main info width
added right margin to nav
changing master list to have menu and editable properties, still in progress
menu bar shows in the inspiration list view, but the new and edit button are borken and make the app crash
Increasing support for weak references when available
Renamed database and table names.
cleanup site docs
Rebase from 'release/moveit_ros_planning' @ version '0.2.4'
Generated debian files for oneiric
removed url from emailsetting page and added TestDriverFactory methods
added my page and test class for registration
added maximize method in DFBasetest, updated registration test with verticals
added joda time in pom.xml and resolved conflicts
Merge pull request #40 from rsantander/master

autotester-82 - update to give cx option to specify env directly from test 
Merge pull request #41 from rsantander/master

autotester82 - simplified code
refractored email settings page and test class, removed all xpaths
resolved merge conflicts
modified registration page after John's code review
added send contract test and review contract page
fixed the linktext issue in D3CampaignsPage
Merge branch 'master' of git://github.com/demandforce/CXTestFramework into regsitration
Modified test classes and page objects for Campaign.
resolved merge conflict page and test classes and Pom.xml
Merge branch 'master' into contract
modified locators
added a verification point in dashboard page and initialized driver withing test method in RegsitrationTest
added contract page and sendEmailContract Automtester-75
 removed commented lines
added few user's verification in test
Working version of d3 interface. Magic. (woohoo!)
Made the graph display nicer. Mostly formatting.
Removed old files, formatted index.html nicely. More chart formatting (color of lines).
Site updated at 2012-12-12 19:14:03 UTC
Updated 404HTML
added support for duplicate merge in collection

also added unit test
Refactored GET request logic to single function.
Work on a simple cookie-based CSRF validator.
Add GL 3.3 history
task for university name and changes in job post views
Merge branch 'master' of ssh://github.com/sachinsystech/Hire-Routes-
Added Attention Name to address class. More was needed there to truly set it.
merge PINESH
Merge pull request #4 from saurabh447/sprint002_ps

merge PINESH
Config test now checks if a user exists in the database
Fixes #33
Merge pull request #38 from schubergphilis/issue33

Config test now checks if a user exists in the database
Stubs for now
New database version 3
Database model changes v3
Updating supporting utilities
Created an event selector
Merge branch 'notify' of github.com:schubergphilis/Seccubus_v2 into notify
Changed in README
What if I totally remove the subject of the comment
SPD: trying again...not sure why it works locally
Created podspec for current version
added .gitignore
added mediator app
pomの設定戻した
Adding a little parallel commands shell script to run both 'cake watch' and jasmine-node at the same time from the same term window without backgrounding annoyances
moving all specs into spec/
Updating specs to use wowtcg require
Actually making the package.json correct
Make sure to ignore node_modules so dependencies aren't added
Moving coffee files back into source so JS can live in lib
Updating specs to use src/
Changing .js to be just lib/
Updating the lib/ to src/ change
Fixing up commands for testing without running tests over and over again
Simplifying loading of classes
Specify runtime dependencies > 1.0 with 2 digits of precision

Assume dependencies follow semantic versioning best practices.
Example on moving data in list into the list view controller
Twitter Functionality Complete

There are a lot of UI issues we still need to fix but in terms of
functionality off of twitter we're good
Merge branch 'alex-ios'
Merge branch 'master' of https://github.com/sfu-innovation/WifiLocator
(Probably) finish utils module

Copied all of utils module functionality from original code.
Hopefully. I probably forgot something.
Solutions for pairwise communications tasks were added.
在家mac机器里面
家里机器
无
Add windows_service component to cmake finder
Merge branch 'master' of https://github.com/sidorovis/system_utilities
Merge pull request #3 from PavelNik/master

Add missing component in Findsystem_utilities.cmake
- Rendering routine now scales with bigger maps (i.e. ~9500 linestrings in ~40 secs), created progress dialog for the ajax call.
Removed locks to accommodate the synchronous changes from last commit
sample folder and file added
More explicit import/export
Go literate
Write much explanatory text
Site updated at 2012-08-01 20:30:04 UTC
added IDEA 11 support in branch idea11
#27 fixed NPE being thrown when beginning to write anonymous class
#30 fix renaming @should descriptions for IDEA11
fixed a bunch of syntax errors, made script compile
offloaded the loading of scripts into a child hex from the main rezzer script to a help script to prevent script sleep
removed the randomizing of questions because all child hexes must follow the same question order as the master hex

if we want to randomize, we will need  a seperate hex_multi_user quiz
script for the mother hex
1) replaced the way a child hex gets questions from the mother, 2) removed the remote_loader_helpers, instead, added necessary scripts to h

1) before the master hex would do all the processing to get next
question, now, just tell the child hex which question we are on, and the
child hex will use its scripts to get the question options from the
server
rezzer_platform script now successfully gets config and quiz data from mother hex
added ability for child hexes to rez children
created a helper script for loading scripts into other prims
new translations
Add html5_tags.php
Site updated at 2012-10-23 02:59:00 UTC
Site updated at 2012-07-28 22:43:27 UTC
Added slider admin bar
Update readme
Merge branch 'master' of github.com:solita/codecamp2012-warmit

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit each, respectively.
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   src/clj/warmit/server.clj
#
Merge branch 'master' of github.com:solita/codecamp2012-warmit

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit each, respectively.
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   src/clj/warmit/server.clj
#
hello Erlangga
Fixed a few little offset things.

Weird thing I noticed is that I though we were storing pointers in the Index_Node.  However, a pointer is 8 bytes, which would mean only 32 pointers would
fit in an indirect block, exactly half of the 64 we need.  Thus, you are right on storing block number, but it is really weird.