labofsahil/github-event-dataset-2012 huggingface dataset:
template: remove magic behaviour of set('debug', ...)

This was mentioned in the old docs, but we're not using it anywhere.
If you use any of these names:

    debug|active_theme|default_theme|current_view|layout|parse_views|
    data|blocks|message|theme_paths|site_path|orig_view_path|ci

they will set class properties of Template, instead of adding a
variable to the view data.  I noticed this when trying to pass a
variable called 'debug' to the view.  The name 'data' also looks ready
to cause many man-hours of debugging fun.

There's no alternative setter for $debug, so I just made it public.
(Remember that without this change, _all_ the properties of the
Template class are effectively public.)  The other properties could
already be set as desired without using this magic.
emailer lib: process_emails(): respect enable_debug() and fix return value

There's not much point testing for CI_Session because it will always exist.
It's loaded by the users auth library, which is loaded by MY_Controller.

OTOH, it may well make sense to respect enable_debug().  This will help
make the debug code a bit more consistent in future.  I.e. we can use a
single PHP variable to hold debug messages, so we don't need to abuse the
session for it.  Being consistent about enable_debug() would make that
easier to explain and understand.

Also fix the return value to indicate success or failure.  It's what the
function comment says, and you shouldn't have to enable debugging just to
tell whether the function succeeded or not.
emailer lib: fix return value of send() and unify debugging messages

The function comment, users module, and create method of the email
settings controller think it returns boolean, but it doesn't.
Returning boolean would make good sense here.  Most callers won't
use the extra debug information - you already have to do extra
work to enable the debugging messages.  And for those that do use them,
grabbing them from a global variable is no big hardship.

(PHP does not do threading - or signal handling - and process_emails()
cannot be called recursively, so a "global variable" is not so bad).

Let's fix send() so it matches the documentation, and so the naive callers
who believed it will now notice when send() fails.

Also fix resend_activation(), which was trying to display the debug
messages, but would actually have errored out trying to display the value
of the private $debug flag.
Merge branch 'fixes/email' into develop

Conflicts (line endings only, automatically resolved by kdiff3):
	bonfire/application/core_modules/emailer/libraries/emailer.php
	bonfire/application/core_modules/users/controllers/users.php
Resuelto lcs
Añadido fichero de entrada rosalind_lcs.txt
Merge branch 'master' of https://github.com/cjperezsa/rosalind

Conflicts:
	src/rosalind/core.clj
	target/repl-port
Adminz no longer hijack an idea as their own after editing, adminz can view and restore older versions.
- Changed website url
changed the version temporaliy to only be the date/time

Change-Id: Ie56b15fd51d222921f4fd2f55a093d5bf0baf2ff
Loose 1/20 Petrinetz
Merge branch 'master' of https://github.com/codejunky/SoSe2012
revisits detection module
fixes concurrency and tracking module initialization bugs and enum naming conflicts
adds initial phone setup, including capture manager and video reader from previous project
enables object tracking via phone test app (there are still a few bugs though)
Added a local gitconfig file for proxy etc.
Stupid autocrlf
Merge branch 'master' of https://github.com/codito/configs-win
Turned off core.autocrlf
d
fuck
Move event handlers to the view, which delegates to the surface if
required.
Made readme prettier for github
adding magic encoding
add a general automatic reader for Leeds Web corpora
Rename README to README.md so github picks it up
Set thread-safe mode as default.
was missing the field 'content', fixed
Fixed some bugs and improved some tests.
Just shadow the outer function variable.

Better than confusion.
mac80211: send peer candidate event for new sta only

Only send a cfg80211 new peer candidate notification if userspace has
yet to allocate this station entry.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>

v2:
only send notification for secure peers
{nl,cfg,mac}80211: Allow user to see/configure HT protection mode

This patch introduces a new mesh configuration parameter "ht_opmode" and will
allow user to check the current HT protection mode selected. Users could
configure the protection mode by the command "iw mesh_iface set mesh_param
mesh_ht_protection_mode=2". The default protection mode of mesh is set to
non-HT mixed mode.

Signed-off-by: Ashok Nagarajan <ashok@cozybit.com>
Reviewed-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Conflicts:

	net/mac80211/mesh.c
audit comments
Merge branch 'master' of github.com:crabideau5691/BADM
Don't highlight link title in Markdown reference links
Moves more to get_status function. Uses constant for ping time
Adds better handling of old and current score
Adds end_match method to handle ending a match
use 32bit rather than 64 for timestamp
Unbreaking Derek's skeleton code.
GWEFHIWEF
Fixed some bugs with CTA
add BiMap
improve q3 material support
Games run. Debugging Reversi!
added band page and content. some IE fixing
Updated to reflect the new #1 recommendation, the Raspbian OS. (Changes are between #ALTERED and #/ALTERED comments). Also added horrible hack to reflect the fact that the Raspbian .zip file does not unzip into a sub-dir, unlike the old Debian 'squeeze' distro. (Changes between #FIXME and #/FIXME)
Ensure key names are properly decoded when retrieved.
Fix cookie tests to correctly align to 1-second boundary before checking cookies.

Re-enable Opera, which was the only browser that seemed to care.
Created a class for generating all possible paths
Minor changes plus attempts to re-add gtf as possible annotation.
With further thought, gtf may be the best method to incorporate user-specified
annotations. However I will need to make sure I have scripts to
properly check the sorting of the gtf file. In addition I also
need to add a gtf file reader that does not depend on the gene names
but rather determines a "gene" based on the weak connectivity property
of the splice graph.
Basic readme added (needs a lot more fleshing out)
Added a basic package file to install dependencies with npm.
Ignore node modules directory if using local node_modules folder
Add bootstrap-cyt
NLTK examples added.
CloudSuite, login function 50% complete
TODO:
-- verify uname and password

-- redraw login button

-- get labs with uname as owner
CloudSuite, login 75% complete.

-- get user labs.
-- Apply username to new labs.
CloudSuite, waypoint login
CloudSuite, Load lab with login complete
TODO
-- New lab
-- Create lab use owner name.
CloudSuite, New labs use username
CloudSuit:Login, Login and Logout procedure complete.
Be stricter about ensuring we only callback once a transaction is complete
Merge pull request #275 from daleharvey/strict-transactions

Be stricter about ensuring we only callback once a transaction is comple...
implement reduce for idb (fixes #64)
Start auth
Minor tweaks here and there
Merge branch 'feature/diagrams-dev' of github.com:damienobrist/scala into feature/diagrams-dev
added a crontab action scheduler.
Added gitignore for DieselFramework
The screen sort of works.
make session expiration full.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>
adding api cache
improving the related fields of member in the api. needs testing
Adds PySide hooks
Adds PySide plugins support via run time hook
Adding Live Preview CSS Styles
msm_fb: display: enable MDP interrupts base on panel interface
Remove jersey from licensing file.
Modified page counts benchmark.
remove some redundant screens and add help text
inputmode default and other fixes
selection mode and multi-image delete
a new leaflet version
nginx-1.3.5-RELEASE
Version bump.
Fixed the "include" directive.

The "include" directive should be able to include multiple files if
given a filename mask.  Fixed this to work for "include" directives
inside the "map" or "types" blocks.  The "include" directive inside
the "geo" block is still not fixed.
Fixed strict aliasing bugs when dealing with IPv4-mapped IPv6 addresses
(closes #201).
Fixed overflow if ngx_slab_alloc() is called with very big "size" argument.
Converted DOS-style newlines.
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Limit req: fix of rbtree node insertion on hash collisions.

The rbtree used in ngx_http_limit_req_module has two level of keys, the top is
hash, and the next is the value string itself. However, when inserting a new
node, only hash has been set, while the value string has been left empty.

The bug was introduced in r4419 (1.1.14).

Found by Charles Chen.
Write filter: replaced unneeded loop with one to free chains.

Noted by Gabor Lekeny.
Improved welcome page.

The feature set of the new page:

 - HTML5 compliant;
 - Description of why the user is seeing the page and what his next
   step should be;
 - Links to official community and commercial support websites.
Memcached: memcached_gzip_flag directive.

This directive allows to test desired flag as returned by memcached and
sets Content-Encoding to gzip if one found.

This is reimplementation of patch by Tomash Brechko as available on
http://openhack.ru/.  It should be a bit more correct though (at least
I think so).  In particular, it doesn't try to detect if we are able to
gunzip data, but instead just sets correct Content-Encoding.
Gzip static: "always" parameter in "gzip_static" directive.

With "always" gzip static returns gzipped content in all cases, without
checking if client supports it.  It is useful if there are no uncompressed
files on disk anyway.
Gunzip filter import.
Gunzip: removed nginx.h leftover include.
Configure: provide inflate() when building zlib on win32.

It is now needed for gunzip filter.
Improved 50x error page.

The feature set of the new page:

 - HTML5 compliant;
 - Looks similar to the new "Welcome page" (r4835);
 - Sysadmin hint with a link to the documentation of the "error_log" directive.
Configure: fixed make macros to use parentheses instead of braces.

Parentheses are more portable, in particular they are understood by nmake
while braces aren't.
Helper target "win32" to run configure for win32 builds.
Updated zlib used for win32 builds.
nginx-1.3.6-RELEASE
Fix a style issue with issue banners.

The recent change to issue banners had text that was vertically
off-center when not showing the buttons. This just fixes the line height
so it'll be correct.
Bump the latest versions of our dependencies.

This ensures every user will have a known good version of each
dependency, and will help us sort out any possible issues if there's a
breakage in some version or another.
Release Review Board 1.7.
Merge branch 'release-1.7.x'
Fix the repository form when there's no SSH key created.

The repository form was assuming the existence of an SSH key, and
operated on it, but if that didn't exist, things would break. We're now
more careful about this.
Release Review Board 1.7.0.1.

This just has a fix for repository creation when there's no SSH key.
It's affecting a number of users.
Merge branch 'release-1.7.x'
Add better explanations and output for rb-site and Manual Updates.

rb-site and the Manual Updates pages didn't go into the <Location> field
changes that were needed, which ended up confusing users. These are now
covered, as are equivalent lighttpd changes.

The rb-site resolve-check command was also a little confusing in that a
second resolve would say that there's no known check. Now it says that
the check was already resolved.

There's also a few style fixes so the manual update page is more
readable in general, and particularly when the stylesheet can't be
loaded.
Fix upgrading database settings.

We had two problems with the upgrade of database settings. The first was
that we never properly migrated postgresql backends to have the full
module path, which meant that we had a new-style DATABASES, but an
old-style engine value.

The second is that, starting in Django 1.4, the old-style engine names
are deprecated, and the settings file was cached prior to the settings
upgrade. So in both the above case and a move from an old version with
DATABASE_ENGINE, we ended up with the old values still in settings, and
that broke the upgrading.

We're now upgrading the postgresql setting, and we're also reloading the
settings so that we can use them during DB upgrade.
Improve some of the rb-site log output.

Some users got confused when seeing what looked like errors during
database upgrades. This is usually django-evolution complaining about
unapplied evolutions, followed by us applying them.

We now let the user know that anything they see in the logs can be
ignored unless the full upgrade failed.
Merge branch 'release-1.7.x'
Merge branch 'master' into release-1.7.x
Release Review Board 1.7.1.
Added layout setting documentation
Fixing shift overflow
alta y modificacion Clientes
remove histroy
add basic support for free users
create readme for anta.
how tos and sql queries will go here!
added similarity function
added Distance model to store cosine distances between documents
added tag type 'actor' to title parsed tags
Fixes aroundwq the full text search
[TU-213] Interface mockups

Signed-off-by: toscheva <sanchis.no@gmail.com>
Varmempi naru.
Samify.
Porautumis-ominaisuus.
NaNNaNNaNNaNNaNNaNNaNNaNNaN Batman!
Osasto-summaus.
Tuoteryhmä-summaus.
UI parannuksia.
Tuoteryhmien piilottaminen, jos osasto piilotetaan.
Kustp -> osasto -> try pureutuminen
Tuunausta.
Kustp -> osasto -> try summaus
Merge branch 'master' into sami/myyntitilasto_muutokset
Division by zero
Käytettävyys parannus.
Merge pull request #449 from devlab-oy/sami/myyntitilasto_muutokset

* Myyntitilastoraportin porautumiset *
Mergetys!
Voidaan kuitata tilauksia kerätyksi Excel tiedostosta!
automated commit from dev@dmehta Wed Oct 17 16:00:01 EDT 2012
automated commit from dev@dmehta Thu Nov  1 14:00:01 EDT 2012
automated commit from dev@dmehta Fri Oct 12 08:00:01 EDT 2012
removed configuration gotcha
Move the rest of the test data to the proper folder

It is not yet used
Rename project
Added basic game types.
Enabled automatic flush on save()
Enabled automatic fail on errors during save()
Enabled automatic HTML encoding of variables in GSPs.
Java version = 7
Servlet version = 3.0
New Domain classes and enums for initialization
Added some initialization code.
document changes
Added text for message items [de]
Added timing utilities timedcall, timedcalls
Added counter functions - instrument_fn, c
[feature/delete-auto-logins] Fixes language entries

Fixed language entries so that UI shows persistent login keys instead of
autologin keys.

PHPBB3-9647
getMaxId method and tests
Корректировка путей ссылок для подразделов.
Корректировка пути для вложенных подразделов. Теперь URL отображает их иерархию. Остаётся проблема с отображением того же самого в breadcrumbs.
Implemented java api and added meta data options
Changed 'Classify video' to 'Classify Video' on dashboard
Fixing tyop
catch another error
Testing if $form_state['uid'] is set as stated in comment
Test also for boolean value of $form_state['uid'] and if password is empty (not name twice).
Updated comment about $form_state['uid']
added support for persistant login
case 581 - Fix additional data loading from DB
update hook sets weight to -1 for correct order of form alters
Removed persistent login
Updated make file to point to ding2 repos
Fixed undefined index in ding_user username alter
Merged make files
added pushtape_connect
added features
Added Jquery UI theme.. needs tweaks
cleaned up staging nginx conf; added ssl directives; added certificate generation to fabfile
build  wikish project
Temporary fix for PostGIS 2.0.x
Deleted references to probe_geometry_columns()
add rebar executable and config
fix for small issue with %20
testing OWU2ZmZkMD
Restore nested hash support for POST/PUT requests
fixed include style
Merge pull request #38 from doktorj/master

added applications controller and got add/edit applications working from /admin
Updated some styles
Added template thumbnails and left nav links to frontend materials/index
Added filters to frontend materials/index and styled. - Needs JS from static site
Merge pull request #39 from placeboArts/master

Style and frontend updates
Added JS link "slideToggle" link to frontend application.html
Merge remote-tracking branch 'upstream/master'
Merge pull request #40 from placeboArts/master

Added JS link "slideToggle" link to frontend application.html
Some icons are added. Implementing address selection.
Address candidates popup window.
temula major problems have been solved I think...this one includes generation of and basic parsing of xhtml
temula major problems have been solved I think...this one includes generation of and basic parsing of xhtml
Renamed check() to exists() per original plan.
Added whole request.META to view
Try some symlinking.
Fixed bad naming conventions.
Added new config options for user keys.
Added a new (more flexible) SSH key database class.
Added a boolean for using the system user dir for checking keys.
Added missing padding.
Added a checkKey method to override the default one.
Added a script for importing keys into the SSH server data dir.
Added a make target for importing keys.
Add uk support file.
Fixed some minor issues, pep8
Migration
cmake: add commented-out flags for osx-deployment, comment in when needed
Can change num layers, and filled in more for determining random word pronunciation.
twilio: fix test method name

The notifications test method wasn't prepended with 'test_', thus not
being collected by the test runner.
twilio: add support for the new usage API

Twilio has enabled a set of endpoints to handle usage records and
triggers.
Usage records are consumption reports, broken down by categories (calls,
sms, ...) and timespans.
Usage triggers are webhook notifications for consumption thresholds.

Both endpoints (and their sub-resources) are now supported!
Misc updates to the example.

Works well with significantly less space among other things.
Fixed extra slash in (base) suite paths
Basic filtering to coverage view
Focus coverage mark 1
forgotten files added

summaries in coverage headline
ConfigFacade, global Config replaces klujs almost everywhere
deploying
Merge branch 'master' of github.com:eanderle/trytwilio
to heroku
deploying
Deploying
Merge branch 'master' of github.com:eanderle/trytwilio
Commit changes to phpCloud git repository

Change-Id: I0cd7cacfd2a28a8a83aa8a28e616e68c97fa92b7
Commit changes to phpCloud git repository

Change-Id: Ic3c862524f6c2798eaa76da527b85fa14eea63eb
Commit changes to phpCloud git repository

Change-Id: Iee94960c88b946e1bb41e232ef71eceab2d857e7
Commit changes to phpCloud git repository

Change-Id: I74f1e14db307a86998f46eca083972e87f14ec57
Commit changes to phpCloud git repository

Change-Id: Ib4f2eeb1fa44be1a758d372bed654d2ed1393031
Commit changes to phpCloud git repository

Change-Id: I2b12c99afd3ad11323aed0fc809382fa2910ee9c
Commit changes to phpCloud git repository

Change-Id: I7084d08f82570df1438c839e10a66e8e8e09debb
Commit changes to phpCloud git repository

Change-Id: I024169e74c1146882905b9bf876d11aa55ec7612
Commit changes to phpCloud git repository

Change-Id: I14cd5cd3bcb457f341045e702fe05682708d8cc7
Commit changes to phpCloud git repository

Change-Id: I34995131afbc9dda823ce6b4a4c2da42a37ab4d0
Adding of a new design.
Fixing eea.daviz demo buildout link
#3 - Updates for event handling
#3 onQuizResponse Event
#3 - Custom tag egulias.event_listener to register listeners during config through container
#3 - Custom event new params and getters, updated questions persisted
#3 - Updating listeners namespaces
#3 - Changed event name
#3 - Changed event file name and references
#3 - Testing PreSave Event
#3 - CompilerPass attributes controll and QuizManager event place change
#3 - Listener added and event fired test
#3 - Event placed and params passed. Fixes to the compiler pass
#3 - Compiler argument typo
#3 - New listener with high priority for response management

- Added to the listener xml
- Removed doctrine event listener from xml
- Prsisting back to its original place
#3 - Removed Doctrine listener
#3 - Var name changed
Merge branch 'dev' into events
#3 - Compiler implemented for multiple events
Fix strings starting after a comment (+fix #167)
linked some '.'s for consistency
Fix .R for changed return stack direction
Reduce number of stack operations when not yielding
Add ZiptasticURL
Changed ethertype to network byte order
Changed all CloudApp URL's to CloudFront URL's; pending upload of files.
Updated CloudFront URL's to include year.
Re-generated site with new CloudFront URL's for static media.
Ignore hidden files on mix compilation.
Ignore hidden files in mix 'test'.
Merge pull request #461 from khia/features/443_exclude_hidden_files_on_mix_compilation

Features/443 exclude hidden files on mix compilation
Fix return value of String.at/2 with negative position out of bounds
Properly tag size functions
[file xcode]: aggiornato
small fix to mqtt view
! Move deleteDrafts to Subs-Drafts.php
! Update calls to deleteDrafts since it moved
! Always allow for a subject, even if there is none, for links
! Remove unused items from show drafts template

Signed-off-by: Spuds
! not strictly needed, but keeps ema happy :P

Signed-off-by: Spuds
! at a certain point just include it once and be done ..

Signed-off-by: Spuds
! wrong check in the SearchAPI-Sphinxql.php isValid()

Signed-off-by: Spuds
! allow preview to show when coming from qr

Signed-off-by: Spuds
Language string typo.

Signed-off-by: Norv <norv@simplemachines.org>
Return a slightly friendly value from createToken()

Signed-off-by: Norv <norv@simplemachines.org>
Add disregard support to Dia upgrade.

Signed-off-by: Norv <norv@simplemachines.org>
Merge pull request #27 from norv/05efd4c8dd7c8cd80a9c59731f2bb6766fbd9d27

add disregard to upgrade scripts
Merge branch 'master' of https://github.com/Spuds/Dialogo
+ Preview of warnings in the issue warning page
add mongo for persistence of dao-s
get,put application working
JBPAPP-10295 Add a testcase to verify that the issue reported in this JIRA is fixed
AS7-5851 Resource adapter deployments should have an explicit dependency on their BootstrapContext
[AS7-5852] Fix jconsole.bat and vault.bat scripts for windows directories with spaces
[7.1] Fixed the fix for AS7-4426

The dependency on org.infinispan.client.hotrod module was misspelled in the original fix
JBPAPP-10054: LookUpTestCase will be run on basic integration full profile
AS7-5847 jboss-metadata 7.0.6.Final
AS7-5835 application.xml doe not support property replacement
AS7-5770 EJB2 entity bean creation exceptions are wrapped with InvocationTargetException
cli: fixes in parsing complex parameter/argument values written in the simplified dmr format

Conflicts:
	cli/src/main/java/org/jboss/as/cli/parsing/arguments/ArgumentValueState.java
AS7-5863 cli simplified dmr format parser doesn't support '\' linebreaks
AS7-5746-7.1: changes runtime binding logic to a service child of service container, which is stopped by the owner undeploy processor, thus always after the component lifecycle service
Refatorando testes e adicionando teste de habilitacao de usuario
ポート番号を修正
vim files
removed unneeded files
sudo kill all
Añadida clase User
Pusheado
Include MKL libraries in frozen distribution, if appropriate.
Add 'ladder_len' config trait to NeuralRunner.

Also, add documentation for most configuration traits.
Allow choice between heat maps and hinton diagrams in HelhmholtzVis.
Simplify 'quote-plaintext to catch more cases

The regex was excluding some valid cases, so now it just checks for a
pair of angle-brackets with characters between them.
Add 'delete-triples

'delete-triple is still present, but 'delete-triples enables us to
remove a string of triples in a single operation.
Individual authors should not have their own license
Added handlebar helper with non hyphenated name as the hyphen doesn't play nicely with lumbar
Add Query Filter

When posts are retrieved, WordPress will retrieve all posts for the parent (and children) category to the requested category. See in-line documentation on `get_term_family()` for specifics.
update
Updates
Merge pull request #5 from ericpoirier/map

Map
(broken) Pull in escalus using rebar dependency

...instead of the git submodule.

Simple 'make test' in this module won't work unless:
- esl fork of paulgray/exml is updated to use children instead of body
  xmlelement's field,
- lxmppc-merge and/or exml-fixup are merged into escalus:master.

One could alternatively change the branch names/repos in corresponding
rebar.configs.
update commands
rm empty files
scalaz snippet
ignores
- New admin-editing dialog
- structured the frontend code
Began ajax request implementation
added tal:omit-tag
create form xml and create element xml added
Add a hacking guide
Initial better README
use config'd port and hostname
hohihiuh
Add relationship from Micropost to User.
Comment out fixture table data for tables not in legacy test schema
Add support for quots in ini values using parse_ini_string()
Merge branch 'master' into permissions
EZP-19959 - Added @covers in tests
EZP-19959 - Added LocalPurgeClient which emulates an Http PURGE request. To be used in mono-server (default after setup wizard)
have pry print out the line where an exception came from
When writing data to file, use full precision so results can be
repeteable

Use repr() rather than str() this means using .format() with {!r}
Update TODO list (bug list)

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Matlab 2012-08-29.
i18n_generators インストール
generate i18n ja
Devise 用の locale を追加
メッセージの日本語化 #19
未ログイン時のメニューを入れ替え
各種メッセージの日本語化 #19

* 一部テンプレートを haml 化
Merge pull request #73 from chocoby/feature/19_i18n

各種メッセージの日本語化 #19
Updated to V2.1.3
Added dumping of data and logging to Mongo
Changes for simulation
Merge branch 'development' of github.com:farhanrahman/kyoto into development

Conflicts:
	kyoto/src/main/java/uk/ac/ic/kyoto/countries/AbstractCountry.java
Merge branch 'development' of github.com:farhanrahman/kyoto into development
missing break statements in switch/case in updateGDPRate in AbstractCountry
Removed some comment. Still facing that onSimulationComplete bug
Merge branch 'development' of github.com:farhanrahman/kyoto into development
Removed dumping form execute method..very crucial!!
Added better method to prevent multiple execution of super execute method. Added boolean executeLock. Acts more like a semaphore and is a MUCH better and stable implementation than the simTick one. Please someone report if there is any bug with this method. So far everything seems to be fine I guess
New test files for balancing
Merge branch 'testing' into development
More CDM
Merge branch 'testtrade2' of ssh://github.com/farhanrahman/kyoto into testtrade2

Conflicts:
	kyoto/src/main/java/uk/ac/ic/kyoto/countries/InvestmentType.java
	kyoto/src/main/java/uk/ac/ic/kyoto/countries/TradeProtocol.java
Trying out execute protection in AbstractCountry
Merge branch 'testtrade2' of github.com:farhanrahman/kyoto into testtrade2
Merge branch 'development' into testtrade2
Merge branch 'testtrade2' into development
Small changed to Issues
Merge branch 'reports' of https://github.com/farhanrahman/kyoto into reports
Renamed method to fix compile error
Merge branch 'development' of ssh://github.com/farhanrahman/kyoto into development
temp changes to annexonesustain
Merge branch 'development' of https://github.com/farhanrahman/kyoto into development
reverse to proper annex1sustain
Merge branch 'development' of https://github.com/farhanrahman/kyoto into development
Oops- need the actual file
removed version from signature
added commentary
rewrite of signature/reader selection
Usernames should be case-insensitive.
[Bleeding] Validate nulls for setExecutor. Addresses BUKKIT-3127
- Fixed function return types
HelloWorld.java adicionado.
fixed test
benchmark: 5% of the VMs have been migrated recently, the others one hour ago
- improve workload generation.
- script to launch the benchmark with different SLAs
- modify the SLAs to fit with the paper. Only the buffer part is missing. Waiting for a percentage-based value.
Highlighting top main menu buttons
Fixed category pagination
python benchmark of sorting algorithms
增加Rect组件
Merge branch 'master' of github.com:flexlite/framework
extended daylight cycle.
added sample for static light and dynamic cycle
Added more comprehensive error-checking
updated vwe dep
Initialized the application with an empty rails skeleton
add support for ${variable?expand to this text with $variable included when variable is set} syntax; remove support for ${variable} syntax
make 'enter' key work in dialogs
form bookmarklet: remove usless newlines
Added BigApple line and also did git fsck
Added a systemd unit for pkgupdate.

Signed-off-by: Spyros Stathopoulos <foucault.online@gmail.com>
More Guava integration. Less garbage generation, less lookups, less iterations,
less regex compilations.
added gpfs function
Update the instructions for paying us the monies.

* I think that backing up the BPT data is useful as there's no way to go
back to calculations for previous years once you've closed the current
year.
* I've made it clearer that you only need to care about notifying/paying
HMRC at quarterly intervals.
* I've added basic instructions for what you need to do to close the
PAYE year.
add mana of any color a basic land you control could produce
Set table layout to auto for IEs benefit
add Strong Parameters gem
before seminar
Fix binSearchTree bugs.  Fix wrong expected results for lowestCommonAncestor unit tests.
rollback shouldn't be durable!
Buttons in IE
ISPN-2358 TestingUtil.waitForRehashToComplete returns too soon and causes random test failures

* TestingUtil.waitForRehashToComplete returns as soon as the LocalTopologyManager receives and dispatches the new CacheTopology. This is usually too early because the StateTransferManager and DistributionManager are in the process of being updated. We need to wait until StateTransferManager has finished processing of the new topology.
* Replaced System.out with proper logging in MultipleNodesLeavingTest
Cleanup imports
ISPN-2142 APPLY_STATE in StateTransferControlCommand uses an InvocationContext having local=true

* Fix StateConsumerImpl to use a remote context instead
* BaseReIndexingTest must use builder.indexing().enable().indexLocalOnly(false) otherwise descendant test classes make no sense after fixing apply state context
* Added subclasses for StateTransferQueryDistributedIndexTest, PersistentStateTransferQueryDistributedIndexTest, SharedCacheLoaderQueryDistributedIndexTest in order to test also with indexLocalOnly=true and a distributed infinispan index
* Update list of dependent issues for disabled test SharedCacheLoaderQueryIndexTest and SharedCacheLoaderQueryDistributedIndexTest
* Call QueryInterceptor.updateKnownTypesIfNeeded() even for updates that are not local. This ensures that all types for data received via state transfer are known even if the index is distributed and nothing was actually indexed locally and will prevent eventual "org.hibernate.search.SearchException: There are no mapped entities. Don't forget to add @Indexed to at least one class" when doing queries.
Cleanup QueryInterceptor/LocalQueryInterceptor.injectDependencies()

The comments on LocalQueryInterceptor.injectDependencies() regarding inject limitations for non-core classes are no longer valid so we can now get rid of this method and have injection in parent only.
ISPN-2289 Report number of active local and global server connections
ISPN-2258 StateTransferManager is not exposed as JMX MBean

Add @MBean annotation to StateTransferManagerImpl to expose it as MBean as it used to be before NBST.
ISPN-2222 CassandraCacheStore Builder API and XML parser
ISPN-2277 Don't reference classes which pull in JGroups from the GlobalConfigurationBuilder
ISPN-2262 Wait for the request's topology to be installed in state provider

A node can receive a message from a joiner before it has installed a JGroups
view that contains the joiner. If it tries to send a response immediately,
it will fail with a SuspectException. And since we don't retry sending state,
the joiner will never finish the state transfer.
ISPN-2262 Fix StateTransferLockImpl.waitForTopology

Only wait while the current topology id and the expected topology id are
different.

Also move the while loop inside the synchronized block, otherwise we might
miss notifications.
ISPN-1174 Fix async cache store consistency issues with some operations

* This fix addresses issues related to interaction between remove,
eviction (with and without passivation) and async cache store, making
sure that the cache returns consistent information.
* To build unit tests I've had to patch internal cache components to
behave in a particular way, which has lead me to converting the
component metadata repository to a non-static class. This helps
enormously in building such unit tests without having to change
existing components.
Add Greek translation file
Merge pull request #168 from Agis-/master

Add Greek translation file
Add LICENSE, Copyright, and VERSION information
fixed peckers in README header
add code for 4.4
forms CSS
Bills report data ready
Bills cancellation
Fixed branch (de)activation message, removed print button on add order and updated the "on hold" orders cleanup
The same as the last commit
Fixing a order registration status bug
Add invoices financial report
Merge commit 'ae0cc8d56c0902d64be61190243fcaf462c71546'

Conflicts:
	application/views/header.php
Progress on add payments, change of bills' model to "importe" and change in details in bills details
Fixes create bill
Merge commit '6349a8a834e58048504f8cd854b867fd64da2518'

Conflicts:
	application/models/bills.php
Dub Siren manifesto
added eportfolio
Utilisation de toast pour les notifications
Misc fixes for sci-libs/magma

Fix shared lib creation, fix tests and remove the tesla useflag, since this
should be the common gpu target
Merge pull request #31 from xhub/master

fix misc issues with sci-libs/magma
ambertools: export AMBERHOME in ebuild
sci-libs/lapack-reference: Added tmg use flag, fix a failing post command test

Package-Manager: portage-2.2.01.21313-prefix
sci-libs/lapack-reference: tmg flag description

Package-Manager: portage-2.2.01.21313-prefix
sci-libs/lapack-reference: removed tmg flag, now separate ebuild

Package-Manager: portage-2.2.01.21313-prefix
sci-libs/lapacke-reference: added tmg for testing, cleaning up ebuild

Package-Manager: portage-2.2.01.21313-prefix
sci-libs/plasma: Version bump. Introduce testing

Package-Manager: portage-2.2.01.21313-prefix
sci-astronomy/starlink-bin: Version bump

Package-Manager: portage-2.2.01.21313-prefix
removed mac files from jlec
Detect if another WM is running for each screen.
Merge branch 'master' of github.com:gentoomen/WizardWM

Conflicts:
	wizwm.c
Fixed content for website

The git repo was incorrect
Replace incorrect git file
Output author details in pelican_import
Add missing colon
Merge pull request #520 from perry/master

Output author details in pelican_import
cake/
suporte a upload de images na edicao de um post
added chapters dropdown to book section, fixes #174
refactored chapter listings dropdown, tests passing
Merge pull request #210 from github/book-nav

Added chapters dropdown to book section
Messages
Nginx
upload accepts arguments title and credits.
allows build up of lazy list if necessary
update readme: DL link for automated release.zip
Update tex/gloss-slovenian.ldf

Fixed Slovenian `\glossaryname` translation.

Translation provided by <Andrej Znidarsic andrej.znidarsic@gmail.com>.
Merge r239597 from main tree

Do not change "cachable" attribute for DMA memory allocated with
BUS_DMA_COHERENT attribute

The minimum unit for changing "cachable" attribute is page, so call
to pmap_change_attr effectively disable cache for all pages that newly
allocated DMA memory region spans on. The problem is that general-purpose
memory could reside on these pages too and disabling cache might affect
performance. Moreover ldrex/strex operators raise Data Abort exception
when accessing memory on page with "cachable" attribute off.

BUS_DMA_COHERENT does nto require memory to be coherent. It just suggests
to do best effort for reducing synchronization overhead.
README Features.
Share and likes for news
News speed up. Info banner initial commit
* Patch from Luiz Americo to return a variant with get

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21821 3ad0048d-3df7-0310-abae-a5850022a9f2
Related to GRAILS-9549 -Don't fire change events to a closed plugin manager
fix for GRAILS-9538 "Exit run-app:  message that schema export failed"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/GrailsProjectWatcher.java
Merge branch '2.2.x'
Added items that could be mentioned to review form
x11/kde4/kwallet packaged.
x11/kde4/okular packaged.
OOZIE-1009 Documentation pages should use default ports for Oozie/JT/NN (tucu)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1393905 13f79535-47bb-0310-9956-ffa450edef68
Removed unsed files
Multiply lines fixes, early support of a teach feature added, more settings for clever work. Stable\!
switch numanuma submodule to https access
refactor tags to tegs.... CB error
Plugins must now be named frontadmin_plugin.py to avoid namespace clash. git add frontadmin_plugin.pyBACKWARD INCOMPATIBLEgit add frontadmin_plugin.py
Added "ip" to get current (wireless) ip address.
add unobstrisive java and helper for devise

Signed-off-by: Hake Huang <hakehuang@gmail.com>
zh_cn for win32

Signed-off-by: HalFtaN <half.a.tan@gmail.com>
Updated lisp-unit interface.
Merge pull request #1 from OdonataResearchLLC/master

Simplified lisp-unit Interface
Find absolute paths in defun twh-prove-pattern
Different buffer names for defun twh-prove and twh-prove-pattern
Fixed defun twh-prove-file-from-t-file for new version of bin/twh-prove
Use mmm-major-mode-hook instead of after-change-major-mode-hook to execute unset-keys-in-current-local-map
Also bind the other keys with set-key instead of global-set-key
Require sgml-mode for mason-mode
Fix edit shelf form
Icons
Messages
More icons
Item details
Fix a couple errors around private shelves
Non owners do not need to see the delete item button
Switch up the layout of the shelf title/author
Standard links
Fix text decoration bleed
Merge pull request #10 from imakewebthings/colorization

Colorization
forget http
repo git: when setting the url from config, also set the git-bin.sshUrl
added group table checking to nextgen class
fix bug about urlencode
fix the scroll js bug
fixed confilict
Have an idea for the command line processor
Unit tested the string libc in VS before coding it for uBlaze
Able to start and stop ML605 control loop from nc shell
PHP-SDK: 修正 XSSearch::initHighlight 调用不当导致 util.Logger 有时导入失败的问题
Reordering models
Disabler legg til-knappen dersom ordet finnes
set pyramid bomb status every time we see the lower chamber.

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11138 b29ace70-8910-0410-8dcc-aa2fc6433167
On Mac OS X, if mrj.version is not specified, try falling back to "open".

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11139 b29ace70-8910-0410-8dcc-aa2fc6433167
Fix typo Issue: #2834
Adding an example privsep_config to the install/templates
Moving privsep_config to the correct place
Merge branch 'master' of ssh://cdcvs.fnal.gov/cvs/projects/glideinwms
Added mongodb and mongolian to installation
update zshrc
Merge branch 'master' of github.com:hoshina85/dotfiles
Removed dots and X from the index.html file.
update to include entitiy script
Make Gravatars Secure
add Project file
starting on documentation
modify .gitignore, add /build path
network monitor
gmail status checker
more formatting
ootstraped
updating filer, fixing django 1.4 updates, introduced rating, model changes, echo print & echo nest prototypes & fingerprinting
implemented filters & relation filters - tons of changes...
Done with the demo app with sqlfix
File for exporting resources, under development.
Got thumbnails working!

The read page no longer lags!!
Add Phonotype class
add TestIOPartition
fix bad error reporting, report duplicate labels and use newest pegjs version
fix broken link to bootstrap 1.4.0 tabs js lib
document the size of the memory module
fix SR matching: priority based on match length
upgrade bootstrap to v2
update parser generated with new pegjs
make webapp inject a newline at the end if it is missing
override backspace navigation binding
override backspace navigation binding
fix case for using org op to jump backwards
ORG op must not point to previous addresses
Added support for HEX memory viewing

Added Hexadecimal display mode to the memory listing box. Now you can
choose wether you would like the memory display to display memory
locations in decimal or hexadecimal order.

Added an extra button which toggles the memory display to switch
between Hexadecimal and Decimal display modes.
Merge pull request #6 from Stankec/master

Added support for HEX memory viewing
tweak UI for selecting memory state output address base
fix address base handling when fetching memory locations in log
add Stanko Krtalic (@Stankec) to contributors
enable SP as an alias for R7
fix memory access in STOREB and STOREH instructions
Added icons

Added icons to all buttons to make them more intuitive and visually
appealing.
Merge pull request #7 from Stankec/master

Added icons to all buttons to make them more intuitive and visually appealing.
mysh2 is done, worked on mysh3 need to add cmd
Fix animation issue on device so reduced the time delay between frames no less that 0.07 seconds.
Site updated at 2012-10-29 08:12:11 UTC
modified dutch and irish content
Merge branch 'master' of https://github.com/imeos/metanetpaper
Version bump to 2.0-BETA.
[task/functional] Trying to get logout test to work

PHPBB3-10758
Revised to set headers and invoke GET request correctly.
fix fetch tomcat native source url; fix patch command
updates to lime survey dashboard
send_cmd not needed
merge
Remove references to verbose profiler option

This option is deprecated in 2.1
add support for index disp
Site updated at 2012-04-08 20:55:51 UTC
ackrc, gitconfig, zsh aliases
Remove some obsolete documentation from the early days of th project
Fix several issues created when adding the new main loop
Adjust transport button sizes
Use floats for the default values, since LADSPA_Data is a typedef's float...  That is some uber-cruft inherited from the DSSI SDK...
zookeeper: use new dsl
wxmac: use new dsl
sshfs: style nits
sleuthkit: use new dsl
lolcode: use new dsl
weechat: use new dsl
factory: always check const_defined? before requiring

Specifying dependencies with a URL works, even if by accident, but
factory is called repeatedly on this URL and this results in multiple
downloads of the same file.

Fix this by checking const_defined? here too, and DRY up the code a bit.

Fixes #14285.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Provide a common interface for Dependency and Requirement

Introduce a new Dependable module that provides useful interrogation
methods for Dependency and Requirement. These methods are mapped to
dependency tags in formula (:build, :optional, and :recommended).

Previously only Dependency objects recorded tags; this allows
Requirements to do the same.

Move Requirement subclasses to a separate file.
Formula#recursive_dependencies

This behaves like recursive_deps, but instead of an array of Formula
objects, it returns a Set of Dependency objects.

While in the area, add some comments clarifying the purpose of related
methods.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Return the block value in ARGV.filter_for_dependencies

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
FormulaInstaller: disambiguate show_header usage

show_header should default to false (we don't want to display it in the
case of installing a single formula without dependencies), but it only
worked this way by accident.

The assignment "show_header = true" creates a local variable named
show_header, and in the case where needed_deps is empty and this
assignment is not actually executed, the latter usage evaluates the
local variable instead of calling the method.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
FormulaInstaller: factor out requirement checking

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
FormulaInstaller: factor out dependency installation

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
FormulaInstaller: skip build-time deps for bottles

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
FormulaInstaller: implement installation locks

FormulaInstaller now attempts to take a lock on a "foo.brewing" file for
the formula and all of its dependencies before attempting installation.

If the lock is held by another process, we bail out. In the future,
`brew rm` can be taught to respect this lock as well.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
missing: don't report build-time deps

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Don't rely on file extension when finding dylibs

Some libraries do not have the .dylib extension (e.g. Qt framework
libs), but need to have their install names rewritten to prevent other
packages from breaking due to upgrades. Use file(1) to determine what is
and isn't a dylib.
adjust the encoding problem
Initial commit
initial commit
removing images
cleaning base theme
commiting from subl
commiting from subl
commiting from subl
resetting base_theme
re-adding files
Update functions.php

Adding browser to body_class
Update scss/_mixins.scss

Adding triangle mixin
Update functions.php

adding open graph
Update header.php

adding open graph
Update scss/_mixins.scss
Update bin/deploy_to_github.sh
initial commit
Some bug fixes for searching tickets

Login through the first post call
Add in specs for searching tickets
Refactor the connnection manager code
NO MORE NPE's PLEASE
ESC Key to abort editing in the two included editors
Version bump 2.0.2
example content for picture grid
Updating tool with Anvil-unified substrate
Changed register method to POST
Small change moving array to a variable.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
now matching should work well including distance constraints
Correcting window size preview dimensions for iPad in portrait orientation.
Fixed some warnings and errors Xcode warned me about
add new relationship between Product and File
Change unimplemented tests to use SkipTest
Added a necessary require to the top of the lib file
Commit before plan B!
Standalone now accepts keyboard commands, and can go fullscreen.

BoardGUI.py added to capture and process images from a webcam
ensure the debian packages include the graphite backend file
Merge pull request #86 from krobertson/master

Debian package scripts don't install the graphite backend file
Merge remote-tracking branch 'upstream/master'
+ ‘Safari/Bookmarks.plist’
+ ‘Safari/ReadingListArchives/080A73CA-E073-4C16-B46F-6466F5479A86/Page.webarchive’
+ ‘Safari/ReadingListArchives/080A73CA-E073-4C16-B46F-6466F5479A86/ReaderPage.webarchive’
get_worker can now be accessed from top level
added a README note about get_worker
added a testing section to README
Dia Jueves 29
use of dic and improved code readability
Deleted temp gEdit files
Set up database.sample.yml
Added a global search box for drones
Removed bad call to .clear()
Merge pull request #1 from kmckelvin/master

Added a global drone search
Miscellaneous fixes to plplot examples, length tweaks in gdk-pixbuf-hl.f90
Links to sqlite from front-end
fish config
git and vim stuff
base16 vim theme, fish config
misc
updated vim plugins
fixed v and added u2
removed submodules, set up vundle
removed bundle ignore
fixed vundle submodule
bundles
update gitignore
separated out vim config into separate files
zoomwin and dwm
Update pry-nav.gemspec
Quick docs for tag-images-with-os
Refactored a lot of code.

Added file upload capability to SPRESTQuery class.
Added UIImageView example of uploading a file to a selected library.
add ../CGDataNew/IntegrationId.py