labofsahil/github-event-dataset-2012 huggingface dataset:
Cleanup node edit actions and use decorated view classes.
Changelog.
Move functions only used for node actions to the NodeActions class.
Move all content forms into kotti.views.edit.content.
Merge branch 'master' of github.com:Pylons/Kotti
Next version 0.8.0
Add another minimum requirement
Move ContentSchema class (but keep a reference in kotti.views.edit).
Also make available DocumentSchema here, which is an API.
Merge branch 'master' of github.com:Pylons/Kotti
Move add_selectable_default_view helper to TypeInfo.
Merge branch 'master' of github.com:Pylons/Kotti
Little restructuring
Make language-dependent URL normalization the default.

(formerly a cookbook entry)
Merge remote-tracking branch 'Pylons/master'

* Pylons/master:
  Make language-dependent URL normalization the default.
  Little restructuring
  Move add_selectable_default_view helper to TypeInfo.
  Also make available DocumentSchema here, which is an API.
  Move ContentSchema class (but keep a reference in kotti.views.edit).
  Add another minimum requirement
  Next version 0.8.0
  Move all content forms into kotti.views.edit.content.
  Move functions only used for node actions to the NodeActions class.
  Changelog.
  Cleanup node edit actions and use decorated view classes.
Add docs to views.image.
add selected area, delete cropping
Makefile: compile identica, jabber modules as well
Update of upload
- ‘logs/apache_access’
- ‘logs/apache_errors’
/ ‘publicHTML/.htaccess’
/ ‘publicHTML/index.php’
+ ‘publicHTML/register.php’
Make directories scroll and overflow correctly
log when unimplemented functions are called
Ignore swap files
load entire app through require.js
organize dropbox and local filesystems into their own modules
attempt to suppress VC warning by adding a space in the parens when there are no arguments to IMP_BENCHMARK()
Implemented client_show()
Renamed bsize
Fixed set_environment()
test use of codepro
Packages that work
-Big changes to get print2: print2 works now
Lab1: better RMI registry instantiation; Lab 2: refactoring, not completed
* pulse2: pulse2-load-defaults: add this new script to autotools
Added some PDFs of some docs
drop leastsqCombinedTop; rename vars; return W and T residuals
syntax clarification
don't use brentq shortcut
no printing
revert fit()
Merge branch 'master' into leptopkinfit-adjustments
dilution test
dilution test
edgesRebinned test
completion of tests for TTree simple branch types: some failing.
resolve absolute pathname so that ./bin/supy-test works as expected
edit readme; create examples/ subdirectory with bare min.
fix wrappedChain; interesting note: sbaF is the one failing tests byte and ubyte, due to interpretation as strings.
reorganize tests/ and examples/ directories
better test for utils.algos.edgesRebinned
less verbose tests by default.
add std::vector tests
test wrappedChain for arrays and vectors.
verbose flag for tests
fix unexpected breakage in python 2.6.x
Value serial test
Entity.key, Ref as entity wrapper
Rename Entity.id as Entity.key
remove api tool from enyo proper
sigh, no 3d transforms for IE, translate + translateZ slower than translate3d on android 4
Add entities and Interfaces
alias base to stem, which is a standard name as well for "basename without extension"
rustc: Implement "deriving" for monomorphic structs via a syntax extension. r=brson
libsyntax: Long line. rs=make-tidy
syntax: switch tt quoter to emit ~[tt], not tt.
Remove parentheses from closure argument types
libcore: Fix a typo
libcore: minor os.rs cleanup
libstd: fix warnings in sort
Add PosixPath and WindowsPath constructor fns
libcore: Clean up the path tests
libcore: add stat functions to libc
libcore: Add stat methods to paths

Should we return the posix types, or should we just use i64s?
Should we expose platform specific stat fields?
rustdoc: Remove legacy exports
rustdoc: Begin removing legacy modes
rustdoc: Use more explicit self
rustdoc: More demoding
libsyntax: Implement `deriving` for enums with N-ary variants. r=brson
libsyntax: Fix duplication of items that occurs if `#[deriving_eq]` is applied to a non-enum/non-struct. r=brson
libsyntax: Implement deriving via a syntax extension for the `IterBytes` trait. r=brson
libsyntax: Implement `deriving` correctly for type-parameterized structs and enums. r=brson
rustdoc: Fix build error
Change type of papercuts to be more general, add and rename tests
adding REDISTOGO_URL handling to support redis-to-go service on heroku, #12
Merge branch 'feature-redistogo' into develop
trying another method for connection to redis-to-go service, #12
Merge branch 'feature-redistogo' into develop
Update Tempest
Improve KeyManager and use in windows project test
Primeiras Correções
code cleanup and javadoc
Made PDB seed alignments (.pdb.seq) part of the dependency chain

Now empty .pdb.seq files will be created for directories with <2 PDBs, which are
handled safely, and it all works recursively.
Site updated at 2012-12-14 03:50:41 UTC
Removed extra brix dirctory
without NON_BLOCKING, in utils_generic_exchange.c MPI_Status status is already defined, no need to define again in included code
utils_generic_exchange.4.inc final #endif missing
Merge pull request #101 from kostrzewa/generic_exchange_fix

Generic exchange fix
start the tests over from scratch.
use PATCH instead of PUT.
Edited "Ken Robinson".
getting rid of XML property files definitions
cleanup work after removing XML configuration file
include vcxproj files for the different jzmq projects. these project files are referenced from the msvc solution file when the project was upgraded to VS2010's build format, but the newly generated vcx files were not included in subsequent commits.
Code clean up and various changes to make the server work while not mounted on the root URL
ECMS-3882 Error when perform getFoldersAndFiles, Item not found /Documents in workspace dms-system
Fix description: In DriverConnector, Get workspace name from property of drive instead of getting from URL
updates to build script for docs
Created Ext.nd.grid.ViewColumn class that extends Ext.grid.column.Column

Moved the dominoRenderer method that was in the GridPanel to this class and set it as the defaultRenderer
Created Ext.nd.data.ViewModel

- This model has all of the common fields for a "viewentry"
- Moved some of the logic that was in the old ViewXmlReader to this class
Various changes to work with the new ViewColumn and ViewModel
Some code cleanup
Converted to use a plain 'xml' reader instead of the custom 'xnd-viewxml' reader
Prepare for v0.2.0 [ci-skip]
added  a note in the CHANGELOG (refs #745)
Added dumb TcpServer
Adding rosy dir, config.js
yakuake-run: new tool to run commands in yakuake from outside the terminals
Don't perform unnecessary particle system bone renames at import.
Remove a redundant selection of the created lights, hit tests and attachment points.
Store the boneName of imported forces.
When the user removes now a force its bone will now also be removed automatically.
netifd: call /etc/udhcp.user from the netifd dhcp.script

This was done previously when dhcp was handled by the network scripts.
So netifd should behave the same.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

git-svn-id: svn://svn.openwrt.org/openwrt@34704 3c298f89-4303-0410-b956-a3cf2f4a3e73
ubus: update to latest version, fixes request timeout handling issues, hangs on lots of requests, adds object notification support

git-svn-id: svn://svn.openwrt.org/openwrt@34705 3c298f89-4303-0410-b956-a3cf2f4a3e73
netifd: call /etc/udhcp.user from the netifd dhcp.script

This was done previously when dhcp was handled by the network scripts.
So netifd should behave the same.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

Backport of r34704

git-svn-id: svn://svn.openwrt.org/openwrt@34706 3c298f89-4303-0410-b956-a3cf2f4a3e73
ubus: update to latest version, fixes request timeout handling issues, hangs on lots of requests, adds object notification support

Backport of r34705

git-svn-id: svn://svn.openwrt.org/openwrt@34707 3c298f89-4303-0410-b956-a3cf2f4a3e73
iptraf: fix compile error

git-svn-id: svn://svn.openwrt.org/openwrt@34708 3c298f89-4303-0410-b956-a3cf2f4a3e73
include/netfilter.mk: remove a few obsolete lines

git-svn-id: svn://svn.openwrt.org/openwrt@33518 3c298f89-4303-0410-b956-a3cf2f4a3e73
tools/mkimage: avoid picking up unrelated /usr/include headers with the same name as internal header files (e.g. image.h), fixes #12232

git-svn-id: svn://svn.openwrt.org/openwrt@33519 3c298f89-4303-0410-b956-a3cf2f4a3e73
tools: flex depends on m4

git-svn-id: svn://svn.openwrt.org/openwrt@33520 3c298f89-4303-0410-b956-a3cf2f4a3e73
build: pass MAKE_JOBSERVER via environment to avoid leaking it to error messages

git-svn-id: svn://svn.openwrt.org/openwrt@33521 3c298f89-4303-0410-b956-a3cf2f4a3e73
grub2: disable nls to fix build failure when libintl/host is built

git-svn-id: svn://svn.openwrt.org/openwrt@33522 3c298f89-4303-0410-b956-a3cf2f4a3e73
build: add the + token to any commands that can pass through the jobserver, fixes parallel build on some systems

git-svn-id: svn://svn.openwrt.org/openwrt@33523 3c298f89-4303-0410-b956-a3cf2f4a3e73
packages: fix parallel build by adding + for every make command that passes the jobserver

git-svn-id: svn://svn.openwrt.org/openwrt@33524 3c298f89-4303-0410-b956-a3cf2f4a3e73
now pickling!!
=Merge pull request #8 from mmoussa/master
Adding note about using callback tags in conditionals.
CS

git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@19251 35612d4c-9d10-0410-837c-bf9dd1be60d7
add TODO for r18947 (moyo)

git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@19252 35612d4c-9d10-0410-837c-bf9dd1be60d7
first new line via git
new line
Minor changes and gameplay improvements.
Påbörjat Sender/Receiver - ej klart
.gitignore shit
Fixed Batch Reactor Tests
corregido el layout vertical del search
completion: respect $GIT_DIR

The __gitdir() helper function finds out the path of the git
repository by running 'git rev-parse --git-dir'.  However, it has a
shortcut first to avoid the overhead of running a git command in a
subshell when the current directory is at the top of the work tree,
i.e. when it contains a '.git' subdirectory.

If the 'GIT_DIR' environment variable is set then it specifies the
path to the git repository, and the autodetection of the '.git'
directory is not necessary.  However, $GIT_DIR is only taken into
acocunt by 'git rev-parse --git-dir', and the check for the '.git'
subdirectory is performed first, so it wins over the path given in
$GIT_DIR.

There are several completion (helper) functions that depend on
__gitdir(), and when the above case triggers the completion script
will do weird things, like offering refs, aliases, or stashes from a
different repository, or displaying wrong or broken prompt, etc.

So check first whether $GIT_DIR is set, and only proceed with checking
the '.git' directory in the current directory if it isn't.  'git
rev-parse' would also check whether the path in $GIT_DIR is a proper
'.git' directory, i.e. 'HEAD', 'refs/', and 'objects/' are present and
accessible, but we don't have to be that thorough for the bash prompt.
And we've lived with an equally permissive check for '.git' in the
current working directory for years anyway.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add a non-versioned SONAME to Avian libjvm.so that
matches the Hotspot Server/Client libjvm.so SONAME,
this allow libjava.so in OpenJDK 7 to find the Avian libjvm.so during ldopen.
Set java.vm.info based on makefile info= and
set java.vm.version based on makefile version=
in order to display relevant OpenJDK -version information.

Signed-off-by: Matthias Klose <doko@ubuntu.com>
Signed-off-by: Xerxes Rånby <xerxes@zafena.se>
Merge branch 'openjdk-version' of https://github.com/xranby/avian
ignore DetachCurrentThread calls for the main thread

My earlier commit to allow detaching the main thread (1f1c3c4) seems
to have caused subtle stability problems
(e.g. https://groups.google.com/group/avian/msg/d2c797c0dcf925c3), so
for now we'll just ignore that operation, which leaks a bit of memory
but should be harmless otherwise.
Merge remote-tracking branch 'upstream/master' into wince
add JNI_GetCreatedJavaVMs stub

Recent versions of IcedTea will not run unless libjvm.so exports this
symbol.  The quick fix is to provide a stub which just always returns
-1 to indicate an error.  I'll leave a proper implementation for when
we need to support an app that actually uses this function.
fix sun.misc.Unsafe.getLongVolatile for static fields on 32-bit platforms

The existing code did not handle static field lookups for
synchronization on 32-bit systems, which is necessary because such
systems generally don't support atomic operations on 64-bit values.
fix reads of out-of-bounds values in tokenizer.h
fix incorrect reporting of fixie collection status in heap.cpp (part 2)

My earlier fix (f8e8609) was almost -- but not quite -- sufficient.
It asked the heap to mark the dead fixies too early, so some of them
were marked dead even though they ultimately survived, causing us to
clear weak JNI references when we shouldn't.
fix a couple of ByteBuffer regressions

The compact() and put(ByteBuffer) methods regressed as of the recent
refactoring to support direct byte buffers.
Merge remote-tracking branch 'upstream/master' into wince
add compressibility to fluid flow scheme
delete obsolete line in flowEngine.hpp
Interaction test between a cohesive sphere and a cylinder.
refactored class initialization, added initial checkbox functionality
improved styling of checkbox controls
added checkmark image
Adding BAP 0.4 for applying pathces
Modified bat by applying patches
Changed architectures according top bfd.h
Update CHANGELOG. [ci skip]
Specsuit is fast again. Run all on start.
Remove notifier duplication.
Remove autoload completely.

This removes all autoload in the Guard codebase and
replaces it with manual requires.

It follows this common pattern:

```
require 'external/stuff'

module Guard
  module Whatever
      require 'guard/other/guard/stuff'

      ... implementation ..

  end
end
```

This has been done since Matz stated that autoload will be removed in
Ruby 3.0: http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/41149

Autoload has also known threading issues.
Avoid to run tasks when Watcher match no files
Pluralize scope (and fix run_with_scopes)
This is set in opt_wlan.h, and should only be done in one place.
Don't write wast amounts of debug info about scanning.
Setting up for Tags.DefineBits support... not working yet
Updates for new NME library support
Implemented Vec2.overwrite.
Renamed Vec2.unit to Vec2.normalize.
Implemented Vec2.orthogonal.
Added missing dependency to CollisionResponse module.
Added missing dependency to EulerIntegrator module.
Added missing dependency to VelocityVerletIntegrator module.
Wrapped all tests in modules. Their dependencies used to leak out into the global namespace which masked some missing dependencies in source modules.
add macros for getter/setter combos, add missing functions
BUILDING: added debian 7.0 to supported distributions list
build-all: build debian 7.0 wheezy
Fix init script to do remount -o remount,ro,bind
[app] changed the link icon to a pin
tiny renaming
Merge branch 'master' into gh-pages
Use a more appropriate filter icon for the tags currently filtered on.
The Twitter docs say to use https for this request, but it only
seems to work with http.
Bug #11899: Cast to string or else objects will continually call the __toString() magic method
Remember duplicates and allow to read them. Provide a reset() method.
Allow to read the duplicate default folders. Reset the defaults before synchronizing.
Obsolete.
Single implementation => collapse.
Reset completely.
Fix synchronization. Provide decent sync stamp. Allow to retrieve duplicate defaults. Adapt to List_Cache change.
Always require a logger and a cache. Readd cached list queries. Adapt to List_Cache change.
Adapt to config change.
No menus.
Use sticky notifications.
Remove unnecessary references and PHP 4 constructor (Bug #11631).
Try sending a "dummy" header for 12.1.
add in master
add in develop
Added pairwise result lookup service
Using pairwise output in feature grid. Added color scale.
Merge branch 'atlas_view' of https://github.com/hrovira/QED into pairwise_python_svc
Genes and cancer selection work in feature grid. Fixed error in coloring.
Merge pull request #5 from kleisb/master

Feature grid coloring and pairwise data service
#40 Included icons-16.css into notex.min.css
enable utf-8 encoded back-end files
#113 Added a pre-defined BTC notifier IP address
Changed from MD5 to SHA512 hashing
fix issue with daily freq.
fixed a bug...
allround access policy class. see CHANGES
new image system. see CHANGES for update instructions
diaxeirish prosforwn diorganwths
Revert "first commit"

This reverts commit 1125c99cf09e49a470dc662707d0c9a8e5adfa80.
Revert "Revert "first commit""

This reverts commit 0c39e3229748ffaaec075986099f10eacff6702e.
Revert "Revert "Revert "first commit"""

This reverts commit a1fd2324ec98af6c5873a4a874e349d5e795317c.
Added travis support
Merge pull request #4 from iqyax/travis

Added travis support
fixed bug with getting test_config from yaml
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/abt/abt_worker_ng.rb
ABT not a gem anymore, removed support of obsolete iron_worker gem
Add Buffer.concat method

We write out this loop a lot of places throughout node.
It clearly needs to be an API method.
fix fs.readFile with lying size=0 stat results
Removed chunking in swift plugin
lib: internal: nativeresolver: dependencygraph: fill: pre-create two possible PackageEntry shared pointers
Update readme: macros
config tweak and add thankyou redirect
Merge branch 'master' of github.com:jaxyeh/DVTV
fix asset dialog URL generation in IE
Allow mixing in objects
Handle the same attribute appearing in multiple tags.
STYLE: Add qMRMLNodeComboBox class documentation

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20513 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: fix vtkArchive build on windows

Use conditional offset type since size_t doesn't match
libarchive's offset type on win32 and win64

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20011 3bd1e089-480b-0410-8dfb-8563597acbee
Revert the Inno Setup Turkish language file update.
Translators should submit any changes to IS translations upstream, otherwise it is impossible to keep track of the changes.

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4293 10f7b99b-c216-0410-bff0-8a66a9350fd8
use DEF_LOGO in the WebServer

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4294 10f7b99b-c216-0410-bff0-8a66a9350fd8
Improve the "Save As" dialog: the dialog is updated more regularly and the units for the sizes and the speed are now automatically adapted to the values.
This commit fixes ticket #2163.


git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4295 10f7b99b-c216-0410-bff0-8a66a9350fd8
Another new line.

Added another new line.
Move config and functions related to abbreviations to abrr plugin
NEW: Utilizar descripcion adicional en folios M y O
testidokumentti lisätty
Added urllink plugin
First commit in gitHub of my blog
Migrate from jPE to Powershell for PE header information extraction.
Spend less time waiting for shutdown ACK.
deps: upgrade http_parser to joyent/node@b47c44d
added new patTuple looper in python. TODO: merge pattuple and edmntuple looper to library.
got getData function working

got getData function working
Set up small literal hashes and hash args using a single bucket.

For many small literal hashes, especially those used for calling
methods with hash args, allocating the default layout for a Ruby
Hash is terribly wasteful. The default setup uses a bucket count
of 11, which for a hash smaller than 11 wastes that many entries.
Since many literal hashes and hash args are as small as one or two
or three elements, I have modified literal hash creation to force
a single bucket with no rehashing. This reduces memory allocation
of a simple single hash-arg call from 6.4MB to 2.4MB and improves
speed about 10-15%. There are additional improvements possible,
such as not rechecking the bucket count for hashing the incoming
keys.
Merge branch 'master' of jruby.org:jruby
add test for JRUBY-6606
#6606 - respect external encoding instead of hard coding UTF-8
Tweaks for #159.
Slate: Enable focus on layout activation
added blade runner police spinner for future noir party
Bug 790437 - Add docstring to mozlog explaining why we bypass __init__, r=jhammel
Bug 798029 - devicemanagerSUT should only print a failed connection in _sendCmds if debug is higher or it cant reconnect;r=jmaher
follow up to Bug 796880 - better diagnostics when parent terminates before children;r=markh
ajax start stop and spinner
ftjcfgtfkgf
Added Memory, MemoryUnit and Label classes.
Allowing status to be show in all its glory.
Attempting to install extensions for build tests.
Fixed broken time annotation for activities. (closes #53)
Only admins and groupleaders see the preference user_list_hidden. (closes #47)
Cleaning up - removing un-referenced libs
enum play
Access log now supports iolists.
修改因AddTexture(...)函数引起的相关问题。
0.4.5a - echo groups enabled
- Various refactoring/cleanup
- Update TODO
- Add winamp-style keybindings for next/prev (b/z)
- Set SM2 configurable preferFlash = true as a workaround for html5 player seek issues
- Block serving of files not specified in ALLOWED_TYPES with 401
- Add 401 template page
added persist route
Force GitHub to re-generate the site
transition locking performance optimizations
transition locking performance optimizations
Refactor testtex to decouple the mappings from the main texture test loops.
Add testtex --filtertest to verify texture filtering.
testtex: update texture lookups to happen at pixel centers, not corners.
Update ref images to match the new behavior.
mjpegdec: support AVRn interlaced

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
rtmp: support strict rtmp servers

In order to send or receive a stream FCPublish, FCSubscribe and _checkbw
are completely optional and often not implemented. releaseStream over a
non-existen stream might report an error instead of being silent.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
configure: Move the getaddrinfo function check into the network block

This makes the two checks (general vs winsock) fit in better.

Signed-off-by: Martin Storsjö <martin@martin.st>
avconv: fix copying per-stream metadata.

It is handled separately from other types because it uses stream
specifiers and currently that triggers an assert in SET_DICT.

CC:libav-stable@libav.org
lavc: introduce VideoDSPContext

Move some functions from dsputil. The idea is that videodsp contains
functions that are useful for a large and varied set of video decoders.
Currently, it contains emulated_edge_mc() and prefetch().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
update wiki template
Fixed minor typo when adding Logging
demo1.0

demo1.0
Site updated at 2012-12-13 14:41:12 UTC
UI ja turve
Return exception messages body as Array in RackAdapter

Signed-off-by: Loren Segal <lsegal@soen.ca>
UI events mapped to JESS functions (for tablets)
created function getResults() in JESS for final UI screen
UI events mapped to JESS functions (for smartphones)
multislot functions are lacking... :/
Merge pull request #3 from lubostar/ui_mapping

Ui mapping
MySQL dialect support

Uses github.com/ziutek/mymysql
MySQL example
Fix null field panic
Remove accidental debug output
Update bcbio submodule.
Exclude goog Java that conflicts with lein cljsbuild.
It was hiding outside of the Leiningen chain; sneaky!

Closes #3.
Added missing files - 2
Uses the usual completion mechanism of magit for gitignore.
Cleans up the ignore code containing redundant code and doc.
Merge pull request #479 from dudebout/gitignore-with-completing-read

Uses the usual completion mechanism of magit for gitignore.
even better SSAA
Optionally embed features in a RGBDImage.
Update CSS/styledoc.css
worked all the defects found during the test
Adding in behavior definitions to parse at some future point
Merge remote-tracking branch 'red-f/master'
MediaPortal pvr addon: fix reading the tsbuffer file on 64-bit Linux/OSX systems
MediaPortal pvr addon: refresh the tsbuffer file before moving to the end of the file
MediaPortal pvr addon: log more errors when debug logging is disabled + code cleanup
MediaPortal pvr addon: tsreader: only allocate RTSP resources when using RTSP for playback
fix for synthetic example
Submodule update.
Remove endwise, I never like it.
Smartinput plugin.
Tweak symlink behaviour not to include the test directory from smartinput.
Fix #4: add loaded accel group to the main window
Don't cache d3_geo_bounds for projection.

I mean, we could, but it seems simpler not to, for now.
Ignoring build and ncrunch artifacts
lanterna: add done event
README: add license exception
Task now migrate when annotated by placement scheduler.
Adds paver distrotools
flake8 +flakeplus
Minor improvements
Layout + little of UI sugar

@todo: wokrer.html + workers.html more work as there was no data...
Merge branch 'lukmdo/fluid_layout_sugar'

Conflicts:
	flower/templates/tasks.html
Merge branch 'mher/master'

Conflicts:
	flower/state.py
	flower/templates/workers.html
Merge branch 'master' into mher/master
OrderedDict first available in Python 2.7
Merge branch 'mher/master'

Conflicts:
	flower/models.py
Adds pavement.py
import ordereddict from celery compat directly
flake8
Merge pull request #9 from ask/master

cosmetics mostly
missing new classes
fix missing distutils import
Correctly display 6-digit hex numbers in colors less output
Color chooser w/ ugly-brown scheme
<h3>Event.stop(e)</h3>
Removed Function#toHandler and created Event.stop(eventObject) instead
Fixed Craft.AJAX and replaced Craft.AJAX#send with Craft.AJAX#update
updated README.md and builds
Changing configuration file: make it abstract for services configurations; make it faster with __slots__; wrap variables around a new dictionary; use safe_load/dump; check type when setting item.
Fixing setitem and adding unittests.
Added documention for CSruct
Resolved some non-ARC possible memory leak; added .DS_Store to .gitignore
jnpr/case_att_download.py - added color themes
other/otpshell.py - more code ;)
jnpr/case_att_download.py - we can print Case status and Problem
description
refined character encoding capability with 1.8 rubies and 1.9 rubies.
init the git reciever handler
globalize guru-mode
Define a public WindowManager.kill(origin) function for mdas' tests
Merge pull request #1248 from davidflanagan/killapp

Define a public WindowManager.kill(origin) function for mdas' tests
Merge commit '5920af0' into q
Removed flawed closedness test.

This test was wrong with respect to several situations:

* If t is an abstraction.
* If t is the lhs of a rule refering to context variables.

TODO: Add a proper closedness test.
Implements Connection and Keep-Alive headers now
Update record member name
login
login
Added raftalks/form
login
forms
forms
login
update messages files
check for missing shader & print error
Merge branch 'smoothlos' into merged
document Add
Changed service registration to register internal classes
Added test scenario
메뉴 소개 페이지로 이동 구현완료
key_commit: updated T5002 with Grady only tr section for tax receipts.
key_commit: Auto generate suspense accounts on F5 window
convert: fixed sc8 convert issue w/ undefined behaviour

Its important to use a signed cast when converting float to int.
Then assign that signed int to an unsigned type of the same width.

Its undefined behaviour when converting a negative float to an unsigned int.
n2xx: fix possible attribute error in netburner win_get_interfaces

It is possible on some machines (at least one in this case),
for adNode to not have the attribute next. Unexplained...
This may be a fix, and if not, should be harmless.
Manutenzione SUB_SYSTEM 'LOG'
fix dodge float issue, add EHP w/o dodge
upgrade to bootstrap 2.0.3 and fix horizontal form styles
v0.1.5  [dev] 2012-11-21 add settings information to chart;
* v0.1.6  [dev] 2012-11-21 add extern item "LotsDigit" default value is 2, but some account allow 1 digit only; fix third order log output text;
Fixing #378, when path or domain are null in both this and that, equals and compareTo return false even when the cookies are equal.
Fix typo in test samples
Make ByteBuf dynamic / Introduce an interface for composite buffers

- Replace ByteBufferBackedByteBuf with DirectByteBuf
- Make DirectByteBuf and HeapByteBuf dynamic
- Remove DynamicByteBuf
- Replace Unpooled.dynamicBuffer() with Unpooled.buffer() and
  directBuffer()
- Remove ByteBufFactory (will be replaced with ByteBufPool later)
- Add ByteBuf.Unsafe (might change in the future)
Replace free() with reference counting / Fix SlicedByteBuf.unsafe()

- based on @normanmaurer's feed back
- Added Unpooled.compositeBuffer(int)
Fix IOOBE after buffer truncation / Add CompositeByteBuf.addComponents()

- plus some bug fixes while running unit tests
Merge pull request #464 from netty/buffer_always_dynamic

Make buffers always dynamic
tidy up syntax
timesheet changes to view project / job
Adding flexible layouts post
New site release
modified:   Makefile.inc
	new file:   grep
	modified:   src/builtin/Makefile
	modified:   src/builtin/Makefile.in
	new file:   src/builtin/xsh_bindkey.c
	new file:   src/builtin/xsh_builtin.c
	modified:   src/builtin/xsh_builtin.h
	modified:   src/builtin/xsh_cd.c
	modified:   src/builtin/xsh_echo.c
	modified:   src/builtin/xsh_exit.c
	modified:   src/builtin/xsh_get.c
	modified:   src/builtin/xsh_history.c
	modified:   src/builtin/xsh_import.c
	modified:   src/builtin/xsh_interactive.c
	modified:   src/builtin/xsh_loadcolors.c
	modified:   src/builtin/xsh_return.c
	modified:   src/builtin/xsh_set.c
	modified:   src/xsh_bindkey.c
	modified:   src/xsh_bindkey.h
	modified:   src/xsh_command.c
	modified:   src/xsh_console.c
	modified:   src/xsh_console.h
	modified:   src/xsh_env.c
	modified:   src/xsh_function.c
	modified:   src/xsh_history.c
	modified:   src/xsh_lib.c
	modified:   src/xsh_lib.h
	modified:   src/xsh_main.c
	modified:   src/xsh_message.c
	modified:   src/xsh_message.h
	modified:   src/xsh_parse.c
	modified:   src/xsh_parse.h
	modified:   src/xsh_script.c
	modified:   src/xsh_statements.c
	modified:   src/xsh_string.c
	modified:   test/.xsh_history
	new file:   test/ctest
	new file:   test/ctest.c
	new file:   test/phptest.php
	modified:   test/shtest.sh
	modified:   test/xsh
	modified:   test/xshtest.xsh
Merged two classes
Api method now shows live url(dynamic) + some regex for finer listing
use dummy value; infer definition annotations correctly
Added command-line argument parsing to switch.cc
ioworker: Add more context to exception logs
Allow adding mixins and overloads to transforms
Changed Mappingfile, Finished StudycardModule, removed tables in db
  - Changed datatypes in MappingFiles from "long" to "integer"
  - Removed some unused tables from DB that I missed somehow
  - Finished Studycard Module so one can actually use it ;)
  - Minor modifications to Studycard UI
BUG: Reshape of 0-sized arrays failed to work without copy

This also adds a check for order=Keeporder which is not supported.
"closes Issue #2700"
MNT: Remove _check_zeros from NewShape

_attempt_nocopy_reshape already handles this case fine. The only
purpose would be to slightly speed up this special case.
Merge pull request #2702 from seberg/issue2700

BUG: Reshape of 0-sized arrays failed to work without copy.
Add separate-build tests to tox.ini
Changes to p018
CMS progress, Map Service Catalogue progress
Move inv_recv CRUD strings to seperate function
Merge branch 'master' of git://github.com/flavour/eden
Super-entity references must use the super-key - but not necessarily as FK.
修改了Lang类的md5方法的实现部分，并完善了lang的部分文档
Merge pull request #261 from ywjno/master

修改了Lang类的md5方法的实现部分，并完善了lang的部分文档
change log datatables pre-sorting scripts
Added limit parameter to PassageEvalConsumer as a requirement of TREC
evaluation (normally set as 1000).
Create a default Input (InputFilter) for form elements without one
Support to remove decimals in currencies
Changed comments to clarify the issues with serialization/unserialization
Changed comments to clarify the issues with serialization/unserialization
Formatted using IDE to prevent excessive white space
fixed phpdoc in Zend\Mvc\ApplicationInterface
Update to Date element use statements to make it clearer which DateTime is in use
FormRow translate label fix #ZF2-516
Change docblock to allow array
Moved the translation code around in FormRow for non-empty labels
Additional test coverage for FormRow when element id is set
fix "use" and multiple spaces

fix "use" and multiple spaces
add fix cs with space after comma

add fix cs with space after comma
add space with string concatenation

add space with string concatenation
Removed comment about non-existent Zend_Tool
fix get method in plugin manager

plugin manager use options in controller :

"return $this->getPluginManager()->get($name, $options);"

miss one parameter.
Add tests with options

Add tests with options
add consistency with use of constant

replace string by constant
add consistency in tests

add consistency in tests
Update library/Zend/Version/Version.php

added support for different version identifier locations
Added tag annotation type, implemented annotation lifecycle
Adding style on <a> html item
touchmove events in Android web browsers have a really serious bug. If you don't include the following code, the touchmove event will fire once, but not again until you're done moving your touch, which utterly kills the usefulness of the touchmove event. It's a weird one, and may very well break more advanced touch logic that works on iOS. But if you preventDefault() on the touchstart event, your touchmove will function as expected.

This bug is documented here: 
http://code.google.com/p/android/issues/detail?id=5491
Remove extra tags panel on item/add. Fix #262.
Fix tests for new record form saving hotness.
handier keybind for this
stream definition for London
also make the fields of the JsonReader a config property in GeoNodeCatalogueSource
Wrap up of a bunch of changes. Should use vc more
simple update for copy
fade out all other items when selecting
download text files and display them inline
label fix
iphone layout fix and plist bump
added resetGame button
Cache
iframe social buttons
update
Add scripts
Update gitignore
Update content
ya ni me acuerdo que
Merge branch 'master' of github.com:pacavied/vj
fix boost tests
added igraph dijkstra tests
fix tests
Fixes SI-4929, with a test to verify.

Also fixes potential issue with Parsers.phrase not being reentrant; however, I was unable to actually reproduce this issue in practice. (The order in which lastNoSuccess was being set and compared seemed to guarantee that it would never actually be a problem).
Ctor default-getters unique name and are typed in constructor context
Fixed build for 0.11.x again.  Working on bringing version properties file up to par.
Fixed up versioning scheme.
SBT build should now mimic ant build for versions.
Added an incredibly hacky way for us to override the default sbt compiler interface.
Streamlining calls so success/failure go through complete, also made sure completeWith doesn't crash on multiple attempts.
Introducing tryCompleteWith for symmetry and for the possibility to treat racing completeWiths as a problem or not.
Removing a lot of residue and superfluous method declarations. Moving out newPromise to the implementations instead of having it inside impl.Promise
Removing some verbosity in Promise.tryComplete
Rewriting the doc message for tryAddCallback so it reflects the semantics
Removing the wrap-method from Promise
Cleaning up DefaultPromise.onComplete
Adding FIXME to ExecutionContext.fromExecutorService
Changing impl.Promise to return this.type
Unbreaking tryComplete + Future.apply since resolver must be use both for boxing of callback and for execution
SI-5543: Merge with trunk

Reverts name unenmanglement that was objectionable in the previous patch
commit 47bfd744177121de08fed489a5b0b1b59a1ae06a.
SI-5543: Ctor default arg wrongly scoped (revised)

This patch fixes the motivating bug by detecting when a method is
the default arg getter for a constructor parameter.  That requires
fixing a secondary bug where an arbitrary string was used to encode
<init> in lieu of <init>.encode.  There is no speculative mangling.
Merge pull request #15
Merge branch 'master' into wip-sip14-fixes
fixed typo in documentation of @cpsParam
Add test for Nieczabug #142, !(4 eqv 4.0)
when registering a package have ghc-pkg not delete packages with the same source name anymore
shadow all but the instance with the highest priority during shadowing
Adding the us.rsync.php.net reference as well, as the map graphic points to it.  Can likely remove americas.rsync.php.net, since there is no reference to it anywhere, and it has not been used.
Brought code tag font size up to par.
another test item

Signed-off-by: Piere Wöhl <piere.woehl@web.de>
refs 3207 adding unit tests

git-svn-id: http://dev.piwik.org/svn/trunk@6651 59fd770c-687e-43c8-a1e3-f5a4ff64c105
agrigate ublocks
Update podspec.
Merge branch 'master' into restkit-development
Cambio en Mistutorias
Added custom devel code. Needs work.
only rotate when the next config is dirty
Basic programs for message routing subscription.
Basic support for setting queue parameters.
cleanup error messages and prevent crossing queue types
better position for the loader gif.
Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages
Implemented send patch workflow.

To be refined and better tested.
Code cleanup.
Fixed Github.js caching issue.
Merge remote-tracking branch 'origin/v0.4.0' into gh-pages
Fixed markdown for link to license
Little Vim improvements.
disable hardcoded unit tests
201211 の予定を追加する
Merge branch 'develop' of github.com:pyspa/pyfes into develop
des produits et de la pagination
contact are not very well protected..., may be not well design
added a bit more comfort for the workshop l0dable
Add LeanPub bit to README
added beginning_of_hour support to core_ext calculations for Time and DateTime
Merge pull request #6156 from mjtko/feature-beginning_of_hour

Beginning and end of hour support for Time and DateTime
fix shadowing outer local variable warning
Merge pull request #7691 from lest/patch-1

fix shadowing outer local variable warning
Updated other README to point 3-2-stable
Merge pull request #5936 from arunagw/other_readme_fixes

Updated other README to point 3-2-stable
Update performance profiler to work with latest ruby-prof, fix 3-1-stable build
Merge pull request #6261 from carlosantoniodasilva/fix-build-3-1

Fix build 3-1-stable
remove 'then' from conditional statement
Merge pull request #7943 from NARKOZ/patch-4

remove 'then' from conditional statement
:foreign_key option should be on has_many side of association
Merge pull request #6306 from erichmenge/3-2-stable-guide-fix

3 2 stable guide fix [ci skip]
#21 . Estructura para parsear datos y formatear.
Add turnip support
Add support for `dirty cucumber`
Fix tests to use new kongrequester helper
Merge branch 'master' of github.com:rcbops/kong into multiversion
Merge pull request #4 from rcbops/multiversion

Multiversion
refactoring the way ['nova']['networks'] is defined.. this allows for n-nic to be defined by an environment override.
Merge pull request #36 from galstrom21/master

refactoring the way ['nova']['networks'] is defined.. this allows for n-nic to be defined by an environment override.
Frenche translate until 1400 line
add vim-plugin zencoding-vim
delete old layout
prepare search form
plugin content_manager
Remove unnecessary checks in the Choice... actions.

We had been checking that the _chosen dict was non-empty in ChoiceJump
and ChoiceReturn actions. This wasn't necessary given the logic of the
program, and failed in the case of a game that hadn't been played
before.

Fixes http://lemmasoft.renai.us/forums/viewtopic.php?p=214590#p214590
Update the changelog.
match symbols in Hash#dig or strings
hand2text: update
fixed library/xml pointing to wrong commit (I hope)
Rephrase the minimal configuration stanza
Add a minimal gitignore
Kitchen -2 fixes
Fixed class registration macro to work with namespace qualified class names.
Adds support for getting parameters.

Working on set params.
Adds getParams to fetch param names.
Removes node name from topic. No longer needed.
when gitx is launched from command line without the --git-dir option, try to determine enclosing git repository (so that gitx can be launched from a subdirectory)
Search directory hierarchy with libgit2's git_repository_discover

The algorithm is the same, but checks for a complete repository structure (objects, head, refs)
More options:

* noupdate
* missing
* fail / failed
* <date
remove op_menu && fix browser
fix browser
add file selection (obj)
fix file selection
add scene tmp colors (reuse)
fix selection pass
button,plug,data,txt free
add screen abort mode
add s_append
add some new letters
Updated the MGSDOTS stimulus ex-file and xml file
I keep breaking rankings...
Revert "GenASM: pipeline disk-write with building of classfiles"

This reverts commit 5d12fa4b791e73d5c99a0e145d28cbaba12823d2.
Merge pull request #861 from dragos/revert-genasm-bg-thread

Revert "GenASM: pipeline disk-write with building of classfiles"
View has better getters/setters
added comments and sys.argv
FIX: replace any() by np.any() for python 2.4

Also some PEP-008 updates.
add gps support
finally we done it

happy : )~
bugfix
forgot to clone...
implemented swapping
added some getter/setter
another getter/setter
javadoc
store deviation in variant
build: the C++ standard is C++ 1998. gcc -ansi provides that

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
Searcher: large integer constants needs ULL for portability

Large integer constants need the suffix ULL, for unsigned long
long, for portability. Otherwise, the value may not fit. The code
was compiled with a TI UltraSparc IIe (Hummingbird) with gcc
(Debian 4.4.5-8) with Linux.

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
Don't dismiss DirDialog when double-clicked.
Skip menu open/close events (or update UI handlers are not called!)
Added note about setMarkerPersistent
Fix gitignore and hgignore to match z3 at the top level
Terrenos: Check!!!

Funções genéricas de colocar peças, check também. Só tens de criar as
específicas para as peças em si, porque eu só fiz para terrenos.

As funções genéricas são: insert_into_line que recebe o elemento, a board
inicial, uma variável onde guarda a board final, o X e o Y; insert_element
que recebe o elemento, a Linha a alterar, a variável onde guarda a linha
alterada e o X.
fix requirements
build magit-blame.el
added text (mock up) to the radial menu
Rename bmake file to bmake.rst
Rename erlang file to erlang.rst
Rename ld file to ld.rst
Rename perl file to perl.rst
Rename python file to python.rst
Rename qwt file to qwt.rst
Rename sdl file to sdl.rst
We don't need qt3 file

That information is in the qt.rst file.
Merge all apache files into apache.rst
Rename apcupsd-setup... to apcupsd.rst
Rename bitlbee file to bitlbee.rst
Merge all firefox files into firefox.rst
Rename cdrecord file to cdrecord.rst
Rename knowledgetree file to knowledgetree.rst
Rename gdm file to gdm.rst
Rename msmtp file to msmtp.rst
Rename xwd file to xwd.rst
Rename wget file to wget.rst
Update the README with better text and formatting
Added a static ucase method to twine.
Add rsolve empty condition tests
audit: don't free_chunk() after fsnotify_add_mark()

Don't do free_chunk() after fsnotify_add_mark().  That one does a delayed unref
via the destroy list and this results in use-after-free.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: Eric Paris <eparis@redhat.com>
CC: stable@vger.kernel.org
audit: fix refcounting in audit-tree

Refcounting of fsnotify_mark in audit tree is broken.  E.g:

                              refcount
create_chunk
  alloc_chunk                 1
  fsnotify_add_mark           2

untag_chunk
  fsnotify_get_mark           3
  fsnotify_destroy_mark
    audit_tree_freeing_mark   2
  fsnotify_put_mark           1
  fsnotify_put_mark           0
  via destroy_list
    fsnotify_mark_destroy    -1

This was reported by various people as triggering Oops when stopping auditd.

We could just remove the put_mark from audit_tree_freeing_mark() but that would
break freeing via inode destruction.  So this patch simply omits a put_mark
after calling destroy_mark or adds a get_mark before.

The additional get_mark is necessary where there's no other put_mark after
fsnotify_destroy_mark() since it assumes that the caller is holding a reference
(or the inode is keeping the mark pinned, not the case here AFAICS).

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reported-by: Valentin Avram <aval13@gmail.com>
Reported-by: Peter Moody <pmoody@google.com>
Acked-by: Eric Paris <eparis@redhat.com>
CC: stable@vger.kernel.org
audit: clean up refcounting in audit-tree

Drop the initial reference by fsnotify_init_mark early instead of
audit_tree_freeing_mark() at destroy time.

In the cases we destroy the mark before we drop the initial reference we need to
get rid of the get_mark that balances the put_mark in audit_tree_freeing_mark().

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Merge branch 'audit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull audit-tree fixes from Miklos Szeredi:
 "The audit subsystem maintainers (Al and Eric) are not responding to
  repeated resends.  Eric did ack them a while ago, but no response
  since then.  So I'm sending these directly to you."

* 'audit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  audit: clean up refcounting in audit-tree
  audit: fix refcounting in audit-tree
  audit: don't free_chunk() after fsnotify_add_mark()
Add: Possibility to record a users route
Change: Added activities to manifest
Add: Layout files for existing Routeactivities
Add: Functionality to see a past route
Merge pull request #12 from span/11-StartRecordRoute

11 start record route
docs: another small typo correction update to magnet pattern post
http: hide non-public HttpRequest member `URI`
sbt: upgrade to Scala 2.10.0-RC5
http: small comment fix
routing: add `optionalHeaderValuePF` directive, closes #178
Fix for #1453 Check Capturing
set content type to 'application/javascript' when serving JSONP

Fixes #1983
Try has_spree_role? method on spree_current_user for products_controller

There is *definitely* situations where spree_current_user is going to be nil
Don't use deprecated syntax for rendering spree/admin/variants/autocomplete on admin/orders/_add_product.html.erb
Remove tests for deprecated line_items_string hack on promotion action line items
Must use expanded partial syntax if passing formats
Fix product autocomplete promotion test
Move helpers into ControllerHelpers::Common

Based on point here: https://github.com/spree/spree/pull/2079#issuecomment-9371007
Version bump for 1.1.2.rc1
Correct require inside of product_filters
Fix issue where we were incorrectly calling a method on an Arel::Table object, rather than using []

Fixes #1709, and adds an actual test for the brands_any filter
Provide ability to disable style and documentation checks from within the RakeTask
Merge pull request #9 from dlindahl/master

Provide ability to disable style and documentation checks from within the RakeTask
Include app in defaults to support Rails out of the box.
Update README with new defaults.
1.1.0 release.
compatible test
hp  /
Add generic Oracle Object Length Rule - based on the OracleObject interface
Add PLSQL codesize ruleset file and example PLSQL  XPATH Rule (TomKytesDespair.xml)