labofsahil/github-event-dataset-2012 huggingface dataset:
Added handling of inequality constraints for {y==k}+{y!=m} where k!=m. Added some test cases p006*.
updated LTLs of test case tests/p006if.*
change semantics of global to preserve bot
change separator in csv output
frontend unification for interface, navigation and forms + created custom form theme (compatible with bootstrap) + added support to upload users avatar
Base: debug header...
docs: fixed a small issue in the code sample. thanks smallfish.
updated docs to reflect recent changes in the TEST_NGINX_USE_HUP environment support.
Add menu- to hide-sidbar-left class to preprocess
Add menu-colors to blackwhite_side a:hover
Separate variable declaration and assignment.

Assignments were a bit lengthy.
Break up method-chaining, and break out regex.

Should make adding new features and tweaking easier in the long run.
Rebuild bookmarklet.
Support soft-wrapping on GitHub's blame pages.

Blame-pages have slightly different markup, so this commit tweaks both
the wrapper-selector logic as well as the injected stylesheet.
Merge branch 'blame-pages' into develop
testing dynamic interface generation
Prototype actions menu - no events yet
Updated the bootstrap library
Add another example to readme

Signed-off-by: Aki Saarinen <aki@akisaarinen.fi>
project: Version 0.1.0 for release

Signed-off-by: Aki Saarinen <aki@akisaarinen.fi>
project: Update version to 0.1.1-SNAPSHOT

Signed-off-by: Aki Saarinen <aki@akisaarinen.fi>
readme: Add SBT dependency links

Signed-off-by: Aki Saarinen <aki@akisaarinen.fi>
added code to trap dynamic invoke exceptions
change ground size
Merge branch 'master' of github.com:alanchen/FattyCola
cleanup/fixes for score handling
gus-like/simplified HUD for LX gaming
less space for "press space for respawn"
small fix for worm drawing
take less space for weapon/health HUD drawing
small fix
FIX on classes Thing,Container
ADDED new Classes: Televisore,Cassetto,Libreria,ClosedObjectException
add please
add merci
add affiliations to sci. committee
add an introduction to en/sci. committee
Add 'default_order' scopes to models
Order collections in application.rb
move language button + edit en/index
Add params display in development for debugging
Add config.ru (for heroku, for example)
Work on views
Work on stylesheets
sign in and sign up views
Apparently global unset didn't work like I expected, so rebind the key in python-mode as a mode hook.
use submodules to manage
configure: Fix --with-json=auto.

One of the previous patches broke --with-json=auto, making configure
try to detect BOTH json-c and json-glib, and failing if any of them
were missing.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
configure: Add support for --enable-json.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
Merge branches 'hotfix/3.4/json-configure', 'hotfix/3.4/optional-modules' and 'feature/3.4/undummy' into sandbox/3.4
Updated test info.
Fix marker display on trackpoint hover
Test removing .php stanzas from .gitattributes
Try normalizing to LF for PHP files
Fix: Needs mandatory jobname too
Allows forcing some content-type instead of negociating with Accept header
Add the possibility to pass forced_accept and forced_content_type to /projects/...

This allows to use XDebug or even debug RDF+XML in the browser

Also :
Try to cleanup some variables passing from logger.php to www/projects
A few fixes hopefully too... some /projects/PROJNAME/subpage seemed broken
More debug in testsuite
Small rework FRS reporting, start merging code
Revert "Small rework FRS reporting, start merging code"

This reverts commit 73d80414219833e0e7dd7f7b9dc487f4a6a7dfbf.
Use Wheezy for testing 5.2
Generate packages and repository for Wheezy
Start reimplementing package building in a simple and readable way
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Work in progress
Run the Mediawiki upgrade on postinst configure as well as postinst triggered
Add MongoDB to requirements.
Merge branch 'master' of github.com:alnorth29/stackdoc
build: cleanup: add more space to usage

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
installer: allow specifying timestap URL to be used for signing

Use by setting: CODESIGN_TIMESTAMP=url configuration environment.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Add panopticon_edit_url as a helper method

We had a method on the model to get a URL to edit the artefact. That didn't really feel
like a model concern and is only used in one controller so I've brought it in line
here and will remove it from the model.

I considered using a decorator to wrap the edition and provide the method but that
seemed like a lot of overhead for a single method. We should consider something like
that if attempting a broader refactor.
Fix typo.
Merge pull request #64 from alphagov/panopticon_edit_url

Add panopticon_edit_url as a helper method
API endpoint for LicenceFinder to query.
Rename SpecialistGuide to DetailedGuide.

Avoiding a nomenclature mismatch should make it easier to develop
into the future.

We'll need to re-index search after deploying this.

I haven't changed any public or API URLs, since that will require
more careful management.

I also haven't changed the event tracking parameter in
`track_external_links.js`, because I'm not sure what the
consequences of that will be.
Fix background style variable.
Update document type cached in document table.
Revert proposition change

We need to check this change with people downstream, as we don't use it for anything but someone else (e.g analytics) might.
Merge pull request #40 from alphagov/rename-specialist-guidance-to-detailed-guidance

Rename SpecialistGuide to DetailedGuide.
Update proposition test
Add GovSpeak help for inline attachments

https://www.pivotaltracker.com/story/show/33104575
Work around active record bug
Define default Cache-Control: max-age in Whitehall module
Set expiry headers for timely scheduled publishing

If any document is scheduled to appear on Announcement or Publication
index pages, or on a Policy activity page, then the expires header will
be set according to the scheduled publication of the document.
Preserve organisation->speech association on state change

For some reason the organisation objects lost the association to the
speech editions when the edition state changed. I couldn't figure out
why, but have this fix seems to avoid it.

This change also exposed an issue in
SpeechUrlsOnWhichEditionAppearsTest, which was fixed by changing the
military_roles factory.
Set expiry headers for scheduled items on organisation page
Rename .in_topic to .published_in_topic

This more accurately reflects the fact that it also filters items by
state.
Move tests to the right place
Harmonise behaviour of edition.published_in_topic

This should behave the same as
Edition::RelatedPolicies#published_in_topic, ie. it should only return
published editions. There has always been a discrepancy, but this has
come to light now when I renamed the method.
Scope for getting items scheduled in a particular topic
Set expiry for scheduled items on topic show page
Inline load_published_documents_in_scope

it's only used in one place
We don't show publications or consultations on the minister page
Set expiry for scheduled publications in document series
Increase expiry time for all pages to 30 minutes
Gracefully control expiry time for overdue scheduled publications

If a scheduled item passes its expiry time, if we just used the default
calculation we'd send a negative max_age header which most caches would
interpret as 'don't cache'. This sets a more sensible value.

We also prevent the expiry time from exceeding the site-wide default.
Bugfix in cache control helper
Scheduled publication time must account for caching

It has to be at least default_cache_max_age minutes from now, otherwise
we wouldn't be able to clear the caches.
Fix for scheduled_publishing if access_limited is set
Make scheduled publication more precise

We run the cron job a little ahead of time and sleep until the item is
due for publication.
Merge branch 'scheduled-publishing-sets-expiry-headers'
Uncomment accidently commented out before filter
fix mocha require
WIP: Lots of failing specs
TAChart: Make sure the previous tool is deactivated before activating a new one

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38861 4005530d-fff6-0310-9dd1-cebe43e6787f
major mrconfig refactor
Scrollpane and markdown editor improvements
melhorei a logica da action edit
Add setup script for easy kbash deployment.
Updates to sync configuration.
use localhost in test
Change comment to reflect reality.
work on unsigned integer
Began work on unit tests
First unit test is passing
Started the switch from MyGUi to CEGUI
Temporary transition
Added license and copyright notice to interactive

Added a license and copyright notice to the startup of the interactive
user interface
Implemented a debug function wich clear the bacon.
Update tests/output/cpp/30103-templates.cpp

bugs of >> - ID: 3555610
Resolve conflict between template and comparator followed by shift operator
ISPN-2403 correctly implement close method for GridFs Input/Output streams
ISPN-2396 For failing injected transactions, the rollback is incorrectly invoked
Reduce execution time for TransactionsSpanningReplicatedCachesTest from 12:18.548s to 19.049s
ISPN-2398 StaleTransactionCleanupService doesn't unlock keys correctly for optimistic caches

Now that we send both the Commit/Rollback and the TxCompletionNotification
to the nodes where the tx has prepared, there's no need to this service to
release locks for the keys that no longer map to this node. These locks will
be released when the Commit/Rollback is received by this node (or if the
originator fails, the StaleTransactionCleanupService will do it).
ISPN-2081 Transaction leak caused by reordering between prepare and rollback
Remove unused imports.
small cleanup
wip
wip
wip
wip
wip
added basic route capabilities
added basic route capabilities
Initial version
Merge https://github.com/antspants/ticketee
integrate the EasyPaint undo and instrument boilerplate and move the display code to the Photo class; it compiles but pixmap is NULL and no image gets shown
removing segoe ui symbol font.
tests: boost timeout

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1424966 13f79535-47bb-0310-9956-ffa450edef68
Added code to add new line to DEBUG_PRINT's at end of loop
reduce sync cmd frequence
update python and git for repo
Site updated at 2012-08-01 11:53:53 UTC
use parseInput for various methods; removed setModule* stuff.
case added if $className is an object or closure.
loadType new wo id always returns brand new object.
updated comment and removed unused $args.
NewsModel renamed to News + Entity Framework Data migrations added :)
Fixed stack trace countdown
Moar stylingz
Added assets to zipfile since jarjar didnt find it otherwise
FooBarBaz.
Updated: Forums in the navigation menu
Refactor user setting files according to latest ST2 builds ones
Reformat json
Merge pull request #1 from avm/master

Explicitly set visibility=default on getFactoryMap.
Added correct stop for daemon with delay.
Merge pull request #4 from ekilimchuk/master

Added correct stop for daemon with delay.
Merge https://github.com/golubtsov/Fastcgi-Daemon

Conflicts:
	debian/changelog
things remaining to be done
Added keychain to .bashrc
Make my own annular indeterminate image.
Added a method to locate .jars containing the AI's
Stop using the wrong AI files. GG
Fixing AI imports for the 90th time.
Removed wrongly formatted, ill placed AI's again.
Adjusting gui class to load AI's
Adjusted the AI Loader. Put a sample .jar in the project. Put sample code under TODO: statement in the gui class.
五千円の時のテストケースを追加
Adding Random Text block
Handling errors while uploading to facebook.
Expired access tokens.
Invalid photo path.
Added Automatic Tagging Support.
View on Facebook Link.
Fixing https url
Changed App-engine-web.xml
Merge branch 'master' of https://github.com/bageshwar/fakewall.git
Every Thing
Moving towards reading params - enough of layout for now
Checkpoint save: giving up for now
Windows444
Adding shortcuts for windows resize and keeping selection after indent.
updated initial route
Adding Meterpreter Linux Peristance script (OLD)

Just wanted to get it hosted here, its been awhile since I updated this
and this is unfinished as of now, needs some root checks, more OS checks
and to be developed into a POST module.
Automatically saves a plot after each optimization and shows plot of everything its done after.
BZ857143
Use macro to clean up repetitive code
add a sentence to explain the share buttons
Webtest updates; added example for do.
Webtest updates
beaglebone-3.6: add hack from Santosh Shilimkar <santosh.shilimkar@ti.com> to fix cpuidle

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
initial committ
corrected some collision logic
removed some unnecessary code
double buffer
index on master: 1186491 double buffer
minor cleanup/renaming
moved level loading into new file
rendering a fighter
corrected ship rendering
some simple path finding for the fighters
experimenting with ai
simulating waves, fighers attack, health on units
added a turret to shoot incoming baddies; game slowing down though
tweaks to rendering
updated to RTM
improving the perf
calculating fps
bring in emeny waves by keystroke
derp
significantly improved the perf of the Fighter AI, now rendering is the bottle neck
Inline var in Array.rand method.
Store the current blog and post as a pair.

Two separate vars made things more complicated than necessary, for
example: `if ( Tumblr.currentBlog && Tumblr.currentImage ) {`.
No need to initialise postCountChangedCallback to undefined.
Renamed 'posts' -> 'gifs'.

You will need to clear the local storage, soz.
Fix: Assembly binding for Yaml was in wrong place in tests App.config.  All tests are now passing.
Removed unused gemspec. Added dependencies.
Added config. Added startup. Switched to
only open socket.io when there are points on the page
some policy doco
email input type; link to policies
minor punctuation fix
more password policy
contact, source code links
[Git] Nouvel alias `gg` : ouvre _gitg_ en arrière plan.
Update Python tips.
renamed the phpdoc and gen bin-scripts.
removed the composer phar and added a Makefile to provide common tasks.
Add clean rake task.
Treat blockquotes differently from normal text in gutter.
local_manifest to build CM10 for cooper
reworked indexer and search
restructured vaildation
new implementation of indexer and searcher in python
getting rid of schema diagram
fixed PrivateChannelMessage to take a long instead of int for charId
Batch.BatchLabels field and widget
spelling
Update setupdata
dlx node insertion
added aboutDialog
Working lori classification

Now need to compare against analytic results to validate that this is
indeed 'working'. :)
Massive bug fix w/ energy calc

For some reason I was recomputing the labels based on the Bayes
classifier rather than using the given labels of the training set...
Small fixes and setup for analytical plot
Lining up some equals signs.
Generalize retry to a set of error codes

Not just 503 and 504.

Also made not retrying the default behavior.
Add #on_retry call back

Mostly for logging but also useful for testing.
Remaquetada la historia del paciente
Incluídos los valores 0.00 en el query de los examenes del paciente
Remaquetada la página de consultas
Agregados los estilos de los botones en registro y consultas
Move views into own file
Repace kaizen run modue with kaizen.system.process

Process is now a class and fits more to the kaizen module name schema.
Remove obsolete quilt process and some space
Fix class hirarchy for copied class
Return download filename if file is downloaded already
dashdemux: fix unused-but-set variable
dashdemux: fix printing buffering time and download rate/size

This was broken on armv7.
Whoops, need alpha on everything but smoke/explosions?

#43
send mail to actual subscribers instead of test account
CAmbio base de datos
Merge branch 'master' of github.com:bloomtec/artesanos
Adding some text, breaking some formatting
Martins edits
links to help
DI DI DI
Moving stuff around
Oh dear! Another mammoth commit.
Return location of created item.
Woohoo! Negotiate let's me set body and headers. Fantastic.
Final editing resume and adding content
check GET and POST for params
Merge branch 'master' of github.com:bookworm/oauth-php

Fixes a hard reset.
Add tests to dist tarball
Bump version to 0.1.1.1
Added tag 0.1.1.1 for changeset bf64c2b8cd67
Merge
Updated specs to keep the same format of analytical.identify
Added delete button functionality in edit mode.
Reformatted comments in CustomCursorAdapter.
Added deleteFromAdapter() to StartActivity.
Functions now work, but still need to work out how to handle non-primitive functions
Merge branch 'master' of http://github.com/boxoffoxes/HtmlGen
Experimental version working. Also extra functionality in Main.hs
remove codecontrolpanel usage; expanded editor and will open java and html files dragged in world
Pagina de Selos de Produtos
Modified reverse alignment script.

Changed muscle_reverse_align to use the stable.py script from the author
of muscle to make sure the alignment out of muscle has the same order as
the input so that reverse_align will work. Some working out of details
at the same time. Ran script on ~ 100,000 files, and it didn't crash.
second heroku attempt
added admin sign in
post heroku update
Several bug fixes

* coerce numbers 0-5 into window function names
* save files.dat (if exists) into fit serialization
* import files.dat from old-style project file into Artemis
* update HXMA plugin
* unreadable attribute for Data so that Athena can bail out of column selection if the file gives trouble
* removed several images from repo
ignoring simplecov
fixed memory leak, this leak happens for each sound created on iOS/Mac platforms
Added model relationships & position fields
Themed bootstrap, messed with layout
Adding apache mode.
implementing file measurement. having bug in send msg.
[Session] No longer calls close on shutdown - prevent early session close.
wine-etersoft and local version bump
date
raj
Merge branch 'master' of https://github.com/woutervancraeynest/outinoffice
.DS_Store bestandje negeren
beter negeren
Merge branch 'master' of github.com:by2-be/outinoffice
verwijderen .DS_Store bestanden
review doc en google kaartje toegevoegd
ajoute des fonctions pour commenter et décommenter des régions.
premier jet d'un nouvel algo pour la coloration. Marche plus ou moins avec les crochets et parenthèses
ajout des boucles balises, filtres etc. et debug du parser
Fix version
Fix README
Fix sendfile limitations
Move convolution2d to texture generator library.
Attributes and nodes parsing is working.
Add basic README. Fixes #2.
[ticket/10724] Fixed pre-commit check for whitespace.

PHPBB3-10724
first commit
Merge branch 'master' of https://github.com/calofiremil/mangos
Added a collections problem
Remove extraTabs template. #1001
Add full url for thumbnails
Fixing a bug only found in the travis test env.
Fixing a bug only found in the travis test env.
fixing step 1 - added js to make sure all files are writable before moving on
Changing step 4 of the installer.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Merge branch 'develop' of github.com:cartalyst/platform into develop
filesystem updates
Merge remote-tracking branch 'origin/develop'
[FEATURE] Begun using the new File infrastructure in cicbase for the cicevents images.
Merge branch 'master' of github.com:castiron/cicevents
fixing comments (warning as errors would fail)
Loading connection.js via require
May be establishing XMPP connection.
Can receive pong.
Add tests for XML renderers
Add libxml to faster XML output generation
Add XML engine configuration
Update README
Add entry to CHANGELOG
Some documentation tweaks
Some documentation tweaks
Merge pull request #6 from dieterdemeyer/master

Some documentation tweaks
On Macs interpose the method to prevent using DYLD_FORCE_FLAT_NAMESPACE
Remove rabbitmq-c directory
link statically
Updates Changelog
boilerplate for what the extension will look like
Agregacion de Referencias entre las capas
x
Merge branch 'ClipMaps2' of github.com:cgPrak12/Praktikum into ClipMaps2
B
pullen und pushen
pullen und pushen
Merge branch 'ClipMaps2' of github.com:cgPrak12/Praktikum into ClipMaps2

Conflicts:
	src/terrain/ClipMap.java
update web-driver and change feature and steps for release
修改通知短信中的运单号为货号
clone a path stack to manager; ensure no simultaneous modification to the same path stack from both the manager and the insertion thread
Merge branch 'master' of github.com:chenweiyj/alfbtree
...; same w/ last update
calculate reorganize and split count
tout les deplacement fonctionnel
Update PhoneApp1/PhoneApp1/MainPage.xaml.cs
rewrite readme
version
commandserver:added volume up/down commands in configuration file
Merge branch 'master' of github.com:chpap/ptu-software into develop
small fix
updated readme
Removing the hardcoded configuration file. This will be handled in Lua.
Update forecast date to actually work
start on GoStateStruct conversion
minor jalopy changes
#8 added methods to get and set status info in a hierarchy of metaobjects
#9 preparing ... moved the lightweight meta objects related methods to the dbserver
#9 preparing ... introduced new method getDomain() and used it whereever it is needed ;-)
#9 preparing ... introduced new method getDomain() and used it whereever it is needed ;-)
#9 fixed ... used new constructor of ligthweightMO in dbserver
#10 added new constructor for ligthweight metaobjects without attributes and formater)
#10 preparing ... adding new LigthweightObject for the usage in domain free contexts
#10 intermediate commit ... with a fixed class id for ligthweight MO's
#10 preparing ... added User and Callserver provider to make it possible for a lightweightMetaObject to retrieve its full object info
#10 preparing ... User and Callserver provider to make it possible for a lightweightMetaObject to retrieve its full object info
#10 preparing ... fetchRealMetaObject in LWMO now try to lookup metaservice and user if they are null
#10 intermediate ... fixing the recreation of the LWMO out of a LightweigtObject (now with the right classID and objectID)
#10 intermediate ... added a quick and dirty object cache for LWMO (to be replaced with a central caching mechanism)
#10 preparing ... change the status and modified fields in metaObject only if there is a real change
#10 preparing ... change some signatures to allow the production of lightweight metaobjects
#13 Performance improvement of the updateMetaObject method based on the efficient using of the LightweightMetaObject
Merge branch 'dev' of github.com:cismet/cids-server into dev
added robots.txt
added humans.txt for kicks
added README.md and .htaccess
Run the sort updates in a transaction
Merge pull request #24 from ewoodh2o/sort-transaction

Run the sort updates in a transaction
Some changes to the rain page.
remove 2 console.logs
Fixes file IO behavior in checker spec
somente link para login no devise
somente rotas de login no devise
rails admin é o root pah
mensagem para usuario ja autenticado
redirecionado para o root_path ao logar
Changed the design of the info page
trending copied from lists
updating with game creation
use clojure ctags setup from @superjudge, with cljs support
event report pdf changes
Merge branch 'master' of https://github.com/clonesec/osProtect
Update notes for submitted changes

* MCF internet connection status.
STREAM-294: fixed memory leak (reading Events) in XML Codec plugin
STREAM-294: fixed memory leak (reading Events) in XML Codec plugin

Merge remote-tracking branch 'origin/4.0.x' into develop
Cleaned up Mono project dlls.
Fixed corner case which produced harmless but incorrect output if the special case attribute value is False
dat Island Tour.
Removed session hackery for next url. Fixes #77
Add / to the end of the FTP path
Add auto-purge command
Remove debug code
Initial commit
Merge branch 'master' of github.com:cniemietz/demo_app
added page view stats from google analytics
do not output null in case of Oracle and empty body
added test case and modified pikaboo script
fixed updated file paths
updated for version 7.3.402
Problem:    When jumping to the first error a line of the buffer is sometimes
	    redrawn on top of the list of errors.
Solution:   Do not call update_topline_redraw() if the display was scrolled
	    up.
Added tag v7-3-402 for changeset 4eda43e1fce0
updated for version 7.3.403
Problem:    ":helpgrep" does not trigger QuickFixCmd* autocommands.
Solution:   Trigger the autocommands. (Christian Brabandt)
Added tag v7-3-403 for changeset 5850b5827691
updated for version 7.3.404
Problem:    When a complete function uses refresh "always" redo will not work
	    properly.
Solution:   Do not reset compl_leader when compl_opt_refresh_always is set.
	    (Yasuhiro Matsumoto)
Added tag v7-3-404 for changeset 8b928bc814a8
updated for version 7.3.405
Problem:    When xterm gets back the function keys it may delete the urxvt
	    mouse termcap code.
Solution:   Check for the whole code, not just the start. (Egmont Koblinger)
Added tag v7-3-405 for changeset c75a8d2404bd
updated for version 7.3.406
Problem:    Multi-byte characters in b:browsefilter are not handled correctly.
Solution:   First use convert_filter() normally and then convert to wide
	    characters. (Taro Muraoka)
Added tag v7-3-406 for changeset fbb23bd517f8
updated for version 7.3.407
Problem:    ":12verbose call F()" may duplicate text while trying to truncate.
	    (Thinca)
Solution:   Only truncate when there is not enough room.  Also check the byte
	    length of the buffer.
Added tag v7-3-407 for changeset 55cebc7e5de0
updated for version 7.3.408
Problem:    Missing declaration.
Solution:   Add the declaration. (John Marriott)
Added tag v7-3-408 for changeset 1fec3c62f6e8
Update runtime files.
updated for version 7.3.409
Problem:    The license in pty.c is unclear.
Solution:   Add a comment about the license.
Added tag v7-3-409 for changeset 7b59c2c032ca
updated for version 7.3.410
Problem:    Compiler error for // comment. (Joachim Schmitz)
Solution:   Turn into /* comment */.
Added tag v7-3-410 for changeset 5cf2a671d8eb
updated for version 7.3.411
Problem:    Pasting in Visual mode using the "" register does not work. (John
	    Beckett)
Solution:   Detect that the write is overwriting the pasted register.
	    (Christian Brabandt)
Added some bit to rooms
Grouped checkbox widgets get duplicate IDs.
RGIMS theme tweak
Use theme css in non-debug too
Merge branch 'master' of git://github.com/hemebond/eden
Merge branch 'master' of git://github.com/coldblooded01/eden
Fix the ADAT import of 24H (was missing priority question)
Record Merger back-end, first cut.
Fix asset_log_onaccept for record merge use-case
Test works
merge settings into enterprise
merge settings to enterprise
add two directory addset and runtime
add database schema v1
Added internal wound surgery.
Merge pull request #1793 from CIB/master

Internal Bleeding Surgery
Merge pull request #1794 from comma/master

Welder tanks are back in business.
Fixes a runtime.
Fixed the bug where 'Show Own Skills' wouldn't work.
You can now exame an IV drip to get the loaded chemicals and attached person.
Removed the silly adminhelp delay.
Fixes a runtime.
Merge pull request #1795 from CIB/master

Various fixes
Readded welder fuel.
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
Forgot to click fuel code in.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Suggest not submitting forks. closes #124
Merge remote-tracking branch 'simensen/no-forks'
Reword
If the under count is small, paint the label red.
Added tasks for Jenkins jobs and Remote deploy
moved jars into libs/ directory

the root directory was looking pretty cluttered... no good!
getting close to a solution
Renamed the post_activity folder to post_activity_ruby.
Multi Thumbnail Support

- newer version of WP broke the multi featured image plugin so I have
updated the files to become compatible once again
c2.x removed other doses
showing cool charts
Fixed bug where when less than CRASS_DEF_NUM_KMERS_4_MODE were found, Crass would DIIIEEEEE!!!!!!!
Added a larger logo
Updated README/added alpha tag to header
now you can choose easing functions
insuline
UC4: Correct degree check for Events.
リファクタリング
#10 Contentで実行する場合も、プロファイルを取得できるようにした
Merge branch 'master' of https://github.com/cwan/SSJS-Profiler.git
these got hosed in merging... added back to get submodules to work
Change a Trade Message from the Bot.

- This also lays the ground work for a remove command
- ground work for an "all" items sub command
removed some unneeded files
add vs2010 sln file

more fixes to come
finish sln file
add more design
cleaning dev branch
Add SCHEMA-NAME argument to TABLE-DESCRIPTION

The SCHEMA-NAME argument can be used to restrict the columns that are
returned by the TABLE-DESCRIPTION to a certain schema.  By default,
columns from all schemata are returned.
Documentation update for TABLE-DESCRIPTION change.
Simplify outputted query in table-description
Merge branch 'upstream'
Add oil barrels on all clients.

Fixes desynch 10 minutes after picking up an oil barrel.

Introduced in 29966c5da299f944a0e52ab579d2b3a7ed8d3063.

Fixes ticket:3396 and ticket:3413.
Only send 2 desynch logs per player on desynch.

Reset desynch count between games.

Since sending 2 logs instead of 5, it should take less time for players to figure out
what is going on, when people have slow connections.
Add assertion against duplicate file descriptors.

Probably can't happen, but no idea why the send() call blocks when it shouldn't.
Update custom translations.
Add scripts to generate translation statistics.

Text version by me, html version by Emdek. The CSS and flag images used
by the latter are in
https://github.com/Warzone2100/wz2100.net/blob/master/static.wz2100.net/htdocs/css/wztrac.css
and
https://github.com/Warzone2100/wz2100.net/tree/master/static.wz2100.net/htdocs/img/flags.
Clarify when we reach unit cap.
Specify which wrong player was trying to give a gift
Disable being shown the option to save at the end of the mission (in the mission summary screen), this is a work around for a flaw in the level loading code in some levels. Also disable autosaves, for the same problem. refs #3377
Cleanup leaks in floodbucket

refs #3395
Cleanup leaks in UTF conversion of command line (windows only) refs #3395
Move NETinit() routines to better location

refs #3395
Cleanup some leaks in the NET* routines.

refs #3395
Savegames are now stored by type. Campaign saves are located in savegames/campaign/ Skirmish saves are located in savegames/skirmish/
Do away with apsStaticTemplates completely, it caused multiple issues. There is no difference in accessing the templates for the AI or Humans now. Only write templates out for active players. Make each template's group unique to each player. Fix clone wars templates. Remove hacky functions GetHumanDroidTemplate & GetAIDroidTemplate fixes ticket:3146 close ticket:3369

refs b99e845d979e89d7735f61cf71c634d0c2b1e033
refs 0cc7c315db4b1b80048e9a45839cdbde5900f698
Let's try to stop checking for tiles when we are offscreen via a Transporter.

fixes ticket:3403
Call this branch bugfixes in the build scripts.
Add missing license header to generate-statistics-html.py.
Update ChangeLog.
Trying to find out why savegames are being broken.
Possibly helps in finding out why #3416 happens.

refs:3416
Only populate unique entries for the UI template list.

Fixes #3369
add enable image cache
add load image and open detail
Change icon

http://dryicons.com/icon/colorful-stickers-part-3-icons-set/tag/
added a pingTimeout option and pool aggregate functions
changed data to @data
Updates the Ghastly engine for OSX compliance.
RVM and Xcode for Mac
Fixed merge conflict
Better check for model instances in CheckRedirect

to avoid some false positives when redirecting to a model instance.
Should fix #96
Update redirect tests for model instances
Raise confidence on model attributes in redirects
Add test for redirecting to Model.find_by_*
Ignore redirects to Model.find_by_*
Added check to address CVE-2012-2661
add support for CVE-2012-2660 and CVE-2012-2661

make the check methods line up with the specific CVE numbers
Turn off quiet mode by default with --compare
Add test for `request.parameters`
Add `request.parameters` to query parameter values
Merge 'do_not_warn_on_redirects_to_model_instances'

Conflicts:
	test/tests/test_rails3.rb
Merge remote-tracking branch 'daveworth/rails_sqli_check'

Conflicts:
	test/tests/test_rails3.rb
	test/tests/test_rails_with_xss_plugin.rb
Merge remote-tracking branch 'upstream/master'
print hpy
fix special characters on cocoa. remove debug prints.
Content views: temporarily fix breaking tests
Merge pull request #1267 from daviddavis/cvfix

Content views: fix breaking tests
Content views: refreshing views from the CLI
Content views: api refresh test
Fixed broken label rspec tests

Label was changed back to name in the api as the cli still uses name for
several of its call. The rspec tests were not reverted back to using name so I
fixed that.
ignore fuzzy and obsolete translations

addressing:
Warning: fuzzy message was ignored.
         msgid 'package group update timed out'
Merge pull request #773 from daviddavis/rspec-fix

Fixed broken label rspec tests
Merge pull request #774 from xsuchy/pull-req-fuzzy

ignore fuzzy and obsolete translations
puppet - fixing web workers issue
Merge pull request #778 from lzap/fix-webworkers

862312 - fixing web workers default value issue
[#4854] Remove the last card should result cards view being dismissed
[Issue #3768] - [keyboard] e shows a grey square box for a character
fixed headers in facebook import
Marking fields as removed instead removing straight
Birth was showing a month ahead
Adding 'undo' to photo (missing grayscale)
Fixing icon height
Adding black headers
Removing unneeded method
Checking if removed to avoid the activity
More efficient and clean way of managing async storage
remove logging message accidentally left in the code
Merge pull request #5000 from davidflanagan/fixlint2

Fixlint2
[Contacts] String freeze copy edits

#### Summary: ####

In advance of Friday Sept 21 "bucket 1" string freeze, are doing a pass of copy throughout all bucket 1 apps. Here are the proposed changes to Contacts.
Devs: please note the "Functional changes" section below.

* Applied title case to buttons, sentence case to labels
* Fixed capitalization and punctuation inconsistencies
* Fixed inconsistencies between Remove and Delete when deleting contacts. Changed to Delete in all places.
* Tightened up Confirmation promtps. eg: "Are you sure you want to delete this contact?" --> "Delete contact?"
* Tightened up button labels. eg: "Add phone number" --> "Add Phone"


#### Functional changes needed: ####

* Contact deletion confirmation prompt button should be "Cancel" and "Delete". Need new string?
* What about Province/State and PO Box?


#### Copy changes: ####

Menus and dialog strings
deleteConfirmMsg   = Delete contact?

Contact fields
org.placeholder           = Company

Contact action buttons
addPhoto       = Add Picture
addPhone       = Add Phone
addEmail       = Add Email
addAddress     = Add Address
addComment     = Add Comment
addFavorite    = Add as Favorite
removeFavorite = Remove as Favorite

Field labels
faxOther  = Fax Other

Hidden information, for screen readers
labelEmail       = Email:
labelZip         = Zip code:
labelComment     = Comment:

SIM import
simContacts-reading   = Reading from SIM card…
simContacts-storing   = Storing SIM contacts…
[#4300] Update lock screen mute icon
Merge pull request #5002 from timdream/lockscreen/muteicon

[#4300] Update lock screen mute icon
Merge pull request #4986 from jmcanterafonseca/fb_async_improved

[FB] More efficient and clean way of managing async storage
Fix: make keyboard animation smooth as before
need to send out keyboardchange event after the transitionend
Merge pull request #5004 from RudyLu/keyboard_smooth_animation

Fix: make keyboard animation smooth as before
[Clock] String freeze copy edits 1

Changes:

* everyday > changed to "Every day"


Questions & Comments:

* Repeat and Snooze value selector titles should be "Repeat" and "Snooze". Currently they are both "Choose your option", and neither is captured in a localization string.
* required / invalid > Where are these used?
* newAlarm, editAlarm, edit_alarm > Where are these used?
* When creating a new alarm, string should be "New alarm"
* When editing an existing alarm, string shoud be "Edit alarm"
Fixed selecting text.
corrected bug on zip code
added google closure compiler
added buster
fixed reference to self
converted mocha tests into buster tests
minified version with google closure compiler
buster + new test command
Added more examples, Update AminoAcidPolymer to fragment ranges
Improvements to code layout, comments etc.

Maze solver now produces outputs to say whether a valid maze was
produced.
Merge branch 'master' of https://github.com/dbar061/MazeServer
delete flex-ido
auto-iniciar el plugin cuando lo llamamos. usar deleteRow para vaciar la tabla.
Fixed xml path for default xml
Some fixes for latest K3.1 compatibility
Polish code and comments
Add insertion / removal tests in stack demo
util: error message correction
util: Optimize KeySpace.keys public access
util: Add ArrayHTMap.putAll() optimized, augment()
util: Use put_all for (ruby) UniMap.merge when other is a UniMap
util: Add DateSupport module, TimeDelta, JDate extension; test
util: Bump to 1.7.0
xmlprod: Bump to 1.7.0, upgrade to util ~> 1.7.0
Merge branch 'util-merge-optimize' into dev
Merge branch 'util-date-support' into dev
util: History for merges
xmlprod: History for upgrades
se agregaron los archivos de nuevo proyecto
[TASK] removed link to denkwerk website
TU-66 - Find most probable solution Way2Think
done
Takaisin nappi menee oikeaan paikkaan
Uusi keräyspaikka linkille oikeat parametrit
Rivien splittaus vasta suuntalavalle vietäessä

Splitataan vasta kun suuntalava on valittu ja kohdistetaan rivejä.
Pieniä korjauksia!
Muuttujanimikonflikti!
Tehty toiminnallisuus joka mahdollistaa päivittää myyntitilauksen kautta ostotilauksen kappalemäärää tiettyjen ehtojen täyttyessä. Tämä projekti on kesken.
Pientä korjausta!
Merge branch 'master' into jamppa/myynnista_ostotilauksen_paivitys
Mergetys!
Mergetyskorjaus!
Merge pull request #179 from devlab-oy/jamppa/myynnista_ostotilauksen_paivitys

Myynnistä ostotilauksen kappalemäärien päivitys
automated commit from dev@dmehta Thu Nov 29 22:00:02 EST 2012
Font progress...
Updated plugins, added ack
[feature/sphinx-fulltext-search] MOD by naderman installed in phpbb

PHPBB3-10946
[feature/sphinx-fulltext-search] minor changes

some minor code changes to make it working against current develop
and comply with other search backend coding convetions.

PHPBB3-10946
[feature/sphinx-fulltext-search] update config file

Sphinx config file updated according to new documentation.

PHPBB3-10946
[feature/sphinx-fulltext-search] adds variable file_extn for Windows

file_extn variable storing '.exe' for windows compatibility with autoconf.
some class property declarations pushed outside the class methods.

PHPBB3-10946
add constructor newInstance
added limited keyboard functionality
Index page reordering.
Online Offline UI Changes
Clean up.
Date and time validator fixes + JUnit tests. Fixes gh-30.
Displaying the number of data inconsistency errors in Offline mode.
Screenings Page: Changing order of screening form to match with mediator experience, thereby matching with the sequence in the physical forms.
Allow offline users to download data while in Offline mode.
Added timestamp to formqueue.
Merge branch 'master' of https://github.com/digitalgreenorg/dg into coco_update
Merge branch 'test_server' of https://github.com/digitalgreenorg/dg into coco_update
статистика по HashTable
revert weird tabbing
added new view templates
added new view templates
Added new display Full List to view ding_news.
- added MP 1.3 Hiddenemnu Changes in 4tr Recordings
新增cup other 项 性能数据采集
增加sensu client 进程状态监控，对异常进程重新初始
Test exported functions
Merge pull request #106 from doktorj/master

installed bullet gem + various other tweaks/fixes
setting up more pdf structure
much pdf prep
upgraded to paperclip 3 (major rails 3+ release with bug fixes) and got images working again - phew
adjusted then rolled backdb, then adjusted material model to have the hass_attached_file :pdf (used to be in pdf model) and adjusted attr_accessible and seperate attr_accessor sections for pdf, which is preventing the form from totally errroring out but not uploading yet
added paperclip pdf columns migration, + alot more experimenting to get it saving and with the proper attr_accessable settings (most examples out there on the web are outdated) --- pdf's now saving
Added js to add classes to body based on page title and updated haml/sass accordingly.
removed old pdfs table migrations, added new migration to drop pdfs table, and removed outdated pdf model and remaining references to it
more model cleanup + added validations to make sure file has a pdf header and that it's max 10Megs for now
Merge branch 'master' into working
Adding filter to body class js
Got body_class.js working to add a class to body based on h3#mat_title and then check if Antique is in the class name on body and show / hide menus
Merge pull request #107 from placeboArts/master

Got body_class.js working
finally figured out an aggregate of key bugs that was causing mass attrib_accessible errors for slugglable after paperclip 3 upgrade, main one was having config.active_record.whitelist_attributes = true enabled in config/application.rb - man that was not fun - tests no longer passing - looking into that next
misc Gemfile tweaks for guard
removed bullet gem + config, and figured out that i needed a rake db:test:prepare to get new migrations in test db
Merge branch 'master' into paperclip_pdf
PEM generation done in an dedicated static function. User can now use own PEM file (with or without passphrase). User can now choose between tcp, tls or ssl.
Update examples
Merge pull request #12 from vincentdieltiens/2.0

SSL improvements from @vincentdieltiens
Remove server test script (new way: phpunit)
Moved client files into examples directory
Work in progress on 2.0
Added Resource interface
Refactoring server and socket
Incorportated SSL work by @vincentdieltiens
Fixed broken tests: don't do full listen test just yet
Moved example applications
Moved ratelimiting functionality to listeners
Updated client tests
Split the socket class out into a class hierarchy
Added a connection manager

This abstracts most of the connection handling logic out of the server,
freeing it up to just deal with applications, logging and events
Added configurable base class
Moved PEM generation to util class
Added BadRequestException, used in handshake
Major refactoring to use sockets by aggregation
fiex
yes
moar better js
about_class_m
Update src/CSlim/SlimListDeserializer.c

Updated length calculation of elements to allow elements to contain multibyte characters.
Update src/CSlim/SlimListSerializer.c

Updated to calculate field length as number of characters when multibyte characters are in the list rather than the number of bytes
Update tests/CSlim/SlimListDeserializerTest.cpp

Added test to test serialization of strings with multibyte characters.
Update tests/CSlim/SlimListSerializerTest.cpp

Added test to test serialization of strings with multibyte characters in
Update tests/CSlim/SlimListDeserializerTest.cpp

Last change incorrect - here is the correct version adding a test to deserialize a string with multibyte characters
clean up crapula2010's pull request
Add support for multibyte characters
Fixing issue where br tags were include in a href auto linking
Fixes #20
Prueba para verificar el push y fetch
add capistrano aliases
Moved the README into the actual subpackage.
Fix bug 4601. Make sure that we look for specific BML files after we process whether we're in journal space, but before we lookup whether we're in non-domain journal view
BigMoneyPlayer
Unbreak the evoke code.

Some time ago, the Stone Soup team renamed it_use3.cc to evoke.cc.  Somehow,
I ended up with both files, with my own changes being applied to it_use3.cc
and imported changes being applied to evoke.cc.  Evoke.cc wasn't even being
compiled, though, and this recently manifested itself in the form of reaching
not working.  Hopefully, this is all fixed now.
IMPORT (dolorous): Comment fix.
add bash function "skill" and alias "%%"
skill usage: skill <screen-id>
alias "%%" is pydoc
[Lua] update CCLuaEngine for new script binding protocol
[Lua] fix lua function reference error
[iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS
[Lua] add ccTexParams, add new luabinding build script, update luabinding
merge
emax@infoarena solved
Fuck that. :v:
Some test cases for debtransform
codemirror
Merge branch 'master' of github.com:eanderle/trytwilio
Moved "TODO" file somewhere else.
Added command `next-line-not-matching'.  It does what its name suggests.
Advice `shell-command' so that it uses an unique buffer name for asynchronous commands.
These questions "A command is running.  Kill it? " are boring!
undoing _e and returning to __
java
client
changed few things :)
Fix horses output
More last.fm stuff

- Now records scribbles
- Cleaned up code
- Now allows special characters in song names other than space
Reporter => DeployReporter
Tests for DeployReporter.
Removing excess code, adding bugs
add mypro:mboot
More improvements to printed docs
Allow uppercase letters to be used in numerals
Merge pull request #252 from alco/numerals

Allow uppercase letters to be used in numerals
Improve docs and tests for Elixir.Typespec
Register shortdoc and hidden as attributes
Allow macros to be used in rescue clauses
Add loadpaths before running tests
Starting from scratch with oCanvas! Got to hell Adobe and Microsoft with your easelJS

I am really starting over just few hours before deadline!!! Un f**king
believable!
remove old html index
Correcciones de ellos
Obtain initial host key for the default library version
Make $realm visible in sub scope in install_bootstrap_key, now that we need to send it to the KDC.
When instance is primary hostname, automatically change when max(kvno) is missing. Delete the bootstrap principal after successful bootstrap, the KDC does likewise. Tidy up a bit of related code.
[ActionCell.xib]:cella con img che disclosure indicator
[AreaBaseController]: prova visualizzazione img in celle… ovviamente andranno adattate alla grafica finale
[file xcode]: aggiornato
[AreaBaseController]: fix  rotazione iOS 5.x
#27 attempted fix. needs a test. hard to test though.
#39 more fixes for this issue
is this cleaner variable syntax?
clean up webserver-handler-maker stuff a little.
use tali713's esxml stuff, looks good!
doc cleanup.
clean the chat form when we're done
removed action on orders with 0 volume
Fix nph unit test
Generated scaffold
s/(education|experience)s/$1/g
fix tests
Add associations with resume.
Add links to associated data in API.
Add achievements tied to experience
Align resume controller test with singleton controller
Populate resume database from my home page.
Protect against unauthorized modifications.
Add README
Fix up README
More README tweaks
sanitize
BUG FIX: ler cookie no primero acesso  - controlando tempo do click
Se modifica el simpleconnectionSignUp para el caso de un nuevo usuario vaya a la pagina de completar el formulario.
Se agrega al controller obtener el usuario logeado.
Se extrae a un metodo la obtencion del usuario de session.
deleted temp and previous unnecessary files
side bar de volta no lugar
adicionada logo sti
adicionada logo sti
testes refatorados
Fix for Rails.root being nil upon invocation.
replaced with Anto's version; leaving out mike's css changes for now
put mike's css in this new file
Merge pull request #97 from agamba/master

replaced with Anto's version; leaving out mike's css changes for now
Rescue for anything, not just SocketError.
Slight performance improvement to sample_indicator.

The real cost is in the call to np.random.random.
Saved the project file to fix error.