labofsahil/github-event-dataset-2012 huggingface dataset:
slow pyMorphy word normalizer

(bad implementation of java-handle for python script)
for merge
Merge remote-tracking branch 'GoodsReview/master'

Conflicts:
	Notebooks_marked_ds.txt
Passage du LeftTree en view
started Calendar dev
calendar working
Calendar v1.0
Merge branch 'develop' into release
moved stack to a header
Update ld-lib-path
readme-markdown
BashConsole added
BashConsole added 2
configure...
configure...
Scoll developing, Font change class->object
developing...
add example file
refactoring
add randomtextGenearator
refactoring
Add console.draw_border & console.draw_window. fix console.draw_rectangle
cleaning
fix def Console.position=
refactoring project structure
refactoring projects structure
refactoring projects structure ..
refactoring projects structure ...
refactoring projects structure ....
refactoring projects structure .....
refactoring projects structure ......
[Bukkit] Should fix the last permission issue. Total goof on my part.
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
code review for org.amanzi.awe.views.network plugin
Fix SkipParen
checkpoint
Upgrade FileSystemWatcher.
And Indexer is way nicer. No more scanning the whole damn directory.
Also, lastIndexed is now only used on startup, not to determine if we
just changed and this makes it less susceptible to races because of the
1 second precision.
Initial extension of LogRotator
Initial extension of LogRotator
first commit
Merge branch 'master' of github.com:AndroidJB/prebuilt
Don't drink and manifest
metadata
Chapter 15 Collections
first core methods commit
Unexpected problem
ticket:3 Creating tests for middleware
Template, model, url for urllog middleware
Make tests to be passed,finishing ticket.
ticket:4 Context processor
ticket:4 Added a testcase for context processor
Created context processor
Merge branch 't1_contact_page'

Conflicts:
	muchcoffee/coffeine/views.py
	muchcoffee/urls.py
Make grid L/R padding configuration available for … configuration.
Adding the GUI to the menu
Making the GUI the main class for the Jar
Fix BUKKIT-2210: Vanished players are still generating movement sounds for normal players

CraftBukkit sends sounds that originate from an entity to every player, regardless of that entity's visibility to the player.  Propagate the originator through methods to the actual packet sending, then check whether the entity is visible before sending the packet.
Signed-off-by: Arbuzov <arbuzov@mcn.ru>
version 1.2.1
no store
adding coutes
Gmapios initial push
Merge branch 'master' of https://github.com/ArkeologeN/Gmapios
CLOUDIFY-1067 Refactored process details
CLOUDIFY-1067 added service details to REST service controller
CLOUDIFY-989 Fixed NPE in DefaultStop.java
CLOUDIFY-989 cleanup
CLOUDIFY-932, Fixed NPE
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/CloudifySource/cloudify

Conflicts:
	restful/src/main/java/org/cloudifysource/rest/controllers/ServiceController.java
CLOUDIFY-1067 Added service details helper.
CLOUDIFY-932 Fixed NPEin undeploy application
Merge git://github.com/CloudifySource/cloudify
803 Build version advanced to 2491-34

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125506 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125507 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 2491-35

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125518 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125519 eb64e737-3616-4df0-8941-5ee2ae88103d
Merge git://github.com/CloudifySource/cloudify
Updated irc.rb to store the nick instead of the username.  The username is not useful.  I think this is what was originally intended.
Merge pull request #233 from untergeek/master

Change to store nick instead of user
update zeh Changlog and add untergeek to Contributors.
reading is hard
allow luabackend to compile with Lua 5.2, patch by Fredrik Danerklint

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2794 d19b8d6e-7fed-0310-83ef-9ca221ded41b
warn when securing a slave zone, suggested by Mark Scholten

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2795 d19b8d6e-7fed-0310-83ef-9ca221ded41b
actually honour SDIGBUFSIZE

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2796 d19b8d6e-7fed-0310-83ef-9ca221ded41b
use correct format for postgres string literals in zone2sql. Fixes #471

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2797 d19b8d6e-7fed-0310-83ef-9ca221ded41b
make traceback handler optional, closes #497

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2798 d19b8d6e-7fed-0310-83ef-9ca221ded41b
move to IPV6_V6ONLY, warn if it fails but charge on regardless.


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2799 d19b8d6e-7fed-0310-83ef-9ca221ded41b
reduce severity level of successful mysql connection to 'Info' - by popular demand ;-)


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2800 d19b8d6e-7fed-0310-83ef-9ca221ded41b
add --master, remove --fancy-records, for gmysql master tests

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2801 d19b8d6e-7fed-0310-83ef-9ca221ded41b
avoid race condition, also avoid a rare crash. Patch from ticket #596

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2802 d19b8d6e-7fed-0310-83ef-9ca221ded41b
make sure SSqlException does not escape from gsqlbackend

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2803 d19b8d6e-7fed-0310-83ef-9ca221ded41b
Merge remote-tracking branch 'git-svn'
[FIX] Naming error of method send -> send_exeception
local commit
fixed merge conflict
Removed a line from the settings file that fixed the token problem with Google OAuth2.
Added Accessors for the Background
Added set_flags method to dns.resolver.Resolver to allow overriding of default query flags
Have git ignore .pyc files
Add TLSA (RFC 6698) record type
Merge pull request #18 from pieterlexis/master

Have git ignore *.pyc files
Merge pull request #17 from pieterlexis/TLSA

Add TLSA (RFC 6698) record type
note TLSA added
Merge pull request #14 from sleach/master

Added set_flags method to dns.resolver.Resolver
Note new set_flags() method for dns.resolver.Resolver
Merge remote-tracking branch 'upstream/master'
lexiconHelper reports lexicon strings with empty values
checkproperties gets properties used with getProperty()
code cleanup
fixed E_NOTICE bug with lexicon helper
added rewriteCodeFiles and rewriteLexiconFiles to config
LexiconHelper checks property descriptions and updates lexicon properties file
LexiconHelper updates changed or empty property description lexicon entries
set rewriteLexiconFiles to true
tell git to unignore build.config.php files
LexiconHelper uses primary language for dir paths
fixed bug with mixed quotes in property descriptions
fixed bug with mixed quotes in LexiconHelper
LexiconHelper updates lex file if only one lex file is included
Improvements to example config
Now checks lexicon for System Setting names and descriptions
Fixed bug with lexicon->load()
updates default.inc.php with missing system setting strings; better insertion and output
added unit test to confirm default property setting code
handle plugin event priorities
bootstrap creates namespace
Resuelve issue #42
Converted a few plugin files from DOS to Unix. Added ctags config file.
Fixed error when pressing Backspace makes both the word and diacritical mark changed
Added custom layout and images.
fixed wrong bitmap width/hight from DrawingSurface
fixed flip tool tests
Add requirements file

Also linkify jinja2 for newbies.
updated some styles and calculation of fonts sizes in tag cloud
added orgs
added orgs
Merge branch 'master' of https://github.com/Compuware/ItInTheD
organizations group
Merge branch 'master' of https://github.com/Compuware/ItInTheD
Update src/env/env.c
Change DISPO to 100, fix auszahlen().
some Events
removing and extra </div> to fix the results layout
Add support for release builds using consistent branch.
Miscellaneous implementation for GUI.

...  Can ingest people, scores (which reference people), and concerts.
Performances (which reference scores) can be added to concerts.
to concerts
Suppression page d'accueil
Fixed installation and uninstallation of the plugin.
Cleaned code (tabs removing, spaces, typos, functions moving...) without code change.
Ended cleaning code for Omeka 1.5.
maven test release
maven test release
maven test release
[maven-release-plugin] prepare release DarwinsBox-2.0
RC1, just need to add server.
* renamed login file from RoR for erlang
* next try for cucumber and erlang
added попрошайка
Click on cinema opens Schedules page only on click in cinemas list, in other times it open cinema description page
Actor page swapped with genres page
DIEEEEEE JENKIIIIIIINSSSSSSSSSSS!!!!!
base controller in the core, localization support for external plugins, updated VS2012 template, minor reorganizations
Updated Icon Menu
Aggiunto README.rm
Switched image and thought bubble

This way we don't cover up the links at the bottom.
Update .gitignore filter
Added character marks!
Serve a cached version of the Scope

The Merge now only takes place once on first retrieve, or when the User
config is updated
Merge branch 'master' of github.com:Dynalon/JsonConfig
Profile view added to 2nd stat view in me.js

This is my first time using git or github so I hope I'm doing this
correctly.
Changed la alias to bind to l and show all hidden dirs except period things
Moving rollup template to common/ directory.
Methoden entfernt
Node ergaenzt
Merge branch 'master' of git://github.com/midgetspy/Sick-Beard.git
MagicSpells API Build 4
Signed-off-by: unknown <Erendil@Erendil-PC.(none)>
updated nmake to use fast/sloppy floating point and SSE registers.
nmake also now uses SDL by default
Add notice that instructions are out of date
Updating the readme with how to start.
Add GLStats config
Merge branch 'master' of https://github.com/Eyescale/Buildyard
Update src/messenger.js
Introduce a third setting for the 'bold as colour' mode, which lets
you both brighten the colour _and_ bold the font at the same time.
(Fixes 'bold-font-colour' and Debian #193352.)


git-svn-id: svn://svn.tartarus.org/sgt/putty@9559 cda61777-01e9-0310-a592-d414129be87e
Support for dead keys and compose sequences on Unix, by instantiating
a GtkIMMulticontext and having that filter most keypresses. I think
I've got this right so that it doesn't break any previous deliberate
keyboard-handling behaviour that's now _after_ the 'if (filter
keypress) return' statement.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9567 cda61777-01e9-0310-a592-d414129be87e
Add the missing code to treat data coming from the input method as
keypresses for purposes of hiding the mouse pointer and resetting the
scrollback.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9568 cda61777-01e9-0310-a592-d414129be87e
John Hartnup reports that Apache SSHD's SFTP server responds to
FXP_READDIR on an empty directory by returning a zero-length list of
filenames, instead of the more common response of a list containing
just "." and "..". Stop PSFTP failing an assertion when that happens.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9569 cda61777-01e9-0310-a592-d414129be87e
Stop including <gtk/gtkcontainer.h> directly, since a user points out
that it'll be absent in GTK 3.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9571 cda61777-01e9-0310-a592-d414129be87e
Turns out that the compose-keys fix in r9567 did in fact break one
piece of keyboard handling: if Num Lock is on, numeric keypad keys are
eaten by the IM, so we must avoid passing them to the IM in the first
place if we're in any non-default numeric keypad mode (application or
Nethack).

This is a grubby way to do it, but the more obvious approach of just
moving the Nethack and app-keypad if statements up to above the IM
call doesn't work because those statements depend on the generic
Alt-prefix handling that happens just _below_ the IM call. So instead
I just repeat the list of keystrokes and modes in an if statement
conditionalising the IM call.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9573 cda61777-01e9-0310-a592-d414129be87e
If pterm's execvp fails when given the whole argument list after -e,
and the argument list contains only one string, try again by passing
that single string to "$SHELL -c" to be parsed as a shell command.
This matches xterm's behaviour (as of xterm 261, at least), and means
in practice that users can do _either_ of 'pterm -e some command' and
'pterm -e "some command"'.

(A quick survey suggests that the majority of X terminal programs agree
with pterm's old behaviour of only supporting '-e some command',
except that gnome-terminal only supports the other behaviour and xterm
supports both. With that disagreement, I think supporting both is
probably the sensible thing.)


git-svn-id: svn://svn.tartarus.org/sgt/putty@9575 cda61777-01e9-0310-a592-d414129be87e
added author to reniceall/reniceall
differentiates between a crash and an exception. Crash messages send stdout and stderr. Exception messages send message and backtrace
creates progress bar view for showing progress in the run
bump version to 0.4.0.rc1
Paging fix
Merge branch 'master' of https://github.com/FlashLabel/Spotiko
Paging bag fix
Partial fix for actions. Needs UI fix still.
prevent NPE in LDAP Provider when username is not found, OF-540


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13058 b35dd754-fafc-0310-a699-88a17e54d16e
fixing cookie prefix
Meta blocks
Core/Logging: Add new log type for SOAP.
Closes #8201
Core/Misc: Check if race is changed before performing faction-change actions. (By tibbi)
Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions)
Core/Misc: tab to spaces and remove trailing whitespaces
Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load.
Core/Dungeon Finder: Update "Current group roles" according to people in queue.
Core/Dungeon Finder: Properly update internal lfg group structure at server load
Core/Dungeon Finder: Remove lfg player data when a group is disbanded
Core/Dungeon Finder: Some codestyle changes

Note: Real change is in LFGMgr::RemoveGroupData, all other are cosmetic changes
DB/Conditions: update ItemEquipped Condition2/3 values to 0
Core/Player: Fix crash in Player::CanUseBattlegroundObject when called from certain spells
Core/Spline: Improve error output for SpineInitArgs check

by Schmoozerd
Fix build
Remove some dead code
Prevent warnings
Merge pull request #8230 from krofna/dead_code

Remove some dead code
Core/Chat: Prevent client crashes with invalid chat language and message type combinations

Fixes #8083
Core/Spline: Change recently added error output to print DB GUID for creatures
Core/Guild: Code Refactor
- Send correct events when modifiying Ranks (Add, modify, delete)
- Store money/slots withdraw, not remaining slots. This will update remaining slots/money properly.
- Reset daily slots/money withdraw for all members at same time, configurable
- Better debug messages
DB/Loot: readd loot to stinky from clean 49 (removed by accident)

Closes #8222
This will be v5015 of the files.
Fixed the attack scribe msg to include the damage done and health
Resolving some bugs and adding README file
Merge branch 'master' of github.com:Ghuillaume/CalSync
Parser : classes & diag de séquence
merging conflicts
Ajout de la possibilite de saisir les cases, affichage des possibilites de la case dans le popup
added some fancy chunk code
not working due storage of x,z of a chunk
need to find another way to get the chunk
glack u do it :3
pc stuff
Merge remote branch 'origin/master'
adding project links for logged in users to main page
getting closer to a release 1
merge cu taburi
PHPCS FIX
Refactored and Added stuff

-Moved all enumerations to Constants.cs
-Fixed warnings from MusicManager and SoundEffectManager
-Set GraphicsDevice from ResolutionManager to a public getter
-Refactored Character class and added new functionalities
-Refactored CharacterPhysics and added functionality for jumping
-Refactored Enemy and Player classes
-Removed example game from Level1Screen and added required functionality
-Added XmlReader class. XmlReader is used for deserializing and handling
XmlItems
-Refactored Camera class
-Added CameraController class. CameraController maneuvers the camera
object in the game.
-Refactored CollisionHandler and added new functionalities to support
multiple obstacle images.
-Added support for XmlItems
-Added new content
Removing obsolete and commented out items
Checkpoint. Adding the buttons on the bottom and Route clean up
Colorize and layout bottom bar buttons. Spacer.
Styling the 'Places' header
Removing the bottom bar color for now.
Removing clear route text
Making the busy panel and the Routes display the same size
Fixing the border on the route eta components
Places header formatting and coloring
Removing unneeded refresh buttons from the routes display
Refresh routes from the bottom app bar now dismisses the top and bottom app bars.
FIX afterburners and microwarpdrives to not activate/deactivte while questor is paused.
Add debugInventoryTree option to questor.cs
Slow the UI refresh rate
Added debugAllMissionsOnBlacklist and debugAllMissionsOnGreyList to the settings you can use in order to help debug any possible blacklist/greylist of mission decline bugs.
Finished release v0.2.3.

# By Eran Rechter (2) and Guy Rozendorn (1)
# Via Eran Rechter (1) and Guy Rozendorn (1)
* release/v0.2.3:
  STORAGEMODEL-165 - minor fixes
  STORAGEMODEL-165 - add compare and write support (cherry picked from commit a0ddd642497f8acf6a295fe2677f398732371019)
  empty commit after version 0.2.2
empty commit after version 0.2.3
TRIVIAL write same support
TRIVIAL python version bump
Added a reference value to InputElement for the center of the range.
Switched termcolor to python-distutils-ng eclass.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key C0174749)
Switched termtool to python-distutils-ng eclass.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key C0174749)
Use distutils eclass in titlecase.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key C0174749)
Switched tweepy to python-distutils-ng eclass.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key C0174749)
Use distutils eclass in urlunshort.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key C0174749)
Allowed server to handle-without-crashing the new `name` tag. Not yet used in a useful way, but this allows the game to run.
Rename CSS class `symbol-anchor` to `symbol-link`

* also rename corresponding variables in bootdoc.js
Rename CSS class `symbol` to `symbol-target`
Remove white space at end of lines in bootdoc.js
Fix JavaScript code breakage caused by symbol link & target division

It was caused by this commit from pull #24: ec6d9c14de051b5bf5a1cee9955f506522595006
HTML/CSS fixes for Opera

* it will force Opera to not hide links under titlebar
Merge pull request #25 from denis-sh/declaration-links-fixes

Declaration links fixes
Added an option for type transformation for parsed NMEA sentences.

It is used as a third parameter for parse map.

Currently  only "decimal" type is implemented.
Made type parsing backwards compatible. To this end I introduced deserialize parameter to NMEAStreamer.

Particular NMEA object constructors have received kwargs param for future parameter passing.
Minor fixes
removed livereload due to strange reloading :o
Merge branch 'master' of https://github.com/JannesMeyer/Reader
Cleaned up backgound code
Final commit until publishing.
Final commit. Hello?
ADDED lua-mode
J'ai supprimé index
deleting node-project template
add node-project template
commenting is important
added user info to problem form, checks userid in session to control link options take 2
Refactored the test names
Organized the usings of all classes
Refactored the names of the public accessable attributes
Register instance.
started overview fixup
駒が成れるか確認するメソッドを成れない駒に対応
Is now multiplayer (2 players, single host (so not via LAN or AI)

Signed-off-by: Kajvdh <Kaj@telenet.be>
Refactored jQuery plugin method signature with default domain support.
Added case-insensitive comparison.
Plugin escapes inputs.
Updated README.
[Fixes #10] Added support for RFC compliant emails.
Removed ljsync, not required in the current project.
edit to the main.py and app.yaml... appengine ready... maybe.
More on server
Merge branch 'master' of github.com:Kissy/hellion-game
more changes to get vtk and piston to benchmark.
Merge branch 'master' into PistonFixes
Correct compilation issues in vtk threshold benchmark.
Correct compilation issue in Piston threshold benchmark.
The cell isn't needed to the threshold classify step.

We remove the argument as it is not only not needed, but
removing it increases the performance.
Merge branch 'removeUnusedThresholdArgs'
Add in support for benchmarking pistons openmp implementation.
Merge branch 'PistonOpenMP'
updates ue to o5m support in trunk osm2pgsql
and again some mod_rewrite dancing
Query optimizations
MSSQL patchs
Add specs for recognize meme in muzang plugins.
Fix for proper link from memegenerator. #2
Adding metadata, which isn't quite working yet.
Bugs: the gift that keeps on giving
Ensure we only fail when then loader is set to something else.
arreglado mongodb
Further updates to allow us to pass in a user to run as.
Reorganized folder layout and made changes relating to page layout.
Before changing to doing trie first
message
test
v0.11
Revert "v0.11"

This reverts commit 93378e6ec7d8bbba4bfd197146242aec5fea3a37.
v0.11new
core
pluginchanges

plugins chat.server.php and chat.stats.php edited for MPAseco
Implemented temporary gamemode solution
Revert "Implemented temporary gamemode solution"

This reverts commit cb45940d8570d8e2b5a7b7de9634fe340ca983e3.
Implemented getType for gameinfo
Merge pull request #1 from ManiacTwister/master

Gamemode fix
Fixed type
Fixed API version
Merge branch 'master' of github.com:ManiacTwister/MPAseco
Temporary fix for script-type
Merge branch 'master' of github.com:ManiacTwister/MPAseco
Doh! Its too late ...
Merge branch 'master' of github.com:ManiacTwister/MPAseco
v0.14 localdatabase fix

v0.14 localdatabase fix
bat fix

bat fix
rasp_votes added SCPT

it should be thought about the whole file in the next versions
royal script smal fix
增加分支
fixed static-y sounds :D
added play until done block and fixed touching edge glitch - Summer now works
Add all depends to test suite
Moved all controls and removed jquery-layout for styling

Still a lot of work to do
Renamed LocationDescription.java to Event.java
added docs for destroy method
Merge branch 'master' of github.com:Mottie/tablesorter into gh-pages
added docs for destroy method
Added some shit to .gitingore
Commit2

Quelque mise au point le perso est centré la carte plus grande
VCall
Define values for ast.Compare and ast.BinOp
Rewrite photos view controller.
tracers+docs: Correcting compilation and installation of trace helpers

Also in this commit an example on how to use trace helpers, including
how to build graphs using R.
limits: Adding support for callback that fired every time a new slot becomes available
docs: README update
LILY-505: Removed DerefMap original
Revert "LILY-505: Removed DerefMap original"

This reverts commit d64c5968c0a5f851ea4a0f5a9f4c878242c860b5.
Revert "LILY-505: Moved DerefMap to indexer-model package"

This reverts commit 0f250cd416021fbf54110dcfe9c32e06932b9adc.
Merge branch 'indexselection' of github.com:NGDATA/lilyproject into indexselection

Conflicts:
	cr/indexer/engine/src/main/java/org/lilyproject/indexer/engine/DerefMapHbaseImpl.java
	cr/indexer/model/src/main/java/org/lilyproject/indexer/model/indexerconf/DerefMap.java
LILY-508: restructured packages to allow an hbase filter to do the filtering for the derefmap queries. This filter has to be on the hbase classpath, which triggered a packages/deployables restructuring.
Add static factory method to Pair
LILY-907 Calculate index filtering in write path
LILY-907 Remove IndexAwareMQFeeder
LILY 907 Add custom ReplicationSource

New ReplicationSource implementation and supporting interfaces that
facilitates custom filtering of WALEdits before they are shipped
to replication peers.
LILY-907 Add subscription-based filtering

Add ServiceLoader-based injection of KeyValue filtering on data to
be replicated through the HBase replication system, with an
IndexUpdater-based implementation that only replicates SEP
payloads to SEP replication peers.
reloading task table contents - using key value in cookie

- cookie "PTL" for pre-tile task
- cookie "CVT" for conversion
- cookie "session" for session
Merge branch 'develop' of github.com:NIF-au/TissueStack into develop
add webform and ckeditor
Agregamos 5. Verlo en acción:
Removed Eclipse files and added them to gitignore
Merge branch 'develop' of github.com:Nardoz/RestOpenGov into develop
Merge branch 'RestBA' into develop
 rename local variable
remote .svn from restFB sources
rename to avoid facebook apear every where
 fix bug with page that started from 10, not from 0
 Now to map objets RestBA annotation is used
added multiple fliborrates vector for builder

added multiple fliborrates vector for builder
Merge pull request #26 from michaelhukun/master

pull
whole discount curve
Changed Readme to english

Again: I am using Tower. Nice.
Signed-off-by: NilsC <null@magerfettstufe.de>
Squashed commit of the following:

commit 25c426ac0cf3c7128e0b5adb96271558f91a425c
Author: NilsC <null@magerfettstufe.de>
Date:   Mon Jun 11 11:45:21 2012 +0200

    Fresh start for HTML5CSS3 in english

    Tried this one with Git Tower
Hallo? Jetzt mal Mergeconflict weg?

Conflicts:
	README.md
Corrected commiting my node modules directory
Wrote a CommandHandler, added /join and /leave. Fully functional commands
Typo
Rewrite the sign in function
Add favicon
Add new menu for logged user (most of the links are broken)
f - config
Run command raises an error if failed
Generate captured run command errors, logs them and raises an CouldNotGeneratePdfError
[+Vinay] Adding openlmis specific path
[+Vinay] Adding openlmis specific paths
Manan,Jaideep,Shruthi |#129| changing error message for required fields adding datepicker validations
#122 | Rahul, Balvinder | Creating reference data, Adding constraints for adding referntial data
Basic device status.
Added some CSS to the tableWrapper to enable vertical scrolling in the table view.
Simple day/night cycle
case insensitivity test case
Merge branch 'master' of github.com:PLTteam22/SmarTest
Basic move code generation
(x): moved some logging statements around to highlight when the object liked to the physics system supports smoothed position and rotation values.
LCS
LCS optimization
added test to hook.t to demonstrate hooks issues
Support for "postponed hooks" (fix the issue faced in t/hooks.t)

The idea is to register hooks in a "postponed" hash if none of the known
hookbale instances claim the hook.

That postponed stash is shared with the app and the runner object. When
something that is hookable is created, we go over that hash in order to find
some postponed hook for it.

This is done thanks to a nice naming convention that we have now:

Core hookable objects must regsiter their hooks under the "core.$name"
namespace (eg: "core.error.init" or "core.app.before_request").

Engine hooks must go under "engine.$name" (eg: engine.template.before_render)

Plugin hooks must go under "plugin.$name".

Note: the whole test suite pass, and the t/hooks.t script now register template
and serializer hooks before setting them up, and that works. BUT. Some work is
probably still needed for plugins. We'll see.
test suite fixes
more tests for session, couple of minor fixes and Dancer::Test stuff
session simple
defaults for template and session
generalize the idea of hook aliases in the Hookable role
saving all registered plugins in the app object, support for plugins hooks.
Dancer::Test exports response_content_unlike
remove core_debug statements
a couple of cosmetic changes for dsl->dancer_version and register_plugin
remove warning
Merge branch 'topic/plugins_compat'
Testy-Commit-3
Shutdown Server works, Client commands OK

TODO:
- try to get rid of silgenton
Add a loglevel setting to selenium tests
Merge branch 'feature/selenium' of github.com:Pita/etherpad-lite into feature/selenium
LibCecSharp: fixed - set the primary LA in CecLogicalAddresses
added GetLibInfo()/cec_get_lib_info() to the interface, that shows how libCEC was compiled and with which features included. added cec-client -i / cec-client --info
added ToString(cec_user_control_code_key) to the interface
added cecVersion to libcec_configuration, that configures the spec version that libCEC will use for devices it controls. defaults to v1.4
header cleanups, cleaned locks around callbacks, added CAdapterFactory, to create IAdapterCommunication instances, added --debug, --enable-optimisation
fixed: disallow sending CEC_OPCODE_SET_STREAM_PATH - not allowed by the CEC spec
fixed: when an image view source message was received from another device, then libCEC incorrectly marked that device as active source internally.
fixed: persist the configuration in the eeprom after initialising the client. fixes wrong/old settings being used in autonomous mode, which broke the wake on cec funtion
fixed: don't use a CTryLockObject in ReplaceHandler, but a standard lock and wait
fixed: unregister a registered client in RegisterClient() before requesting the vendorid, so the device members get reset. don't call ReplaceHander() another time, since GetVendorId() already doe$
fixed: don't try to write to the eeprom more than once within 30 seconds, and schedule another write if more than one change came in within the 30 seconds
p8: fixed - updated the cached device type setting properly when persisting new settings. correct return value from WriteEEPROM(). lock a mutex when updating the state
p8: fixed - always set controlled mode to false when unregistering the last client. fixes 30 second timeout before controlled mode gets deactivated
fixed typo in CUSBCECAdapterCommunication
sync LibCecSharp
updated README with a link to the FAQ page
updated changelog (release)
added support for the Raspberry Pi. this needs a recent firmware for the Pi. libCEC's configure script will check whether the version is correct
p8: updated 'last firmware date' version so users see a popup when not using the latest version
Merge branch 'development'
Merge branch 'master' into release
Commit de internacionalização
Merge branch 'master' of github.com:PunkMaldito/lemure

Conflicts:
	public/.htaccess
Merge branch 'master' of github.com:PunkMaldito/lemure
commit de internacionalização
finished FindTower, and cleaned up some duplicate functions in Player
added silence check and FindTowers to updateGameboard
endret navn paa texture-filer
lagt til masse metadata og properties
forandra player.setMark til abstrakt. fjerner metadata ighen og ser hvordan det gar
Implemented skills and skill restrictions.
Retina-display-proof the CSS style for mobile browsers.

The relevant statistic for switching to a single-column display
is not how many *pixels* wide the *device* is, but how many
*characters* wide the *browser window* is. An iPhone in landscape
mode is about 800px wide, but should clearly still be using the
single-column style. Also, now you can preview the single-column
style in a desktop browser by simply resizing the window.

I still haven't figured out a golden mean between the original
games' hard-wrapped monospaced 80-column display and modern
browsers' proportional fonts. I have the SOFT_NL macro (from
commit 150a267d), but turning it on just looks terrible, unless
I limit the viewport to about 60em. And either way, I worry
about how Platt's shaped AIEEEEEeeee!s will look.
refine logic works but the form is replaced by the text
no underline in navigation links
navigation without page reload
Fixes Bug 297188 - Sending a message to a blocked contact should report that the contact is blocked
Fixes Bug 297187 - Crash when blocking contact on group chats.
Fixes Bug 297191 - When blocking a contact "typing" status should be cleared
Fix ID des rooms
Ajoute card2.cfg
work on caching tiles based bounds as opposed to having to brows.
cleaned code, new Board class, Game class, constants
Initial DB usage
질문카드 질문내용 commpany -> @치환방식으로 변경
new version of readable
0.4.8
1
Revert "1"

This reverts commit 7d08f351800680ec85d3b32ffa52024818e40b84.
1
Revert "Maj readme"

This reverts commit 7af70aa5221b6c229341e51fb28d53e5f4c0bc9d.
Ajout des bots.

Manque plus que l'IA a bien faire :) .
Added .md files for old TaskPaper scripts
bup
README changed
passing unit specs: array, cons, cyclic, empty, enum*, finite, immut, singl, as_enum, take
logo size alteration
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Add Image Editor\!
removed setPersonalNumber from fixtures
[Issue #25] Added PlaceRents model
Merge branch 'master' of github.com:psu-capstone-aperture/aperture-vman
Merge github.com:psu-capstone-aperture/aperture-vman
* app/index.html: Adding search by name
Updated Readme

Added a lot of new information about the current state of the project
and where it is headed as well as implementation information on the CLR
library.
Added a junit test for the validator.
Added JavaDoc to all undocumented API and moved EmfFactory and
SetupDataCreator to the utils package.
Added the function to add a new article and added a jUnit test class for
the authenticationContextBean
Revert "added permissions table and bootstrap themed it"
permissions table was not really needed, at least right now.

This reverts commit 7645d81d6a7d6cc3cb32a1a0a37a56eefb9504f1.
added LOTS of permissions
half working directory stack
changed path for js in footer
add testSeq15a to init TI CDCE72010
Added author link to articles
Updated

Mostly everything has been updated ^^
ALL THE THINGS

no
Drop not needed assertion.

getFullComputerInformation is being used, so there will be no empty response.
Check that locking works.

Assert that when cleanup was requested, cleanup nor installation cannot be
requested.
Assert that when installation was requested, cleanup nor installation cannot be
requested.
Activity checking is more important then catalog checking.
Cover destruction of partitionless instances.
Install erp5_secure_payment
Missing plugin.
ROBIN: Implement some more opcodes
Revert "李金珊提交第一次作业"

This reverts commit 81839e23ab0c83cf92e87c8ae6824ae1e4e7de0d.
added core/array tests back in... turns out they work, but consume a huge amount of memory.
converted DNAComponent and Collection to use Documents
added a link to the online documentation
wl18xx firmware
wlcore/wl18xx: change priority calculations for links

Update the 18xx FW status private part to include Tx ralated link
priorities. Introduce new HW ops to determine link priority per chip
family.

For 18xx the changes are:
- Suspended links are at most low priority and Tx for them is stopped
  beyond the suspend threshold.
- Active links now get their thresholds directly from FW
- There's a new "stop" threshold for active links, at which point a link
  stops receiving new packets.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
wl18xx: limit Tx for the AP single-STA-in-PSM case

Treat a single connected STA in PSM as a slow link and regulate Tx speed
according to slow link priority/stop thresholds.
This allows us to avoid flooding the FW, while delivering decent
throughput to a peer in forced-PSM.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Added title helper
signup page
user model with secure passwords
changed name of bundle
NSDictionary使ってデータを複数格納できるようになった
次はplist対応で読み書き予定
Give up adding Facebook like & send buttons due to Content Security Policy
for katana
Added rss image, updated facebook/twitter logo
start of error framework
Update mainmenu pic
Got the bare bones of the UI created; Creator.java is a work in progress.
Fix for WC update. Was using old Subscriber value, needed to grab the lastest from the database before posting to WC
further updates

Changes:  miningApp.lua  | looter.lua
All others updated basiclib --> itemlib
proj push - 2.1
The action button is not over the thumbnails list anymore
Guards not loading in properly :(
Make QTreeView items uneditable, copying is still possible
fixed up cleanup
Some changes, fixes, etc.. :P
Started implementing search form in the SoundCloud Demo
Almost finished with the SoundCloud demo. Only needs to figure out layout for search form, implement different results templates, and make CSS firefox-compatible.
Added styling to search form in SoundCloud demo.
Merge branch 'master' into gh-pages
merge postler/master as new commit, squashing his into one to not get an external lib into the tree history.
vald deployment fixes
add decorator for unit conversion functions to catch division by zero
fix sql parser bug. numbers like 1E-9 were rejected
add query to error message
Added LootChestObject
 - randomly populates chests inventory with loot
 - you can set the probability for each material to spawn

DungeonObject uses LootChestObject to spawn chests with loot now
Corrected the sprite

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Fixed up compat for SpoutAPI

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Setup App on Mac

Modified Gemfile and migrated db to use pg on mac.
Gemfile Update and Pending Specs
fix apple position
Cleaned Headers
add date/time to files that are meant to be backups
add example ipfilter
Optimized query for groups
Updated Events for chat changes and moved PlayerHeldItemChangeEvent to Vanilla

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Merge pull request #341 from W1ndwaker/events

Updated Events for chat changes and moved PlayerHeldItemChangeEvent to Vanilla
novos campos para o valor da variavel: valid from e valid until, representam quais as datas que aquele valor é valido para uso
adicionado funcao para calculo do period e restringindo os period para (daily, weekly, monthly, bimonthly, quarterly, semi-annual, yearly, decade)
Merge pull request #44 from renatoaware/master

mais informações no commits
Corrigindo campos de populacao homens/mulheres
..
Added Retina support / make it possible to build with xcode4.5
Projekt Start Bu...
commiting first import file
changed to prod
fixed merge conflict w/heroku
removed stupid import file
move README to html
closed #4 added license file
Support configure file
Profile Items Final Commit
Merge branch 'master' of github.com:ZenAnthro/ProjectX
In
in
terminal background, fold method, screen swapping
[*] баг с кодировкой
[+] присланные сканы двух отзывов: воронеж, муром
[+] заготовки и сканы присланных отзывов
added parse for mankato and winona
edit tabs on User Profile pages
Updated recvall() to use join() on all the chunks, instead of iterative +=, which is more memory efficient (and about twice as fast, for large amounts of data).
Added links to android and iOS sources

Improved layout, links etc. Main project page is now done
Adding fs/mkmount
Updating gem versions
Automatic commit of package [cartridge-jenkins-client-1.4] release [0.28.2-1].
Automatic commit of package [cartridge-perl-5.10] release [0.25.2-1].
Automatic commit of package [cartridge-10gen-mms-agent-0.1] release [1.11.2-1].
Automatic commit of package [cartridge-phpmyadmin-3.4] release [0.15.2-1].
Automatic commit of package [rubygem-stickshift-controller] release [0.12.8-1].
Automatic commit of package [cartridge-postgresql-8.4] release [0.10.2-1].
Automatic commit of package [cartridge-jbossas-7] release [0.94.6-1].
Automatic commit of package [cartridge-jenkins-1.4] release [0.94.3-1].
Automatic commit of package [cartridge-ruby-1.9] release [0.1.3-1].
Automatic commit of package [cartridge-mysql-5.1] release [0.28.5-1].
Automatic commit of package [cartridge-mongodb-2.0] release [0.21.4-1].
Automatic commit of package [cartridge-jbosseap-6.0] release [0.1.7-1].
Automatic commit of package [stickshift-abstract] release [0.12.4-1].
add eap maven repo
updated eap template pom
Converting line delimiters to Unix-style in all the makefiles I missed, as well as the bar-descriptor.
Added MPLS file name to alert box
More fixing regarding testrunner
Merge branch 'testrunner' of github.com:acken/AutoTest.Net into testrunner
SCHEDULING-1711 Disabled database logs for junit fuctional tests.

And for JMX statistics.

Change-Id: Ib32871cfc28425916ae4a9c11bd842fd4a986e07
Committing because there are some changes in the settings as a result of upgrading the SDK.
Add a dummy property to the end of the URL that looks like a .css filename.

Without this, archives of the site generated with wget might not be
hostable since the webserver won't be able to determine the correct
content-type for the CSS.
funcionando logueo
When not having signed in, nothing is displayed on a header.
refactors to move logic from controller to model
Merge branch 'master' of github.com:adibsaad/bssrutils
removed out.txt
Orden Compra 15.03.2012
shut !
Change name of application class to CCCultura
Fixing discrepancy between local and remote master

Merge branch 'master' of github.com:afbroman/ccCultura
fixed wrong route
display reservations not found message when user has no reservations instead of display the table with the header but no rows
removed stupid smile face at the topbar
Add Build Instructions...
finally fixed bootstrap problems
Correct delegate property
Update package version
Fix non-oriented features. Closes #3
Updated version dates
Updated changelog
Merge branch 'hotfix/0.9.5'
Fixed Python 3.2+ compatibility
test8:x=0しか解がない場合を追加しました。
OGM-144: Make association collection configurable (prefixed/global/entity).
adding database project and publish profile
get find() and persist() working for BlogOneMapper
Add co-existing groups multicast features
fixed a retro compatibility bug with express 2.x
change sprites graphics removed unused sprite
merged
ker ker
Merge branch 'master' of github.com:alanchen/FattyCola
add notify-osd support
Do not use any template in _filtering_value helper
Improve filtering form interface and functions

Allow to filter by attributes on nested associations and by nested associations themselves (selecting them from a list of checkboxes).

This seems to work, but is not very well tested.
renamed games collection
updated style
Save updates options
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Merge remote-tracking branch 'origin/master'
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fix doc comment
Add missing file doc comments
Wrap some long lines
Use the factory class
Merge remote-tracking branch 'origin/master'
Fixed unclosed HTML tags
fix errors and defects
Added _cache/ directory to .gitignore
jsonparser: Handle every kind of invalid input gracefully

Previously, we used json_tokener_parse_ex(), which always returned
NULL in case of an error. A while ago, we switched to
json_tokener_parse() instead, which never returns NULL, and instead,
modifies the returned object to be an integer casted to pointer in
case of an error.

This resulted in the json-parser segfaulting whenever it encountered
invalid input.

The best course of action is to switch back to
json_tokener_parse_ex(), because that way we can easily see when an
error happened, and we even have easy access to the error message.

In the long run, we should probably move back the tokener to the
LogJSONParser object, and protect it with a mutex, for a bit better
performance.

Reported-by: Eun Kyung <ekyung01@googlemail.com>
Signed-off-by: Gergely Nagy <algernon@balabit.hu>
contrib/systemd: Alias the service to syslog.service

In order to be considered a syslog service, we need to Alias ourselves
to syslog.service. Doing this will make systemd consider syslog-ng a
valid syslogd service, without the alias, one has to do something
similar manually.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
scl: Teach the system() source about systemd

On Linux, when LISTEN_FDS is non-empty, and
/run/systemd/journal/syslog is a socket, assume we are running under
systemd, in which case our source shall be the journal's syslog
output, instead of the default /dev/log.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
libsyslog-ng-crypto.so: link against libcrypto explicitly

This patch adds OPENSSL_LIBS to LIBADD so that libsyslog-ng-crypto.so is
always linked against libcrypto.so

Reported-By: Alexander Komyagin <komyagin@altell.ru>
Signed-off-by: Balazs Scheidler <bazsi@balabit.hu>
Make sure to notify if enable_uploads is unset, and no target images dir will be created by cronjob, which will prevent uploading
Set incoming early and make sure to notify in case of write access problem
Display the selection box only if files are already present
Better title for that section
Safer if/then sections with curly braces
use local var name for function and more explicit message in case of non-writable dir
Let's try and fix the svn checkout issues for tests breakage on minijson
Fix CR/LF problems introduced by .gitattributes changes in git most probably
Hopefully the minijsonTest.php isn't touched by git now
Maybe without a svn property eol:style that will be better ?
Add list of slugs for migrator
Moved Govspeak helper outside the accordian
Closes ticket #1553
Cleaned up Govspeak help for guides
Moved parts outside the accordion, made it a fixed height with overflow to not take up too much space
Merge pull request #6 from alphagov/new-govspeak-layout

New govspeak layout - reviewed with James S
more ie6 fixes, images on ministers page
Unpublish should not be hyphenated.

According to Ross, our spelling guru.
Added acceptance tests to check video player functionality.

While the assertions may not be the most robust, the tests do at least
ensure that the media player javascript is running successfully against
Youtube URLs embedded in document content.

Also removed a console log statement which was cluttering up test
output.
hiding images for secondary features for mobile
Add +other buttons to managment and chiefs of staff
Add series information to publication index

This displays the information of a series the document is in in the
index and via the Ajax updating mechanism.

The Javascript to present this information is getting a bit hairy and
led to the decision to send back the text as a string rather than
URL/name pairs in a JSON object, but since Neil wanted to try it out
quickly I did the simplest thing.
Merge pull request #34 from alphagov/document-series-in-publication-index

Add series information to publication index
Also need to precompile bootstrap_admin.js
Merge commit 'b876fabf461ffa4e5a7c58241a19277abf8253ef' into HEAD
Fix anonymous class issues
Style changes and fixes
design tweaks to person page

• re-order contextual nav so that the minister portrait is above the
links
• adjust whitespace around page heading
Will need moustache & hiccup
Updating .gitignore
SynEdit: PascalBeautifier, fixes for comment indent/prefix-continuation

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39604 4005530d-fff6-0310-9dd1-cebe43e6787f
IDE: Add option to auto-continue comments

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39605 4005530d-fff6-0310-9dd1-cebe43e6787f
Added random seed for dataset generation.
Added OOB
Merge branch 'development' of https://github.com/davor/bbrc-sample into development

Conflicts:
	bbrc-sample.R
Fixing del
removing zero entries
I've created an app.
Refactored FAQ section
Update to the new cleaned up xml.
Removed unitless because it's a boolean function :blush:
Update signaling code to connect to real IP addresses
Updating temporary download link
Method!
Updated dependencies to RC versions of WebApi
update an aliases
Add MN015.KinhTuLuong
Updated factories and externalization table to handle StateRequestCommand and StateResponseCommand.
2058  FIXES

TODO: cleanup this commit
FIXES 2

TODO: cleanup this commit
Albums are now sortable
continued
Merge branch 'upgradelibs' of github.com:ansell/jsonld-java into upgradelibs

Conflicts:
	pom.xml
add note about hardcoded path to /project

path needs to be configurable or a constant somewhere
extensive moving, remove EnumerableRDFNamespace, create static Vocabs
migrate two sesame utilities and property utils to new api and ng-lib
0.6.01