labofsahil/github-event-dataset-2012 huggingface dataset:
cleans up some of the links I put in that aren't needed
Some small bug fixes
Merge branch 'master' of https://github.com/kcalmes/a-team.git
Merge branch 'master' of https://github.com/kcalmes/a-team.git
footer is now fixed
Changes for editing docs
Changes for editing docs
Add tests for server_matchup
Change to run 'weaker' algorithm in case 'stronger' algorithm fails.  Turns out that these names could be better: sometimes the 'weak' alg succeeds where the 'strong' one fails.
linked demo page to the github repo
Make it easier to replace the stock JSIL browser HTML with your own.
Attempt to support on-demand resolution changes by resizing the canvas.
Implement IsMouseVisible.
Fix mouse coordinates being scaled wrong after a resolution change.
Fix incorrect ClientBounds and Bounds properties when the canvas has been resized
Never call Array.sort() without an argument because it stringifies its arguments by default.
HslColor
RgbColor: moving things around
Updating authors in read me

Welcome, @eskimoblood !!
Update NS3 communication
Fixed error with new HashMap stuff
Updated for PRP 4
Rebuilt the Sphinx docs. Don't care about epub and want the to-do stuff.
Minor documentation tweaks.
Some basic reference documentation.
Added frequency and AD scaling
Bugfix: changing all key names to plurals to make consistent
Selective loading of different data components
Enhancements

1. Options to load only those variables needed from nex file
2. Loading of markers
3. Waveforms now scaled
Initial commit of problem no 1
more changes
last official chg for about
rating: implement reduction error correctly

- regenerated model with dogen 696
Switch to markdown
Added task to reset test data
Version bump - 0.9.2
Use source encoding
Added test to for source encoding
Map of characters changed to use an int as key.
Rename a variable.
Add the GoScript signature at the end of the files generated.
Update github README
Fix non-ASCII character in Penguins.
Handling '-' in enums as '_'
Merge pull request #9 from grossws/master

Adding support for '-' in enums.
Revert 58e065.
add version.go
Add notes how to init mspdebug
Add preserve_{current_canvas,batch_state} and invisible_canvas context managers
Add xaxis/yaxis properties to plotting.Efficiency
reverse order of branches in tree draw to match hist argument order
Merge branch 'master' of github.com:ndawe/rootpy
fix draw regex
fix regex and add test
test Tree.DRAW_PATTERN regex
Merge pull request #55 from pwaller/eff-axes

State preserving context managers, invisible canvas and TEfficieny.xaxis
Merge pull request #58 from ndawe/master

Reverse order of branches in Tree.Draw expression to match Hist constructor order
Merge pull request #1 from rootpy/master

Test - update fork with original
Fixed non occuring colors not being set to 0
fix so music21 import can be timed...

git-svn-id: http://music21.googlecode.com/svn/trunk@2889 5c16147e-a200-11de-b0cc-ab0ad15e60d0
updates to time graph

git-svn-id: http://music21.googlecode.com/svn/trunk@2890 5c16147e-a200-11de-b0cc-ab0ad15e60d0
less dependent timeGraphs

git-svn-id: http://music21.googlecode.com/svn/trunk@2891 5c16147e-a200-11de-b0cc-ab0ad15e60d0
Rudimentary permissions, fixes #4
try to get rid of jersey dependency
Merge pull request #7 from kvarga/master

Updated stocks module
New jabber now functional
Full functionality?
Updating sample config
Facts working, for reals this time
Removing deprecated commands, improving help
Improving facts and item support
Migrating history search to module
Log UID with username for admin access violation
Remove extraneous nicks from inRoster
Migrated security commands to module
Migrated quoting to module
Completely removing old-style commands
Correcting erroneous JUsers
Refactoring Interface to IConnection, step 1
Refactoring IConnector, part 2
Refactoring IConnector completed
Common api.launch
Refactoring modules to use zope.interface
Enabling simple module APIs
tus
Merge branch 'master' of github.com:kvnwinata/cara
Reflect last commit in CHANGES.
Center on current line after go to line.
Reflect last commit in CHANGES.
Make auto-indent move the caret before the first non-indent character, instead of before the end of the line.
Reflect last commit in CHANGES.
make an exception in autocompletion for <<, add forgotten definition for <leader><
Chapter 12.5: Friends
modi validate and fix bug
remove global PIE behavior
when logout, clear out login_as
replaced property list with a record. Let's see if that will pan out...
changed mews_webserver to a gen_server. So far only supports init and change of listening TCP port
more attempts for the gps service
Added some matches of the wiki matches db
Merge branch 'master' of https://github.com/lboudard/plaja
Umbenennung der README in README.md Dateien im MANIFEST nachgezogen.
copy-edit contributing guide [ci skip]
Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password""

This reverts commit ddbea9474e20a40e80110944c1e3493ba0efe572.

Reason: Includes non-doc changes.
Merge pull request #5414 from nashby/select-hidden-input

add 'include_hidden' option to select tag, closes #5402
mark engines guide as wip [ci skip]
Fix AM Guide

Use proc as default argument to recaculate recipients array every time
Merge branch 'master' of github.com:lifo/docrails
fix typo in AP CHANGELOG [ci skip]
Merge pull request #5419 from nashby/patch-1

fix typo in AP CHANGELOG [ci skip]
Remove Active Resource source files from the repository

Dear Active Resource,

It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository.

I will miss you,

@sikachu.
Ensure that engine can be mounted at root (#4314)

It's already fixed and the fix was actually in journey library,
but with #4314 it reappeared second time, so probably this
kind of integration test will be good to have to not allow it to
sneak in after changes in journey or rails itself.
Don't need to share engine's tests anymore, plugins are gone
Environment in engines tests is required on boot_rails, no need to require explicitly
add include_hidden option to checkbox tag
Check for existence of exactly the called `fixture_path=` method
Merge pull request #5420 from lest/patch-2

add include_hidden option to checkbox tag
Merge pull request #572 from sikachu/remove_activeresource

Remove Active Resource source files from the repository.
Added missing end to example
Merge pull request #5415 from rafaelfranca/refactor

Refactor the test_unit scaffold generator to use the key_value method
Remove sprockets integration on ActionPack
Remove tests and fixtures for Sprockets on ActionPack
Fix .deb names
Nice changes to performatic transpose in acc
1. Renaming PEG dir to Scheem.
2. Addition of WEB tests with Mocha.
3. Addition Node tests with Mocha.
Incrementally improved directory structure.

Not terribly much of significance here, but the clutter gradually
rearranges itself into a simulacrum of software decency.
SCHEMA CHANGE: Store key data in folders per the Keyczar spec

Rather than storing one key per device and the server key in the database,
we instead place them in a configurable directory as God intended.

Furthermore, we support having different keys for signing and encryption.
You're more than welcome to use the same keys for both, but if it breaks
you get to keep both pieces.

The schema change is a removal of data from the models, therefore no actual
database changes are required; the extra tables lying around there aren't
that harmful.*

*: I am not a DBA. This is not table advice. Seek counsol from a qualified
professional before taking action based on the above.
Why are we using double-b64-encoding?
Rename task given to device.
Added Film 4
Added more Channel 4 sites
Added Right Move
Added HSBC
Added Natwest
Added BT
Added Money Saving Expert
Added Auto Trader
Added Gov.uk
Added John Lewis
Added Royal Mail
Added Transport for London (TfL)
Added Asda
Added Premier League
Added Bet Fair
Added bone-counting addition example
Restructured folders. Folder now fits into themes directory directly.
Move uriSuffix extraction into lift_ajaxHandler.

By having it in doAjaxCycle, there were situations where the uri suffix
could get lost. The most obvious one was when a long-running ajax
request was occurring, and two AJAX requests were queued during that
time frame. This would result in the first request getting the second
request's uriSuffix, and the second request getting no suffix at all.

We now immediately put the uriSuffix into the sending data when
lift_ajaxHandler is called.
Merge pull request #1327 from lift/asc_issue_1327

lift_uriSuffix can get lost during long-running AJAX requests
upgrade pysimplesoap to 1.05a

git-svn-id: https://uliweb.googlecode.com/svn/trunk@957 14287918-b64d-0410-abb6-a92efa0c2026
check for null object.
add quiz plugin; begin styles
删除其他vc，全部用bee去写
tweaked cmake files.
Github changed their api, argh
Add some hints and it shows local ip
add express and ejs
Adding .jpg version of NPEB figure.
motivations done

Signed-off-by: loopasam <samuel.croset@gmail.com>
Testing the windows configuration!
Add overflow : hidden to body element to hide scrollbars (bug in firefox)
adding pipelinebase to default node
Add a test file, to test the lib inside node.js
Gemfile updated
Merge branch 'master' of https://github.com/luismrds/Rapti
Merge branch 'master' of https://github.com/luismrds/Rapti
Merge branch 'master' of https://github.com/luismrds/Rapti
Merge branch 'master' of https://github.com/luismrds/Rapti
Merge branch 'master' of https://github.com/luismrds/Rapti

Conflicts:
	Gemfile.lock
arreglado conflict
Merge branch 'master' of https://github.com/luismrds/Rapti
Merge branch 'master' of https://github.com/luismrds/Rapti
Merge branch 'master' of https://github.com/luismrds/Rapti
merge conflict fixed
ENH Update Vita
Ensure Array#to_sentence does not modify given hash

Also simplify I18n logic for Array#to_sentence, doing only one lookup
for all keys and using merge!, instead of one lookup for each option key.
Set hash value instead of merge a single key, and use flatten! if possible

There's no need to create two extra hashes with options.merge(another_hash),
with the goal of setting only one value, so lets just set it.

Also refactor validates_each to use _merge_attributes, like other
validates_* helpers do.
Use default + merge! instead of reverse_merge

Since we're not directly requiring the reverse_merge extension, we can
avoid another hash creation by using default_hash.merge! instead.
Cleanup attribute methods a bit, use map! when accepting *args

Since we're dealing with a new array instance, it's safe to use map! and
we avoid an extra array object.

Also remove the symbolize_keys! from AttributeMethodMatcher, since it's
an internal class that always receives symbol keys from the prefix/suffix
methods implementations.
Refactor attribute method matcher to use Hash#fetch
Merge pull request #6863 from bcardarella/asyn-actionmailer-guides

Guide update for Async ActionMailer
Add polymorphic option to model generator

For instance,

    $ rails g model Product supplier:references{polymorphic}

generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.

Also fix model_generator_test.rb#L196 and #L201
Address test_basic_model test error with Oracle enhanced adapter
which ids start from 1000 as a default.
Merge pull request #6879 from yahonda/address_basic_inclusion_model_test_oracle

Address test_basic_model test error with Oracle enhanced adapter
Fix wrong testcase. This is a testcase for db:test:prepare.
Fix wrong environment. env should be RAILS_ENV or test.
Merge pull request #6856 from lexmag/polymorphic_generators

Add polymorphic option to model generator

For instance,

    $ rails g model Product supplier:references{polymorphic}

generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.
Merge pull request #6880 from kennyj/fix_20120628

Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.
Add changelog entry for polymorphic option in model generator

Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226.
[ci skip]
Update psql adapter to rename a default pkey sequence when renaming a table.
Fixes #6825, adds tests covering cases and error possibilities, also changes SQLite3 driver to correctly generate a time column instead of datetime
Merge pull request #6873 from mauricio/fix-for-6825

Fixes #6825, adds tests covering cases and error possibilities
fix: limit of enum columns of mysql
Merge pull request #6878 from masarakki/master

fix bug in limit of enum columns of mysql

Closes #6432
Mention effect of accepts_nested_attributes_for on association autosave option [ci skip]
add an install file for next time
moved ir/code dumping to raw.py
remove forgotten debug
Hack so I can use from clojars directly. Remove dependency on goog-jar.
calculating lock picking (prepares for even more attributes)

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Added a reference counter to the text rendering info for easier synchronization with multithreaded rendering systems.
Fixed a GCC warning.
Added CodeBlocks project file.
support function argument for wrap, wrapInner
Added Registration System

Registration system + ajax for validation.
Moved data generation scripts here. Seemed more approriate.
Made an attempt at a custom adaptor. Doesn't work yet
adding melissa's files
ggg
going back before the failed first merge
melissa, please buy a pc
one computer?
added rings to sources and changed subParticles
merged beatD with master
mergggeeee
MERGED
sources with rings
sources with rings
everybodys working ridiculously slow.
hurrying
working vidMode, additional sound framework
added beat detection debug screen and fixed mousePress error
backup before merge with alex
merged with alex
practically done
practically done
CodeStyle

Signed-off-by: Salja <salja2012@hotmail.de>
Simultions ...
lateral arrows hidden
new arrow icon
data.c: Change function get_rss_code for get_feed_source

This new function returns a feed_source struct, instead of just the cod_source
returned by the function get_rss_code. With this new function, we have a better
approach when making transations with feed_sources. Instead of call a function with
a lot of parameters, we can just send a feed_source struct.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
data.c: Make a better approach for work with feed_source

This patch introduces great changes of how to manipulate feed_source data.

The function update_source_data now works with a feed_source struct, insteadof a lot
of parameters.

The function fill_feed_source was create to work with a feed_source struct, putting all
the available data inside the structure, and allocation data when necessary.

The release_feed_source now have one more parameter. This new parameter told us
when we need to relase the structure, and when we can leave it as it is.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Add encoding to stderr output
Fix wrong parenthesis nesting
Merge remote-tracking branch 'upstream/master'
Updated POTFILEs.in file.

 * frogr-picture-uploader.c got rmeoved and integrated in frogr-controller.c
 * frogr-picture-loader.c got renamed into frogr-file-loader.c
updated $ROUTES to make it a bit clearer on the proper usage.
Resized images to 24px
explicit node class
POD
Fix a typo: msggen->mscgen.
mparser: fix dictionary removal
v 1.2.1 removed -ms-prefix from animations, transforms, transitions and gradients
added example for calculating deg5 minimal valuations matrix
Remove janus.rake. Why is it still there?
Use more verbose time in git mine output.
Add lc function thanks to Michael Bernstein.
He published this at https://github.com/mrb/lc
Add hub and autojump zshrc snippets.
Enable show_log for Pry.
Bump oh-my-zsh to latest.
copy rebar to fix
initial commit of c_splitter for fix
more with generation of C parser for FIX
passed first test for fix_splitter
Now fix_splitter can parse simple fields
Now splitter for FIX lives in C domain
Now fix splitter in C is fully compatible with erlang parser
Added clean makefile target
removed fix:parse_num
markdown and vimpager settings
Delete old parser.
binding handler init can get all notifications of change in value (just like update)
Fix constructor freezes newly created instance instead of dup
Ok, changed some more stuff. Level Editor is done. It cannot delete stuff, but I don't really care. I'll change that later if it's that much of an issue.
added table.cs
Correct praces to braces
Merge pull request #4 from iepathos/master

Fixed typo
(bug 41042) Regression: API action=parse with nonexistent page

Changeset Iec98e472 changed the behavior of action=parse&page=... when
passed a page that does not exist: previously, it would return a
"missingtitle" error instead of assuming an empty page. As some people
had been depending on this old behavior, restore the error checking.

Change-Id: I4c76ce458ceb01e233c6074cd9251879013ec143
Merge "(bug 41042) Regression: API action=parse with nonexistent page"
sys-apps/uksmstat: fix build
Fix debug value
* createarchlinuxpkg.sh hozzáadva a kódhoz.
Incorporation of SBMLReaction List
Harded coded date format since AWS server is using US format
O mundo foi alterado, utilize esse projeto como base daqui pra frente na sua vida
s/red/pink
pdate colours
#1 Sync users to a mailee list
Implemented a rudimentary ai agent for easy mode (it's not good...)
playing around with button styling
1. Добавлена возможность добавлять парметры в CustomComand.
   Например что бы можно было вставить [video]{src}, а src получить через prompt
2. Исправлен баг при создании комманд. Раньше все аргументы превращались в строки.
   Сейчас используется eval, хотя комманды по прежнему лежат в commandList.
deploy to heroku
fix db:seed
fix remove smeta
Fix for parameter handling in SPI calls

This commit provides a fix for parameter handling for queries
called through SPI. Most of the issues were related to plpgsql
functions with DML and SELECT queries.
When sending a list of parameter to remote nodes, the PostgreSQL
protocol does not allow types with incorrect OIDs or names, in
the case of XC, incorrect names.
In the case of queries called with SPI, some parameter have no
type as they are not used by all the queries involved on the call
The reason of this behavior is that parameter management is centralized
in the SPI itself. In the case of such parameters, the same method as
dropped attributes of relations is used, meaning that a parameter that
has no type will be considered as a NULL entry and so remote node will
not complain about any unexisting type.
This fix is done on top of the existing infrastructure, but honestly
this should be rewritten with a set of APIs that makes remote parameter
management more easily manageable in cluster, however this is out of
scope for the time being.

2 regression tests are fixed thanks to that: plpgsql and rangefuncs.
final edits to project
TYPE_INACTIVE added ;-)
Add rst extension to README
ksL
working on ipc listener
enhance socket termination
core is now a true mediator
viewer: show more exception messages

When trying to render the map widget in the viewer, we catch exceptions
and print out the message to stderr. The only exceptions that are printed
are mapnik::config_error messages. mapnik can throw more errors, so this
change makes it catch all std::exceptions.
Merge pull request #1238 from simonsonc/viewer-exceptions

viewer: show more exception messages
viewer: add mouse wheel zooming

This change makes the viewer zoom in and out when using the scroll wheel.
The zoom tracks the position of the mouse pointer when zooming in so that
the map will be centered under the mouse after a zoom.
Merge pull request #1239 from simonsonc/viewer-wheel-event

viewer: add mouse wheel zooming
+ better not to use errno (via perror) for std::iostreams
  (it works with gcc and friends but non-standard)
fix warning message for pending features for markers
avoid compiler warnings with msvc
agg/grid renderers - match cairo by using buffered detector dimensions for placement_finder collision tests
finish exposing markers symbolizer in python - closes #612
only link libjpeg if we are building with jpeg support
explicitly include projection header
add operators for computing the envelope of a transformed box2d
(cherry picked from commit 9ad342cbed150948561c08e98957bc014dedc7f3)
agg::trans_affine: add static const `identity`, make mul/div operators const
(cherry picked from commit db47a6c9bad5828fe62b5c1c05661118e23ad218)
add value_null operators, improve is_null, move mapnik::value definition into separate namespace
(cherry picked from commit 653bca6bea1abb2e45c66e76fd5e4fe7dc10a91a)
new feature: transform expressions are now dynamic
(cherry picked from commit 173c402b5c142310087246b0ea54dbec54edcac8)

Conflicts:

	include/mapnik/vertex_converters.hpp
	src/agg/process_markers_symbolizer.cpp
	src/agg/process_point_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/load_map.cpp
Catch and throw PNG exceptions - fixes #1213

The png library uses setjmp/longjmp to throw exceptions when reading. If this
is not set up, the png library calls abort(). This change handles the errors
and throws a C++ exception instead.

This issue was found by testing images from pngsuite at
http://www.schaik.com/pngsuite/. These images are included and a unit test was
added to test both images that should be successful and images that should
throw an exception.
remove now unused blending modes as they have been replaced with AGG compositing modes - refs #1206
expose a get_pixel method on mapnik::grid (for testing purposes)
move to int32 for grid rendering buffer - closes #1196
only mark deprecated api names for removal at major versions to ensure we are semver compatible - thanks @migurski - closes #1129
Modify the readline delimeter. Now, the filename can contains '-'
Fix usage of reviews/approvals in patch object.
Removed console.log statements from debugging.
README: fixed live-install command
Revert "fjupdate: cherry-picked feedparser timestamp processing fix from chrisv2/master"

Modern versions of feedparser seem to be able to handle that format.
And if some relevant version do not, it should be
 fixed by registering date format handler with feedparser.
Fixes for some naive vs tz-aware datetime object comparison errors
Revise request and app context lifecycle tests, CDI-219
Fix invalid ActionSequence reset
Adds immediate return if number is a key in the dictionary
Towards #8

* Split laps by distance only as lap time is completely unreliable as it exludes inactivity time.
* Erroneous (e.g., empty ones in the beginning) laps (e.g. accidental press) will have start time of the next proper lap.

Also Activity Id in UTC
fixed some package name errors, dos2unix
fix typo
simplify packages
Issue #20, added Zend Framework support with base controller class
Add newlines/format OSX Mountain Lion guide
Apparently room.speak is not a bound function
COMMIT 1

COMMIT 1
Removed the test files from the gemspec as they are not there.
Fix test result displaying
FIX: came_from redirect after login
WiP: New Submission controller url layout, Pygments instead of SyntaxHighlighter and difflib to the max
Initial simplification of User model
Merge branch 'develop' into feature/simpleusers
Merge branch 'develop' into feature/simpleusers
Polymorphic not needed anymore
Merge branch 'develop' into feature/simpleusers
Merge branch 'develop' into feature/simpleusers
Further steps to simplified users
use request.allowance
Un-class the site test suite
Mention tutor in docs
Some more fixes in CRC
Cleanup tests and dummy data setup
Merge branch 'release/0.7.5' into develop
Merge branch 'feature/simpleusers' into develop
Version bump

Installing from plain archive is NOW possible, finally!
Merge branch 'release/0.8'
Google Downloader is added
Fixed a bug in GC.
Added true support of the Property module.
[#2200] Removed unused variable in embed jade template
Update config file to include new plugin defaults [#772]
Merge pull request #258 from jbuck/t722

Update config file to include new plugin defaults [#772]
Select text when editing newly created elements.
Merge pull request #64 from karthikv/master

When editing a text element, select text so I can overwrite it
Loading extension resources via stringbundle
Remove unused code
Missing file
Lint errors
Change pdfviewer->pdf.js for chrome://;new line
make the locale stuff a precondition for make extension
Merge pull request #1690 from yurydelendik/stringbundle-1

Loading extension resources via stringbundle
Move font translation to the worker
Merge pull request #2111 from yurydelendik/move-font-conversion

Move font translation to the worker
Bug 785052 - /usr/local/bin in missing from buildslave_path on 10.8 puppetagain test slaves r=Dustin

--HG--
rename : modules/buildslave/files/buildslave.plist => modules/buildslave/templates/buildslave.plist.erb
Bug 800986: upgrade to bmm-0.1.2; r=dividehex
Updating wsgi file to run standalone.
Merge pull request #12 from brandonsavage/master

Wsgi update
that will teach me to copy settings
20121113 Initial load
Removed i2c slave definition since it is crap and useless as is.
Cleanup to fit 80 col window.
Added callbacks for SPI master transfer finished.

SPI slave callback for each byte might be too slow. Try out a implementation.
Removed return of read_int, to retrigger call read again from inside INT.
Touchup of the implementation to shrink some size.
Works with new db structure... rudimentarily
manage the folder
minor tweaks2
minor tweaks2
barf on driver init error
minor adjustments from gpio debugging. all gpio outputs now work
debug prints out rule name
X+1 raises TypeError, not ValueError
matrix_add_glom
Fixes to use ws.
switch to PE
update for latest Z3
split syslog processing between filter and input
give each event a explicit default field
use default when field name, type is unspecified
removed _raw field from file input
correctly raise exception on query errors
call validate methods with fieldstore parameter
add msgpack dump and load functions
add env vars to control C header, lib paths
Implemented QUnit

Added QUnit unit tests.

Created tests.html for QUnit tests.

Moved javascript from index to Controller.js.

Moved js from index to Utilities.js.
unescape parameters in method-controller
introduce respond_with helper
change method call for GET() and POST() so that they return Mashes instead of Hashes
Problema con los botones de registro iniciar sesion en los talleres.

Este @benyArrona me comento que en la resolución para mobiles los
botones de "iniciar sesión"/"registrarse" se encimaban uno al otro
dicho problema quedo solucionado en esta confirmación.
[from now] 2012/08/22 01:42:31

diff --git a/README.md b/README.md
index 4d9837a..8d69286 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 skooma
-======
\ No newline at end of file
+======
+test
Merge branch 'patch-6' of https://github.com/davidwindell/zf2
Merge branch 'fix/i18n-view-helper-translate-text-domain' of https://github.com/cgmartin/zf2
Merge branch 'tests/clean-old-stuff' of https://github.com/Maks3w/zf2
Merge pull request #2070 from WickedyMike/features/IbanSepa

Remove remnant debug information
Merge pull request #2071 from BilgeXA/patch-3

Update library/Zend/Mvc/ModuleRouteListener.php
Created a StrategyEnabledInterface which allows the creation of hydrators without implementing strategies.
[#2069] reverted include_path changes

- These were necessary for Zend\Code tests to run, as well as tests
  running in isolation.
Merge branch 'hotfix/ZF2-418' of git://github.com/postalservice14/zf2 into postalservice14-hotfix/ZF2-418
Zend\Db: Fixed coding convention for pull request 2003
Added tests for the hydrator strategy
Added new lines to the end of the files.
Added tests for hydration strategies to the Form component.
Merge branch 'feature/hydration-strategy' of https://github.com/WalterTamboer/zf2 into feature/hydrator-strategy

Conflicts:
	tests/Zend/Form/FormTest.php
Moved Debug and Version into their own namespace, componentizing them.
[#2072] Fix for 5.3

- Defined a number of closures that relied on the current method context.
  Unfortunately, this does not work in 5.3 unless you import the current object
  ($self = $this; use ($self) in the closure declaration).
- Renamed HydratorStrategyTest to remove naming conflicts
[#2072] CS fixes

- trailing whitespace
[#2072] Updated README.md

- Added new feature to changelog
Added composer files for Debug and Version
Fixed usage of Zend\Version in components that don't first "use" Zend\Version
Merge branch 'refactor/debug-version-components' of https://github.com/ralphschindler/zf2
Added SurveySensor and support to enable survey answers to be analyzed
by Triggers and included in the data flow.
consumer shutdown 추가.
first try using git
fixed more bugs related to button creation
added .vimrc.bundle
adding tests directory with two types of test files
update resource
Merge branch 'master' of https://github.com/mzoneapp/zjjmb.git
modified .tmux.conf for remote
A few changes for the login system and a bug fix
FIxed formatting in NSError category, Changed password fields to secure, and fixed launch screen issue.
Make option-fn's composeable...

All option fn's now take an additional first argument representing the
command up to that point. The option fn appends it's output to the
command and returns the result.

* added 'this as first argument of all option fn's.
* Added AppendableSeq protocol.
* extended AppendableSeq to Seqable, String, and nil.
* used new protocol in mk-fn-clause.
Updated README
Update and simplify tests.
immigrate fn's as vars, to ease development.
work around for year=0 infinite loop bug in val_to_date_std.

Backported from development branch.

--HG--
branch : release-0.6
Test case for issue 28.

--HG--
branch : release-0.6
Fix issue 28.

--HG--
branch : release-0.6
Remove some old tags.

The ver-0.6.0 tag was not actually version 0.6.0.

The 0.6.0~rcX tags were interfering with my hg-git bridge (~ is an invalid
character for git branches, I suppose).

The true tagged versions (0.6.0 and 0.6.1) are still there.

(Backported from development branch)

--HG--
branch : release-0.6
Merge from stable.

Just need the fix for issue 28, but some other things are along for the ride.
Use tw instead of t as an alias for task
adding cart and line_items
#3
#1
new features and bug fixes

* Added migration-file command to patio executable
* fixed timestamp migrations to compare case insensitivity
* upped deps in package.json
fixed manyToOne assoc error

Fixed error where manyToOne association would not save foreign keys when set after initial save
fixed oneToOne preupdate
changed manyToOne to set id if val is not new
Merge pull request #23 from doug-martin/v0.0.8

bug fixes
Trying different configuration to run both suites
	modified:   .travis.yml
	modified:   unit-tests/ci/run_script.sh
Generated gh-pages for commit bc5715e (origin/master, master)
Author: Nikhil Marathe <nsm.nikhil@gmail.com>

    Remove glossary. Not worth the maintenance.
Get code compiling on Linux.

Link math, ev, pthread and dl.
Pass uv.a as build input as well.
To compile plugin add export-dynamic to executable to get mfp_register exported.
Use proper shared lib build options for gcc.
add query mechanism to API
Version bump for relase 1.4
Version bump for relase 1.4
Merge branches 'release-1.6' and 'develop' into develop
Merge branches 'hotfix-1.6.1' and 'develop' into develop
Posting a new comment would now return a CommonReturnObject.java instance which has the ID of the new comment
bumping to 1.7
added 1.7 jar
Merge branches 'release-1.7' and 'master'
Need to get all the changes in.
Merge branch 'master' of github.com:nmtadam/collab

Conflicts:
	vfpSandia/intro.tex
	vfpSandia/vfp.tex
updated ribbon code
Stylizing the challenge stats using bootstrap on the homepage
in progress for adding shape functions of interface elements
Insert id when making the teleport
improving preview...
Merge branch 'dev' of github.com:novius-os/blog into dev
Fixed URL for www.novius-os.org website in About popup
Added a comment for the 'Bye bye' translation
Add  function $nos.tab('current')
Fix up icon placements in FF and IE
Merge pull request #574 from alfhenrik/help-enhancements

Fix up icon placements in FF and IE
Announce topic changes to everyone in room as notification
Merge pull request #578 from dpatti/announce-topic

Announce topic changes to everyone in room as notification
Merge remote-tracking branch 'upstream/master' into nuget-updates
Update jQuery to 1.8.0

Ajax Min also updated
optimisation, corrections
creating git repository
removed svn remnants
Rename test file to make it more consistent will all the other file names
Make test method names more consistent
Add all types to __all__
update linux app to match osx
fix osx app commented code + remove unused Label
logout + and perfect header
trying to fix broken dev repo with broken submodule
Merge branch 'master' of github.com:nuriel77/Ovpnc into dev
Still fixing and refreshing submodules
Added root/static/js/mersenne-twister/ as submodule
Changed prompt appareance
Changed prompt appareance again
Forgot a reset_color
BAM-17 - changed notification enablement on a node to use a list of notify types, rather than a boolean flag, to make filtering notifications more fine grained.
Demo_app end of chapter 2 push
added anonymous review
col b
xi-config: fix verilator output and broken if statement
Removed credentials prior to making the project open-source
surface module refactoring & UIContainerElement::remove
add/removed test files.
[auto-stache] Protect against JSON.Parse error.
[pvr] bump add-ons to https://github.com/opdenkamp/xbmc-pvr-addons/commit/5f97406cffb412ac5161c3dc51205caca009fcc7
쓰기 관련 사항을 하나로 정리

앞에서 뒤에서 모아서 하나로.
map renderer should not render if map is not defined
enable DOM in two-layers example
map renderer should call map.render instead of this.render
dom.LayerRenderer.handleLayerLoad addition
remove ol.TWO_LAYERS_DEMO_ENABLE_DOM from two-layers example
remove FIXMEs
Merge pull request #18 from elemoine/domrenderer

DOM renderer changes
Finally fixing event sequences.
Add ol.Rectangle
Base ol.Extent on ol.Rectangle instead of goog.math.Box
Base ol.TileBounds on ol.Rectangle instead of goog.math.Box
Port ol.TileGrid to ol.Rectangle
Port ol.Projection to ol.Rectangle
Port ol.Map to ol.Rectangle
Port ol.webgl.TileLayerRenderer to ol.Rectangle
Remove ol.Bounds
Clean up stale filter
Update notes for submitted changes

* Fix a crash when launching qcow2 images containing snapshots
Update notes for submitted changes

* Add user_name project_name and color option to log
Update notes for submitted changes

* Move queue_get_for() from db to rpc.
Stub-implement floating-ip functions on FlatManager

This was messing up horizon in a way that would probably be difficult to fix.
It also is probably a bit tricky to implement floating ips properly for
FlatManager at this stage of the release cycle.  Stub them out for now,
to keep horizon happy.

Bug #954580
Bug #937227

Change-Id: Icb8d689860b893ebeeee02e248e836c52830b2de
Update notes for submitted changes

* Fixes nova-manage fixed list with deleted networks
Update notes for submitted changes

* Save exceptions earlier in finish_resize
Update notes for submitted changes

* Using query.soft_delete() method insead of soft deleting by hand
Update tools/flakes to work with pydoc

Change-Id: Ib141553017aa88d6edb65b5d51c06740699a2480
Merge "Update tools/flakes to work with pydoc"
Compute restart causes period of network 'blackout'

Fixes bug 1034401

When a compute service is restarted each instance running on the
host has its iptables rules built and applied sequentially during
the host init stage. The impact of this, especially on a host
running many instances, can be observed as a period where some
instances are not accessible as the existing iptables rules have
been torn down and not yet re-applied.

The presented work-around for this is a configurable/flagged deferred
mode that prevents the application of the iptables rules until all
instances on the host had been initialised then the rules for all
instances are applied all at once preventing a 'blackout' period.

Change-Id: I0da90d07e54225fb63f3884897fb00a6027cd537
Merge "Compute restart causes period of network 'blackout'"
Key auto_disk_config in create server off of ext.

Implements part of blueprint disable-server-extensions

Makes sure that auto_disk_config is only accepted in the create
server request if the extension is enabled. Note that the extension
alias is OS-DCF because it also adds output to the server
request.

Change-Id: I59fafe769e1e562e6bf9f6db768acc9b0f8d2b93
Test in every module became a member of "Hooks" map[string]func(*context.Uni), no need for any separate switch in api/mod.go.
Ran gofmt.
Readme and comment translation.
started making cavalcade work
support both json and jsonp
Adding CI build status ability
修改了发布博客url
Fixing FormHandler::checkPatterns
Preparing sign up feature (check form values)
Preparing system for custom data for each user
Revert "Use double underscore to avoid tainting blizzard"

This reverts commit 32ff39ebe69d8bcc759bcec48eaa9f250bbbadcd.
BUGFIX: Se abría una factura cuando se hacía doble clic en una obra.
tweaks, adding classes
tmux conf.
changed title/status bar
renamed folder, added directory picker
changed behaviour of dragging outside of turtlegrid
Some caption changes
Renamed CardField, some tiny fixes
rewrote exception handling for generate button
Implement damage function for gen1
Fix type assertion bug in build-pmon

The preconditions assumed that two types would be provided causing an
assertion error when only one was.
add plugin/a.vim
Alias tweaks.
/dist wird vorerst wieder sychronisiert
readme correction. little optimization
Added some tests for Math module. Some refactoring in math.c; numeric tolerance exported as Math::TOLERANCE and also used for fuzzy tests in mrbtest suite
nfs4: Add Request class for better handling of NFS4 requests
nfs4: Make RPC calls asynchronous
nfs4: Correctly handle timeouts and other rpc errors
Add possibility to set additional parameters of message part header e.g. attachment size
Added automatic setting of attachment size via Content-Disposition size parameter
Fixed Bug #19328: Wrong encoding of filenames with comma
Update release date
Add owner to browse view
Picked the best parts out of #101.
enable desktop-save functionality
DERP! I was using x coord in place of z coord
This is fairly important.
Added gtid and trigger word to data transferred to python. Closes #3. Will need reviewing on PackedEvent structure change.
better exception handling when scripting
test_regex.py to gitignore
Display additional data for refuels.
Introduced MyBatis for this purpose.
Tests now have to run against MySQL.
каптс
Install UltiSnips.vim instead of snipMate.vim
refactoring: creati controller pre gestire separatamente le routes
trello#6 : creato tag se non esiste, in fase di +1
aggiunta get tag e piccolo refactoring
aggiunta route per lista di +1 su un tag
CSS reloaded
Ampliado el modelo
back to 2.8.0-SNAPSHOT .. try again .. sigh.
Remove svnwagon extension
Removed test code that forced screen captures to be stored on personal desktop
Updated the Windows installer script for improved detection of XSB.

git-svn-id: http://svn.logtalk.org/logtalk/trunk@6571 ac9c905b-388a-4ddf-9b6a-4063a022bc57
Updated the Windows installer script to make sure that we don't try to integrate with a XSB 64 bits version that happens to available on a 32 bits system!

git-svn-id: http://svn.logtalk.org/logtalk/trunk@6572 ac9c905b-388a-4ddf-9b6a-4063a022bc57
Events Service Application init.
Core project for events restfull web services.
working through ical issue
added heroku to admin menu
add thresholds on qc plots
More complete version of the move of the password views

The previous one missed a number of parameters which caused it to throw
exceptions when used.
Fix encoding spec false failure on 1.9.3
Removed trailing backslash because brew doctor asked me to do so.

	modified:   _bashrc
Added tagbar to bashrc, django_bash_completion among other things.
 Changes to be committed:
	modified:   .gitmodules
	modified:   _bashrc
	new file:   _django_bash_completion
	new file:   _vim/bundle/tagbar
	modified:   _vimrc
fixed cache keys not getting the program name
resolve mvn warnings about deprecated `parent.version` property
trivial touchups to VoiceDataDumper

the important thing is, to use this with Mary 5 the voice jar file must be added to the classpath explicitly, since it contains the config file (which is no longer available under MARYBASE/conf/)
servInfo.html first upload
graphTaskView template
dfgbsdjf
dfgbsdjf
Merge branch 'master' of https://github.com/qwer-team/qwer
fgdfg
Merge branch 'master' of https://github.com/qwer-team/qwer

Conflicts:
	Controller/DefaultController.php
Zmiany lesnego
inconsolata 14pt
started changing over all logging to use enumed events
changed all logging to use events
Include API docs link
Fix DELETE task method
Template adjusts
put in a better namespace
fix the validation code and add more specs
commit lwt2 initial
Removed catepillar file
Second Commit

Various Changes
new versions from http://code.google.com/p/tinkercode/source/browse/trunk/automation-framework/i2c/
normalize newlines
patch back my data amount calculation (that might not actually work but hey...)
remove unneccessary common include, remove unneccessary ifndef, fix typo
see if this API break returns functionality
fix (hopefully) the buffer size calculation
cleaning whitespace
use CakeEventManager to dispatch afterSave event

- detect presence of id
- remove implicit call to afterSave, otherwise it will get called twice
Move logic in Model or Lib. Installation from shell now works.
Merge remote-tracking branch 'occitech/1.5-improve-install' into 1.5

Install via CLI. Closes #246
HTTPS default port 443

- Port tests for HTTPS default port 443
- Default port for SuperglobalUriDetector (http and https scheme)
Merge pull request #4 from hakre/port-le-port

HTTPS default port 443
为《日志》添加时间 feed 实例
添加锁实现代码
four headed video player - no seek
Update to Rails 3.2.6, for AcitveRecord security fix
Update to mysql2 gem
Merge branch 'feature/mysql2' into feature/ar-security-fix
Merge pull request #21 from restebanez/feature/ar-security-fix

Feature/ar security fix
Fixed SI-5708. Correctly compute accessibility for object members.
More useful crash reports.

If you can't get your hands on something which crashes
scalac - I know, I know - you can try this ready-made crasher.

  % cat test/pending/pos/t4717.scala
  trait Bounds[@specialized A] {
    // okay without `>: A`
    def x[B >: A]: Unit = new Bounds[B] {
      lazy val it = ???  // def or val okay
      it
    }
  }

  % scalac -d /tmp test/pending/pos/t4717.scala
  error:
       while compiling: test/pending/pos/t4717.scala
          during phase: specialize
       library version: version 2.10.0-20120510-134429-ce1d68ed19
      compiler version: version 2.10.0-20120510-152646-ba4dfd1e63
    reconstructed args: -d /tmp

    last tree to typer: Select(This(trait Bounds$mcZ$sp), x$mcZ$sp)
                symbol: method x$mcZ$sp in trait Bounds$mcZ$sp (flags: override <method> <specialized>)
     symbol definition: override def x$mcZ$sp[B >: Boolean](): Unit
                   tpe: [B >: Boolean]()Unit
         symbol owners: method x$mcZ$sp -> trait Bounds$mcZ$sp -> package <empty>
        context owners: value it -> anonymous class $anon -> method x$mcZ$sp -> trait Bounds$mcZ$sp -> package <empty>

  == Enclosing template or block ==

  Block(
    Assign(
      $anon.this."it "
      Apply( // def ???(): Nothing in object Predef, tree.tpe=Nothing
        scala.this."Predef"."$qmark$qmark$qmark" // def ???(): Nothing in object Predef, tree.tpe=()Nothing
        Nil
      )
    )
    $anon.this."it " // lazy private[this] var it: Nothing, tree.tpe=Nothing
  )

  == Expanded type of tree ==

  PolyType(
    typeParams = List(TypeParam(B >: Boolean))
    resultType = NullaryMethodType(
      resultType = TypeRef(TypeSymbol(final class Unit extends AnyVal))
    )
  )

  // And then the usual stack trace
Be discriminating about custom hashcodes.

If there are no primitives, use the regular boxy one.
Quieted down a developer warning.
Impl classes printed more accurately.

They're not traits.
Test cases.

Closes SI-4482, SI-4651, SI-3702.

Pending tests for SI-1832, SI-3439, SI-5091, SI-5231, SI-5265.
Merge commit 'refs/pull/526/head' into develop
Checkfile update.

Wonder if we should have a special area for high-turnover checkfiles.
A whole bunch of checkfile updates.

Wasn't me this time (I don't think!) Mr. Robot can't get
here too soon for me.
Forbid forward refs from self constructor invocations.

Prevents the wheels falling off during later compiler phases,
or, worse, during bytecode verification.

Closes SI-4098.
Share a Function0 for all inlinable anonfuns.

  // Given that `a` is inlinable:
  def foo(a: => Any) = a; val a = 22; foo(a)

  // We can compiles to:
  $anon.foo(new Function$Const$mcI$sp($anon.a()));

  // rather than:
  $anon.this.foo({
    final <synthetic> class $anonfun
       extends scala.runtime.AbstractFunction0[Int]
          with Serializable {
      final def apply(): Int = $anon.this.a()
    };
    (new anonymous class $anonfun(): () => Int)
  })

Saves around 750 $anonfun classes when compiling the Scala
distrubution. The savings might be less with the inliner enabled,
other than giving the inliner less work to do.
gl: try to fix reloading texture cache when atlas is used. Actually, no need to reload atlas objects, only the associated texture, and it's already done so... Just restore the texture cache "in case of". Refs #578
Merge branch 'master' of https://github.com/kivy/kivy into upstream
Remove trailing space from 'Stopping.' message.
added session protection and remember me
Also needs w3m for building xslt
Merge branch 'master' of github.com:D-Programming-Language/dmd
Revert "Revert "Merge pull request #41 from 9rnsr/rvalue-struct-literal""

This reverts commit 6b6734055710a72809d7d1d4d9c7ecb9bb6bbcca.
A small fixup to call Type::defaultInitLiteral
Fix compilable/line.d for Windows
7557 Sea of errors after template failure

Fix issue 7557.
ScopeExp should run semantic on templates, even after errors.
7557b soldier on through dottemplate expressions

Remove another use of global.errors
Merge pull request #754 from 9rnsr/fix_test

Fix compilable/line.d for Windows
Merge pull request #753 from 9rnsr/rvalue-struct-literal

A fixup for rvalue struct literal
Merge pull request #755 from donc/seaOfErrors7557

Regression 7557 - sea of errors after template failure
Remove blank lines from dmd.1.

The blank lines show up in the man page, making it
look weird compared to other man pages.
Add some new flags to the man page.
move errors to Dsymbol
Merge pull request #756 from bhelyer/master

Some man pages updates.
Merge pull request #680 from yebblies/issue3812

Issue 3812 - Missing line number for implicit cast of variadic function to array
fix Issue 3927 - array.length++; is an error, but ++array.length compiles
Merge pull request #729 from donc/gag4269

Fix most cases of regression 4269 (invalid types while gagging)
fix Issue 5525 - Eponymous templates should allow for overloaded eponymous members
Merge pull request #758 from 9rnsr/fix5525

Issue 5525 - Eponymous templates should allow for overloaded eponymous members
Merge pull request #749 from yebblies/issue1149

Improve codegen for OPmsw
fix Issue 7562 - DMD crashes by using TemplateThisParameter

Uninitialized pointer dereference crashes compiler.
Get file contents string function
Remove Dumper debug code.
Akismet:

* Pass additional post information on topic/reply edit, to prevent Akismet from nooping it.
* Revert part of r4041; put actions back before bbp_is_error() calls.
* Replace some missing revision numbers.
* Fixes #1869.

git-svn-id: http://bbpress.svn.wordpress.org/branches/plugin@4042 9866e705-20ec-0310-96e7-cbb4277adcfb
Adding deploy locking object
Fix for AWS testing pattern match for LB liveness
clear should clear all properties
updated to use the new test process
Delete spare files
Add test__db_builder
Updated Dropdown

fixed misplaced dropdown ID and class
Add json_path_get()