labofsahil/github-event-dataset-2012 huggingface dataset:
enforce 1m min keycache for auto
patch by dbrosius reviewed by slebresne for CASSANDRA-4306
add CASSANDRA-4306 to CHANGES.txt for 1.1.2
Make sure DeletedColumn.isMFD always return true

patch by Wade Simmons & slebresne; reviewed by jbellis for CASSANDRA-4307
Set gc_grace to 0 on index CF

patch by jbellis; reviewed by slebresne for CASSANDRA-4314
Merge branch 'cassandra-1.0' into cassandra-1.1

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
ex msg for cql3 order by constraints says primary filter can be an IN clause which is misleading
patch by dbrosius reviewed by slebresne for CASSANDRA-4319
fix NPE in compactionstats
patch by jbellis; reviewed by xedin for CASSANDRA-4318
Add CQL3 documentation
CQL3: Reject 2ndary indexes on table with composite key

patch by slebresne; reviewed by jbellis for CASSANDRA-4328
Set JVM stack size to 160k for Java 7

patch by slebresne; reviewed by jbellis for CASSANDRA-4275
fix maven dependency version for CLHM
fix #4262 reference
skip tombstones during hint replay
patch by Vijay; reviewed by jbellis for CASSANDRA-4320
inline
move hint liveness check to beginning of loop
avoid promoting tiny sstables
patch by jbellis; reviewed by yukim for CASSANDRA-4341
rename store -> cfs
fix bug in sstable blacklisting with LCS
patch by jbellis; reviewed by yukim for CASSANDRA-4343
setlocal and fixes for stress and sstablemetadata bat files
patch by Holger Hoffstatte and jbellis for CASSANDRA-4344
split out uptodate checks for cql2 and cql3 so they actually work
move topology tracking into TokenMetadata from the Snitch
(cherry picked from commit 243113b450f9e2203410e7fe450e7131dad1bb8c)
Merge commit 'refs/top-bases/p/cassandra-1.1/3881/01_calc_natural_endpoints' into p/cassandra-1.1/3881/01_calc_natural_endpoints
update NTS for updated topology tracking
(cherry picked from commit 075ea8e36579a1ebdc4080d8f0d2b5720c94f9ff)
merge
Merge commit 'refs/top-bases/p/cassandra-1.1/4122/01_bootstrap_decommission' into p/cassandra-1.1/4122/01_bootstrap_decommission
actually drop hints (as advertised)
Merge commit 'refs/top-bases/p/cassandra-1.1.0/4120/04_remove_node_by_hostid' into p/cassandra-1.1.0/4120/04_remove_node_by_hostid
Merge commit 'refs/top-bases/p/cassandra-1.1.0/3881/00_snitch_topology' into p/cassandra-1.1.0/3881/00_snitch_topology
Added new Cygwin ssh-agent code
Merge branch 'master' of github.com:adam-p/dotfiles
bug in tally distribution probability
fixed some stuff or something idk
link düzenlemeleri...
searchsaver should work
[model] Be sure to not reenter in termaison more than once
[hyperc] Fix copy of userDefined directory
Lighting

- fixed problems with lighting
- added light_test
#30 Login history -> supprimer
Cleaned up levels.py
More cleaning up of levels.py
Added static files and twiggy server
Style update for most of site
Specify load path
Whitespace testing without white mode
水浒杀lua小扩
七律·纪念九一八

豺狼突啮巨龙身，血肉横飞日月昏。
铁马千军挥利剑，长缨万丈缚凶神。
江河浩荡英雄泪，山岳巍峨忠骨魂。
但奏凯歌冲汗漫，誓逐贼寇远国门。
IoC implementation.
put actual ids into plugins so make.sh will bake-in actual ids
(step 1 of many to simplify/correct module resolution code)
moved module id resolution out of path resolution code
(need to do same with plugins next)
also removed ctxId shenanigans and added module.config()
finished moving module id resolution out of path resolution code
also: renamed priv.cfg to priv.config() to grab latest config
re-added better wrapper for closure compiler
Merge branch 'dev' of github.com:cujojs/curl into dev
curl no longer throws if the dev overwrites the global api or define
some devs were using this feature to collect define calls before curl.js loaded
Fix version so that npm can install curl
Merge pull request #125 from scothis/npm-version

Fix version so that npm can install curl
Fix building on systems where /bin/sh is not bash

Set bash as the interpreter for make.sh. This allows make.sh to run on systems where /bin/sh is is not a symlink for bash (most non-GNU/Linux POSIX systems and some Linux distributions)
add commonent in ROICalculator

add commonent in ROICalculator
update, remove nerdtree
update, remove nerdtree
Removed license, there's already a separate file, no need to repeat this.
Fix for missing FutureCancelledDate on Subscription object
analytics: rename methods accessing records by external key

Make it obvious the records are looked-up by external keys - these may
not be unique anymore.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
analytics: remove unneeded setters

Since we're not updating most objects anymore, remove the setters.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
analytics: update sql templates

Update the query names in the templates.

Also, remove the now deprecated update queries.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'integration' of github.com:ning/killbill into integration
analytics: add plumbing to listen to payment events

Record new payments in bip and update bin/bac as needed.
Note: we are effectively storing payments, not payment attempts.

We also store now the payment ID from the external payment processor -
this may be useful for certain reports.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Fix json issue
analytics: make BusinessInvoicePaymentRecorder idempotent

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
payment: store paymentMethodId along with the payment

We default to the account default payment method id for now.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'integration' of github.com:ning/killbill into integration
invoice: rename paymentAttemptId field to paymentAttempt

We really link invoices to payments via the invoice_payments
table, which records payments, not payment attempts.

The payment attempts mechanism is only visible to the payment module.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
analytics: support refunds and chargebacks in bip

Add invoice_payment_type and linked_invoice_payment_id columns, which
map to the ones in invoice_payments.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
analytics: fix credit in bin

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
jaxrs: fix test failure for ChargebackResource

One cannot pass an entity with Response.Status.NO_CONTENT (Jersey will
return 200).

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
util: make catalog translation files path configurable

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
util: improve error handling for translator

Fail gracefully if no default locale is configured or if the translation
bundles are missing.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
account: fix potential NPE in DefaultAccount

We need to be able to pass null values for e.g. the bill cycle day.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
gerência de memória feita, acho
Fixed bug in time zone localization test case
Some MASM fixes in CMakeLists.txt.
changing routePath to routeId
Fix typo that had broken active state for tabs
Add keyboard navigation to tabs
Adding bash_profile and vim settings to project
Added startup script
Merge branch 'master' of github.com:alukach/mySetup
turtlesquare
fix: compute changes for all alpha
Project Pages

Created pages and added images
Uso basico de feedparser
Added plugin.getDescriptor() api function to get an json object
of the plugin descriptor for accessing its information from within
the plugin itself.
Removed a debug trace.
Fixes broken header parsing which would ignore headers without
' ' after 'name:'.
Merge remote-tracking branch 'hean01/master'
Makefile changes for xulrunner on Mac
remove whitespace
Merge pull request #974 from davidflanagan/makefile

Mac support for downloading,installing and running xulrunner
Add comment block on terminologies
change app origins in calls to WindowManager.launch()
Fxing a l10n id for #923
Bugfix for #927
Fixing the auto-scroll to the save button when the focus is in the email field of the contact form (the last field of the list)
Better return key handling for the contact form.

Fixes #932
Bugfix for #774
Merge branch 'dialer-fixes' of github.com:etiennesegonzac/gaia into dialer-fixes
Clearer comment
Don't turn off screen while video is playing. Fixes #878
Provide suggestions in candidate list based on term selected
Provide suggestions in candidate list based on term selected with IndexedDB
Removing the alarm tab placeholder (#901)
Removing the on call unused buttons (#924)
don't autoscan networks when the wifi panel isn't active
force text/plain MIME type for *.properties files
Removing the fake profile pictures in the Dialer app.
fix dupe detection mw
readonly init frame
User bundler tasks for gem management
Added support for basic token expansion; more work still needed
modification du fichier main.c
update test utils code
Revert only_if for variables and templating prompt

Since the condition was not templated, it wasn't working.
Only variables in local scope were used, which made this not very practical
Merge pull request #1115 from dagwieers/only_if-revert

Revert only_if for variables and templating prompt, little practical use
ヴァージョンアップ
ACCUMULO-889 merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1424088 13f79535-47bb-0310-9956-ffa450edef68
Excluding mobile/components/CalloutButton test suite due to missing source files. Need to revisit this at some point.

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/develop@1425122 13f79535-47bb-0310-9956-ffa450edef68
fixed dropdown issue
fixed dropdown
fixed spaces in template
hide all tabs ,remove my appointments header , added well style
Fixed a bug where the action sheet mask was not being removed on some devices.
header and tab changes
pre filter changes
changes to the intercepting filter spec
added a more automated approach to populating the guest ip addresses, so they do not need to be explicitly configured.  See modules/machinemanagers/virtualbox.py VirtualBox.initialize for more info
Add offset for ellipint.
Add a world layout.
MultiSerialMega example is now bi-directional
[RPD] -- Refactored the calculations out of the nests into a consolidated ProtoDS1 function.  Fixed a demand array error in fetch xml.
Argha -#1371 - removing ambiguous step definition.
Added MANIFEST.in for the README.rst
Made entire sim reach steady state using fdm run.
cleaned out stuff I don't use and added vim dotfiles
Merge pull request #271 from artart78/master

Implemented user segment relocations
Random bits of cleanup
Clean up more warnings
Revert some error=0 stuff

Just make them unitialised.
More error=0 reverts
Last of the error=0 reverts
Merge pull request #264 from tmaul/master

Some clean up
Clamp colors before fragment shader.
Add some options to ingame menu. Minor fixes.
Don't log display lists, instead dump them on demand.
Makes it fairly convenient to dump and look at display lists at run time
on non windows platforms. Adding a menu item on Windows should be
trivial.
Try to fix linux build
Fixed compilation on Linux
Hopefully fix all the ELF loading issues
Add fragment process
Doc instructions
#154 Added administration interface for enabling deploy trigger API
#154 Added request and response handling for URL deploy trigger API
#154 Added test script to test the URL deploy trigger API with
#154 Large refactoring in order to make API work but only in a blocking manner at the moment
Merge pull request #166 from asgrim/feature/issue-154-url-deploy-trigger

Feature/issue 154 url deploy trigger
Add win32 skeleton exec
Optimize minizip read
Fixing data storage bug for magScale
Merge branch 'master', remote-tracking branch 'github/master'
keep shell history in Reference/ShellHistory per hostname
added vim numbertoggle
Convert pages
Change tphp links
Convert pages
Fix meta tag attributes
websockets: error triggering
tcp-test for tcp-based Connections with C2SServer
Move _themes directory.
Move theme-related configuration to astropy.sphinx
Move minimal sphinx version definition.
avoid repeating author, project in sphinx config file
Explain sphinx theme options in documentation
Install theme files.
Merge pull request #1 from mdboom/docs/install-themes

Install themes explicitly so that they actually install.
(slightly) modify docs to reflect new sphinx/setup_package.py
revert AstroPy caps, change author.
removed astropy.css because it was subsumed by bootstrap-astropy.css
moved fits doc images from _static into io/fits
Copy css definitions from astropy.css into bootstrap-astropy.css
Merge pull request #2 from eteq/kbarbary/move-themes/static-fixes

static fixes
remove astropy.css from config
organize content of sphinx configuration files

This doesn't change any actual behavior. It simply makes the sphinx
configuration files easier to read. I have left commented-out lines in
the *global* settings file, rather than the local conf.py because the
local conf.py already had very few commented-out lines whereas the
global one had many.
Homogenize logo filenames and source SVG files
set theme pygment style to sphinx, which we were using anyway
Merge pull request #312 from kbarbary/move-themes

Move documentation theme to astropy.sphinx package 
(so affiliated packages can use it)
initial commits for cosmology documentation
small tweak in get_current and set_current docstrings to allow sphinx to build them
added initial cosmology docs
updated cosmology docs to better match standard
small tweaks in cosmology docstrings to make docs look a bit nicer
clarified developer usage of cosmo keyword
small cosmo doc tweak
updated based on @astrofrog comments
updated cosmology docs for correct section characters
misspelling fix
Merge pull request #272 from eteq/docs/cosmo-docs

cosmology docs section
always find dohroot, even if there's a local configuration file
jQuery base index.html & angularjs base todo_angular.html commit
Mise en place du système de d'internationalisation.
Made db tests less redundant
UI.LazyLoadのテストが失敗してしまう場合に対処

ダミー画像のロード完了前に判定を行うと、非表示画像と判定されてしまい、ロード処理が実行されない。
実用上問題が確認されていないので、とりあえずテストをダミー画像ロード後にスキャンを行うよう変更。
=の前にスペースが欠けているのを修正
add tim's part
Added check the state of instance for backup.
nwmon: remove debug print.
moved to messaging module.
code refactoring
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.
Merge pull request #11 from axsh/fix-teminating-event

Fix teminating event
IT lab4 fixes
#134 ready for testing
#134 ready for testing
Merge remote-tracking branch 'origin/BBA-Power-V3.1' into BBA-Power-V3
#221 fixed text label wrapping for contract forms
added more invoice stuff and set doc route to bba-power-docs
Removed startup hook
.rvmrc
Merge branch 'master' of github.com:badger/frontend
add publish_stream permission to FB logins
share tab on domain show page
another fix related with revision 4146 to make AtlasSprite.setSize() work correctly when sprite atlas was created with an atlas region with rotate = true

git-svn-id: https://libgdx.googlecode.com/svn/trunk@4187 6c4fd544-2939-11df-bb46-9574ba5d0bfa
[fixed] compiler options for gwt demo projects, localWorkers all hail.

git-svn-id: https://libgdx.googlecode.com/svn/trunk@3640 6c4fd544-2939-11df-bb46-9574ba5d0bfa
[added] config file to gdx-setup-ui, for test purpose

git-svn-id: https://libgdx.googlecode.com/svn/trunk@3935 6c4fd544-2939-11df-bb46-9574ba5d0bfa
bs考总。。也bs我自己。。

下次review要更小心点。
增加search的参数保护
添加ES的分库规则

同时取消Date类型，直接存成int
把es的初始化脚本移除到单独的baixing/system_config项目里面
根据考总review意见修改
Updated recipe search to include name/name form for more popular libraries
[Config/ReferenceDumper] avoid notice for variable nodes
Add tag web-development
up python shebang from 3.1 to 3.2
Add .eunit to .gitignore
Multichannels
Missed icons
Removed some of the warnings related to the accessor being hidden later on
Added  own exception example
Added require_moderator decorator and corresponding ModeratorRequired exception and some refactoring:

* Renamed get_community_settings to get_settings
* Renamed update_community_settings to set_settings
* Renamed update_stylesheet to set_stylesheet
* Removed the logout function as it serves no real purpose (doesn't invalidate session).
About em301_r.Rmd
Even more karma.
update javadoc
add a new filter to count the number of requests for each URL
add a session listener to calculate the duration of each session
The petanque ball on the mirror
Bugfix: Added html encoding for special character in near by search

The following problems are solved
* Fixed issue with html entities in station name of near by seach (JSON)
* Added fixture downloader for near by json
* Added test case for API nearby search
* Added test case for Location parsing from json
* Added JSON nearby fixture
Fixed strange type bug. O PHP, why do you think 0 == 'via'?
Updated docs for via and limit. Fixes #27, documents #51.
Merge pull request #48 from gwrtheyrn/via_support

Support for multiple via's
Merge branch 'fix-location-umlaute-json' of https://github.com/dol/Transport into dol-fix-location-umlaute-json

Conflicts:
	lib/Transport/Entity/Schedule/ConnectionQuery.php
add documentation, fixes #41 and #47
Set timezone for stats.php
small documentation corrections, css
Merge remote-tracking branch 'gwrtheyrn/via_docs'

Conflicts:
	web/index.html
add PassList from result as array of Stops to Journey
fix tests
Merge branch 'master' of github.com:benib/Transport
added pdf manager and json manager
updated gitignore
Merge branch 'master' of https://github.com/benny99/swe2epu
Cleanup test/test-build.js.
Allow compiled templates loaded via AMD  to set and use the private `_` variable.
refactoring
nextGen test for empty board added
Add channel half operator support.

[fr.hbis.ircs]
- Define.java : add non RFC channel flag.
- IRC.java: add new values for halfop support.
- Channel.java: add half operator support.
- Channel.java: update channel prefixes/types/modes support functions.

[fr.hbis.ircs.commands]
- Users.java: update command for new channel prefixes/types functions.
- Names.java: update command for halfop support.
- Who.java: update command for halfop support.
- Whois.java: update command for halfop support.
- Mode.java: update command for halfop support.
- Invite.java: update command for halfop support.
- Kick.java: update command for halfop support.
- Topic.java: update command for halfop support.
- Privmsg.java: update command for halfop support.

- build.xml: fix targets.
- start.sh: rename startup script.
- force format on all source files.
- update distributions files.

Signed-off-by: Boris HUISGEN <bhuisgen@hbis.fr>
put everything in one level
Add Travis CI clicklet to `README.md`.

Closes #3.
Merge branch `chicklet` into `travis-ci`.
Mathimata Teloz
README updates.  -pthread in the makefile.
stop opening a file named -
[biocaml_sbml.ml{,i}] Removed erroneous executable bit.
[Fasta] Added score_stream_of_in_channel function.
[Fasta] Fixed bug. Were parsing floats instead of ints.
initial commit
readme
test
test
test
test
Openbravo 3.0MP10.2
Merge branch 'upstream' into 3.0MP10-bippo
update guard
fixed i18n for loved tags on user#show
Fix wording
Merge branch 'master' of github.com:bitboxer/hcking
Bugfix: getwork: NULL pindexPrev across CreateNewBlock, in case it fails
Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerr

Conflicts:
	rpc.cpp
Bugfix: getmemorypool: NULL pindexPrev across CreateNewBlock, in case it fails
CreateNewBlock: Check that the produced CBlock is acceptable (except for proof-of-work and merkletree, since those need to be provided later)

This throws an exception from CreateNewBlock otherwise, which is not safe without #1245!
Merge branch 'checknewblock_0.6.0' into checknewblock

Conflicts:
	src/main.cpp
Run BDB disk-less for test_bitcoin
Tests for CreateNewBlock
Merge branch 'bugfix_CNBerr' of git://github.com/luke-jr/bitcoin
Merge branch 'checknewblock' of git://github.com/luke-jr/bitcoin
toHTML won't add empty wtx.mapValue elements

As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.

Removed a duplicated identical if

There are two equal ifs, one inside another. If the first one is true, then the second one is true.
Merge pull request #1881 from xanatos/Tests

Removed a duplicated identical if
first attempt at c client
successfully send image
transition between images working
added glyphs
add makemovie script
make movie with glyphs separate
batch convert images
project changes
image scaling still has some problems
everything but overseer and visionviewer and two image log viewer is working
double images in log viewer working, smaller than I'd like though
remove ckjmbean
fix pf coloring
Improving the "our team" page
Merge branch 'master' of github.com:bleen/studioone

* 'master' of github.com:bleen/studioone:
  Disabling html5_tool's over-ride of URL link fields.
Add forkme hyperlink
Add of debuging visualizer. Various bug correction
patched incorrect header level
Cleaning up and pushing to heroku for RDIY
Merge pull request #10 from bra19/master

updates
Profile page
Css fixes
Dropdown fix and other changes
db update
Merge pull request #8 from selvinfehric/master

11/10
PHP 继续完善分页类
增加多目录创建函数
foreman information
Anemic prime factor calculation
Solution to #3
Added an add server page
Added line to test git changes
changed "Move to Hand" function, bug fix for Random Discard and Random Pick
-Move to Hand will now ask if you want to reveal the card name if that card is face-down (such as in your library)
-slight bug fix for setDie
-Random Discard and Random Pick will now delay for a short period to allow the cardIdentity to load for all players
crossbrowsing, father integration begin, main products recss
add types to Window, Array
[attributedlabel] Added bug code.
[attributedlabel] Added custom attribute to count runCount correctly.
Revert "[attributedlabel] Added bug code."

This reverts commit d02e83ff48fe171a6c5aa8206aba57917de6e9b5.
[attributedlabel] Added bug code in Japanese.
[attributedlabel] Ignored typographic-leading to evaluate _rectForRange:inLine:lineOrigin: for Japanese-character link.
[attributedlabel] Cleanup.
Merge branch 'inamiy-master'

Closes #272.
[catalog] Remove Japanese text from attributed label demo.
[core] Use __bridge_transfer to correctly transfer a retained ownership from the non-retaining collection methods.

This avoids a memory leak in ARC caused by an incorrect transferring of ownership.
[catalog] Remove more Japanese text.
[attributedlabel] Add support for modifying highlighted link styles via attributesForHighlightedLink.

Closes #266.
[attributedlabel] Copy the link attribute properties rather than retain.
Preserve the original image orientation when processing
Ensure photo zooming is set correctly after page reuse.

NIPhotoScrollView's setZoomingIsEnabled: checks whether an image is set
before allowing the zoomingIsEnabled property to affect its internal
scroll view's zoom.

This is usually fine whilst scrolling to the left of the album to get
the next pages, however when scrolling back and loading previous pages
whose images have been cleared due to prepareForReuse, the call to
setZoomingIsEnabled: is too early to have the intended effect.

This patch remedies this by setting the property only after any
potential image is set on the page.
[models] Make cell background border radius configurable.
[pagingscrollview] Add centerPageView to NIPagingScrollView.
[models] Don't draw the highlighted state underneath the cell border.
[attributedlabel] Handle highlighted state correctly.
Contributing doc.
[models] Don't draw borders on selected cells in NICellBackgrounds.
!fixup Changes test
fixed parsing algorithm for code snippets & algorithms, facet UI is dynamically generated (todo: cache in localstorage); minor fixes
Syntax cleanup

Also added a check in server/sys/DJController/Rights.php that handles
the default scenario where no controller files are present.
fix bug in simulem

    Wrong call to radionode due to adding name in __init__ argument
print merge messages with line break
Checking in changes prior to tagging of version 0.04.

Changelog diff is:

diff --git a/ChangeLog b/ChangeLog
index b6ad7ab..7118a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@

+0.04 日  8/19 17:49:04 2012
+
+- Improve git-rc script
+- Support remote tracking branch
+
 0.03 四  8/16 22:31:21 2012

 - Add git-site script.
idle timeout management
idle timeout cleanup - it now works
minor fixes
oops missing wires
Fixed some memory issues in string.c that were causing heap corruption
Fix overwriting of GET/POST

ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.

Fixes #2841
Add no-op method to base class.

Fixes #2839
Fix issue with non-sequential array keys.

Xml::fromArray() should not cause errors with non-sequential
numeric array keys.

Fixes #2580
Update assertions.

Use assertXmlStringEqualsXmlString() it gives
better error reporting.  Also update string concat
into heredocs.
Use correct argument order.
Fixed HTTP status codes for non-redirects which were breaking AuthComponent.
Again using same serialization strategy for cached view files, as in some environments file is corrupted
Merge remote-tracking branch 'http/2.1' into 2.1
Removed triple nested condition.
Merge pull request #633 from Phally/2.1

Redirect check is breaking AuthComponent redirect status codes
Fix saving translate records with saveAll()

Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
Fix error in Sqlite tests.
Fixing order inconsistency in queryString and bug with string based existing querystring
Fix additional issues with saveAll().

Fixes #2857
Fix test cases with postgres.

Setting id values confuses postgres' sequences.
Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable

This allow changes in beforeValidate to be saved
Merge pull request #642 from nodesagency/hotfix/beforeValidate-copy-data

Copy changes made to $this->data in beforeValidate callbacks
Adding support for a trailing & or &amp; in the existing queryString
Another fix for Pull request 642
Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data

Hotfix/before validate copy data ( Another fix for Pull request 642 )
map view for all clubs

XML Parser
Map View Controller for all clubs
Created urge.js
Added necessary libraries
Fix text allignement (#240)
Merge pull request #321 from camptocamp/css

Fix text allignement (#240)
removed teachers times and dates mandatory field restriction
architecture
binary
Showing animals that were adopted by user
CARROT-831: site restriction support in eTools
A typo fixed.
CARROT-831: referencing eTools-based Wikipedia search in component suites
fixup adding mark-multiple
add zen-coding
Fixed OLI dataset to have better name.
Added new chapter, other changes to remainder.
Added new chapter.
Overall mods and cleanup for Sleuth chapters.
Merge branch 'beta' of git://github.com/rpruim/mosaic into beta
JTE BAISE
Separated simple and thorough help info.
assiqe: Support quads in export.
ADD always invoke ri in interactive mode
Add readme and build batch
working jacoco coverage report
Make DCell::Explorer into an actor
Separacion de store generico para iteraccion con BackEnd
HiLink cParens to Special.
Delete unnecesary sample files
no more automatically fixing things
simpler prompt; no more colors in css
Refactored parse args from main
Added popenshlex line to get calibrator flux out of BOOTFLUX output.
Adding codemirror license files
Port to stable enyo and basic layout
リファクタリングとパスワードハッシュ化・認証実装
fixed snmpiface.py
compiled Crypto module removed: not needed
Merge branch 'master' of https://github.com/chilikk/project
header och infoknapp bakgrund
geaderknapp
AuthController first commit
fixed lots of bugs & cleaned up code
add katakana
Support systems where ./do builds for 32 and 64 bit
Another new structure
Selectors Extensibility applied!
List files now takes an associative array of options. Custom sorting available for list_files

list_files(array(
'url' => '/folder/',
'prefix' => 'prefix-',
'sort' => array('one','two','three')
));
Get mod_wsgi working for Apache
added star and unstar functions, and moved HTTP code checking out of the connector for POST
first commit
Merge github.com:clmoon/dotfiles
Add save state support to Mednafen cores
Add support for FDS in Nestopia core plugin
Item6837: Fixing exclude list from being looked up in LDAP

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@22889 a00a5322-12db-0310-a70b-8735589c885e
Item6837: Fixing exclude list from being looked up in LDAP - updating docs

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@22890 a00a5322-12db-0310-a70b-8735589c885e
PION-1236: more 3rd party library path updates for Windows build
Fixed rivers looping back on themselves
alta de skills
fix strange sending in phantom length value
added debian support to prevent net boot looping
Merge branch 'master' of git://github.com/cobbler/cobbler
Merge branch 'master' of git://github.com/cobbler/cobbler

Murge with upstream master
remove edit for now
fedora 17 changed the output of ifconfig command. This will make IFNAME set in snippets again
Merge branch 'master' of github.com:/lflaks/cobbler into cobbler-ifconfig
os_version for debian should be similar to ubunty for virt-install to work
changed tree in app.py so that I can use debian mirror different from cobbler server
Merge branch 'cobbler-debian-squeeze'

changes to koan for debian to work
virtinstall.py: os_version should be set the same way as on ubunty
app.py: tree is set to allow debian installation tree to be on a system other then cobbler server
Merge pull request #237 from lflaks/master

Changes to network snippets for Fedora 17 and koan fixes for debian/ubuntu
Found another regression defect introduced with transaction replay on 5/28.  I think I've added a condition
which will satisfy both, but I'll have to keep an eye on the OIDemo test version to see if that comes back.

Probably should be filing Jiras for these.
mail widget
update project generator for api changes
Adding a get_pk_dict method to conveniently retrieve a models id and its
value
Fix an extra line written to CURRENT group on add.
logger: fix a null reference bug

log_buf isn't shared any more, so we can't call log_flush() in sheep context.
let logger do the flushing work solve the problem.

Reported-by: Srer00t <sysecr00t@gmail.com>
Signed-off-by: Liu Yuan <tailai.ly@taobao.com>
added topic cloud navigation
clear
reorganized partial views
desktop ex: revise next/prev iteration code
Update Disk/FaciOS/libs/core
Released n4root

n4root - Unlock bootloader and root the Nexus 4
test: Implement buffer tests;
Merge pull request #28 from kazupon/maglev_buffer_new_test

test: Implement buffer tests;
Core: added 'exit' function;
Core: added 'abort' function;
Core: add 'kill' function;
Core: move 'setuid' and 'setgid' test;
Core: Fixed 'getuid' implementation;
Core: Refactored 'kill' and 'exit' functions;
Merge pull request #89 from kazupon/core_dev

Core dev
new add page function.
Merge remote-tracking branch 'origin/s10' into s10
Merge branch 's10' of https://github.com/coolxyz/NewSwat into s10
new page finished.
Merge branch 's10' of https://github.com/coolxyz/NewSwat into s10
完成Navihint
Updated example layout
add testMv
Camera documentation.
基本差不多了

1.0版本问世
removed some useless do notation
Add node 0.7 to engines (crossing fingers).
Renamed Eclipse project
Extended README with features section
Merge branch 'master' of https://github.com/cry-inc/scajong
Added basic libtool support, also made a convenience file for pkg-config. Modified coal/io/printf.c to reflect new build system.
add: #Managers para Speakers#Tests/model/urls/views/managers para Talk#Comentários
tweaked colors/fonts
Finished external modification detection
Fix STRICT warnings on PHP 5.4
Implemented @script directive
Implode now checks for valid ADTs when encountering a lexical with a
constructor name.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git
Bottle.py dep
Added README
Hello world
Organization
Rack::Response
ERB template
Router
Params
Cookies and redirects
Static files
Rack::Cascade
Basic auth
Testing
Gemfile
Rakefile
Controller
View
Setup DB seed
Model
Configuration
Adding line breaks on P and BR tags
Amended package homepage
Fixes for Contiki
Transfer version for migration
Errores en scripts js TinyMCE
better support for catalog radio -- ensure that we expose all the paths to the user for choosing
Update README.

Signed-off-by: David Celis <david@davidcelis.com>
Fix scrollToBottom when a horizontal scrollbar is present

Because the scrollHeight - height calculations do not give the actual max scroll
value, we have reverted to using just scrollHeight, which is an obvious
overshoot. That said, the only reason it was changed originally was so that the
scroll fix for chrome could offset it by 1 and then back again, but this can be
worked around by setting it to 0. Because the browser won't repaint immediately,
no stutter should be visible.
Merge pull request #565 from dpatti/horizontal-scroll-fix

Fix scrollToBottom when a horizontal scrollbar is present
Fix bug in auto-loading posts.
wtf! how do you guys import views without  __init__.py
switch $SGP hard wire for [[my.sgp]] to allow for SGP_BASELINE usage
Remove GoFit=TRUE from Baseline to allow = FALSE to be supplied from ...
Clean up @SGP slot when run sequentially - Null out Panel_Data and other NULL SGP slots
Merge pull request #254 from dbetebenner/master

Addition of README.md 
Merge branch 'master' of git://github.com/StudentGrowthPercentiles/SGP
Merge pull request #255 from adamvi/master

clean up Baseline percentile only usage in analyze and summarizeSGP
Early work on a Mongo module for Node.js.
Merge branch 'master' of github.com:dbuchwald/eoott
Merge branch 'master' of github.com:dbuchwald/eoott
[#LIB-5] DicomInputStream.readDataset() may skip empty attributes
[#LIB-6] mppsscu: support forward of mpps in specified DICOM files
백그라운드변경 , 타이틀 , 라벨 변경
네비게이션 소스 추가
added max set size param to loader
added redis-test.conf
organized dir, added port and max size size as parameters
fixed bug where prefixes weren't being saved
fixed bug causing prefixes to be exluded from db
reimplemented redis pipeline, single threaded only now but performance increase of 3x
Adding background image

- Padding is temporary just to get it to show up
- update yml
Map working again
Added leaflet images
Added jquery ui
Moved views to view directory
Added leaflet code
Added proper color scheme for GVim. Added guifont for Powerline.
Updated save data varibale
Added indexstyles.css
Jimmy John now pauses for his hook
created dev branch to investigate feasibility of obstacle avoidance game
hook update
hook now in correct position. Tedious but worthwhile...for now.
removed user files
refactor
Fish.cs now cleaner. Ready to add on hooked & steering behavior.
Started feature branch: steering
added orientation changes for fishes
unfloat
Merge branch 'master' of github.com:detomastah/adwc
If a parent-page closes and emits "onClosing", so should child-pages
Added plaquette support.
updated style for reader img and reader pre
update gitignore file
update the display hero unit conditional form an if to an unless, which displays it only when user is NOT logged in
fixed issue with application closing and proxy conf not being restored

Fixed issue with ProxySetter object being deallocated before the thread
had finished by removing the thread altogether (there was no need for a
separate thread anyway)
Merge pull request #634 from dgough/next

Converted the line endings of AndroidManifest.xml from CRLF to LF.
Forces screen/window to be posted before we enter the event message loop.
Ensures pause/resume does not toggle until screen goes into fullscreen state the first time.
Merge pull request #635 from seanpaultaylor/next

Next
Adds forms test using default theme and fixes point projection on Xcode. Also adds billboards test to the Xcode project.
Adds joystick control to forms test and fixes projectPoint in framework (protect against null scene and use world matrix not local one).
Fix naming conventions for new forms test.
Merge pull request #636 from kwhatmough/next

Adds new forms test and fixes some framework bugs in Forms.cpp
Fixed spelling mistakes
Updated genotype, tests
better error handling of post-action hook in app
remove unused import
start creating a subclass of command for producing a list of output in different formats, using prettytable as an example formatter
add a csv formatter for list apps
improve error handling when loading formatter plugins
require PrettyTable package for the table formatter
Make MoH a feature, replicate prompts through cfengine, install default MoH prompt with ivr project
UC-1785: return local MWI address, fix HttpServer not considering first IP from trusted sources
PT-40191687 Add video codecs for VVX500; migrate video settings to 3.3.0+
Save MyBuddy in mongo
Actions connected

Connected actions to most of the conrols.
GUI updated

Updated some functionality to the GUI.
Better tab design.
fixed rep-home url
change refcounter to uint32_t
add: history muc-filter
fix: speed up muc-filter
Fix URI processing bug in move-meta module #1369

Add URLUtils.decode(String) convenience method.
Fix merging ID rewrite bug for space in URIs #1370
Remove deprectated property from demo #1371
Pass logger to index term readers #1378
Fix index term reader XML escaping bug #1377

IndexTermReader should no longer escape index term text, as
IndexTermCollection will escape it while writing it out.
Fix topic merge URI resolving bug #1382
Remove duplicate see and see-also entries from PDF #1365
Remove duplicate see and see-also entries from PDF #1365

Remove duplicate also from RenderX stylesheets.
Output see-also in the end of term in PDF #1365
Prepare 1.6.3 release
Merge branch 'hotfix/1.6.3'
Merge 1.6.3 changes into develop
Remove xref desc from text-only mode #1191

Fix bug introduced in commit 5e01a9d2676c0a5906b42be23a7209a61df09e63.

Instead of ignoring xref/desc in text-only mode, process xref so that
desc is not output. This way the desc text value can be extract for
e.g. titles.
Colorea la liga al aviso de privacidad en el formulario de video, y hace referencia al sitio de Global Entrepreneurship Week
Removing phpMyAdmin folder
need to implement player accusations and suggestions, other than that it is done
Improvement to fuzzy searching
Update nikola/data/themes/site/templates/post.tmpl

Fixed mismatching divs
Changed 'galileiTansformParticles' so that it gives a proper result no matter whether MASS is switched on or off.
Added documentation for 'galileiTransformParticles', 'system_com' and 'system_com_vel'.
Output a warning if a virtual site is created with vs_auto_relate_to and the min_global_cut is too small
small fix to dielectrics
Merge remote-tracking branch 'rweeber/master'
Docs.
Output a warning if a virtual site is created with vs_auto_relate_to and the min_global_cut is too small
Docs.
Merge branch '3.1'
Default radius in VTF files is 0.5, as in the docs. Thanks to Jacob Kirkensgaard for the hint!
Merge branch 'master' of github.com:espressomd/espresso
fixed buggy particle coupling for GPU LB.
Merge branch 'master' of git://github.com/espressomd/espresso
changed add function to only allow for additions with correct media type and no blank titles.

Signed-off-by: Michael G. Young <mgodfreyyoung@gmail.com>
after changing add to only allow right media type and no blank titles

Signed-off-by: Michael G. Young <mgodfreyyoung@gmail.com>
Merge branch 'master' of git@github.com:dmulder/Library.git
Added a commented out means for starting a python interactive session in PLInterpreterController awakeFromNib: method. Uncommenting this statement PyRun_InteractiveLoop(stdin, "<stdin>") will start an interactive session within the console and NOT begin the Liasis app.
Fix bug in storing attributes
Fix the dismiss dialog button.
Improve alert message
Complete the parsing of the opml head.
Complete support for parsing RSS subscription list
Adds injection protection
ignore npm-debug.log
Fixes parsing bugs
1. Change the "blue-button" and "orange-button" CSS to "blue" and "orange", and these two class are for temporary use only, they will be removed or changed after UX team come out the final UI styles.
2. Add utils.js and add function "escapeHTML" to escape special chracaters.
changed the spelling of skills
cleaned xmonad configs folder
Merge branch 'master' of https://github.com/dotpyfe/configs
added methods for summation and to add 6 numbers
Merge pull request #1 from dpsProv/successfully-merged-branch

added methods for summation and to add 6 numbers
C4 + delete
Fix $t_path on windows

Backported from master e7ee768d97e078a1a669ba6279671e58e9936ba8

Signed-off-by: Damien Regad <damien.regad@merckgroup.com>
Streamline $g_path definition

Simplify the code by replacing uses of ternary operator with switch
statement and removing unnecessary variable assignments.

We now also cover the (admittedly unlikely) scenario where the
temporary path is empty, to ensure we always generate a valid path
that includes a trailing '/'.
Localisation updates from http://translatewiki.net.
Whitespace fixes
Custom fields names in Excel export were converted to lower case

This was not happening in other export functions; the root cause was
inconsistent code to output the column headers in the excel API.

Function excel_get_titles_row() now relies on column_get_title() to
retrieve the custom fields default name, same as standard columns, and
in line with CSV export.

Fixes #14772
clone the routes in store.getRoutes(), because the router modifies the route object in-place
Use rpc_endpoints specified in describe_ring if possible.
Merge branch 'thobbs-1.0-ttypes' into pooling-rpc-address

Conflicts:
	test/test_cassandraclusterpool.py
Move unit test so it doesn't depend on Cassanova.
Merge pull request #33 from nickmbailey/pooling-rpc-address

Use rpc_endpoints specified in describe_ring if possible.
Fixed cancelled audit label color.
Roughed in assignment/scheduling, extracted to partials for edit and show.
some cleanup
Console experiments
innreach host, some use command cleanup
retain sort order on form-based/multi-select options
don't check search results cache if not configured
search results cache for solr and summon (plus newspaper limit, whoops)
keep current limits/totals when shifting between tabs
solr view helper
tighter de-duplication of authors using 'display'
use author display in main author area (really need to clean this up)
Allow empty host to PDOOracle
Fix: fix an error because of which instead of loading \Symfony\Component\Console\Helper\HelperSet in cli-config.php Doctrine tries to load Doctrine\Symfony\Component\Console\Helper\HelperSet.
fixed
fixed quote problem
Adding support for datetimeoffset for MSSQL Server 2008
missing call to logger in Connection->exec(), cleanups
SQLParserUtils triggered an error when feeding it Type instances instead of PDO param type ints.
Removed is_int check and converted both comparisons into equality comparisons when expanding list parameters.
Log transaction statements
Stick to coding standards
Merge pull request #121 from frosas/master

Log transaction statements
Merge pull request #120 from maikg/patch-2

SQLParserUtils triggered an error when feeding it Type instances instead of PDO param type ints
[DBAL-219] Test for change
Merge branch 'DBAL-219'
Merge pull request #41 from stakovicz/patch-1

Allow empty host to PDOOracle
Merge pull request #117 from nicolas-grekas/logger

missing call to logger in Connection->exec(), cleanups
Adding PDO::FETCH_COLUMN support to OCI8 fetchAll method using the fetch structure OCI_FETCHSTATEMENT_BY_COLUMN.
[DBAL-241] Added platform independent test for Statement#fetchAll(PDO::FETCH_COLUMN)
Skip Test running with mysqli, Fixes GH-103
Added test for FK onDelete/Update options
Delete all vim plugins
Added JST plugin back in
Revert "Refactor Game into a class of its own."

This reverts commit 1a53486808ed6d31311026f96a0ba66f4e095b64.

People have too much in-progress.
Various examples improvements.
Started update on README
Increased resolution of collision scans to mitigate
slingshot-through-wall exploit.
修复在IE8也有提醒升级浏览器的错误，小于而不是小于等于
添加帖子标签功能开发介绍，开始热门标签获取了
first step to Android/iPhone port (no audio on these platforms yet)
Moved soundclouder.js into its own project
изменена работа с файлами
Trabajo de hoy

Queda pendiente ajustes en la funcion MENU
Configured ActionMailer.
Catch all proxy errors to avoid possible crashes
Fix environment validation + runtime discovery validator
ignore too frequent notify
actualizacion
Merge branch 'master' of https://github.com/ecastillon/cdcu
pos tagger based lemmatizer added
add support for reading apikey from system properties
bump version to 0.1.2
updated docs and bumped a few dependencies
* Falling bags complete-ish
 * "Popcorn"-dubstep mix background (commented)
 * Gold/Bag animations complete.
inotify: ignore and retry if system call was interrupted
move compression tests to js/css assets
move compression to assets
Add methods formalizing the list of valid mysql roles supported by Jetpants
Rename the README file

This way it will be recognized as markdown
tweeting README.md some more
tweaking README.md some more
more info in message
suppress error in case of zero eff
5fb
holes for various modes
normal running
protect against zero division
examples
more info in message
suppress error in case of zero eff
adding signals2
correct xs
iterate over correct items
whitespace; comment muons
histo range
use new examples
ranges
comment lists
Merge pull request #207 from elaird/examples

Examples
separating commit call from html

The get_commit call now returns the raw text from the detail. The
CommitHTML class will do the markup.
removing extraneous method of handler
refactoring git get_commit

Moving towards cleaner code and implementing a proper error handling on
unicode error.
Create autoload system in helm-config.
Fix dependencies and autoloads. Reorder.
* helm.el (helm-update): back to one window when updating when helm-samewindow is non--nil.
Remove flet in some places.
* helm-command.el (helm-M-x)
* helm.el (helm-candidate-buffer)
* helm-files.el (helm-ff-serial-rename-1): Simplify, use make-symbolic-link.
* helm-grep.el (helm-c-goto-next-or-prec-file)
* helm-mode.el (helm-comp-read, helm-c-read-file-name)
* helm-ring.el (helm-mark-ring-get-marks, helm-global-mark-ring-format-buffer): new.
(helm-mark-ring-get-candidates, helm-global-mark-ring-get-candidates)
* helm-net.el: Remove some more flet here too.
* helm.el (helm-read-pattern-maybe): Don't kill two times timer.
Add explicit chunk trailer packet
Add a couple of new guides
Disabling meter due to recent spamming.

Signed-off-by: Tyrope <Tyrope@TyRope.nl>
Bump footer down on homepage
Upadate link to forum and website
Readme changes.
Readme changes.
subgroups specs migrations and model
Subgroups controller and layout tweaks
can't inherit from a subgroup
list of subgroups + breadcrumbs on group page
oops forgot an if statement in the breadcrumbs
Merge branch 'subgroups' of https://github.com/fuzzytern/loomio into feature/subgroups

* 'subgroups' of https://github.com/fuzzytern/loomio:
  oops forgot an if statement in the breadcrumbs
  list of subgroups + breadcrumbs on group page
  can't inherit from a subgroup
  Subgroups controller and layout tweaks
  subgroups specs migrations and model
Re-order migrations. Install draper.
Merge branch 'master' of github.com:enspiral/loomio into feature/subgroups

* 'master' of github.com:enspiral/loomio:
  flash msg removed form landing
  fixed spec tests
  new landing page

Conflicts:
	app/controllers/home_controller.rb
Get it all working
Remove trailing whitespace.
Dashboard - do not show subgroups twice.
Add tree bullet icon
rm motion_activity_read_log.rb
rm motion_activity_read_log_spec.rb
aborted
remove :w file
escaped
rebase
escape added to block mailer
Merge branch 'master' of github.com:enspiral/loomio into feature/subgroups

* 'master' of github.com:enspiral/loomio:
  remove :w file
  Fix broken motion css file.
  rm motion_activity_read_log_spec.rb
  rm motion_activity_read_log.rb
  pie pieces found
  Make public groups truly public. Plus small bug-fixes.
  labels re-introduced in css

Conflicts:
	app/views/groups/_form.html.haml
	app/views/groups/_users.haml
	app/views/groups/show.html.haml
	db/schema.rb