labofsahil/github-event-dataset-2012 huggingface dataset:
Order#merge no longer uses Order#add_variant

This is because a LineItem may have extra information attached to it, which would be lost with the add_variant call

Instead, what we do is one of two things:

1) If the line item with that variant already exists then we increment the quantity for that line item and save it. Everyone goes home happy.
2) If a line item with that variant doesn't exist, then we re-assign the old line item's order_id field to the current order object.

Number #2 comes with a caveat: we *must* reload the old order's line items because otherwise the re-assigned line_items would be destroyed when order.destroy is called.

Fixes #2179
Remove leftover reference to testing_support/env

Fixes #2242
Set payment to processing state when capturing, and allow failure form pending state.

Fixes #2224
Retreive products for search based on currency.

This allows users to override selected_currency in order to get
sets of products retrieved in their selected currency.
Explicitly retrieve price in current_currency.

This will display prices at each step in the currency currently
specified for the user.
Currency support for active.

This allows you to search for products and variants that are active
in a specified currency.  For example,

Spree::Product.active()
returns all active products in the default currency

Spree::Product.active('EUR')
returns all active products in Euro.

This is required if some products are active in some currencies,
but not in others, because a price in that currency has not been
specified.
Remove auto-price logic from Spree::Price.

This logic was copied from a variant but doesn't really make a lot
of sense in this context.  This prevents prices from being nil, so
you can't add have a variant which is not offered in a specific
variant.
Ensure the shipment has been dealt with before transition over payment step

Fixes #2191
Clean up calls to update_totals within Order model

Semi-related to #2191
Merge git://github.com/spree/spree
observe_field elements should be processed once the document is ready

Fixes #1790
Find variant_images linked to a product through its master variant or the product itself
ASD Week 2 Update (Coding)
Remove more bbPress copy pasta.
Soften the numerical precision required for orthogonal slices
documentation complète de tous les packages
Hooks seem to be working
started porting the analyzer
started adding support for namespaces
added ns fns
reader now depends on brochure's namespaces
removed reflection
fixed a bug
Propagating post deletion
différentes choses
Verify call disabled and muted.
version bump
Merge branch 'release/0.1.4' into develop
Bump to snapshot.
add frameworks to vfrReader
Merge pull request #192 from waterlou/master

add frameworks to vfrReader
Adding ALAssetsLibraryFramework
Adding the AssetsLibrary framework
Removed space on branch
Changed the sample filter file type to jpg
Merge pull request #476 from ribeto/Update_DLCImagePickerController

Added AssetsLibrary
state where user is logged in (shows avatar and log out link and stuff)
made the external links to js work
saving work, removing unused file
remove console.error logging
Populate gitignore with contents from svn:ignore
Merge pull request #9 from michajlo/with-old-ignores

Populate gitignore with contents from svn:ignore
经验条报错
Improved Search and 2i's support, simplified the API by creating search.solr and search.twoi methods.  Added flags for returning search results as RObjects, per #13

Set Bucket and RObject to `return this;` to support naive chaning now and the basis for better chaining in the future.  closes #14

Updated tests to include cases for new search functionality.  Just need to update the documentation to reflect this.
Updated README with Search API information.
Finalized Search docs.

closes #13
Bumped to 0.0.6
Fixed #905
Make the biome id public

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
tr
t
v6r4-pre2
JobTwit.py added
Fix double directory structure by moving files up a folder

Change honeyd/honeyd to just honeyd
Update README with Ubuntu and Archlinux dependency install instructions
Fix nv3d issue #86
Refix: Rather embarrassingly I got the top and left properties of the bounding rectangle the wrong way around for adding to the top and left of the position of the element in the box. This commit fixes that...
#118 temporary fix.
RF: game_master can keep round index in the state

This frees the callers from having to calculate round index by hand.
RF: remove index parameter completely
Code simplification in game_master
RF: use abc.abstractmethod for abstract methods

This makes the code a little simpler, and a little more robust. Errors
are thrown earlier, since abstract classes cannot be initialized at
all.

Some tests stopped making sense and are removed.
ENH: be more careful about which methods are required

Viewer must have observe() and can have set_initial().
Team must have _set_initial() and _get_move().

Tests are rearranged, to keep SimpleTeam tests in test_player.
DOC: Clarified the docstring.
Merge pull request #94 from Debilski/feature/docstring-fix

DOC: Clarified the docstring.
DOC: fix heading in rst
update list of contributors
add changelog
Merge branch 'prepare-v0.1.1'

* prepare-v0.1.1:
  add changelog
  update list of contributors
DOC: fix buggy link syntax
DOC/BF: bump copyright year and owner
DOC/BF: the literalincludes were broken
DOC/BF small abbreviation fix
DOC/RF move some implementation details to end of the document
DOC/BF: missing backtick
DOC/RF: remove all implementation detail from the section discussing the BFSPlayer
DOC/RF: move the link to the API further up
DOC/RF: remove detail from the BasicDefensivePlayer descritpion
random web socket junk… going to ditch this
Fixed bug that made application
crush due to database not being
installed or containing no data.
Merge branch 'master' of https://Denis1990@github.com/Denis1990/Zwdia.git
Working on Triangle widget.
loto json update at Sep 26, 2012 11:26:04 PM
loto json update at Aug 9, 2012 11:25:11 AM
moving_detection
add a LOCK in optionsmodel to ApplyProxySettings()

- fixes #1560
badwolf colours for vim
Add a config option to automatically run svn update prior to the 'show' command.
Remove trailing whitespace, and implement the 'update' svn command.
Whitespace removal.
Add a _setUp method that commands can use to perform early setup.
Remove the extra instantiation of the Svn class.
Use the new _setUp method to see if we need to run svn update first, and do so.
Check the working copy, and stop if it is 'dirty'.
Implement an Iterator for Svn_Entry items.
Remove the debug code.
Use the new Iterator in the Svn->status method.
Rename the method to be clearer what it does.
Move _isWorkingCopyDirty method up into the Filter command.
Implement the dirty working copy check in the 'merge' command.
Use the new Iterator method to get the working copy state in the 'reintegrate' command.
Use the Iterator method to get files we're interested in for stashing.
Remove trailing whitespace.
Expo implementation fixes
Uprava landsraadu
working demo! woo!
Made new home controller called for home/start page.
Made ajax call to return list of colors selected.
Added loading gif and favicon. Loading gif is not implemented in jsp
Fixed bug where scope would be wrong if start and end of range where in differen elements
Dunst hinzugefügt
Substantial code added to access OpenGL variables and constants
Minor changes
WORKING to import blank field

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
WORKING on to import db

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
adding KEY4 for Indonesian Year enumeration

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
fix year
renamed it, to be able to run it in command line

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
Adding KEY4 and KEY5 to support reenumeration and adding notes/description to the data

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
Command line overrides configuration file
corrected Frontend
Use Boost.Iterator's zip_iterator instead of workaround zip_iterator
This will not compile - but refactoring is coming and in progress
libfreerdp-codec: jpeg fix for issue #737
Merge branch 'master' of github.com:FreeRDP/FreeRDP into channels
Fixes #120: Fix linking of avahi
Merged guidelines, expanded Git guidelines (#42)
tweet long min msg size
shrink option in build.xml. specify -Dshrink=false to speed up the build
provided a helper method to create a new TimerTask from a function block and added a simple test case for using timers
Merge branch 'master' into dev
SubModuled Apache Assets, and siblinged People.Web.
Moved sqlite3 to only development and test
added pg to production
updated gemfile.lock
Made package PSR-2 compatible.

Since this is a fork, also renamed the namespaces and containing folder.
Allow category to be null in layer_metadata form. closes #464
Merge pull request #489 from jj0hns0n/issue-464

Allow category to be null in layer_metadata form. closes #464
Papildināta vārdnīcas paka
Check whether header <pow.h> really exists before including it.

The windows build has been failing for several days due to this.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22146 57a11ea4-9604-0410-9ed3-97b8803252fd
Simplify history view.
Creation de toutes les classes coachDb
Updated GuIT forum's URL.
fixed MapCalculator to not spam create a thread every game tick (removed Thread zCalc as it is not used at the moment)
Add HanifOS definitions

Add HanifOS definitions, target is left alone for compatibility.
Finished StockMarketYear
Added TaxRate and InterestRate
Updated StockMarketYear to take TaxRate and InterestRate types
Added Dollars type
Removed non essential copyright information
Usage of Dollars throughout StockMarketYear
Updated all classes to remove primitive obsession using Dollars class
Added multiple rows to the StockMarketYearModel
Added StockMarket, updates scratchpad
Moved classes into either domain or ui, end of episode 27
end of episode 28 (adding utils package)
ending episode 29 (Added fast fail code)
Finished episode 33
End of episode 35
End of episode 37
Fixed ending principal, added Dollars.min()
End of episode 41
End of Episode 42 (Not working correctly)
dotteddecimals puzzle added
Removed: bogus zip file
Finished problem 32
Added d3 example charts
Use strict and warnings for Sscep.pm
Replaced all old log and seterror messages by new static logging messages
实现了 EventManager 中 handler 的迭代器
controller bean config 中支持 view:xxx 的写法
Merge branch '0.8' of github.com:JeCat/framework into 0.8
fix bug : 在 WebpageFrame::buildBean() 中优先执行 parent::buildBean() ，避免 frameview 和 view:xxx 冲突
Fixed some minor errors with createAlliance() + added Join command!
Added diff-dirs alias
Merge branch 'master' of github.com:JonasG/dotfiles
Implemented ISaveable and renamed lots of classes named JDOM since JDOM is now the
standard xml library.
Merge branch 'development' of https://github.com/Jost4/HUSACCT-1 into development
Move cursor to insertion point at end of change.

Fixes #164.
Fix put on newline.

Fixes #163.
Fix install-lighttpd target
We need a separate section on Graphics in the README.
pkg: updating to latest and greatest packages
module-ize Cairo, add CairoXlibSurface
proof-of-concept drawing to a Tk canvas with Cairo
doc: fix ipad layout
Update to dsfmt v2.2
Separate handling of temp files on OS X and Linux
Merge pull request #1387 from johnmyleswhite/master

Provide macros for defining separate functions on OS X and Linux.

Use these separate macros to define tempdir() and tempfile() in different ways on OS X and Linux.
New callback format:
->param([mixed $callback_argument], [callable|callable $callback])
->param([callable|string $callback], 'callback')
reduce stack usage.
Images Sync
Commencement de la fonction de retour d'une entrée du répertoire
katello - remove unused methods
katello - notifications cleanup
808437 - [RFE] Don't make notifications for CLI actions performed (and pop them up in UI)

methods for destroying organization moved to its own class
%defattr is not needed since rpm 4.4

which means rhel5+ and we do not support rhel4 anymore
http://fedoraproject.org/wiki/Packaging:Guidelines#File_Permissions
katello - corrections after pull request review

https://github.com/Katello/katello/pull/241
replace #N_ with #_
do not persist "Welcome back" success-notice
add documentation to notifier
fix password_reset_controller#update to notify with correct type
group copy cli and API first pass
Merge branch 'master' into 808437-RFE-no_notifications_for_CLI_actions_in_GUI

* master: (59 commits)
  Updated hash for converge-ui to include pull request.
  ...

Conflicts:
	src/app/controllers/application_controller.rb
	src/app/controllers/system_group_packages_controller.rb
	src/app/controllers/user_sessions_controller.rb
system groups - unit tests and error conditions
Merge branch 'master' into group-copy

Conflicts:
	src/app/controllers/api/system_groups_controller.rb
system groups - removing local modifications not intended for upstream
rubygem-fastercsv is missing in Fedora 17 (orphaned)
system groups - wrong variable name in error message
reverting to the same hash as I had originally
Fixing some ldap config issues that were polluting unrelated tests
add rubygem-activesupport to rhel6 repo

addressing:
Error: Package: rubygem-delayed_job-2.1.4-2.el6.noarch (katello)
           Requires: rubygem(activesupport) >= 3.0
           Installing: 1:rubygem-activesupport-2.3.8-2.el6.noarch (epel)
               rubygem(activesupport) = 2.3.8
Merge pull request #318 from xsuchy/pull-req-rubygem-fastercsv-fedora

rubygem-fastercsv is missing in Fedora 17 (orphaned)
Merge pull request #322 from xsuchy/pull-req-rhel6-rubygem-activesupport

add rubygem-activesupport to rhel6 repo
katello - action profiling
840600 - Post creating new environment in headpin, webui returns row:NotFound error
Merge pull request #256 from xsuchy/pull-req-defattr

%defattr is not needed since rpm 4.4
initial untested pagination
content browser - improving user experience of selecting environments
Merge branch 'content-browser' of github.com:Katello/katello into content-browser
Merge branch 'content-browser' of github.com:Katello/katello into content-browser
jsroutes update
content browser - content selector and more rows wiring
Merge pull request #274 from jlsherrill/content-browser

Content browser - wiring up more rows and content type selector
rb19 - extra comma
rb19 - adding check
rb19 - warning msg
rb19 - invalid char
rb19 - setting collate
rb19 - one more UTF8 fix
rb19 - and one more UTF8 encoding fix
rb19 - removing exact versions from Gemfile
rb19 - adding puppet bundler check
rb19 - encoding fix turned off for 1.9
rb19 - fixing collate
rb19 - adding missing require
rb19 - correcting requires for fedora guidelines
Merge pull request #408 from lzap/installer_f17

Installer f17
BootstrapRenderer readme
if you try and open a modal from within a modal close the other modal first
retirage du bootstrap temporaire
Merge branch 'master' of github.com:KenTiN/PolyPeer
adding a post about rake tasks in the background
Admin + front :: introtext toegevoegd

•	Bij het verwerken van de opdracht in de backoffice mis ik nog het
veld met: de verkorte omschrijving van de opdracht. (K) korte
omschrijving toevoegen, zodat de backoffice de opdracht kan
samenvatten. De samenvatting moet in de opdrachtlijst verschijnen en
als eerste tekst bij opdracht-detail.
Front :: fixes tonen van image

•	In de backoffice een foto kunnen toevoegen aan de opdracht (K) Kevin,
als jij zorgt dat de backoffice een upload en/of keuzemogelijkheid
krijgt. Sowieso moet de documentupload gecontroleerd worden, want ik
kan niet zien of er een doc is geupload is…
Moved jenkins build script.

Out of jenkins and into version control.
Unified 2.8.x and 2.9.x build scripts.
Moved jenkins build script.

Out of jenkins and into version control.
Unified 2.8.x and 2.9.x build scripts.
Separated build and publish scripts.

Unified further with build options.
Merge branch 'common-build-script' into 2.8.x
Swimming with the jenkins current.

Configuring via environment variables.
Merge branch 'common-build-script' into 2.8.x
Boiling more logic out of jenkins.

Offer explicit settings.xml path for maven if some specific
hardcoded path exists, don't otherwise.  At least it's in one
place where we can keep an eye on it.
Making path to settings.xml configurable.

Environment variable maven_settings.
Merge branch 'common-build-script' into 2.8.x
Hardening get-scala-version.

Reimplementing without git-describe to harden against old
gits and make any kind of reference tag unnecessary.

Conflicts:

	tools/get-scala-revision
Merge branch 'common' into 2.8.x
More on get-scala-revision.

Now that I've resorted to building git 1.5.4, I can stop trying
to reverse engineer it through jenkins.  This implementation feels
winnerish.
Merge branch 'dec10-version-string' into 2.8.x
Tweaking build string some more.

Reintroduced date and an "r" to meet IDE needs.  Moved reference
commit backward to accomodate 2.8.x.  Merging changes into 2.8.x,
2.9.x, and master.
Merge branch 'dec10-version-string' into 2.8.x
More build.xml massaging.

Backporting auto starr download to 2.8.x and 2.9.x build.xmls.
Trying to get build strings consistent.
Merge branch 'dec10-version-string' into 2.8.x

Conflicts:
	build.xml
Injecting epfl-publish into merge-base.
v 3.3.5 + dons
Added basic Flask scaffolding
renamed hashtag variable, deleted unused function
Change to edit
Merge branch 'master' of github.com:Kritzkrieg/PKSU
fixes linux build...
Added spatial index
Change English to French
Merge pull request #190 from akumax/patch-1

Change English to French
Updated with App Store download.
Corrected stupid mistakes from last commit.
init2

lol
SomeChanges to Squeeze Method
Switched to using the d3.js streamgraph.
Client-side dynamic properties, createAll/destroyAll

Also an indent fix that makes the diff look a little more serious.
生成debug-script
Site updated at 2012-10-10 20:32:58 UTC
DictList layout
fix GPS time fallback value not being a string
fix valid fix detection
show GPS time
add satellite count support
show satellite count
added lua config file
.gitignore
path-tweaks in settings.py
grappelli needs to be 'before' contrib.admin

and updates requirement to 2.4, which is compatible with Django 1.4
Fixes GeoServer authentication endpoint

GeoServer requests authentication at /data/acls, whereas our endpoint is
/geonode/data/acls
Dit moet hem zijn denk ik...
[feature] runtime, magic: Added a generic generator of default value
[enhance] runtime, database, mongo: Bson unserializer is less strict for traverse map
[enhance] compiler, database + mongo: Added exists query in db ast (just internaly use for moment) + use it on mongo generator for embeded path
[fix] runtime, database, compiler: Use Opaserialize intead of magic to string
[enhance] qmlSimpleSlicer: more uniform messages
[enhance] qmlCpsRewriter: add possibility to skip the with construction

CHANGELOG The 'with' construction generate more efficient code (less scheduling points)
[enhance] qmlCpsRewriter: @atomic ensures a computation is atomic or fails at compile time

CHANGELOG The directive @atomic(expr) now checks that the compiler is able to emit an atomic expression computation
[fix] app_sources.opa: remove an implicit protected value exposition, and make it dynamically published to limit its exposition
fix typo in kconv
delete trailing whitespace in kconv
fix documentation in kconv
New ANN version
some runs!
Some fixes to loadingscreen.

Signed-off-by: MaloW <malow@spray.se>
fix init-script-builder
dont hardcode apache group name when setting permissions for state dir
Merge pull request #19 from MarcWeber/fixes/apache-dont-hardcode-group

dont hardcode apache group name when setting permissions for state dir
ClamAV: package virus fingerprint database updater.
Use ext4 for VirtualBox images
renaming all occurrences of /var/run/{booted,current}-system

in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
modules/services/web-servers/apache-httpd: make this module more configurable

 - The new option 'apacheHttpd' determines the version of the Apache
   HTTP Server that's being used by this module. The default version
   is Apache 2.2.x, as before.

 - The new option 'configFile' allows users specify their own custom
   config file for the web server instead of being limited to the one
   that this module generates.
modules/services/web-servers/apache-httpd: add apache user to the apache group
modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
Merge pull request #17 from MarcWeber/fix-init-script-builder

fix init-script-builder
Merge commit 'refs/top-bases/experimental/php' into experimental/php

* commit 'refs/top-bases/experimental/php':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder

Conflicts:
	modules/services/web-servers/apache-httpd/default.nix
Issue #68 - Modest code cleanup.
adding back task from a bad merge
I hate Github… also playlist support
Fixed minor syntax errors
More crash fixes
Saco mas basura y corrigo gitignore
Addition of Views

Added views for directory
Removal of Attributes
Fix for deadlock - fixes 12578
[projectm] - fix type name clash between type_t from projectm and type_t from osx sdk10.8
[osx/ml] - allow to build XBMC against osx sdk 10.8
[osx] - adapt readme - we are supporting osx 10.88
removed old project files and stdint.h from lib/libhts. no longer being any more
Merge pull request #1362 from opdenkamp/cleanup-old-libhts

removed old project files and stdint.h from lib/libhts
removed obsolete keymapping.txt
cosmetics
Merge pull request #1364 from mad-max/keymap

removed obsolete keymapping.txt
Merge pull request #1317 from jimfcarroll/fix-12578

Potential Deadlock fix
German Translation
Translations
German Translation fix
Merge pull request #10 from Tommy-LSA/master

German Translation update
* [xenserver|compute] set_attribute request now accepts var args
  - added new tests

* [xenserver|compute]  VBD fixes and cleanup
  - VBD.metrics now returns nil when VBD not attached
  - VBD tests fixes and cleanup

* [xenserver|compute] cleanup tests and add new helpers
Use MultiJSON #dump and #load rather than #encode and #decode

MultiJSON deprecated these methods in 1.3.0 in favour of the new ones.
This requires an update to the gemspec to ensure ~>1.3
Add debug option to Fog::Compute::Server#ssh

keeps display logic in Fog::SSH::Result
some small fixups
[AWS|Auto Scale] Add support for put_notification_configuration and
change AWS API to use 01-01-2011 Spec
fix get, all, and all!

get and all returned AWS error responses about empty values being specified.  Existing shin do
tests already covered these cases as this:

FOG_MOCK=false bundle exec shindont tests/aws/models/dns/records_tests.rb

was reporting 6 failures.

Tests pass after fix.
Merge pull request #868 from scsmith/multi_json_deprecations

Use MultiJSON #dump and #load rather than #encode and #decode
Merge pull request #870 from mgk/aws-dns-records-nil-options

[aws|dns] fix get, all, and all!
[aws|elb] Failing test for load_balancers marker support.
[aws|elb] Deprecate describe_load_balancers with just an array of names.
[aws|elb] Marker support for describe_load_balancers.
[aws|elb] Fix use of describe_load_balancers in tests.
Merge branch 'aws-elb-describe-load-balancers-marker'
[aws|beanstalk] Support different AWS regions.
adds batch_put_item functionality to AWS dynamodb + test
Add support for ports in AWS storage URLs

* Unify the generation of URLS and support http://
  This is useful for when using fake S3 implementations
* Automatically detect default scheme based on the connection
Merge pull request #874 from adgaudio/master

Adds Support for AWS DynamoDB batch_put_item
Merge pull request #871 from halorgium/put_object_http_url

Add support for ports in AWS storage URLs

DRY up get/put_object_url
Fixed #875: Loosen multi_json version.
Merge pull request #877 from fog/loosen_multi_json_version

Fixed #875: Loosen multi_json version.
DerpyAI: Started working on our Move class located in the DerpyAI
package. Not done yet
Merge branch 'master' of ssh://git@github.com/MrClement/Chess.git
A start on the tests
Plain replaces are now global
omit option UDID & VERSION
Delete all the options, leaving only KEY_APPID
revise ifuse
支持中文变量定义
(定义变量 变量 值)  (setq name value)
-Re-added Overview page.
-Remove connection control via the header.
-Fixed a flaw when using AttachedCommands in bulk.
-Fixed some UI lag issues (nearly 100% responsive now, yay!)
-Added/Removed some images.
-Worked on the maps tab a little bit (buttons should be operational).
-Some other stuff.
Merge branch 'UI-Development'
use shoulda-matchers
Attempt to fix test for repo without master branch.

Without a working test environment, it's hard to be confident it will
succeed, but it's certainly a step closer to correct.
v0.6 changes... (1.4.2)
* now works with new bukkit event handling
* also replaced CraftEntity references
fix gravatar links
convert remaining agent variable getter and setter prims to Scala
plot exporting: don't fail if a plot has no current pen (fixes #160)
Modified viewport for login
drop const optimization of operators '<<' and '>>' from stage 0
Merge pull request #22 from jmeridth/be_explicit_about_source_list_delimiter

Add sentence to notify users of what the delimiter is for source lists o...
Finished TownOne and more changes to tileset
PNG files of APP "Climate Disasters" . Art: Adriano Lima
[README][xs]: link to dataset.
[scrape][m]: geocoding operational (though with very crude parsing of source text - expect na ... as).
document directory in wrong place
Adding proxy initializer interface, various todos and exception dedicated to uninitialized proxies
Añadi metodos para obtener ultimos registros en bd
Draw menu
got sphinx working locally
Remove obsolite t_Co and and ttimeout
Json のパースが失敗する場合にアプリが落ちないよう修正。
Dodanie klas.
fix sync

Change-Id: I41a088d81a0aca90522af3496300ef00ef77369b
implement test_dns use dig, remove default ip
Merge branch 'master' of https://github.com/ProjetX/ProjetX.git
Small change to minus sign in turning. This commit has a working headland drive
Add DFT algorithms module
Add repa mapM
Add fromGrayscaleFloat
Work on local cfa analyser
Change gitignore to include new output file name format
Minor fixes / changes
Return first available task. Close #135

This commit reduces the overhead of querying for all available tasks. The first time
that one task is ready for the user is sent.
Use own PyroMod repo instead
improved documentation and added license info
Filtering only favorited items [closes #15]
added options menu [closes #14]
commit #1:
line buffer length use 16*n when defined RTGUI_USING_SMALL_SIZE.

commit #2:
when cursor in the end of line, if press the key "RTGUIK_DELETE",
it will the next line merges into the current line.

Signed-off-by: amsl <iamyhw@gmail.com>
html and body overflow hidden
fix MSVC build regression
Created Classes. Let's go!
Added README.md
Migrated to a single entity cache for the primary MOC instead of one per thread
Änderung noch für Projekt / Protokoll nachgezogen. Vlt können die Änderungen noch auf cd gebrannt werden?
Noch im Testverzeichnis aufgeräumt
var renaming
added api to get user avatar
display avatar on hover
nodes slightly bigger for better hovering
Update TestPrj/src/com/test/MyApp.java
- correct existing raise test
- amend it so rack lock releases the mutex on throws as well and raises
- added raise test
Action parser, fixed potential issue with action 0x06
refactored preview request detection into plugin
replace Html::url array with string syntax. Performance.
workaround for router bug cakephp 3400
Worked on admin. Totally not finished yet.
Added README and bibliography about the SeqWare Query Language.
Turret way reads from tmx using Shapes provider
better on memory, still hard on CPU
miRE data insertion
Aggiornato file per la connessione al database del sito
Merge branch 'master' of https://github.com/ShinDarth/gsfgd
Uso db_connect.php per stabilire la connessione, in tutti i file
Define string length limit through argument (no longer hardcoded)
Import missing class for response
Make isSerializable flag static
Test file existence before loading
Format code
Refactor format handling, allow registering new formats
Use new static call
Implement Json wrapper and interface
Remove useless comments from class definitions
Revise exception classes
- Improved simple behavior.
- Fixed error.
- Added :VimFilerExplorer command.
- Improved document.
- Fixed buffer settings.
Updated release notes.
Minor JS refactoring
Fixed broken websockets fallback logic.
Fixed bad targets in ASP.NET samples project preventing open in VS2012 RC.
Improved websocket detection for ASP.NET
Only continue retrying if the connection isn't disconnecting.
Updated the JS client so that it builds on mono.
Updated the make file to build things relevant to mono.
- support for runtimeSelect
- switch SELECTHXML_RUNTIME_PARSING to disable passing of parsed selectors from macro to the runtime
- added benchmarking to all tests
- added tests for runtime versions
- replaced XmlDom with XmlExtension (faster for single queries)
- optimized some parts of the SelectEngine
Make Config/config.json work again

This code is hard to follow.
Changed: made some UI changed on all templates
Creado un sistema de colision de pixel perfecto, nuevos sprites para el robot, y comenzado el trabajo con las balas
Added Ruby Gem installer
Fixed typo in comments
I feel silly
Fixed unused labels.
Changed slider check implementation

It now uses jQuery.isFunction(), and does not create a slider until the
check succeeds
Remove colours repository

Now is implemented in theme
New style for lists
Install working but still issue with dependency
union diff mit speed speichern/laden
Merge branch 'master' of github.com:Terenc3/MarcWoo
Added toggle for fisherman's diet
Trying to make the Sunny Day success message random.

This is is very weird and horrible way, but I couldn't figure out a
better way. Will try again some other time.
Oops, this needs to be 3 :)
New formula Axes Addon! (durability reducer)
Trying to fix the new formula bug
Clean up for debugmode
Formatter
Still fixing, not much success yet.
this should be floating
deleted list.txt
Fixes issues with Growl on Mac and removes click event.

- Updates Growl to latest SDK
- Removes callback on Growl click (and Snarl click)
- Added Growl Wrapper for Mac
- Fixed Notification Tests
- Added New UTF-8 Notification Test

Fixes issues TIDESDK-57, TIDESDK-53
Removed ARC memory release, fixing issue with mist
Merge remote branch 'origin/growlfixes' into develop
Logging of message events
Added more information to states, removed generics.
Completed
smaller connectivity images
Further UI fixes for organization API b0rkage.
verification queries can be run for alerts. fixes #3
Merge branch 'devel' of github.com:ULAKBIM/NfQuery into devel
IN PROGRESS - issue GWDP-472: Inspection results not linking properly 
http://internal.cida.usgs.gov/jira/browse/GWDP-472

Debug settings.
[maven-release-plugin] prepare release ngwmn-1.6.6
CFwriter rewrite to 1.6 spec (3).
  timeseriesProfile: allow time(time)
Merge remote-tracking branch 'origin/target-4.3.9' into target-4.3.9
update TDS main page
Merge remote-tracking branch 'origin/target-4.3.14' into target-4.3.14
in Checksum first sed commands added
in Checksum checksum processor extended
in Checksum first running version of sha1 hash checksum
in Checksum md5 hash added, implemented by package nano-md5 (binding to openSSL lib)
new project dir fgs2/ for find-grep-sed-hash created
use persistent UDP connection for faster send().
Updating CommandHandlers to load objects via Repository
Adding Repository
Adding new EventStore
Adding a start to the SnapshotStore
Moving Model definitions to Model folder
Updating Watcher example and indicating it's a TODO
Moved the EventStore
Changing on_ method prefix back to apply_, Updating namespaces
Updating test to use the Repository, refactoring
Adding first UMF sample
transactions
	app/assets/images/headimage.xcf
Merge branch 'hotfix/trans'
connect
Merge branch 'master' of github.com:WanCheol/Anicom
add new files to gitignore
Rename of Acl to Security
Merge branch 'master' of github.com:WebTales/rubedo
Added a name check method and other stuff

name check and allowed for spaces when typing and checking names
OpenMesh Wrapper works. Lightning only rarely - driver problem?
Thinking about the package system
fix more cppcheck warnings
css
rettelser
imlib2
Created a scripts directory.
Better name for build script.
Moved compile and tagging to different tasks.
Updated package.json to reflect new test script location.
removed link count limit from the profiler task
removed double #normalize_url call when setting the URL
added #realize to Object and Enumerable -- tries to approximate the real size of the object
#request: url is now dupped after being normalized
added a require for enumerable.rb
added Cache class
URL manipulation methods now use the Cache
net.ldns: Fix lib name mismatch
Set proper execution permissions to scripts
Commit 14

Lots of bug fixes
refactored and debugged people_search interface
CIEL_DIR changed to /root
Fix %-encoding in keywords
Don't allow empty password in uri, again
add wousewheel handling for spinbuttons (input[type="number"]/input[type="time"]) fixes Issue #108
Compressed the finance charge output in MBNA StatementPage __ansistr__
Consolidated xo.scraping imports into __init__.py
README fixed. index.html removed.
Reset error message on provision to make sure we wipe out-of-date errors
Don't show defunct instances in provisioned instance status
Fix filtering on provisioned instance/group status
Adding support for user level (filtered) API
no csrf_exempt
fixed more bugs with stopping gps updates
Beginning of zsh completion commands. Only includes basic subcommand completion.
Add a README about the zsh completion scripts.
Add a utility function for checking actual file types.
Доделана работа со статьями.
Добавлено несколько правил доступа.
Да простят меня все за такой огромный коммит
Make jmx setters consistent with yaml config.
Patch by Chris Merrill, reviewed by brandonwilliams for CASSANDRA-4479
Murmur3Partitioner improvements
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3772
merge from 1.1
Merge commit 'refs/top-bases/p/4443/010_refactor_range_move' into p/4443/010_refactor_range_move
Merge commit 'refs/top-bases/p/4443/020_calculate_pending' into p/4443/020_calculate_pending
Merge commit 'refs/top-bases/p/4443/030_relocate_token' into p/4443/030_relocate_token
Introduce MessageOut class, which wraps an object to be sent in the "payload" field.  The old Header class is inlined into the "parameters" map.
patch by jbellis; reviewed by yukim for CASSANDRA-3617
Automated refactor: rename Message to MessageIn
Automated refactor: move StorageService.Verb into MessagingService
Rewrite IncomingTcpConnection to deserialize w/o extra copies to byte[]. MessageIn now has a payload field, and uses the Verb to look up the correct deserializer. REQUEST_RESPONSE deserializer is not uniquely determined by Verb, so we look those up by their callback instead.

patch by jbellis and yukim for CASSANDRA-3617
Automated refactor: rename Message out of class names that aren't MessageIn, MessageOut, or related
serializedSize implementations, part 1 (gossip and streaming packages)
patch by jbellis; reviewed by yukim for CASSANDRA-3617
add serializedSize (part 2) and fix unit tests
patch by yukim; reviewed by jbellis for CASSANDRA-3617
cleanup CallbackInfo and mark deprecated Verbs
New TopGit branch: p/3881/01_calc_natural_endpoints
serialier() -> serializer and some clean up
remove unnecessary class
import patch
rename DBTypeSizes -> TypeSizes
New TopGit dependency: p/3881/01_calc_natural_endpoints
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Remove TopGit dependency: trunk
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/3881/01_calc_natural_endpoints' into p/3881/01_calc_natural_endpoints
String#to_s and #to_str specs for dealing with subclasses
String#underscore and String#demodulize implementations and specs
applyMove -> apply for tictactoe
Add contributing.md
Merge pull request #126 from tony/contributing

Contribution guidelines
Display error is plan is not loaded before using help for CERR Command line
my tmux file
Adjusted name replacement in IO.
Storing user_wall_assignments in mongo db so tablets can figure out who else is at the wall
Merge pull request #86 from agamba/master

changed videowall to letters and fixed events
Finally added (probably completely broken now from the merge) frontboard-tracker webapp
Merge pull request #87 from mikecules/master

Finally added (probably completely broken now from the merge)
Merge branch 'master' of github.com:encorelab/NEOplace
working first step in sideboards -- students can now post tags to wall with full persistence
Merge branch 'master' of github.com:encorelab/NEOplace
updated the classroom.json
Added sail.js and server.js to frontwall-tracker
Merge branch 'master' of github.com:encorelab/NEOplace
added equation images
Merge remote-tracking branch 'upstream/master'
Merge pull request #88 from miketissenbaum/master

updated classroom.json
Added Sail submodule to teacher tablet
Adding Sail events.

A work in progress.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitmodules
Add sail submodule for teacher tablet
first 2 sections finished, restoreState added
Merge remote-tracking branch 'upstream/master'
Merge pull request #89 from pchen/master

Small updates to the teacher tablet.
Merge pull request #133 from agamba/master

changed a bit names of what screen capture does + uno missing / in ajax call
send only accepted balloon data in _commit events
bigger margin around problem rationale box
Merge branch 'master' of github.com:encorelab/NEOplace
a small adjustment to the css of aggregator giving the equations a border
Merge branch 'master' of git://github.com/encorelab/NEOplace
Merge pull request #134 from miketissenbaum/master

css for aggregator updated to add a border to equations
fixed a dumb mistake
Merge pull request #135 from miketissenbaum/master

dumb request for error
minor change to text color in update status
Released 0.3.0, now cross compiled for Scala 2.9.1 and 2.9.2

Just a maintenance release. No significant new features added since it currently does all I need it to do… sorry :(

Signed-off-by: Age Mooij <age.mooij@gmail.com>
push taurus core codes
Fixed #19500 -- regression in join reuse

The ORM didn't reuse joins for direct foreign key traversals when using
chained filters. For example:
    qs.filter(fk__somefield=1).filter(fk__somefield=2))
produced two joins.

As a bonus, reverse onetoone filters can now reuse joins correctly

The regression was caused by the join() method refactor in commit
68847135bc9acb2c51c2d36797d0a85395f0cd35
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
auto commit sql backups
added over 8 char test to HelloNexusJS
Improve the README even more with MD syntax
Check debug or release mode to use appropriate key for G maps
Set default values for postcode and efficiency
No new object allocation in onDraw
Add unit test case for rest/ping
Docs for the first client management services (#9, #16)
remove local consumer key references
iv_notify.3: Escape the minus sign in "-1".

Groff treats "-" as a hyphen by default, not as a minus sign.  Since
it is used as a minus sign, it's best to escape it.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Merge branch 'develop'
did some work
did some work on adventure.lisp
added prehistory
Hizlandi
deleted bin/ directory
fix pattern matching filters on 1.9 (LH #345)
fix test for haml 3
Fixed a problem with request.accept and provides.
Small fix in routes and host option.
In README docs, fix links to HAML and SASS Options pages.
In Japanese README doc, fix links to HAML and SASS Options pages. 
In German README doc, fix links to HAML and SASS Options pages.  
changed access to @template_cache to a reader.
Merge dougireton's README fixes
fixing issue with Tilt::VERSION check: '0.10' < '0.8'
Correction to erubis template rendering instructions

Signed-off-by: Simon Rozet <simon@rozet.name>
lighthouse => github issue
fix whitespaces
get '/' should match even if PATH_INFO is empty. This fixes compatibility with Rails 3.

Signed-off-by: Simon Rozet <simon@rozet.name>
fix whitespace
set accepts anything responding to each

Closes #8
Merge branch 'master' of git://github.com/sinatra/sinatra
Adding scss support through specific command
Allow DateTime instances to be passed to last_modified. Makes sure the value is always a string, so Rack::Lint will not complain. Fixes GH #16
Upgrade bundled Tilt, fixes GH #40
課表 regtype=1 顯示藍色字
Reordering benches to produce better looking charts
Make sure to return a value from the dummy functions
Completing the capture and specification for #190.
[winphone] changing config.xml preference key networking => network
Use the public_hostname method to detect the correct ip address. Otherwise
this will fail for vpc instances
Pass album as well
Βελτίωση του Προλόγου και του πρώτου κεφαλαίου
Remove import. Closes #11.
Update README.txt
Merge branch 'master' of github.com:rjaffe/ui
NOJIRA: Update from collectionspace/ui master branch
Merge remote-tracking branch 'upstream/master'
CSPACE-5166: Add termName field and label to PreferredTemplate-person.html. This is rough, to enable development to continue.
CSPACE-5060, CSPACE-5170: fixes to UI to make location work with repeatable term group
CSPACE-5060: First pass at tying in concept, place, org. Fields appear without labels. Awaiting further services work.
CSPACE-5060: Labels working now. Removed termStatus field from main template as it is now in preferred; Shifted foundingDate to float left
CSPACE-5060: Fix template markup, whitespace; try to create a label for repeatable term block group - not working yet
CSPACE-5060: Creating label for repeatable orgTermGroup. SHOULD REALLY REPEAT WITH EACH INSTANCE, LIKE TEXTUAL INSCRIPTION GROUP IN CATALOGING.
CSPACE-5060: Fix labels for three authority types
NOJIRA: Merge updated upstream/master in loca 2dot4AuthorityWork branch
CSPACE-5060: Minor fixes to labels; remove label for repeatable group, which had been added temporarily by me.
CSPACE-5060: Remove scope note, etc from repeatable term group
CSPACE-4977: Term completion widgets should now be able to expand %vocab variable in matchUrl that is coming from the app layer.
Merge branch 'CSPACE-4977'

* CSPACE-4977:
  CSPACE-4977: Term completion widgets should now be able to expand %vocab variable in matchUrl that is coming from the app layer.
Merge remote-tracking branch 'upstream/master' into 2dot4
CSPACE-5060: minor fix to label
NOJIRA: Updating tests so they pass (including missing files)
Merge remote-tracking branch 'upstream/master' into 2dot4
imu corrected, partial path follower working
while path take
Changed map generation to add more rooms and ensure they don't
circumvent any roadblocks
Update lang files with missing texts
SSDP: Change ST in M-SEARCH to service:ContentDirectory:1

This makes (the non-conforming to spec) PS3 Media Server and
Universal Media Server respond to the query
我加了新東西
1205171610
John Idle Animation, aufgeräumt
improve output formating for playbook
Merge pull request #576 from davehatton/adjust_playbook_output_formating

improve output formating for playbook
Port command module over to new common code.  Notice that this has to subclass AnsibleModule -- this should be the only
one that has to do that.
Import cleanup, plus have /bin/ansible remind you if no hosts were matched by a pattern (for instance, assume
there was a typo in the pattern)
Add unit tests for playbooks, and fix an error caught by one
Playbook test upgrades, made some notes about callbacks we need to add.  Still need to compare events
recieved vs expected so we can be notified if this test breaks, and also to add some more detailed
playbooks that use includes & async, etc.
Use boost to wrap c++ to python
typo in removeitem, init fetch 3 months
G+1 button on landing page
changed template body
changed sign up and add service drop downs
expiry 6
Merge branch 'master' of github.com:apoorv03/naasaa
Angad's change
iOS and android form fixes (double event issue)
adding test for loading single field specification
remove old legacy data structure
Merge branch 'hotfix-rm-pkg-datastructure'
updated bounding box to reflect the area around the watersheds of interest
'newversion'
added bootstrap and jquery, also changed order of css compilation
Added and configured devise
styled devise views
update gitignore
Added 'deconstruct' methods for Rectangle and Circle class members
首页默认到admin@younoter.com的个人主页
Fixed Autotools configuration files.
'engine' source group moved up
Force value overwrite will allow readonly values in script but mutable from c++
Value forcing is now public
SharedData object moved into gs2d::Application
SharedData creation functionalities
Sprite drawing glitch (that was happening mostly on GLES2) fixed
Convenience ignored files
Order fixed
Shared data methods on the java side
Command listening redesigned
Add print_colors.sh prints color codes
Added clkgen to directory listing
changed look of HomeActivity; introduced checkin check at home activity; some code corrections
now we commit the previous changes
make Connection.startParser() internal
Moves the core Log4j code into a Maven module called log4j-core
Pomifies modules, core, parent and net
Enables other modules except NT

Fixes compiles error in DefaultLF5Configurator.
Tidied up packages in contribs module
Fixes some compile errors and moves out code identified as out of date or stale
Corrected test directory name and removed duplicate tests
Moves resources in test/resources dir
Tweeks test file paths to Maven layout
Moves net testing resources to net and tweeks some of net test paths
Moves LF5 examples into LF5 module
repository cleanup
added links file
potd processing
add distinct option
admin for bartab

add bartab entry to intranet backend
Ajout des commentaires
Merge branch 'master' of https://github.com/authchir/LOG210

Conflicts:
	src/hotel/Main.java
refractor
collapse into one file && figure out howto plot eigenvectors
add PML+PRB
correct FD method
search2.svgの色が問題でImageMagickでの色変換が機能しない問題に対処

ついでにSVG手書きに移行。
rpmbuild/ops: add --dry-run option so far.
removed unnecessary code.
added to get target servers
add to get load balancers
improved AMQP cilient connection
added event hook node module that can be hook the something event.
in the first case, it is executed Instance unregistering and  Load Balancer update.
chx
Check for jslint output in all possible locations

On windows, if jslint is executed within the cscript host
it will place lint in index 1 of proc_output, however, when
run in node, it will place it in index 0.  I updated the
code to check all elements of proc_output for lint errors
#167 ready for testing
dump機能リファクタリング
Regenerate gemspec for version 1.9.14
better representation of auto renew. only show auto renew for badger registered domains
Added stored procedure to create a table code for a given table number and a script to test the procedure.
russian letters - for stackexchange
let aggregates have conditions if defined outside of aggregatable