labofsahil/github-event-dataset-2012 huggingface dataset:
Adapt module common code to use the systemd journal if it's available
Fix comment in example config file.

The config file incorrectly mentions the --private-key-file flag.
Should be --private-key
Have ansible respect private_key_file option

The ansible command-line tool was ignoring the private_key_file option.
add import sys to virt module b/c it needs it if the libvirt python
module is missing
Fix postgresql_user bug

If I create a database from scratch and assign permissions by doing:

      - name: ensure database is created
        action: postgresql_db db=$dbname

      - name: ensure django user has access
        action: postgresql_user db=$dbname user=$dbuser priv=ALL password=$dbpassword

Then it fails with the error:

  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 565, in <module>
    main()
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 273, in main
    changed = grant_privileges(cursor, user, privs) or changed
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 174, in grant_privileges
    changed = grant_func(cursor, user, name, privilege)\
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 132, in grant_database_privilege
    prev_priv = get_database_privileges(cursor, user, db)
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 118, in get_database_privileges
    r = re.search('%s=(C?T?c?)/[a-z]+\,?' % user, datacl)
  File "/usr/lib/python2.7/re.py", line 142, in search
    return _compile(pattern, flags).search(string)
TypeError: expected string or buffer

This fix fixes the problem by not executing the regex if the
db query on pg_database returns None.
Install action_plugins
Merge pull request #1025 from dhozac/action_plugins-setup

Install action_plugins
make this python24 compatible
Merge pull request #1022 from skvidal/devel

add import sys to virt module b/c it needs it if the libvirt python
Merge pull request #1021 from lorin/config-key

Have ansible respect private_key_file option
Merge pull request #1014 from marktheunissen/journald

Fix regex that allows passwords to get into syslog, use journal if available.
Merge pull request #1023 from lorin/postgres-user-fix

Fix postgresql_user bug
Merge pull request #1027 from mcodd/setup_bug_python24

setup not python24 compatible in 0.7
Add package to setup.py
Line in file regexep should match a portion of the line, not the whole line!
lineinfile should use 'search' everywhere
Nike version.
P2.c
Move the position of the file impress.html to the right folder

Signed-off-by: David Aparicio <david.aparicio@free.fr>
fix the LockScreen.unlock() call in tests/head.js
init
Merge branch 'master' of https://github.com/davidpcruz/MSE-EAI.git
default war name
More developped example
Example and Tests Refactoring
Example Refactoring
Merge branches 'develop' and 'master'
MultiContext
MultiContext session beans repository
First Version Multi Context
Small Fix and Refactoring
Last Fix on Multi context
Merge branches 'develop' and 'master'
spell;path
Version 4.6.12
- added control inside REDIPS.drag.relocate() method - "from" and "to"
input parameters should be element nodes
fix removeClass`
js fb fix
repository migration

move my works from main repository
Add description and long_description to setup
more backbone-y
Get live preview working.

Also refactored some stuff into a Backbone collection,
even though I'm not using any of the Backbone functionality.

Still unsure how to transition to a true Backbone collection,
but it's cool to see that the by just programming my organization
tends towards what Backbone provides. I like being in control
of my persistence, so I may see if I can implement Backbone.sync
and do it myself so I can get to know a little bit more of how
it works.
Updating the config file to include the flag length for Skyrim, adding in the beginnings of the ability to read in ESP/ESM files, and adding in a test file as an example of sorts on how to use things in the current state.
main.js: changeDisplayLevel(): the secondary status metric is now the index-distance between the current element and the cursor. That way, we can animate status entries around the cursor.
main.js: remove comment outs.
テストの順番をシェルスクリプトと合わせてソートするようにした
ヘッダのディレクトリをatto_testからattotestに変更した
ライブラリ名をatto_testからattotestに変更

ライブラリ名をatto_testからattotestに変更
識別子やマクロのprefixもそれぞれattotest, ATTOTESTに変更
アサート用マクロのprefixをATTO_からATTOTESTに変更
256テスト/行書けるテストをリポジトリに追加しわすれてた
READMEの文面修正
Adding support for pen color and pen width by
added textobj-user (sorry for removal) and textobj-rubyblock
done issue #211 (fixed bug with scgpoint objects shape)
Updated gitignore because a few things slipped through
fallback to check_output() debugged
TEMP
Merge branch 'master' of https://github.com/deventio7/TM-Pulse
[log][view] search params
Tilausvahvistuksen vakioviesti.
Ylimääräiset veks!
Notice veks!
Notice veks!
Noticet veks!
Jos keräyspoikkeamien takia joku kolli jää tyystin tyhjäksi niin sendataan Unifauniin _discardParcel-veisti, niin ei jää turhaa kollilappua roikkumaan systeemeihin.
Merge branch 'master' into sami/logistiikka
footterit takas!
Merge branch 'master' into sami/logistiikka
Merge branch 'master' into sami/logistiikka
Merge branch 'master' into sami/logistiikka
Miniviilaus!
Mergetys!
Korjattu nappien toimintoja.

"Kohdista kaikki sivun rivit"- ja "Poista kaikki sivun kohdistukset"-nappien bugeja korjattu.
KKSTD: 123456 --> 999999 jos rahtisopparinumero puuttuu
Merge branch 'master' into sami/logistiikka
Debugia.
MH30 messiin!
Ei vähennetä rivisummaa xml-vaiheessa.
Debugit pois.
Tilkpl -> varattu, kun haetaan hintatietoja.
Querya paranneltu.
Korjataan kommentti
Tehdään lue dataa:ssa tuotepaikkojen lisäyksessä ja poistossa tapahtumat samaan syssyyn.
Merge branch 'master' of github.com:devlab-oy/pupesoft
Merge branch 'master' into sami/logistiikka
Monitoroidaan Kardex SSCC jonoa
Lapsiperhe fix
automated commit from dev@dmehta Thu Dec 20 18:00:02 EST 2012
automated commit from dev@dmehta Fri Dec  7 04:00:01 EST 2012
automated commit from dev@dmehta Fri Oct 26 22:00:01 EDT 2012
Moved finfo fix into the "use" statement.
Updates to the event-handling.

I don't have time presently to fully grok the event structure (and this module
will change anyway, when ZF2 CLI is working), so I've moved the asset
sending step into the application bootstrap event, which appears to work fine
for my current modules, and will probably work fine for most.
tests, plus bugfix for ToInt32/ToUint32
Printing now supports negative numbers.
Доработка методов сохранения данных подраздела.
Set nolist
--new team members added..reformatted the team page and boardpage..Added eric profile in board
--css added for region names
--boardmember eric description
Merge branch 'practice_level_integration'

Conflicts:
	urls.py
Merge branch 'practice_level_integration'
Merge remote-tracking branch 'origin/practice_level_integration'
Fix farmerbook urls
Merge branch 'practice_level_integration'
App Commit

--Made Spreadsheet that updates Person information on Google Spreadsheet
--Added Abort on Exception unctionality
--Uses server@dg for Google sign in
Merge branch 'path' into test_server_alt

Conflicts:
	base_settings.py
	urls.py
usr formdesigner
read from APP_CONFIG[:zxing_port] or use 7777
Added smsController
added charting resource for topic counts by date range
added announcement app, model, resource, and associated UI:  privileged users may add announcements (free-form content posts) to any event
vf_dlopen: bump version to 1.0; explain version use
uncrustify
Removed category from questions
modify goto itinerary button on results page
teste

testeeee
Rename sources and headers to match Google C++ guidelines
Rename sources and headers to match Google C++ guidelines
Remove driver.cpp
Add new librasterblaster classes
Remove main.cpp. It has been replaced by configuration.cc
Remove old driver.hh header
Move definition of Area and PRB_ERROR to utils.h
Update all files to use new function names, fix librasterblaster build
Remove old tests
Switch to libtool and fix library dependencies with automake
Add symlink to top directory to get automake to put the binaries in the right place.
Correctly check the output_projection pointer against NULL
Link librasterblaster.a against GDAL
input and output paths were swapped
Remove pixel_type parameter. The output raster will always have the pixel_type of the input raster
Keep a copy of the wkt pointer in CreateSampleOutput because importFromWkt modifies it.
Force BigTiff to support sptw parallel i/o routines. Remove unneeded Photometric interpretation
Beginning of parallel io demo program
glob the binary names in .gitignore
Change partition_count to partition_size
Added .git to ignore list.
dust clearn
[DDC-1807] Fix composer bin support and keep BC with PEAR installer.
Fix DDC-2079
Fix typo
Merge branch 'DDC-2079' into 2.3
add get_token_by_caller API call
Heap sort added
Juego e UI listo
remove output cache
repost html update
Closes bug 4458. Two new themes by <user name="anthologia">: Hazy Autumn, for Abstractia; La Mer for Funky Circles.
ChatArgument support in Translation API
Fixed CLRF
Revert "ChatArgument support in Translation API"

This reverts commit 18edbfe21ebb86601fa551c01112be0ee4158512.
Line endings, the 2nd
Normalize line endings again
Normal-normalize
Added Whitelist methods, moved MaxPlayers to SpoutConfiguration, moved Whitelisting into BanManager, added ban command, fixed [#SPOUT-86]

Signed-off-by: dredhorse <dredhorse@breiden.net>
first redo
* Fixed bug where auto annotator would fail when adding a new node.

 * All sorts of little fixes to make annotator work for non-admins.
Removed all the ridiculous stuff for default to unpublished and publishing on the 'Annotate' tab.
Mark all auto annotations as auto and deal with this in the manual annotator.
lingwo_korpus: Perform a sanity check on the HTML and Annotator before allowing the user to get started.
Fixes for lingwo_korpus:

 * The manual annotator now records revisions for each save.

 * Give correct error message if text is modified by another user while annotating.

 * Correctly preserve values when there is a validation error.
lingwo_korpus: Completely removed the 'Lookup Entry' link from the annotator UI.
lingwo_korpus: Hid the 'Type' and 'Missing' tools from the Annotator toolbar.
lingwo_korpus: Moved the sanity check into the Annotator object.
Merge branch 'master' into production
IMPORT (galehar): On click, unwield weapons of reaching instead of evoking them (#4581).
Removed identify, amnesia, and curse-related scrolls from most vaults and lua stuff.
IMPORT (kilobyte): Lua function crawl.dpr() to print messages in debug builds only.
[Lua] update luabinding for CCPoint, CCSize, CCRect
Made projects alphabetically sorted
Spellchecking is enabled by default, disabled for programming languages.
SOLR-2824: don't rewrite join subquery

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1337955 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' into rr
upgrade rubygem
初期ソースをコミット
add labels for all the tracking things
+Twitter OAuth Tweeting

Implementation of Tweeting through OAuth.

Configuration
------------

It is required that the user create an application with both read and
write access through Twitter Developer API and authenticate their
account for said application.  This information should then be stored
within the config file loaded with Phergie.

It is possible to hide a consumerkey and consumersecret, but I believe
that most users will have no problem with the current limitation.  Once
more basic functionality has been address, it should be modified so that
users have the option of using their own application, or one provided by
default.

* twitter.consumerkey
* twitter.consumersecret
* twitter.usertoken
* twitter.usersecret

Application
----------

PEAR module/extension OAuth is now required.  I am looking for advice as
to how you would prefer this requirement included.  I feel as though
requiring it when the user has not provided authentication credentials
would not be the best idea.  What would be the best way of making OAuth
a requirement only when specific configuration variables have values?

A new function onCommandTweet(); has been added so that users can !tweet
TWEET MESSAGE and send a tweet.  The user is notified on error, or given
the tweet back from Phergie.

Notes
-----

The four oauth credentials are private variables, but the oauth object
itself is public.  Since the oauth object belongs to $twitter, which is
private, this should not cause any problems with other plugins accessing
the data.

My experience with OOP is very limited.  Please note this when reviewing
the code.  I welcome any criticism and explanation for any of the
methods I used that you may have done differently.

I also fixed an issue where Twitter URLs were not being parsed correctly
for their ids.  Phergie will now respond with the tweet message of a
twitter URL linked within the chat.
cambios tabla
Merge branch 'help' of github.com:echappero/melicard into help
cambios tablas
cambios tablas2
updated grid text
new compressed stylesheet
Creating project 07
Made the delete user button less red and scary
basic voting ability working, not limited though and looks retarded
voting code abstracted in a module
DRYed up voting module
DRYed up views with comment_head and article_head partial
comments always in ascending chrono order, cleaned comment_controller
comment views very DRY now
readme and .blank? in comments/list
users limited to one vote per votable object, tracked using the relational database
cleaning up
voting bugs fixed, i.e. point default for articles etc
pluralize method implemented
editing/deleting capabilities on articles/comments available to their users
cleaning up
controller changes, redirects should avoid continuous loops now, and assigning seems unnecessary?
Added Rspec, removed Test::Unit, added some boilerplate validation tests
added account specs for making accounts, logging in and out
forgot to git add, no changes
basic success and auth spec tests for users, articles, and comments working
getting unit tests started
readme updated
Fix Controller in xml file
[maven-release-plugin] prepare release monophony-0.3.1
fittingation
Introducing entities with multiple keys and application model update
Removed accidental Google Analytics code inclusion
Down to 23 failures.
Remove support to ::, down to 16 failures.
Down to two protocol failures.
Ensure protocol is properly concatenated.
Remove automatic aliases from defmodule.
Add refer back.
Bump to 0.9.0, because that's what we are aiming for.
Compare all known compilation types
Removed userena and other un-needed stuff
Initial 3.7.2's jface text
Only set Server header in server-side of http pipeline
BUGFIX: filterByDone por padrão estava true
Ready to use as AMD Dojo Modules
creating this strong class to be a red one
set up drop down menus
Validate settings in digit specificity runner.
build.sh: added a script for building
Added a coment to generated files
need to see the error removed failing code
Changed URLs to point to the CDN.
Fixed the link to the missing speaker image.
Changed gaps to M'SS" format in results screen.
removing the private constraint on the title attribute for Fragments as this is not playing well with future scala versions
Add _selix suffix to test's configuration property if selix is enabled
Merge branch 'master' of github.com:ettoredn/selixperf
rubbish django
[VPost] Удален
Update Faye version
Update faye.
Fix issue with new version of faye
Fix for issue #2
updated to faye v0.8.2
Merge branch 'mmagnusek/master' into master

Conflicts:
	vendor/assets/javascripts/faye-browser-min.js
Merge branch 'gmanley/master' into master

Conflicts:
	faye-rails.gemspec
Merge branch 'jhicks/master' into master

Conflicts:
	faye-rails.gemspec
exclude faye js.map

* unused? also causes problem in the rails asset pipeline precompile
loger test fix
Fix build for GHC 7.6

The "bytestring" package shipped with GHC 7.6 rc1 is version 0.10.0.0 .
It isn't on Hackage yet.

In base 4.6, Prelude no longer exports 'catch'
Merge pull request #46 from joeyadams/fix-for-ghc-7.6

Fix build for GHC 7.6
Merge branch 'master' of github.com:snoyberg/http-conduit
Add eXo Parent POM
PLF-3192: Update platform.commons version
Change config.php Configuration Paths to point to abosolute paths for standard module

Hence make sure correct settings are loaded when used with different working dir.
Complete removal of ValidatorService & some of FieldTypeTools
EZP-19968: Fixed a mistake in host/port setup
add template dir
add some more defaults
Merge remote-tracking branch 'upstream/master' into l10n
Merge pull request #1165 from etiennesegonzac/sendtones

Sending DTMF tones while on a call (#406)
nit
Merge pull request #1148 from timdream/sms

Various SMS imporvement
Merge pull request #1162 from fabi1cazenave/l10n

[l10n] localize the 'Save' button in the Dialer app
de-dup the pending message
Merge pull request #1168 from timdream/sms

de-dup the pending message
Merge remote-tracking branch 'upstream/master' into l10n
Use curl on Mac OS X for xulrunner downloads.

wget is not installed by default on Mac OS X. This patch uses curl
instead, which is available.

See also: #967 #974
Merge pull request #1170 from janl/master

Use curl on Mac OS X for xulrunner downloads
de-dup the pending message; check for empty database
Merge pull request #1181 from timdream/sms

de-dup the pending message; check for empty database
Add internationalization support and spanish translation
Changed locale to spanish/Spain
Merge pull request #1130 from kanru/screen-power

Move screen.enabled/brightness to power manager interface
Merge pull request #1182 from Nachete/locale

Locale support for tasks app
Merge remote-tracking branch 'upstream/master' into l10n
Ensure navigator.mozL10n is defined before accessing it from buils/webapps-l10n.js
Merge pull request #7 from ochameau/mozl10n

Ensure navigator.mozL10n is defined before accessing it from buils/webapps-l10n.js
Dialer->Contacts Delete/Destroy contact button fix
Dialer->Contacts Delete/Destroy contact button fix
Merge pull request #781 from pivanov/master

Contact destroy button
Merge remote-tracking branch 'upstream/master' into contacts-work
Implementing the contact destroy feature
This part of the browser_sms_new test wasn't bringing anything since the sms isn't added to the dom in the B2G desktop build.
Typo fix: change CallHander to CallHandler
Add Arabic keyboard to settings
Update screen element when homescreen loads
and allow removal of event listener when screen is turned off.
Merge pull request #791 from timdream/arabic-settings

Add Arabic keyboard to settings
Merge pull request #793 from timdream/update

Update screen element when homescreen loads ...
Merge pull request #790 from etiennesegonzac/contacts-work

Contacts work
Remove extra onload event listener (my bad)
stick to mrbkap's latest patch
Merge pull request #797 from timdream/update

Remove extra onload event listener (my bad)
the connected network should be first on the list
temporary 'isConnected()' function
prevent 'undefined' identity on first authentication try
Merge pull request #798 from fabi1cazenave/wifi

Wifi -- update to match mrbkap's latest patch
merge with upstream/master
Increase default HTTP/Conduit timeouts to 5 minutes

Summary: Realistically, some operations are pretty slow. These conservative timeouts don't actually help with diagnosis or troubleshooting (a hang vs a timeout tells us nothing useful, really) so bump them up to 5 minutes.

Test Plan: Read carefully.

Reviewers: phleet, vrana, btrahan

Reviewed By: phleet

CC: aran

Differential Revision: https://secure.phabricator.com/D2602
Exposing stateWriteComplete in HTTPFuture to allow for more robust asynchronous http request solutions.
Merge pull request #16 from indiefan/master

Exposing stateWriteComplete.
fakhar khan versioning
modify terminal title
Merge branch 'master' of github.com:false-git/dotfiles
Fixes bug described in issue #58:

Now Monitor will prompt CarbonTarget to recalulate targets if any
countries have lied about their carbon output.
Merge branch 'MonitorBug' into development
Added logic so the US creates new buy and sell offers when it's a part of the Kyoto Protocol
Merge branch 'group4' of https://github.com/farhanrahman/kyoto into group4

Conflicts:
	kyoto/src/main/java/uk/ac/ic/kyoto/roguestates/USAgent.java
	- some function alteration conflicts fixed
Define struct ip6_opt for Mac OS
Readme.md temporarily deleted
add super basic test framework
collection spec
load templates synchronously
basic app spec
use runner instead of raw app
simple name test
Merge pull request #26 from firefox007/master

Reconstructed Filter, Listener test structure
add reorder log
toString -> getValues	(DTORenderer)
布局类updateDisplayList()时遇到空数据直接return没有设置contentSize的问题
Split bopen and bclose from makebuf
wenn ein bild einem dokument zugewiesen wird und ein gleichnamiges .txt file im selben ordner vorhanden ist, wird nun automatisch dieses txt file als text zum dokument gespeichert
in der lieferungDetail form wird nun auch der dokument text berücksichtigt/automatisch hinzugefügt
Fixed markdown problems in README
Cleanup code. MIME support 2.5
Remove html2text for preview
New search GAL provider: CardDav
changed to template for html escaping
Stripped out Mechanize code. Now dependent on Gem. Requests are broken, though
Playing with Mechanize
Mechanize v2.5.1 POST / GET requests working
Basic http concurrency
Basic working usage of celluloid inside module. Response handling not included
Response handling implemented through procs.
phpMyAdmin brute force + finder modules threaded. They appear slower, though.
Commiting some tests
Added basic pooled_req functionality
Wordpress username and password enumeration modules
Add a StaticPages controller
added rspec tests for static pages
Refactored to include template (application.html.erb)
added about.html.erb
Fix regression in b7ff8454064e5

lxml.etree's namespace handling really does make simple things
difficult :-/

Also changed to apparently more modern string formatting syntax.
gh#39 Make case name obvious h1 title on case pages
Resolved assignment 5
Fix filenames with ampersands, spaces, etc
Fix emails from people who don't have a full profile
Ajout du moule, projet 1, projet 2

Bon,

Le projet 1 est pas mal terminé, vérifie que ma démonstration est
cohérente. Pour le projet 2, j'ai intégré le code matlab et inséré un
guide d'utilisation. Sinon, copy and paste les matrices obtenues... et
les milliers de tableaux,
Fix a log messsage
Lots of changes, preloader, better scene management, base objects and updated styles
Fixed daylight savings bug

* Fixed a bug that occurred when daylight savings kicked in
* Fixed the context menu from appearing in opera when buttons clicked
* Changed the messages that get displayed when mouseout of datepicker
* Updated CSS to give stronger highlight to selected cell
12 Nov 2012
13 Nov 2012
13 Nov 2012
Replaced ibus bridge-hotkey with Meta.binding and use libgnomekbd.
Released 3.3.3.20120203
Released 3.3.90.20120308

Fixed API errors with gnome-shell 3.3.90
Integrated preload_engines and preload_engine_mode
Released 3.3.92.20120327

Fixed switcher to fix shell_get_event_state with gnome-shell 3.3.92
Released 3.4.1.20120424

Fixed meta_display_add_keybinding for gnome-shell 3.4.1.
Fix trigger keys without modifiers.
Renamed ibusPanel.js.in to ibusPanel.js
Added global-capture event to handle Control+space on shell entry box.
Fix Control+space+space on shell.
Fix trigger_shift dconf value not to save non-modifiers trigger keys.
Fixed Fedora dependencies. ibus-gjs requires ibus-xkb.
removed client stuff fo rnow
modificando o arquivo .jse treinando outros comandos - proximo passo: looping e criacao de html
bumping steadymark version
using latest version of steadymark
fixed check & added test
fix
fixed test to not fail using ibm jdk
rewritten as requested
Updated readme to read better
raise a special error, to differentiate from in-app timeout
send 504 and 10-second refresh on timeout

Instead of sending an exception up the call stack,
 * send a 504
 * have the user's browser refresh in 10 seconds
 * show the user an adorable fail whale
user-definable timeout reporter

Allow the user to define a lambda which will
be used to report when a timeout occurs. By default
the rack env and the exception will be inspected
and sent to STDOUT (this could be done much better).

Here's an example of using a custom handler to report
occurrences of timeouts to exceptional.io:

Rack::Timeout.reporter = lambda{|exception, env|
  ::Exceptional::Catcher.handle_with_rack(exception, env, Rack::Request.new(env))
}
ability to specify custom error page and title

Rack::Timeout.error_page = 'http://cdn.example.com/504.html'
Rack::Timeout.error_title = 'We're sorry :'-('
remove support for ruby 1.8 and rails 3

sorry.
Don't inject middleware in Rails apps

and documentation improvements
dfvd
Merge branch 'master' of github.com:gatmanmihai/travel

Conflicts:
	config/_database.php
Following working...
Made the index, added logo/email images and updated README
add top,down direction for bullets
Tweak $inc code
explosion quand sur-régime
Merge branch 'master' of github.com:geenux/StartRacing

Conflicts:
	src/game/GameScreenState.java
linux: generating Position Independent Code (PIC) by default (see src/makedefs)
Fix tests for update to DB Model

These tests now expect that the Board and Tile models are associated
through the Advertisement model instead of directly via a foreign key
in Tile.  All tests should pass appropriately.
Merge branch 'test-models'
Fix ouverture boite jour passe ou futur
inchi: Add static-libs USE flag
code is changed to be more similar to the code in beta branch
Merge branch 'master' into multidirs

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java
1 more fix in unzip code
version number => 1.4.6
Merge branch 'master' into multidirs
more debugging information
images support in native code (in progress)
RTF images (in progress)
RTF images (finished but not tested yet)
- debug printing
RTF images support: finished
Merge branch 'master' into native

Conflicts:
	jni/Android.mk
html support
Merge branch 'master' into booksdb
updated TODO
Merge branch 'master' into booksdb
set maven output to --quiet
Update ZeroRatedMobileAccess and MobileFrontend to master

Change-Id: Ia88898958ef2cb434962344d1be254c1e5c905cd
Update extension E3Experiments to master

Change-Id: I3e1fb195d7ed90fb37f20bf9e001a112a7f7aedc
[FileRepo] Fixed purging for "short style" thumbnail names.

Change-Id: If63b4c609b7bc43cda658cb87abe59562b335c69
Better parsing of hub messages
Capitalized Lantern exe name #236
Merge branch 'master' of github.com:getlantern/lantern
Tweaked to do more lazy loading of settings for easier offline testing
Had to reverse compile my own code since windows went bananas
added results tar.gz
Log4j XML file added
1アカウントの複数キャラクタに対応、所持金、次の経験値の取得に対応
this solves the unsortable table problem
Inserting colorscheme: hybrid
Removing python-mode and inserting vim-flake8
Removing python-mode configurations
Configuring flake8
load tree from JSON
Fix method
Call Actor's publish_feed callback after commit
Activities from entry
some fixes and add bg
renice the config
Media paths fix
returning more meta data when uploading an image.
Events single page

* [fix bug 761558] Add single event page.
* [fix bug 761547] Display flickr photos.
* [fix bug 761548] Display tweets.
* [fix bug 761567] Attend event button.
* [fix bug 761568] Display events in user profile.
Events single page

* [fix bug 761558] Add single event page.
* [fix bug 761547] Display flickr photos.
* [fix bug 761548] Display tweets.
* [fix bug 761567] Attend event button.
* [fix bug 761568] Display events in user profile.
Implement /events page

* [fix bug 775027] Events API
* [bug 761553] Implement /events/
* [fix bug 761554] Map on /events page.
* Customizing the site title
* Customizing the site logo
* Customizing the page title of every page; appending the site name to each page title
* Reducing the font size of the tab text to 20px
[Fix] Coding standards
Redone sign-in pages
Merge branch 'master' of github.com:gobelins/templates
new file:   .Xmodmap
new file:   .xbindkeysrc
+ Added a flag allowing a section to be written into both .dbg and executable files. This is needed at least for ELF SHT_NOTE sections.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22614 3ad0048d-3df7-0310-abae-a5850022a9f2
Fix for age-old time zone issue as proposed by TheConstructor
this version works!  Needs formatted date though
updated __version__ and __status__ strings and references to the version number.
Merge pull request #581 from gregcaporaso/160-release

updated __version__ and __status__ strings and references to the version...
Multiply lines compatibility
Merge branch 'class' of https://github.com/gridsane/SimpleOCR into class
GROOVY-5571: small change regarding the OSGi problems (use lazy for the bundle activation policy)
Contact existance and photo appearance controlled via CSS classes.
just ui
use cc files already in tree (no need to copy)
adding support to add labels to issues without using edit - http://developer.github.com/v3/issues/labels/
this is the result of running 'node generate.js -v 3.0.0'
Updated .gitignore and added a lot of content to the README.md file.
just a little test for the static property stuff
integrating droidtn and k9mail
Use Unicode on PDFObject.s for CJK metadata 

As a Chinese user,
I want Use Unicode to store PDF metadata,
So that I can read a Chinese Title&Author...

Not so familiar with coffeescript re-organize may be required
AMMEND: forgot to add the specs to last commit
Playlist should have a scoped name.
Merge branch 'master' of github.com:hasgeek/hasgeek.tv
Using baseframe_js instead of local js
Ignoring baseframe asset cache. Incorporated Contact Point Web Socket Support in the Sponsor Kiosk Page.
Merge pull request #17 from miteshashar/master

Sponsor Kiosks WS working.
mac eventlog: open in a less obtrusive position
windows setup: fix typo
eventlog: move some logic to controller
addBuildsetForChanges rewritten as inlineCallbacks
Temporary support for only the first sourcestamp
Class methods replaces by dict.get() method
addBuildsetForChanges restructured
Test if sourcestamp is generated if <scheduler>.codebases does always have a branch or revision entry
Test if failure occurs in scheduler when changes contain 1+ codebases and scheduler has no codebases defined
edit comment block in rakefile
Update vimrc to use size 12 font, and dark background, in gui mode
add function to get http content to std::string, remove useless files.
fix a typo in data URI encoding
Add trabalhos relacionados, lvm, outros
Test Gist with external resource
got the inpogress experiment to flush output like crash count at end of simulation
have simulations end after a certain number of ticks
Roll back. Padding-top must 60px
"Child[name] == divider" for a divider
Change default page to project/all
project detail page
utvrdi broj usera za db seed operaciju
Mumet

oke
Angular files & directory structure

Adding Angular files, creating directory structure
Added a chapter about the new smbtamonitor concept and
smbtamonitor-cli
win32: close zmq-signaler-port-sync event object to avoid handle leak
Change fileowner :)
Update link to Hoa's logo.
[auto] Merge from Compiler

    • #c02e9c5 — Update link to Hoa's logo. (Ivan Enderlin, 2012-12-16)

---

Merge remote branch 'library-compiler/master'
Import disjunction for all realdoms.
[auto] Merge from Realdom

    • #5d132c5 — Import disjunction for all realdoms. (Ivan Enderlin, 2012-12-03)

---

Merge remote branch 'library-realdom/master'
Remove the Android_Server reference causing compile failures.
first commit after fork

fixed default admin section does not display by coping squared theme admin to default theme
Merge 'branch_v2_6plus_2613' into master via cherry-pick.

Add limits on how fast held glideins can be released. And how often; if released too often, just remove them. Moreover, glideins that have been released several times are released slower than glideins held the first time
Fix regression problems
Fix regression problems
Remove duplicate
Merge pull request #1 from honghu91/master

ok
ok
合并冲突
1. fixed to auto refreshing second level of projects listvew when add new project
Some reordering.
Merge branch 'master' of https://github.com/hpRamirez/db-class
fix for invoking agenda on dates and tags with mouse double-click, fix for ># '' comparison
* 修正了新建task没有关联到当前登入用户的错误
* 拿掉了protect_from_forgery，因为这会导致AJAX时session被重置，但是更好的做法应该是在提交ajax时带上token，而不是拿掉protect_from_forgery
Finishing up 2.0
Finishing up 2.0
Fixes support for replacing functions inside one-line for loops
Adds replacement for identifiers in the for loop initializers
Ignores subscripted functions on objects with no apparent keys
Adds better handling for the .call() function in a switch
Some small fixes
Some checks for strange cases
Adds nested switch case support
Revert "Some checks for strange cases"

This reverts commit d597ecb8bc1b788c6e2498bfe2d8b30fe9112ad6.
Adds some checks for strange cases
Adds nested switch case support
Fixes handling of extra semicolons
Adds some fixes for passing ?: and using safer variable names
Finishes fixing unsafe variable names
Fixes replacing identifiers inside library switch statements
Fix #69 Solucionado el problema de las colisiones fisicas.
Add action buttons and log view
Solr split work on query bug fix. http://ruby-china.org/topics/4657
Adds solarized for mutt.
mutt: tagged mails are now displayed in yellow.
vim: autoformats mails.
mutt: adds mailcap.
Ignores .mutt/certificates from now on.
ignore hxflyer user data
commit from hxflyer
Rename functions and reorder arguments within `path.clj` for clarity.
image extracotr
Merge branch 'master' of https://github.com/hyeonmi/NewsHolder
additional calculations for easy mergeing of parts
Merge branch 'master' of github.com:i3games/Pooooooong
add metadata to docs
hide Garaza entries if there are no arrivals
use ' to denote minutes
premiere version du rapport (part I)
- added mission and sponsors page objects
- added new tests for navigational bar
update: return the instance after decode
adds commit on the header part of controller mobile
Added allTypes() method to Context, as well as a working copy of varNameCollisionP()
Updated the TestFiles project for better testing conditions
Updating to reflect TextSpan
Added IPrecondition, IPreconditionResult, and implemented LocalNameConflict
Updates to the Precondition and Result interfaces
Small rewording in Rakefile
Added a formatter for displaying dates as "time ago"
Parameterized the "time ago" formatter
Adding an init.d template
updated to Bootstrap v2.0.2
Report more info regarding flipping to the INPageView.
added the view config paramter under the form service in order to define a custome template/view to be used when rendering the contact form
Merge pull request #5 from hostingnuggets/master

custom view/template for contact form
hkajshdfkajshdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merged two messages…..
alt text für bilder
rss anpassungen
	modified:   app/views/goldencobra/articles/show.rss.builder
Doc 3
modified:   app/helpers/goldencobra/articles_helper.rb
	modified:   app/helpers/goldencobra/articles_helper.rb
Merge branch 'master' of github.com:ikusei/Goldencobra
added support for getting and storing old input.
Grey's anatomy - Season 1 Full - ENG/01-A hard day's night.srt -- we can parse this now
Ignoring Gemfile.lock
Version bunp
updating copyright again to include imagesnap
[feature/revisions] Initial schema setup

PHPBB3-10755
[feature/revisions] Schema for develop/create_schema_files.php

PHPBB3-10755
[feature/revisions] Add local moderator permission

PHPBB3-10755
[feature/revisions] Add config setting to ACP Post Settings

PHPBB3-10755
[feature/revisions] Added constant for revisions table

PHPBB3-10755
[feature/revisions] Fixed typo in constants.php (thanks t_backoff!)

PHPBB3-10755
[feature/revisions] Fixed schema, save revision on edit

PHPBB3-10755
[feature/revisions] Added revision-related objects and page.

I create a page called revisions.php because I could not decide on
a better place to put this. viewtopic.php is the next best if we
prefer that instead.

PHPBB3-10755
[feature/controller] Remove extraneous language entries

PHPBB3-10864
[feature/controller] Don't use $user->lang() before container compilation

PHPBB3-10864
[feature/controller] Remove unused language strings

PHPBB3-10864
[feature/revisions] More work on ACP module

PHPBB3-10755
[feature/userdelete] Allow user to delete own account

PHPBB3-9621
[feature/userdelete] Fixed pesky syntax error

PHPBB3-9621
[feature/userdelete] Email the user when account is deleted

PHPBB3-9621
[feature/userdelete] Fix up some acp delete queue stuff

PHPBB3-9621
[feature/userdelete] Redo some logic

PHPBB3-9621
[feature/userdelete] A few coding structure changes

PHPBB3-9621
[feature/userdelete] Miscellaneous code format changes

PHPBB3-9621
[feature/userdelete] Log deletion for admins and users

PHPBB3-9621
[feature/userdelete] Reword some language strings

PHPBB3-9621
don't try to notify flowdock if config is missing
Release 0.0.6
add recaptcha to inquiries form
fixed parameter handling
Merge branch 'master' of github.com:ipa-fmw/cob_driver
Merge branch 'review-ipa320'
modified joint_config for overtray so that they hold joint_limits (soft_limit)
merge with ipa320
some simple arm_joint_configs for testing
new sdh_mount arm_joint_configuration on dashboard
merge with ipa320
Merge pull request #37 from ipa-fxm/master

new arm_joint_configurations
add sdhmount position for all lbr robots
rename eyes to head
Merge branch 'master' of github.com:ipa320/cob_robots
Merge remote branch 'origin-ipa320/master' into automerge
Site updated at 2012-04-08 15:37:05 UTC
Remove IDEA settings
Remove IDEA project file
Restricted editing access on users and edited  user index
Mods in header/footer links, added admin+bio migration, did not rake
Adding assets for Heroku to work
Finished userdestroy/admin, bio, indexing
Merge branch 'augmenting-users'
it was necessary
Finished augmenting users, for now
Merge branch 'augmenting-users'
Fixed CC automation for bus effects...  That was easy...
- make registration form a bit nicer.
- Store location of street view, not working yet...
- towards objectifying room offer
- changed loading of dev models to use SnakeYAML directly instead of Fixtures class of Play!
- fixed width of input fields in search form
- changed position of Registration button
- added street view to dev model of Knöbelstr. flatshare
- changed default zoom level for maps when displaying an offer
- fixed age slider
- added date fields to offer
- added a search box to the start page
- fixes on date fields
- changed form layout
- changed start page
- added date periods to dev models
- changed toString method for RoomDetails
Merge branch 'play_port' into objectified

Conflicts:
	app/controllers/Offers.java
	app/models/user/RoomrUser.java
	app/util/DevelopmentModelDataLoader.java
	app/util/SnakeYamlDevelopmentModelDataLoader.java
further merging

- implemented method stubs for repository remove methods
- removed setting of flatshare at non existing public field
added objectify room offer repository skeleton
read sc.ini again after command line processing to get architecture
specific settings
swapped Environment32/Environment64
renamed "section" to "envsectionname", added comment
renamed parameter in declaration
sc.ini/dmd.conf: use DFLAGS from architecture specific environment block
fix build due to merge issues
Add @attribute syntax.
Add tests for the @attribute syntax.
Disallow the @2+3 syntax for UDA.
2nd fix for Issue 9124 - Object variable of variadic template struct needs explicit "this" in certain situations
fix Issue 9143 - template structs with two parameters confuse DMD on multiple instantiations
Remove empty newlines.
fix Issue 9153 - Type inference for array of delegates should not break based on order
fix Issue 5204 - Inherited out contract requires lvalue result?
Merge pull request #1378 from 9rnsr/fix5204

Issue 5204 - Inherited out contract requires lvalue result?
Merge pull request #1365 from jacob-carlborg/uda

Add @attribute syntax
account for change in meaning of const and immutable fields
remove dead code
fix lookahead for UDAs
fix Issue 9162 - [tdpl] Non-static structs should have access to outer lexical scope

Calculate StructDeclaration::isnested lazily.
Tried to handle large input. Failed. Why? Want to get second opinion. And fixed typo.
Nightly Commit. New UI finish at 99%. Fixes numerous bugs. Includes all original functionality and more.
fixed comparator assignment anonymous function to use arguments and check param length rather that the misleading 2 param definition
make FeatureCaching::Cache not convert all keys to strings to reflect what a more stupid cache could do -> use .to_sym on all keys called on cache

also made all the .where stubs return what is actually coming back from AR: a feature with a string symbol
Merge pull request #26 from grosser/swappable_backend

make FeatureCaching::Cache not convert all keys to strings to reflect what a more stupid cache could do
move .rvmrc to .rvmrc.example; ignore .rvmrc
Removing a bunch of tabs and spaces in empty lines of yaml files, making Ruby 1.9.3 happy.
If lib/endorsed included add it to vm options
database
print
edit README for noticing this is NOT mine
Added changes to from.dfs in order to let rmr2 communicate with Lily: http://www.lilyproject.org/
Converting dao to use jpa.  Configuring persistence.xml with hibernate and H2.  Generating default guice module with autogenerated daos.
verbose
fixes and logging info
forgot /dev/null
moved version back to 1.8.6 since it was unnecessary to upgrade it
7.6 Exercise 2, Listing 7.31. Bunch of tests for errors.
Oops. Removed password presence validation in user model in accordance with 7.6, exercise 3, to prevent duplication of password error message on blank signup.
Listing 7.32, tests for the post-save behaviour in the create action.
Listing 7.33, flash ERb in the site layout using content_tag.
initialized UMS project
Added code for ospfs_read and allocate/free_block
Gearing up for 2012
Attitude calc algorithm partially mapped to hardware
Merge branch 'master' of github.com:jctemkin/quad_fpga
Attitude hardware roughly laid out; math still needs tweaking
worked on regfile, fifo
Organized tests.
Don't lint 3rd party JavaScript.
More work on arrow functions.
JSHint file and updates.
Fixed a few compiler warnings and fixed a bug caused by the dev console
that was preventing mouse input from getting past the GUI (even when it
was invisible).
output data for nyree to fix
minor changes
set up the new herbarium table
remove an extraneous comma and add the missing )
Update rdio.gemspec
Added resharper cash to git ignore
Updates Dragon for the ease app.
Merge branch 'master' into site
Dump foreign key constraints by default when using the schema dumper extension

Using the recently committed foreign key parsing support, make the
schema dumper dump foreign keys by default.  This is not just as
simple as using foreign_key calls.  When you dump foreign keys, you
need to make sure that you dump the tables in topological order,
such that referenced tables come before referencing tables.  You
also need to handle circular dependencies, where table A references
table B and table B references table A.

This patch does both.  It handles circular dependencies by breaking
the easiest dependency by skipping its foreign keys, and then
adding the skipped foreign key constraints manually at the end of
the migration.  However, such migrations can probably not be migrated
down.

Because you often don't want to set up the foreign key constraints
until after migrating data (similar to indexes), add a
dump_foreign_key_migration method for dumping just the foreign
key constraints as a separate migration.  Unfortunately, such a
method cannot be migrated down.

while here, make sure that the dumped down migrations do things
in reverse order of the up migrations.  This wasn't important before,
but is definitely important now that foreign key constraints are
supported.

Currently, foreign keys are not dumped if you are skipping the
dumping of indexes, because foreign keys pointing to non-primary
keys generally are required to be pointing to columns covered by
a unique index (or constraint).  You can override this if
necessary, but anyone dumping indexes separately should probably
dump the foreign key constraints separately too.
Add a new git config section for switching branches
Add git aliases to quickly switch to development and master
Add 'pry-nav' shortcuts to the pryrc file
When removing a branch, remove the remote and/or the local even if one of the two doesn't exist
Add a plugin for local config settings not appropriate for the main repo
minification tweak
updated offset error for combined file
Filter dups from path
Updated with clean working copy.
Fix typo in documentation
Merge pull request #26 from mattonrails/patch-1

Fix typo in documentation
This change introduces a new naming scheme for the stats collector but also allows the developer to provide their own if they want.
Initial capability to do dynamic topology.
Reorganize tests to support Multi Dempsy testing and add more tests for Dynamic Topology.
working dynamic topology.
Fix assets in production (make them lazily compile)
Pokerbot now responds to !roll in PM
Return the content of the first file found

At the moment the backend continues through the loop and returns
the content of the last file it encounters. This is opposite to the
way that hiera works for other things.
in-place erase & stuff
wrap var lookup in parens, fixes #17, also tweak express integration
move ld/rc/prereq.ctl to new location bld/rcr/rc/prereq.ctl
try to fix inventory chart
Ability to fetch tweets from TweetPlaces and have them locally stored
Rename strict_parameters to strict_requirements

To match https://github.com/symfony/symfony/commit/4b521985f121be25360365e2dc7a36645daa26b1
merged branch benlumley/patch-1 (PR #382)

Commits
-------

ef7300e Rename strict_parameters to strict_requirements

Discussion
----------

Rename framework.router.strict_parameters to strict_requirements

Doc update - to match https://github.com/symfony/symfony/commit/4b521985f121be25360365e2dc7a36645daa26b1

and

https://github.com/symfony/symfony-standard/commit/6e3f568d0ace2fe674feb6e8b64e7b43aff7a0ca
updated deps
plotting refactoring
plotting refactoring
plotting refactoring
Auto-update: 30-Apr-2012 17:41:04
Auto-update: 26-Sep-2012 16:38:10
Extract CLI classes to separate files
fixed global "opt" with proper import (scipy.optimize)
Added HostAdmin
clarify the fast part
Removed main_win32.glade (no longer necessary)
Cleanup some the titles and names in the Gui
Set MS1 reboot geterror timeout to be 200ms instead of 100, as slow windows boxes end up getting stuck in the bootloader occasionally.
Fixed incorrect limits on ms1 sparktable for trim angle
Added stripchart accell dohickey to ms1 accel wizard tab as per user request
tiny tweak to hte builder to spit out hte actual filename after renaming
Created new Interrogation profile for MS2-E 3.2.1
Got 3.2.1 detected and new RTvars/text/statu's working.
Renamed glade file to make a wee bit more sense in this senseless universe
Tweaks/new files for MS2-E 3.2.1
Fixed sporadic deadlock due to bad threading semantics. Replaced by less bad threading semantics....
Bump copyright spans to include 2012
Added some code to POSSIBLY do windows overlapped IO for increased performance
Cleaned up this fugly windows code....
Enabled S12x verify by default (hardcoded on). Don't send S0 records...
Added tpsaccel to ms1-e accel wizard
Actually make verify errors go to the mtxloader display instead of Stdout which may be invisible if using the gui tool
Merge branch 'master' of github.com:djandruczyk/MegaTunix
Better output from loader..
Better messages on verify failures...
fixed shit
Merge branch 'master' of github.com:johnliu/07.21.2012
did nothing
Changed status line colours to something more readable
Change status activity display
made few changes with graphs

made sure that these graphs show up correctly on every screen
added JotView view and Jotalog collection
change index welcome
Add Remove Trailing Whitespace to Edit->Line menu.
don't close if socket is nil
test commit
Update formatting
Further code beautification
Add MathJax support
Added buildings removed spawn positions
done writing ListGraph
fixed up lexing of -