labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #1 from bergie/master

PSR-0 autoloading support
Set attributes to correct object
Add link to demo site
Merge branch 'master' of https://github.com/bergie/createphp into bergie-master

Conflicts:
	README.md
	src/openpsa/createphp/arrayLoader.php
Cleanup mess from automerge
Re-apply change that got lost during merging & correct to oversights
Fix some more typos
Move to new namespace
Use lowercase here, since that seems to be the convention
rename folder as well
Some renamings that were missed during the first round for some reason
Fix some more oversights
some leftover fixes from the psr change
Add some more simple unittests
Add another simple test
Begin adding controller tests
renaem RdfMapper interface to RdfMapperInterface
Add two more tests
typo fixes
Merge pull request #3 from dbu/rdfmapperinterface

renamed RdfMapper interface to RdfMapperInterface
Create table prefix and connection with that. Works
Add * prefix to voicemail extension 4000. For *97 change the variable used to identify the registered extension. CDR use domain_uuid if it has been supplied.

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@2661 e2954ef0-caed-11de-bd98-e341d93cc3cc
Resoves Issue 310. fixed eavesdrop, caller id name/num, added agent listenting to table. 

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@2801 e2954ef0-caed-11de-bd98-e341d93cc3cc
Add missing column to domain_uuid to v_user_settings

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@3059 e2954ef0-caed-11de-bd98-e341d93cc3cc
Update cidlookup config so that it is configured to use the fusionpbx contacts.

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@3060 e2954ef0-caed-11de-bd98-e341d93cc3cc
-updated xml to /discovery/sound_group
-added flat/sharp toggle to piano_composition-activity
-added 4 easter eggs to piano_composition activity
256 color option for tmux and vim
too many changes
added new build variant, compress

build stylus with compress option
Merge pull request #11 from samuelmesq/master

added compress in build options
Fixed a typo.  "Does not" of course
total_seconds -> seconds for 2.6 and earlier
Refactored flask.ext process to not swallow exceptions on weird Pythons.
Parentheses are for Python3
This will be Rakija
Bump version number to 0.8
This is 0.9-dev
Prepare for an 0.8.1 release
Fixed an issue with an unused module for Python 2.5 (flask.session)
Merge branch '0.8-maintenance'
Removed a newline
Added support for anchor link generation.
Merge branch '0.8-maintenance'
Added PasswordField in docs/patterns/wtforms.rst
Merge pull request #333 from kracekumar/master

Added PasswordField in docs/patterns/wtforms.rst
Added a newline
Subscribe to signals with extra kwargs in the docs
Mention that people subscribe with **extra.
Merge branch 'master' of github.com:mitsuhiko/flask
Changed logic for debug level log settings
also set post_max_size
checkout from git
use precise to video tools
Parent opacity bug updated.
不断开发中

不断开发中
Génération de pdf pour l'impression
Merge branch 'master' of github.com:blemale/VisedSIM

Conflicts:
	VisedSIM/src/main/java/ecn/pappl/visedsim/view/ConfidentialProjects.java
Add gvim specific options
0.04 README
can output deltaZ
Merge branch 'master' of github.com:bnowel/NodeWorld
Send the right message back to the clients
コメントをわかりやすくした
もろもろ修正
PHP の記述を追加
Don't show loripsum on 'users' page. Fixes #66.
fix double luthercollege at bottom of login page
spelling
Merge pull request #185 from hostmaster/master

spelling
сегодня много исправлений :)
Кое-кто потерял главное - саму ссылку на пост Синофски. Получилось "ты Битлз-то слушал? - Нет, но мне Рабинович напел"  :)
Merge pull request #150 from Bougakov/patch-11

Кое-кто потерял главное - саму ссылку на пост Синофски. Получилось "ты Б...
bug fix: some files (unicode / english dude) crash the manager
Listen happens, next need to poll before accepting
Merge branch 'master' of github.com:bpa/playtogether

Conflicts:
	lib/Gamed/Network/INET.pm
	t/connect.t
Papildytas main.cpp is Remziuko repo
aa
1
Msd`erge https://github.com/Remziukas/aritmetika

Conflicts:
	main.cpp
バリデーションを修正した。
Removing individual parsing functions due to noise
Last minute tweeks to presentation and add some tests.
Added color coding for user names
Little mongo changes
Making PHP worker executable.
Updated CURL lib to 2.1.2
Activating service hook at Github when activating repo in local db.
Adding repo_temp directory for checking out repositories.
Ignoring test data and keys from repo.
Adding a shared directory for deploy keys.
must give credit to youtube-viewer creator
Cleaned up encoding code and added some helpers.
Updated readme.
merged in changes from lesson-validation branch
converted interaction script
added theming lesson
completed validaiton on DataSource lesson
completed validation changes
completed DV basics validation
completed chart types validation
completed gauges validation
Playback now works
In bp_get_the_profile_field_options(), don't delete properties from $field global

bp_get_the_profile_field_options() expects the $field global object to be an
instance of BP_XProfile_Field, because it needs access to that class's
get_children() method. Inside of a profile loop, however, $field is *not* an
instance of this class. So bp_get_the_profile_field_options() clears $field and
replaces it with a new instance of BP_XProfile_Field. However, this has the
side effect of wiping out any custom data that has been manually inserted into
the $field global (for instance, data and visibility_level). This meant that
visibility level was being reset in the case of radio button and other
get_children() fields.

This changeset works around the problem by ensuring that the new
BP_XProfile_Field object contains all of the properties of the $field global
before it is replaced; when they are missing, they are supplied by the
manually-created $field global before it is replaced with the new object.

It will be a good idea down the road to revisit the way that the profile loop
is set up, so that the BP_XProfile_Field is used as much as possible, making
this kind of switcheroo unnecessary.

See #4233
Whitespace cleanup in xprofile component and templates
get rid of null operations :)
Merge pull request #7 from edahlgren/reference-buckets

get rid of null operations :)
basic resolution proxy and test client
Fix proto name and fields in comment
Add an multi-typed example, more complicated resolution
last write wins example test
reference example tests
reference testing example
Merge pull request #1 from edahlgren/examples

basic resolution proxy and test client
Sample password file
first shot at OOO
fixes to package installation phase
First implementatin of input. Click to play now!
First implementation of click to play. Click to play now!
testing history.js title
the number of files should not be a limit + logs
Merge branch 'master' of github.com:cadrian/projects

Conflicts:
	types/eiffel.sh
update php to incorporate the same changes as in the other files
simple script to fetch and locally save image attachments from all my e-mails at google's gmail (similarly how lostphotosapp.com works but open source)
Merge pull request #60 from calvinfo/master

Adding tests for composite removal and select * CQL queries
- Added some figures to the sample.
* parser: fixed parsing multiple single frame responses for ISO 15765-4
Sync account details page with archweb

Synchronize the layout of the account details page with the developer
profiles page from archweb.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Sync account editing page with archweb

Synchronize the layout of the account editing page with the profiles
page from archweb.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Move package deletion to a separate page

Package actions now have a separate box on the package details page. Make
a package deletion link in that box.

Link leads to a new page (pkgdel.php) that can be used to confirm package
deletion. A separate page with confirmation is used to avoid CSRFs.

Signed-off-by: canyonknight <canyonknight@gmail.com>
Move package merging to a separate page

Package actions now have a separate box on the package details page. Add
a package merge link in that box.

Link leads to a new page (pkgmerge.php) that can be used to confirm package
merging. A separate page with confirmation is used to avoid CSRFs.

Signed-off-by: canyonknight <canyonknight@gmail.com>
Deprecate actions bar when virtual URLs are used

The only buttons on the actions bar that were still used when virtual URLs
are enabled were the package deletion and package merging. These now reside
in separate pages, so remove the need for the actions bar when virtual URLs
are enabled.

Signed-off-by: canyonknight <canyonknight@gmail.com>
fix to not generate unnecessary dir
Merge pull request #2215 from banyan/fix-bug-of-consistent-naming

fix to not generate unnecessary dir
last
Derniere
Last Terminal mobile
Merge remote-tracking branch 'origin/master' into Popos

Conflicts:
	src/TerminalMobile.java
Add poor old defensless grannies, with handbags
put bootstrap back, edited pages and styles
- Fixed some bugs with cat movement
- Still one or two minor bugs that are hard to reproduce
Redid A*
Started adding base for GameChar class.
Working on logic for movement next.
made it more "root" friendly
modificado readme2. adicionado a primeira linha
add attribuite adress
removing unlam references
correcao no navegador e na 06
Not compiling List yet
initial commit
added .DS_Store in .gitignore
configured project.clj
removed failing test
replaced uppercase in Ptang and added a LF between swank and midje
perf-summary ("5 number" summary for performance results)
changed sample dataset implementation
changed function name to response-time-summary
added run summary (count and error count) 
added assert / http detail
refactoring of run-summary
removed old test
refactoring of the test
implemented http-codes-summary
sample file
fixed test description
added a main and printout on the sample value
fixed a bug on error count
removed unused use and require
added preconfigured charts
virtualenv: readline and sqlite
relase-python: python26, python26Full, python27Packages
python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion}
Merge branch 'py/pdb' into python
changed
#!/usr/bin/env python
Move the anonymize_smart_rdf function
added credits table styling
fix bug in string.c
delete the file called "File"
Removed some of the logging events, made uneccesary entries
Added the @LLVMECB YARD tag and used it to add aditional documentation to methods that require the extended C bindings in the Support module and the Value and Module classes.
Changed all of the type checking methods to return ArgumentError instead of RuntimeError.
Added an additional type check to ExecutionEngine#initialize.
Fixed the message queueing
Cambio de Modulos a Modulo
making a bit more oo
user model pt 1 done
user with pass, user show
Done sign in
actually, now users-signs work
Mouse click event happens only on double click
Enqueing songs on mouse click
work of 2012.6.29 night: modify user kakaku goods  manipulation completely!!
More correct "nick mentioned?" regular expression

- @ledbettj's source (Mr. G) dictated to me that valid characters in an
  IRC nickname are: a-z A-Z 0-9 _ - \ [ ] { } ^ ` |`
- I adjusted the regular expression that matches on the nickname to
  require that none of those characters be on the end of the nickname
- In my tests, it's more correct, so let's ship it.
Reinstate check for system queueing lag when the current pool's queue is maxed out, there is no staged work, and the work is needed now.
Remove the low hash count determinant of hardware being sick. A low hash rate can be for poor network connectivity or scrypt mining, neither of which are due to sick hardware.
Added api controller, actions
Music Scanner Bugfix

1. Bugfix: Music scanner did not correctly load the image artwork for directories with more than 1 album (i.e. "Singles" directories).  Now it does.

2. If album songs have more than 1 artwork then load the first as the album artwork but also leave all the track artworks, the reasons for this are as follows:

  a.  Random albums without artwork look stupid, especially in album wall view
  b.  The majority of times these "differnt" artworks are actually the same artwork but differnt resolutions (i.e downloaded from differnt sources)
video plugin backend page
Merge branch 'master' of github.com:clevertech/WSWPN
fixing library stories and studies pages
Goal list is now generated from a form in goals directory
Fixed gem unit test, failing since last week. Fixed jenkins too.

Change-Id: I691370a9b06f6803126d879966a8eaadd7955c1f
CFID-289: add validation for user email and names

Change-Id: I80654000f91436c4466cad8bfdf0854bd2d5d03b
CFID-296: modify app sample to work in production

Change-Id: I43b6e9566773d2bb3d9b03ffd7fbe122e9258bf5
Update notes for submitted changes

* [cfid-241] Add audit events
Do not request scopes from the token endpoint

The UAA does not like this and it's not compliant with the spec

Change-Id: Ib8efce85e521a4213d571f262100a07490dc15d4
Update notes for submitted changes

* [cfid-259] Add default scopes to authz request mgr
Update notes for submitted changes

* [cfid-261] Fix broken varz integration tests.
Update notes for submitted changes

* create-service: accept given Plan
Update notes for submitted changes

* only grab choice data when needed
Update notes for submitted changes

* info: order frameworks after runtimes
Added implementation for munmap
mapping leader f to fufcoveragefile
Added Portugues language file
detector: Implements anomaly detection
remove stuff from holman that i dont use (yet)
Added transparent highlight image.
Float server icons above the rest of the canvas.
Added note about interaction of reader::location_push(),
location_top() and unget()
Converted tabs to spaces and removes white space aat end of lines
Updated labels on images
add joinus box
fix #21, add login decision 'IsXmlHttp()' for ios or client call; do not redirect when login via ios client
Merge branch 'master' of github.com:codesharp/cooper
Switch parent pom to the last codjo-pom stable version
[maven-release-plugin] prepare release codjo-util-1.10
[maven-release-plugin] prepare for next development iteration
Switch parent pom to the codjo-pom snapshot version
Switch parent pom to the last codjo-pom stable version
[maven-release-plugin] prepare release codjo-util-1.11
[maven-release-plugin] prepare for next development iteration
Switch parent pom to the codjo-pom snapshot version
Disabling redis to fix climb calculation
fix
fix
fix
Merge branch 'dev' of ssh://123.108.111.47/data/git/clubot into dev
guard and rspec config
rename engine
fix hilite of "\" search char
Comment out the Yahoo initializer.
fixing space issue when creating a model
prova a vedere se riesci... con me non ne vuole sapere.
qui http://stackoverflow.com/questions/5463012/rails-3-and-devise-redirecting-to-page-following-signup-confirmable dicono che ci può essere un bug che si risolve aggiornando devise.
after sign_in_path
configurazione proposte
redirect alla home dopo la conferma email (altrimenti andava sulla user index)
redirect alla home dopo la conferma email (altrimenti andava sulla user index)
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	app/assets/javascripts/democracy.js.erb
	app/assets/javascripts/flot/jquery.js
	app/assets/javascripts/fullcalendar.js
	app/assets/javascripts/gcal.js
	app/assets/javascripts/jquery-ui.js
	app/assets/javascripts/jquery.quick-wizard.js
	app/assets/javascripts/markdown.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/coda.css.erb
	app/assets/stylesheets/fullcalendar.css
	app/assets/stylesheets/fullcalendar.print.css
	app/assets/stylesheets/groups.css
	app/assets/stylesheets/notifications.css.erb
	app/assets/stylesheets/proposal.css.erb
	app/assets/stylesheets/redmond/custom.css
	app/assets/stylesheets/redmond/images/ui-bg_flat_55_fbec88_40x100.png
	app/assets/stylesheets/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
	app/assets/stylesheets/style.css.erb
	app/assets/stylesheets/users/users.css
	app/controllers/application_controller.rb
	app/controllers/group_quorums_controller.rb
	app/controllers/groups_controller.rb
	app/controllers/quorums_controller.rb
	app/controllers/users_controller.rb
	app/controllers/votations_controller.rb
	app/models/blog_post.rb
	app/models/proposal.rb
	app/models/quorum.rb
	app/views/candidates/index.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/events/_calendar.html.erb
	app/views/groups/_administration_panel.html.erb
	app/views/groups/_left_panel.html.erb
	app/views/groups/_quorums_panel.html.erb
	app/views/groups/edit_permissions.html.erb
	app/views/groups/edit_proposals.html.erb
	app/views/home/index.html.erb
	app/views/home/portlets/_proposals.html.erb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/events.html.erb
	app/views/layouts/groups.html.erb
	app/views/layouts/open_space.html.erb
	app/views/layouts/settings.html.erb
	app/views/layouts/users.html.erb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/new.js.rjs
	app/views/votations/_list.html.erb
	config/initializers/constants.rb
	config/locales/it.yml
	config/routes.rb
	db/migrate/20121117101327_its_time_for_quorums.rb
	lib/blog_kit_model_helper.rb
Declinazione della partecipazione
redirect alla home dopo conferma via email (ora va nella index users)
Aggiustamenti grafica colonna sinistra
fullcalendar
fullcalendar
fullcalendar
fullcalendar
nuove categorie
nuova rank bar
correzioni css, bugfix e piccoli miglioramenti
salvataggio quorum
Merge branch 'master' of git://github.com/leoniglio/DemocracyOnline
Заменил регексп для проверки url`ов на более быстрый(быстрее примерно в 100 раз) https://github.com/chriso/node-validator/blob/master/lib/validators.js
Deals with plurals better
Moved config into gitignore
query with empty ids returns early
changing routes to be more selective
DEL removing unneeded test
UPD changing LogDelegator to accept deps in constructor
UPD adding LogDelegator service to Container
UPD fixing some errors to get Travis build going correctly
removing the seed data for relationships table. this is in reference to issue #2. Laravel is somehow not able to execute detach function calls when seed data exists… this will have to be investigated at a future point in time!
Switched to a JPA Criteria based query system for dynamic filters.
Moved Timestamp & Immutable into own package
se procede
Thu Dec  6 13:14:09 JST 2012
Allowing multiple types for a single argument
search \include commands for referenced tex source in cite completion
Ignore swap files from e.g. vim
Fixed javascript calendar layout a bit
Including script from submodule in index.html.
Codificación de caracteres en UTF-8 antes de procesar los títuos y descripciones de página.
Allow control characters in LiteralSearch.
Quiet weget
mark json-encode and json-decode dynamic, so they could be rebound if desired
cherry pick some of the amber methods for better portability
Update theme.
Update reqs.
Update readme.
Update settings.
Fixes for bugz 840030 - Apache blocks access to /icons. Remove these as
mod_autoindex has now been turned OFF (see bugz 785050 for more details).
BZ 834668: Dynect call to determine if domain is available not protected from exceptions.
BZ 838365: Setting app state was failing because the user in question could not run processes.  Force-kill must kill all processes even if it cannot set app state for some reason.
Merge pull request #242 from ramr/master

  Fixes for bugz 840030 - Apache blocks access to /icons
Merge pull request #244 from rmillner/dev/rmillner/bug/834668

BZ 834668: Protect additional dynect calls from exceptions
Merge pull request #245 from rmillner/dev/rmillner/bug/838365

BZ 838365: Protect force-stop against user resource limits
broker sanity test reorg
Disable button if all checkboxes are deselected
[AS7-5098] HornetQ cluster connections default values

* use the CLUSTER_CONNECTION_XXX attributes variants when
  creating the cluster connection configuration to ensure
  the correct default values are picked up
[AS7-4217] JMS ConnectionFactory serialization

* add test to check that the issue no longer occurs when the JMS CF is
  looked up locally before being looked up remotely
* exclude test from basic-integration-default-web since it requires the
  standalone-full configuration to pass
trim down VirtualFileAdaptor dependencies & implementation
OP plugin updates
Se corrigió problema en deploy que no consideraba base xapian
(trivial) avoid constructing a new Double each time we make a String
Merge pull request #29 from davidcoe/master

Small Changes

Reviewed by Thomas
Merge pull request #30 from davidcoe/master

Added feature for libs

Reviewed by Thomas
Merge pull request #31 from davidcoe/master

Deprecations and improved LogMessageHandler
Add more tests for ImmutableDictionary
Merge remote-tracking branch 'cishell/master' into next
Merge pull request #32 from davidcoe/master

Removed knoplerfish lib
Awesome
Merge pull request #33 from davidcoe/master

p2 repo and source build

:cake:
Merge remote-tracking branch 'cishell/master' into next
Merge pull request #34 from davidcoe/master

Fixed p2 deploy path
Add source feature, and p2 repository bundle thing
Merge pull request #35 from tgs/next

Add source bundles, and p2 repository bundle

This is David and I approved this message.
Merge pull request #36 from davidcoe/master

Updated version number for cishell utilities
Merge pull request #37 from davidcoe/master

This is created to support target platform build in Eclipse only. 

Added a target platform definition for the unstable cishell p2. To customize the  target platform to point to stable cishell p2, you can edit 

+<repository location="http://cishell.org/p2/nightly-repo/"/>
recurly: add support for recurly
Final login commit. 2.....
v0.0.29alpha
Updated download source.
start jquery plugin
jquery plugin updates
jquery plugin folder
jquery plugin folder
old
readme: jquery plugin
readme: jquery plugin
[ui][home] Removed the Home text
[ui][home] Refactoring of the CSS
[ui] General navigation
[ui] Refactoring of UI
[ui][policy] Section headers
[ui][policy] Section body
[ui][policy] Groups
Switched the spec tests to use the AssertStringMixin class.

Also corrected/improved the spec test harness's handling of unicode
since simplejson handles unicode differently from json.
change count / hide in feed when post marked as readed
desing : widht of icon column
fix validation error on macro with unique attribute
Update Templates/goldClub/farmlist.tpl
Protect from null env variables in mesos.
Parse query strings on all requests (not only get)
Add save and open button
deleted uneededports

changed 2 commands from eventgm to mass
Remove raise_error() call
Update pontifical-biblical-institute.csl

Various corrections based on the official style guide for the Pontifical Biblical Institute, including: 
- Separates page numbers with a hyphen instead of the default en-dash
- Format author names in the bibliography section last name, first name
- Books which have an author and an editor now correctly present the editor(s) with the first name preceding the last name
- Includes fix for the group suppression bug related to "ibid" and "locator" by rmzelle
changes to get use camera and logical jump
adding vim-ack to submodules
added php-extras
got fetchmail working, + other minor changes
Update portforward model and resource to contain protocol field to be used by Horizon
Deleted old devstack_mysql.py script
Added port_alias field to addressbookentry model to be used by Horizon
Fixed devstack_mysql.py script to use the admin tenant_id, add protocol field in portforwards, and clean via abstractions
Update portforward model and resource to contain protocol field to be used by Horizon
Deleted old devstack_mysql.py script
Added port_alias field to addressbookentry model to be used by Horizon
Fixed devstack_mysql.py script to use the admin tenant_id, add protocol field in portforwards, and clean via abstractions
Added PortAlias model for Horizon to store aliases in Quantum. Cleaned up devstack_mysql.py script
Added PortAlias model for Horizon to store aliases in Quantum. Cleaned up devstack_mysql.py script
add initial port forward rule API and model
Merge branch 'horizon-l3-integration' of https://github.com/dreamhost/akanda into horizon-l3-integration
Minor fixes
Merge branch 'horizon-l3-integration' of https://github.com/dreamhost/akanda into horizon-l3-integration
Fixed indentation in PortAlias model
Merge branch 'horizon-l3-integration' of https://github.com/dreamhost/akanda into horizon-l3-integration
More models_v2.py fixes and clean up
Merge branch 'horizon-l3-integration' of https://github.com/dreamhost/akanda into horizon-l3-integration
Created PortAlias resource extension to be used by Horizon
Merge branch 'horizon-l3-integration' of github.com:dreamhost/akanda into horizon-l3-integration
Command line version, execute only
updated harvester to use RDF::Virtuoso
Updated to search for regular expression.
fixed action attribute in the form
WIP: tagging users in notes
display tagged users in notes
Ruby can't decide on a name for their history file
remove "push" stuff

remove the cat picture

reset and forms are really unnecessary as components

cleanup layout

cleanup up to headers

messed up replacement

delete unnecessary repos

header looks okay, i think

oops

cleaned up to slates
yay modernizr
rebuild
add tag to title tag
almost done with venv stuff (=tons of failing tests :D)
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
"fixed" tons of tests by switching to sqlite3
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
some more fixes
VIRTUALENV, F*** YEAH!
removed buildout tests
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
Improved runtests
Added runtestserver
Added runshell
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
setup.py test anyone?
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
added sphinx to tests_require
docs changes
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
Fixes for runtests.py to support individual test runs
Merge branch 'feature/fix-some-1.4-stuff' into feature/venv-tests
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
Merge branch 'feature/fix-translation-deletion-confirmation-1.4' into feature/venv-tests
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
Multilingual middleware checks for Content-Type header before using it
Merge pull request #1393 from bercab/issue-1392

Multilingual middleware checks for Content-Type header before using it
Made JSON in README example valid with addition of quote
x86 bootloader files
Incremental commit of auto-detection of littleendian/bigendian headers
Fix whitespace
Change inject guidelines

* I no longer avoid inject, although I do believe it should be minimized to
  cases where you are clearly iterating over an enumerable, and returning a
  different object for each iteration. This is common when doing things like
  summing a list of values for example.

  People often use inject and return the same object from the block each
  iteration. For this case I recommend #each_with_object since it ignores the
  return value of the block and is less prone to be used incorrectly.
Change guidelines about "other" variable to be more clear

* I realized taken out of context this guideline is a bit weird.

  When writing veritas I had lots of cases where I had to compare one object
  with another, besides the standard #eql? and #== methods, and I established a
  convention that I would always name the other object "other" since it really
  could be any kind of object, and I didn't want to give it a more generic name
  like "object".

  Also the use of "other" as the argument to predicate methods seems to be in
  common use in other libraries, so I decided to go with convention on this.
Change llvm to be used from the CyanogenMod org.

Change-Id: I7a9ac076a24bd44386cc637dc42787dbe95838c5
Move libphonenumber to CyanogenMod

Please clone the libphonenumber repository to CyanogenMod. I have
a patch for it to fix the inability to dial 0001.

Change-Id: Ifa0ef1b2d8cbc3cb88b77733f54c092de6e7bdef
Use external/webrtc/ from CM

Webrtc needs fixing for ARMv5/6 targets.
Someone please fork from aosp.

Change-Id: I0208c1488fb35ba0c9c4dc69114d78aae9d8429b
Fix derp in libphonenumber path

Change-Id: I1ce46a4cc470ce622b6f9dfd908c19538088abe9
Remove p4-common - handled by cm.dependencies now.

Change-Id: I9b8ba36fb729b7e299257e539763c7ac96780ed6
Merge remote-tracking branch 'upstream/ics' into ics
Adding t and tt
Added ability to search by time when using the profiler
Can register uesers now
Added getScripts and getStylesheets
Adding save/load to a few more diagnostics.
move fonts.conf
- Extended demo by tabset: first tab with circle collisions, second -
client-server communication
- Added JSR 303 bean validation functionality - to check data validity
on client and server respectively
- Did several code refinement and minor fixes
refactoring
Merge branch 'master' of https://github.com/dominikus/visits.git
threshhold added
Javascript UI validation on register
Lboot memory init function is finished.
added images for name blocking
Fixed SQL layout
Marshaller fertig geschrieben. Später Items/Element deklarierung für Swing als Methoden auslagern.
Installing FuelPHP and creating htaccess to rewritebase to public
Removing unused scripts and adding gitignore
select port for http-serve and open browser after running
change track char
Merge pull request #2 from dotta/master

Minor changes :)
Make the script work on Ubuntu Linux

The use of 'grep -v' was making a conflict with the use of 'bash -e'.
It looks like the return value logic of grep is differente on OS X and Linux.
Replaced by a awk call to count the number of entries not matching the pattern.

Added a .gitignore file for the repos which are pulled in.
Merge pull request #3 from skyluc/issue/grep-v-on-linux

Make the script work on Ubuntu Linux
Use a local m2repo for building the IDE

I've decided to do so because otherwise the Sbt artifacts built during the
script's execution would not be picked up when the
``org.scala-ide.sbt.full.library`` project is built. This is not ideal, but at
least it's easier to make sure that the Sbt artifacts packaged in the IDE are
indeed the ones built with this script (i.e., the artifacts are not downloaded
from the Typesafe repository).

As part of this commit, I've added three (3) new parameters needed to build
sbt from a given branch (this is needed for the IDE 2.1-M3 release).
new features!

* comb.when now accepts an array of promises to wait for
* new comb.chain method, can be used instead of comb.Promise#chain
* new tests for new features
add ruby mode to .rake files in emacs"
Make it clearer that sampling is only for counters.
Fix for config.js, use fs.watch instead of fs.watchFile
Increments bad_lines_seen when sampleRate bit does not match regex
Added support for sets and gauges, standardized on using updateStats internally, removed sampleRate argument for clarity from those methods that will never use it
Fix logging of key frequencies to stdout.

The current code writes by default to a file called "stdout" instead of the
stdout filedescriptor.
Merge pull request #166 from draco2003/5516c1e7748ba228aac6e5c685702a01b1987578

Small cleanups 
Test sending bad packet and bad_lines_seen being incremented
Merge pull request #171 from draco2003/new-test

Test sending bad packet and bad_lines_seen stat being incremented
fix timings on some locales

when php use not common locale (RU for example) simple
convertion float to string may look like
13,4343
21 1212,00
12'212'000.33
and udp request send strings like this
12,2323|ms and statsd can't correctly parse such strings
Move config.js to lib folder
Simplify threshold calculation
enable ipv6 support
Fix ipv6 typo ...
Merge pull request #176 from draco2003/move-config

Move config.js to lib folder
Merge pull request #173 from Timosha/master

fix locale issue in php
Merge branch 'php-gauges-and-sets' of https://github.com/stevenscg/statsd

Conflicts:
	examples/php-example.php
Merge branch 'master' of https://github.com/drscream/statsd
Merge pull request #165 from juliusv/fix_stdout_key_logging

Fix logging of key frequencies to stdout.
Merge pull request #150 from smreed/log-bad-sample-rate

Increments bad_lines_seen when sampleRate bit does not match regex
Merge branch 'master' of https://github.com/diegovar/statsd
Add === support

Closes #341
Merge pull request #343 from haines/threequals

Add === support
Cambios para incorporar inclusion opcional de nombre de paquetes en
nombres de clases en BD
Agrego atributo sendCount en los mensajes, contador de envios.
Correccion a logs de velocity que seguian apundando al directorio log
cuando el resto se cambio para logs. Esta harcoded en SmsManager, de
podria ver de sacarlo de alli.
Add sleep command
Switch to asynchronous run type
Switch sleep to asynchronous
Make sure we have an exit code
added back some stuff I accidentally removed when debugging
added readme file for ios project
Removed LanguageTool
improved {} matching (still broken though)

improved {} matching (still broken though).
I beleive it is less broken, but it is still broken.
test.~ATH seems to be working, but looptest.~ATH is not.
admin, db, timezone
изменил параметры zsh
использую fluxbox вместо xmonad
конфиг для fluxbox
перемещение строчки вверх-вниз в vim
Changed coiled-coil SVG to start always on heptad position 'a'
Fix for drupal_wrap_mail() mangling HTML e-mails!
Merge branch '6.x-1.x' of github.com:dsnopek/mandrill into 6.x-1.x
Removed unused imports
New test case for overriding global symbols with local ones
Try to resolve constant attributes of python objects at compile time. Issue #16
Kepler and eyeballing
Add support for qcow2 images in $IMAGE_URLS.

This patch adds suppot for loading a qcow2 image and using the 'bare'
container format for all single file images.

I tested this successfully by setting:

IMAGE_URLS="http://berrange.fedorapeople.org/images/2012-02-29/f16-x86_64-openstack-sda.qcow2"

Change-Id: Ia55ffd4957866a3d7b9fd7ba4c62e38663b35080
Merge branch 'milestone-proposed' into dt-test
Merge branch 'func-add' into dt-test
Merge branch 'scripts' into dt-test
Merge branch 'unstack' into dt-test
Merge branch 'keystone-conf' into dt-test
Merge branch 'swift-conf' into dt-test
Merge branch 'stack-org' into dt-test
Merge branch '5584-uuid' into dt-test
Merge branch 'tools-updates' into dt-test
Merge branch '5934-qcow' into dt-test
Use a massively more complicated (yet more accurate) regex.
Removed old Readme.txt as it is not needed anymore
Corrected casing of target in output
Fixed Quests initial and reward spell
Corrected Iteration counter.
Merge pull request #56 from manniss/master

Fixed quests initial and reward spell by manniss
Merge branch 'master' of https://github.com/WCell/WCell

Conflicts:
	Services/WCell.RealmServer/Commands/AdminCommands.cs
	Services/WCell.RealmServer/Commands/MovementCommands.cs
	Services/WCell.RealmServer/Commands/NPCCommands.cs
	Services/WCell.RealmServer/Commands/UnitCommands.cs
	Services/WCell.RealmServer/Handlers/QuestHandler.cs
	Services/WCell.RealmServer/Quests/QuestLog.cs
	Services/WCell.RealmServer/Quests/QuestTemplate.cs
Cleanup rule record.
Fix wrong max connecting time on first segment.
license added
Comments added
Add ability to set wallpaper from image files

http://bugzilla.gnome.org/show_bug.cgi?id=547420
Only support manual layout in Desktop views

https://bugzilla.gnome.org/show_bug.cgi?id=681880
Merge the settings for showing text and image previews

Especially considering that the default GNOME theme does not do
text previewing it doesn't make sense to have two different settings.

https://bugzilla.gnome.org/show_bug.cgi?id=681956
Update Punjabi Translation
Remove the open folders in new windows option

This is not something we want to encourage as it basically
breaks the browser model.

https://bugzilla.gnome.org/show_bug.cgi?id=681919
Remove always-use-browser option

This isn't necessary since the removal of spatial mode. Having
it as a hidden preference is counterproductive because it may
have been set before and it will silently break the behavior of
the current version.

https://bugzilla.gnome.org/show_bug.cgi?id=681919
Add more info to DEBUG_THUMBNAILS
Move Properties to the end of the context menu again

Now that the context menu is leaner this is a good choice.
Remove always-use-browser option from treeview sidebar
Expand node data when clicking on the node
Set css styles for the expanded area
Pass all the simple nodes to the list view
Draw and highlight JSON record when extending the node
Merge branch 'master' in expand-node-data-in-list
Fix tests
Merge pull request #58 from edelight/expand-node-data-in-list

Expand node data in list
refactoring design idea
This is a newnew commit
- uses CORS; JSONP support dropped
- passes JSHint
- expects rollcall to have config.active_record.include_root_in_json = false
expets rollcall to have config.active_record.include_root_in_json = false
store config loaded from config.json in Sail.app.config
Lazy-init the OOo connection.
Strip trailing /s from urls.
Fixed lines with both label and branch.
Add MatrixFunctions.
Merge branch 'master' of github.com:ejackson/clatrix
Added id3v1 support, bug fixes, started on multiple databases
Commit with cart added 24OCT12 1850
commit with multiple items in cart combined 24OCT12 2140
commit with empty cart function with links 25Oct12 1135
Return non-zero exit codes on failure
Sort out menues
backbonize & remove view
remove View
Merge branch 'master' of github.com:elliotlai/sterne
Fixed param list compiler for param lists with no required params. Relates to #36.
Validator class generation now working to some extent. Relates to #42.
Issue #143 Add Home.mdpp, remove helm.tex.
Update Home.mdpp.
* doc/Home.mdpp: Fix helm wiki path.
* doc/Home.mdpp: Quote path to wiki.
* helm-files.el (helm-dired-action): Fix paren error.
* helm-grep.el: Support using wilcard in basic git-grep command.
With info on dict
With hash table
With more QandA
With a few answers
With 003_blog in progress
With progress
Without 003
Improve the sorting algorithm for routing

If one route is an explicit substring of another,
prefer the longer one.

Otherwise, if one of the routes has a dynamic
segment, prefer the route without the dynamic
segment.

Otherwise, prefer the longer one.

This fixes posts/:post_id being preferred over
posts/new.

Eventually, we should prebuild the match tree.
Merge branch 'master' into simplify-properties
Refactors View rendering into Ember.States:
Use Ember.Logger instead of console.log
Correct state transition name to reflect StateMachine state nesting.
Use standard StateManager send/sendRecursively and convert state method arguments to include options hash when necessary.
d'oh. ember-states needs to come before ember-views
small cleanup
Merge commit '91103de4767815c923a5318fdaead26dc0202757'

Conflicts:
	packages/ember-states/lib/state_manager.js
	packages/ember-views/lib/views/view.js
Update composer.json

Original name of vendor gived back after packgist test.
Change former Student reference, remove useless user attributes
Need to login on /exams, to print all the exams (for the moment)
With the files it's better
Merge pull request #10 from Soulou/exams_controller

Exams controller
added meta data controller
config routes and random finders
Config data working but not used yet
Test of basic replace-rename functionality (no system files)
Test the internal-call-to-original functionality.
Beef up the replace-rename test to check both system and non-system
header files.
Added namespace definitions in linux/xattr.h.
Make register-update cycles more rubust to support service side data lost
Moved template and setting deletion to the uninstall routine. Trying to work out some issues with the global hook too as it's not playing too nicely.
Just thought that the author might not be as good branch predicter as the compiler. Plus if the getSample methods are "likely", why if them anyway. Just discard the output, if gate is CLOSED.
more image plugin tweaks
ResizeOperationTests was added; 'isEditing' attribute usage improvements
Heavily updated: repos.py
make user subscriptions view decoratable

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1270 0cfe37f9-358a-4d5e-be75-b63607b5c754
WIKI-157: Remove hardcode in URL
Mising ;
Updaed zone def
Ensure CSV references top-level ::CSV constant
Remove old diviner documentation before publish new documentation

Summary: This isn't ideal, but fixes T753 (currently, we write the new docs over the old docs but leave no-longer-relevant docs).

Test Plan: Regenerated documentation.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran, epriestley

Maniphest Tasks: T753

Differential Revision: https://secure.phabricator.com/D1886
adding spacing for sub categories (9 in , 7 in , etc.)
not autoview html and change sort order
Documented next steps for Flash Tracking
fix debian bug #688011
tentativa para remover o scroll dos modais e bug de segundo scroll
Update admin users endpoints to allow managing authpolicies
Merge branch 'arm' of github.com:feedhenry/fh-fhc into arm
- Added initial test
Fix support tests.
Fix fthread-01 to prevent read being optimised away.
Oops .. can't ignore a unit value. Change to sent int.
Remove gratiutous space destroying result.
performance improvement
add proguard w/o obfuscation
cleanup, minor fix
basic dual sim support; issue #163
minor performance fixes
improve performance
Merge remote-tracking branch 'origin/master' into translation
update translation stats
fixed missing semicolon
Merge pull request #18 from harakka/orbatnotes

Fixed missing semicolon in init.sqf
removed . file
If autocorrecting, we don't need the other warnings
updated schema
Merge branch 'master' of https://github.com/filefrog/synacor
Added libdispatch functions, cleaned up, added an app-wide dispatch queue
Made const string node take a non-mutable nsstring
Made custom node correctly copy it's passed block
Cleanup
Exposed dynamic ivar table accessor
Implemented an include: method on NSObject that copies methods from a specified class.
Implemented dynamic method creation on TQObject
Consolidated cleanup code in nodeblock
Fixed method signature generator
Made member access use const string objects
Added insert:after: to node (Only implemented for blocks)
Made weak processor take into account method blocks
Allowed class definitions/extensions to contain "on load" messages, that are sent to the class as soon as the def/ext is executed
Fixed typo in spec
Default impl for insert:after:
onload msg test
Added missing synthesize to TQNodeBlock
Fixed global queue generation
Added async (incomplete) and wait statements
Made const string more versatile
Fix handling mouse events in IE outside the panel when dimBackground is set to false
Merge pull request #60 from ctimmerm/transparent-mouse-ie

Fix handling mouse events in IE outside the panel when dimBackground is ...
using the term 'hacklet' now
Improvement in map and classes
readme added for graph
specialty update
update 5/9
Modification du plugin de compilation
Refactoring de la gestion des logs & utilisation de SLF4J
Refactoring du plugin de log
Nettoyage & Finition du système de log
Nettoyage & Refactoring
Gestion du projet: édition des tâches
Merge branch 'dev' into recette
color picker
---
fix for progressbar when OSD + info active
missed label
typos
Update Greek translation
CAPS font in Uppercase labels
Merge pull request #313 from CutSickAss/patch-79

Update Greek translation
Notification doesn't last long enough
Notification doesn't last long enough
Merge pull request #314 from CutSickAss/patch-80

Notification doesn't last long enough
reworked panel2 integration and layout
Merge remote-tracking branch 'origin/master'
...
...
...
also added font for other fontsets
...
...
exchanged some music logo texture paths
added random/latest episodes to live pics bg (using thumbs)
also for tv playlists
increase width of shutdown menu
Add new sub to customizer + give it unique id
different linespacin font_reg20
Startup delay to 3 seconds due to improved watchlist and random items - great work Martijn
textbox tweaks
---
Only show unwatched icon when there are unwathced items
Merge pull request #406 from xhaggi/improvements

increase width of shutdown menu
Fix alignment of clearart
removed dialogmusicscan

http://forum.xbmc.org/showthread.php?tid=126502&pid=1208005#pid1208005
Merge remote-tracking branch 'origin/master'
Restore x and y tag in coordinates tag
just to be sure
---
Merge git://github.com/BigNoid/Aeon-Nox

Conflicts:
	1080i/DialogButtonMenu.xml
	1080i/custom_1138_ColorPicker.xml
More work on square theme
Merge git://github.com/BigNoid/Aeon-Nox
Ruby 1.9.3-p125.
lem1802 -> lem
Added support for BB10/PlayBook keyboard.

There was already support for bringing up and pushing down the virtual keyboard, but this will now handle the OS events signalling that the keyboard has been pushed to or removed from the screen by the user (by swiping to center from bottom-left, for example).
Added basic operators for CCPoint to ease their manipulation. 
Not all operators are provided because it shouldn't be the role of CCPoint to have more mathematical functions. A 2D vector abstraction would be more adequate. I added these operators because they are the most commonly used by my code when placing sprites.
Another addition of some basic functions useful to manipulate sprite positions:
 - length(), as in "vector length" -> CCPoint shouldn't be taken as a vector but there is no other type provided...
 - normalize(), to normalize a direction ( then use the multiplication operator to make a final move vector)
 - distance() between to points
Added asserts to check CCPoint divisors to be different than 0.
Merge pull request #902 from Klaim/master

CCPoint extension
Add Klaim into AUTHORS, he contributes for CCPoint extension.
Missing std:: namespace
Merge pull request #911 from edbartley/master

Missing std:: namespace
fixed #1264: CCLabelTTF: wrong string alignment when using utf-8 encoded text. And fixed a bug in CCActionCamera.cpp.
Merge pull request #920 from dumganhar/iss1264_win_drawtext_master

fixed #1264: CCLabelTTF: wrong string alignment when using utf-8 encoded text.
update tolua++ files
Lua binding standardization
Add CCLuaValue class, use for pass values to Lua
Add CCScriptEngineProtocol::pushStringToLuaStack
Add CCScriptEngineProtocol::pushCCLuaValueToLuaStack
Add CCScriptEngineProtocol::pushCCLuaTableDictToLuaStack
Add CCScriptEngineProtocol::pushCCLuaTableArrayToLuaStack
fix tolua++ build configuration for LUA_TABLE data type
CCSprite::spriteWithSpriteFrameName output friendly error message
remove warning messages
BB10 modifications.  Auto adjusting the screen width and height.
Updates for BB10.  Updating the screen calls so that it works for both BB10 and PlayBook.  Also updated the accelerometer to use the bps/sensor api.  Renamed the folders and the defines from QNX to BlackBerry.
Merge branch 'master' of https://github.com/dducharme/cocos2d-x into dducharme_bb10
Merge pull request #897 from Ian-MacDonald/96495c2d2fdaf32a6ccd5953876cf9be4379a20c

fixed #1319: Native Keyboard support BB10/PlayBook.
ready to import for second round of eval
change testplay
more references and writing
Alguma mensagem...
Primeiro commit, Fernando
remove info family since it is no longer used
Merge branch 'rsgroup_94_w_cli_5_94' into y94
optional encrypt args, pass buffer to callback
Merge pull request #4 from freewil/fix-encrypt

optional encrypt args, pass buffer to callback
Bump version
Update contributors
Added value text colour option in the settings
Bash completion should only complete the command once.
finihing clearing article
Merge branch 'gelatin-results'
Tests - Allow special handler for deleting a symlink

Signed-off-by: Michael Geddes <michael@frog.wheelycreek.net>
Test - Implement special handler for deleting a symlink in msys

Need to handle directory and file symlinks differently and with a cmd call.

Signed-off-by: Michael Geddes <michael@frog.wheelycreek.net>