labofsahil/github-event-dataset-2012 huggingface dataset:
BZ 834684: updated bundler to version 1.4.7
BZ 834684: minor changes to checkstyle.xml to bring it up to date with Checkstyle 5.5
Merge pull request #15 from witlessbird/buildr-1.4.7

BZ 834684: updated bundler to version 1.4.7

requires running `bundle update`
added support for updating of Content
Merge pull request #79 from witlessbird/content_updates

added support for updating of Content
changed ContentResource#update to use contentId in the resource path
Merge pull request #80 from witlessbird/content-update-fix

changed ContentResource#update to use contentId in the resource path
Fixed a couple of bugs:
* scrollbar behaviour;
* bubbles ordering,
Cleaning things up a bit
Fixing merge conflicts
initial comment by cbh
-q
add jquery and jquery-mobile files
add support for frameworks (jquery-mobile is it for now)
added blank lines to the end of each file
dirtdarren.dac
ftp.py v1
[BUG] Actors cannot override #send
Merge pull request #139 from celluloid/bug/send_override

[BUG] Actors cannot override #send
Added class + user selection for mobility plots (issue #216)

Note: Class selection is a special case that is unique to Mobility plots. In order to determine which classes the current user is privileged, we use class/read with the class_role parameter to obtain only accessible classes. If no classes are available, the user should still have a "No class (self-only)" option to view one's own data.
build ceph base tarball and debs with -fno-omit-frame-pointer
update gitbuilder vm hosts; comment out some obsolete ones
Added BSD-style license to project
for I shall commit IV
Get keywords if hash exists fixes #1951
Merge branch '2.1/develop' of github.com:swilla/pyrocms into 2.1/develop
Missing object init for $data
Bumped version numbers
Very minor formatting.
Adding multiple relationship support into streams_core if anyone needs it before the new streams nested tag syntax in 2.2.
Fixing a bug where the wrong ID could theoretically be passed as the entry ID to profile inputs.
Fixing integration issues with alt process field types in the user plugin.
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into release/2.1.5
Bumping version numbers.
Updated release date
Fixed conflict
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop

Conflicts:
	system/cms/config/constants.php
Fixing undefined variable error.
Update system/cms/modules/wysiwyg/views/files/index.php

Added slashes to the name so that single quotes to fix a syntax error when they exist int he file name.
Adding in some missing tag/event fixes.
Fixes an issue getting a field by slug

When retrieving a stream field by its' slug there is a conflict with the
cache where it doesn't respect the namespace that a field is in and
instead returns the first instance it finds in cache. This simply
updates the cache key to use namespace:slug to avoid this conflict.
Update system/cms/language/dutch/global_lang.php
Fix for bad function call in file field type.
Fixing PHP error where sections are empty.

Addresses #2007.
[Sanitizer] Add internal_isatty to sanitizer_libc and PrintsToTty to determine whether error reports are printed to terminal

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@167298 91177308-0d34-0410-b5e6-96231b3b80d8
Remove the setjmp.h dependency, fix the comment.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@161662 91177308-0d34-0410-b5e6-96231b3b80d8
Added ★ and ☆
Init devicetype page
continuation de arbre.c, mais c'est recursif.
Tweak a bunch of things with file attachments.

This change makes a bunch of tweaks to the file attachments view. Probably some
similar tweaks could be made to screenshots but seeing as they're effectively
deprecated, I didn't see the need.

First of all, I've linked the file's thumbnail to the review UI, if appropriate.
This was probably my #1 annoyance with the new system.

Next, the spacing was pretty ugly. This ended up being the product of several
different issues:
- The filename had way too much spacing, which forced it down into an ugly
  position instead of seeming like a title. I've eliminated the top and bottom
  padding.
- The thumbnail image had a max-height of 6em, and the entire file had a height
  of 13em, which meant that the thumbnail image got scaled down in an ugly way
  (to about 68px instead of 100px) and the caption bar got way too much vertical
  space. To fix this, I made the height of the thumbnail always be 100px and
  eliminated the hard-coded height of the file div, letting it scale to fit its
  children.
- After this, attachments with no caption would end up with a collapsed caption
  area. I've given it an explicit height so it's always pretty.
- The empty captions were pretty crappy. I've made it so if there's no caption,
  it explicitly says "no caption" in grey italic and added some javascript to
  the inlineEditor's "complete" handler to toggle the approprate classes.

Testing done:
Attached several images to a review request and double checked all the spacing.
Saved one caption as empty and reloaded the page to see the "No caption" text.
Edited that caption and saw the style switch back to normal. Removed the caption
and saw it be replaced with the italic "No caption". Verified that both draft
and non-draft captions worked as expected.

Clicked on the thumbnail images to load up the review UI.

Verified appearance in Chrome, Firefox, and IE.

Reviewed at http://reviews.reviewboard.org/r/3569/
Add docutils as a dependency.

This is needed for ReST thumbnails.
Fix overzealous caching of static media.

When upgrading a Review Board site, the static media references would
often be pointing to the wrong places. This was because Django cached
the resulting media files in memcached, which is definitely not what we
want. However, it will first try a "staticfiles" backend, which we can
dynamically add and point to local memory instead.

We do this after we've loaded the rest of the settings, ensuring we
have settings.CACHES set up.
Don't show "None" for the repository for review requests in the dashboard.

Review requests not backed by a repository had "None" listed in the
Repository column in the dashboard. This changes it to simply be blank.
add support to create/delete networks, acls, nat rules
additional functionality to check server status
MInor fixes
Add ability to create RANGE ACLs, delete ACLs
Add comment about pending work
Add proper docstrings and rename variable names  to appropriate meaningful
names
Add ability to create and delete keypairs
List SSH Keys.
fix merge issues
Add ability to create and delete keypairs
Resolve merge related issues.
Minor Fixes
Merge branch 'trunk' of github.com:chirag-jog/libcloud into trunk

Conflicts:
	libcloud/compute/drivers/ibm_sbc.py
	libcloud/compute/drivers/opsource.py
Remove useless postMessage call

Oops.  This is left over from when this used to be in /frame.
Fixed a merge conflict in the list form.
Travis Patch 3
Added a message box and normalized input to search term field
Added stats counter, commented client side code
Validated HTML, commented server side script, less and html
nep runs on default theme
Merge remote-tracking branch 'upstream/master' into exceptions

* upstream/master:
  Use new json function in doc
  [docs] fixed typo
  [docs] fixed typos
  [docs] added cookbook recipe on how to disable CSRF Protection using FormExtension
  Use the application charset as default charset for `$app->escape()` method.
Removed index.php and .htaccess from .gitignore
Added support for array style callbacks on the Error handler, plus a unit test
Skeleton of UICV
edit works… but buggy!
RevA version, as shipped.
Add todo for Rev B
tags created in lower case; fixes #1
Integrated in the IniRealm to provide information about permissions
make sure everyone is a user
a little smaller since 25fps is too low

Max map size is about 50k tiles. Over that drops the fps to a noticeable
point.
edit default page text
Update em-warden-client

Change-Id: I2273d35d7d1472051f3de7d24b7ffb00001fa720
Start waiting for link after succesfully starting

Change-Id: I17f9530a9ea48e3e2ba1f4cc79de70e176bc2fe3
Add transient STOPPING state

Change-Id: Ib5b1e960872334745f908b24432a8cf4c607a682
Notify the system of a crashed instance

Change-Id: I8732939907b4d6cf2ab1676cf0854bda04796bec
Update notes for submitted changes

* Give netcat more time to start during tests.
Send notification based on user's email setting.
Merge branch 'master' of https://github.com/clydeli/HECCAdapter
Estilos dos botões do formulário
But all client files in client directory
Added hacked-together version of Postgres example database
Postgresql hackery
Adding extensions to enable tests for APC, Memcache, and Memcached tests.
fixed diskpart scenario
Add comments describing node type properties
Added Stars and fadey whale
Adjust tip-arrow colour
BUG 10065 Cuando carga una pagina de new case u otra funcionalidad sale un mesaje erroneo SOLVED

- In the callback function "failure" don't vaidate if a valid mesage exists
- Verify if a valid message before show the popup
Merge pull request #957 from julceslauhub/master

BUG 10065 Cuando carga una pagina de new case u otra funcionalidad sale un mesaje erroneo SOLVED
Fix bug with the email sent in the events
Merge pull request #467 from julceslauhub/master

Fix bug with the email sent in the events
remove "component.json" dep of component target in component-create(1) makefile

at least my version of Make seems to be over-eager, probably
due to textmate doing something
remove logging from component-convert(1)
add --standalone [name] support to component-build(1). Closes #34
[mr2010] Update spell dbc extractor
[mr2011] Fix crash in func. IsAtGroupRewardDistance() on multithread environment
[mr2012] Fix conflict external ACE with Mangos in win OS.
SD2 renew
[mr2013] add internal map locking to direct operations with map objects store. related to #941, testing. may cause freezes.
[mr2014] implement and use MAP_LOCK_TYPE_THREAT
[mr2015] Use damageInfo in CalculateSpellDamage() method v5. also implement ResilenceAlternativeCalculation for all damage. Related to #75, #1014, testing
[mr2016] try fix crushes in EffectPowerBurn. need test.
[mr2017] tru make proc on splitdamage effects v2. need test. related to #873, #1025
[mr2018] additional pet cast check from Zakamurite. also some verbosing in log messages
[mr2019] clear player cache while player delete. related to #1024.
Merge branch 'master' of git://github.com/mangosR2/mangos
Revert "[mr2015] Use damageInfo in CalculateSpellDamage() method v5. also implement ResilenceAlternativeCalculation for all damage. Related to #75, #1014, testing"
sorry, wrong commit :(
This reverts commit 18e12752e0859dc205f229c2c6875bda1c4fd99c.
[mr2020] Use damageInfo in CalculateSpellDamage() method v6. also implement ResilenceAlternativeCalculation for all damage. Related to #75, #1014, testing - also some additions in DamageInfo method (not affected to current calculation) for feature use.
[mr2021] some style changes
[mr2022] add some vitual destructors because class has virtual function
[11995] Fix following for guid linked npcs on evade

Thanks to grz3s for pointing

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11996] Fix targeting for spells like 53022

Thanks to Inquisitor for pointing

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11997] Add spell support for 54092

Thanks to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11998] Implement fail chance for spell 54732

Ths to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[mr2421] define unordered_multimap for use intead of std::multimap. may broke Win compilation, need test.
[mr2422] restore suddenly disappeared code for aura modification of creatures regen. need test, must fix at least vehicles regen.
[12257] Improve error output for invalid waypoint texts

Conflicts:
	src/game/WaypointManager.cpp
	src/game/World.cpp
[12258] Avoid crash and .pool command

Conflicts:
	src/game/Language.h
	src/game/Level2.cpp
[12259] Add more checks to creature_addon auras field

Note for DB-Devs: There are tons of spells with LOG_FILTER_DB_STRICTED_CHECK disabled, please start to review these errors, and give feedback if there are false positives among them

It is planned to change these checks to be applied always
[mr2423] rewrite MapObjectsStore v0.13   - use GuidSet for make object-safe UpdateDataMapType (this fix at least pet action bar after mount)   - use unordered_map instead of TypeUnorderedMapContainer template collection   - full rewrite object update making system, make dependent update queue for players items   - add Transport objects to current Map storing/updating system (currently by half-hack)   - simplify code   - use storing guids instead of pointers in Camera/Viewpoint subsystem for fit new object storing system   - fix very old bug with Sentry totem (appears only now).

    NEED TEST and measurements CPU load and resource leaks! related to #1165, #1083, #852
[mr2424] fix problems with item update after "rewrite MapObjectsStore".
[mr2425] correct player-in-map search after  rewrite MapObjectsStore. seems old method obsoleted.
[mr2426] implement safe basic (only debug commands and placeholders for in-map operations) part of transport rewrite. need test by GM (transport commands).
[mr2427] changes for speedup WorldStateMgr (don't use double copy StatesSet). close #1239 attention! possible meleaks here, need continue observation.
[mr2428] use UNORDERED_MAP in WorldStateMgr.
[mr2429] use UNORDERED_MULTIMAP in SQLMultiStorage. testing.
[mr2430] improve WorldLocation structure. rewrite WorldObject binding to WorldLocation instaead of some separate uint32.
[mr2431] tempfix for badly hacked spells after 2401. be removed after full rewrite targeting on WorldLocation structure.
SD2 update
[12260] Fix hidden memleak with waypoints

Thanks to rsa for pointing
(note: Schmoo version more correct then my)
[mr2432] fix compile after mr2430
[mr2433] remove unneeded script call from MO_TRANSPORT
[mr2434] revert part of 2411 for fixup charge-like spells
[mr2435] fix wrong virtual definitions in WorldLocation structure and simplify code.
added test file and rendering for bindings
Update AUTHORS

Change-Id: I54028d9afa67f3c9eafb5b571d52df6ebdd5ea18
Reviewed-on: http://review.couchbase.org/22398
Reviewed-by: Rod Vagg <rod@vagg.org>
Tested-by: Rod Vagg <rod@vagg.org>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Increase bucket deletion timeout.

Databases deletion can take significant amount of time under certain
conditions. Seen in MB-5230.

Change-Id: I9eca2fa813151c61eccb4bc066702c0020e04a74
Reviewed-on: http://review.couchbase.org/15652
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Make ns_rebalancer:unbalanced strict about missing nodes

[alk@tut.by: shortened subject line]
Change-Id: I47d25a1a634cf4e9e702921dc273ca5bbfe8aadc
Signed-off-by: Aliaksey Kandratsenka <alk@tut.by>
Reviewed-on: http://review.couchbase.org/15672
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
MB-4176: use rounding to get 3 digits of numbers

Instead of Math.floor

Change-Id: Ia37e6f1304bde1a47a1e1029550c295956d74910
Reviewed-on: http://review.couchbase.org/20007
Reviewed-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
move vundle stuff to vimrc like a normal person
remove empty vundlesettings file
adds vimux for tmux handling
uncommented conque term configuration
latest vimrc
Removes the vimux bundle again
removes the vimshell mappings
Removes the vim consoles, using tmux now
Fixes streaming styling.
Ignore npm-debug.log
Bump to v0.0.3
renamed file and encoded as mp4
blah
merges resolved
'stuff'
fixed some shit
Changed git review to no longer use --name-status. It will now output just like git diff does and accept the same options.
mało istotna zmiana
Added important info in OgmoLevelLoader class's comments: "First tile in spritesheet must be blank or debug. It will never get drawn so don't place them in Ogmo! (This is needed to support many other editors that use index 0 as empty.)"
Add options for setting which files to write to.
[#1230] Fix subtitle positioning inside relative-positioned containers
Merge branch 't1230-SubPos' of github.com:cstigler/popcorn-js into t1230-SubPos

* 't1230-SubPos' of github.com:cstigler/popcorn-js:
  [#1230] Added newline to end of file
  [#1230] Remove obselete tests (browser now handles repositioning for us
  [#1230] Fix subtitle positioning inside relative-positioned containers
Added Code
Chetan Thayur
chetan.thayur@gmail.com
Integration tests not dependent on local database anymore :). Now using h2db instead.
Merged conflicts from pull request
Cleaned up pom's to be consistent with rest of project. Renamed directories to match module names.
Removed old sql files. Updated service integration test output folder
Service integration tests now working without transactional wrapper. Added cleanup to delete load balancers after tests complete.
Added ability for  switching adapters from config file.
Added zxtm core module
Merged conflicts
Ported over most of the Zxtm adapter code. Got rid of deleteNode in the load balancer adapter as we already have a deleteNodes call.
Pulling extensions into the core project
Enabling support for extensions from config file
Merge branch 'core-refactor' of github.com:lbrackspace/atlas-lb into core-refactor
Adding the Service annotation to ZXTM Adapter
Zeus integration tests now connecting properly with enpoint. Modified host table to be more generic. (v1 TK-11253)
Merge branch 'core-refactor' of github.com:lbrackspace/atlas-lb into core-refactor
Added more zxtm adapter operations along with integration tests. (v1 TK-11253)
Modified adapter to take in domain objects. Added more Zeus adapter integration tests. (v1 TK-11253)
Added more integration tests for Zeus adapter. (v1 TK-11253)
Added IPv4 as default vip when not specified on create lb. Added some tests for the virtual ip service. (v1 TK-09338)
Adding support for pluggability for extensions based on config files.
Habilitando THUMBNAIL_DEBUG = True para ver porque no me esta funcionando sorl-thumbnail arriba
Revert "Revert "changed back to ul""

This reverts commit 54a388232776a8ab849acec01eb5a8d232b870be.
Removed sqlite3 from Gemfile
Removed sqlite3 from Gemfile
Add a StaticPages controller
Finish static pages
Finish static pages
Merge branch 'static-pages'
add ack.vim
add plugins unite.vim , vimfiler.vim
deleted a bunch of unused images
added an npm test script
added ant building scripts and phpunit.xml update
attribution
Merge branch 'master' of github.com:d-snp/ludum-dare-23
more neighbours
Cleaning out comments in filter
fixed a path fail
Add node_modules to gitignore
Make the youtube function get the id with url instead of regex
Merge pull request #1 from Kyso/master

Made the YouTube function not use regex to pull an ID.
Fix for issue 261. It appears when you are working with two moment objects and you take the diff, the input moment's _isUTC is ignored when you parse the input into inputMoment. I've done a check to see if it looks like a moment object (by checking the _isUTC to see if it is defined) and if it is, then it just copies the input rather than parsing it. I think it should work fine on regular date objects as there is no _isUTC member.
Client web-service generated through Spring framework.
Merge pull request #208 from jordi-puig/feature/client-ws-spring

 Web-service client generated through Spring framework.
Merge pull request #37 from dana-i2cat/feature/readme-file

Feature/readme file
Changed Label a little
Added draw to Rectangle2
Added Font2D
Added inherited constructor to GUI
Fixed Font
Added TextBox
Window constructor waits until init is done
Fix glob installed volo not finding local modules

Update volofile format
Update README file to reflect new volofile format
Merge branch 'volofile' into dev
MDL-34444 - actually display the title, just don't link it..

Don't worry, i'm going on holiday, so i'll be away from this git repo
for a while to prevent any more mess.
Root page has level 0 when it is the only node in the tree. Since
asserting this requires iterating over the records, which might not
be possible, simply remove the check.
Cleanup compiled files
サブアクティビティーのIntentFileterを削除（アイコンが増えてしまうので)
Renaming ctrlp.vim to ctrlp
Add: autotesting system, cpp API and tests yaml parser uses this API to create tests
Add: Asserts and getters for autotesting system, renamed test to action, moved parsing into autotesting system
Add: operators == and != for VariantType, changed autotesting system getters and asserts to work with VariantType
Add: assert message, can save report to file if define __DAVAENGINE_AUTOTESTING_FILE__, fixed assert bool
Add: autotesting Scroll action to scroll to element at specified path
Add: autotesting for macos
Add: UIList::GetOrientation()
Fix: calculate physical point from virtual. Add: Thread yield for posix threads.
merged with development
Merge branch 'development' into feature-testing
removed unused files
Add: YieldThread
Merge branch 'feature-testing' into development
Merge branch 'development' of github.com:dava/dava.framework into development
[DF-452] Added some hotkeys for landscape editors
DF-291 fix: call executables using os.spawn
DF-276 fix: allow sprites to draws with filps. Fixed one more time
Merge branch 'development' of github.com:dava/dava.framework into development
Fix: Logv corrected buffer size calculation for case if the size is exceeded
Fix: add uniformLocation ckecking
Fix: add icon for invalid node
Fix: changed icons for scene & data nodes
Added code to setup old lod distances for all scene objects
Refactoring: removed unused params
URL for MathJax CDN is now HTTPS safe
Added auditing to report generation
Started engine support for allowReview
parser: add `community_rating` attribute (closes #28)
small bug in header
dynaload is integrated to txt module
realtime pos display
writeMode enabled
infoBox has a module
first filter (buggy)
new file:   pgXplorer.desktop
Some podlator stacks do not like multi-word =begin
More extensive travis testing plan
new a file
add b
#66 Deployment and error handling
#93 Added some debug information about the request used when creating
the template
tcp over tcp
move row key to a more logical location
Makefile modified & abstracted print
setting up the theme structure for styles
Debugging code
Debugged code and added git files.
Switch from QGraphicsWebView to QWebView - QGraphicsWebView doesn't work on OSX
#290 JVM in web start had to be told about default encoding.
Merge pull request #666 from delving/12.08-jvm-char-encoding

#290 JVM in web start had to be told about default encoding.
Merge pull request #285 from delving/next

RecDef, RecMapping, RecDefModel now use version
Merge pull request #287 from delving/next

De-duplication
Merge pull request #288 from delving/next

RecMapping hacks initial version numbers
Workaround for:

Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
            at sun.font.FontDesignMetrics$MetricsKey.init(Unknown Source)
            at sun.font.FontDesignMetrics.getMetrics(Unknown Source)
            at sun.swing.SwingUtilities2.getFontMetrics(Unknown Source)
            at javax.swing.JComponent.getFontMetrics(Unknown Source)
Merge branch 'master' of github.com:delving/sip-creator
Merge pull request #289 from delving/next

fact-definitions in repo
Merge pull request #292 from delving/next

Tooltips, trimming arg, FileSystemFetcher etc
Merge pull request #294 from delving/next

IMAGE_URL System field, new RecDef method
Merge pull request #295 from delving/next

#293 getFieldType now returns default when it's not defined, and null wh...
#293 fixed broken build.  fieldType also for attributes.
Merge pull request #296 from delving/next

mapping engine avoiding bad augmentation.  anonymization trickery
Merge pull request #297 from delving/next

Schema version of mapping being set upon dataset load
Getting the TestMappingEngine to work again. ESE and Delving namespace issues
Initial setup for having DataSetFrame replace DataSetMenu.  Some nice restructuring.
#298 Starting up with data sets frame.
#298 Restructuring, added ViewSelector so that the dataset choice can change the view.
#298 List with icons, and HtmlPane for details.  Download and release done from Data Sets frame now.
#298 Unlock button, and "owner" to distinguish from mapping locks
Merge pull request #300 from delving/dataset-frame

Dataset frame
Current work on site renderer
organizing testing exec functions
Updating logging temporarily
Fixing issues with async
Refactoring to use blueprint
Updating head.js renderer
Getting renderer working with blueprint
Updating renderers for content
removing commented out code
Full site rendering done. Still needs better error logging
Preview 5 (Dependency on WCF Data Services removed)
See WcfDsExtensions.cs
Removing unneeded App::uses() call
Fix variable naming.
Load routes as late as possible.

As a concequence - routes will also work by default in the cli
unbrake Console/cake on osx
Improve error message.

Fixture datasources must begin with test so you don't accidentally use
a real datasource.

Fixes #3254
url encode nested named parameters in unmatched routes

reference: #2988
and 31033239bd06750358a8aea3542392209234278a
Cache character set names
Update doc blocks to reflect reality.

Closes #3263
Update doc blocks for logging + scopes.
Fix issue with logging scopes

Logging scopes should be exclusive and not allow messages matching on
level alone to be logged.  By using scopes + levels you opt-in to new
behavior so grabbing all messages by level should not occur.

Fixes #3264
Merge branch 'master' into 2.3
Merge branch '2.3' of git://github.com/cakephp/cakephp into 2.3-fixed
Fix code style errors.
Merge branch '2.3' of git://github.com/cakephp/cakephp into 2.3-fixed
default value null makes more sense. add test cases for false.
remove default value for debug's first argument
Allow specifying tag for current page number. Closes #2892
Merge pull request #899 from dereuromark/2.3-more-tests

default value null makes more sense. add test cases for false.
Merge branch '2.3' of git://github.com/cakephp/cakephp into 2.3-fixed
Added unix_dgram_server class test
General code improvements

E.g.:
- restructuring order in some functions
- Fixing some possible memory issues
- Comments
- ...
backend link fixed
Add definition of iconv-convert from uim-trunk/scm/util.scm because uim-1.8 branch does not contain this function.
Add install of bushu34h+.{index2,expand} and bushu12.{index2,expand}.
Fix indentation
Bump to 3.1.2
update catalog layout
UTF-8 fun again.
Model 2.2: Some improvements in the Cache Manager; minor bugfix
20/08/2012
Fixing js style.
Merge branch 'master' into production
Facebook description test
Merge branch 'master' into production
changes the Gemfile (new relic in prod. mode) and loads locales in subfolders
adds a thumbnail for Facebook
add slashes / makes upload work finally
added basic CSS to make popup look less shabby
Load tmuxinator, if available
Use java_home to set JAVA_HOME
Defaults for difftool/mergetool
Updated submodules
Starting work to integrate SD code.
Modifies the Wirefree library to use flash memory for the storage of the wireless module command table
Adds a WebServer sketch which serves a webpage stored on the SD card
Revert addition of WebServerSD sketch
Merge branch 'master' into experimental
Merge pull request #6 from benquark/experimental

- Syncs experimental branch to commit 28c2e8aedc2cb3ab50db096f9fbaa19c0d6c65fe on master
- Adds memory optimization changes
Merge branch 'master' into experimental
Added core module with basic contracts.
change name of production host from "librarybox" to "bibliobox"
change name of production host from "librarybox" to "bibliobox"
Merge branch 'master' of github.com:djfiander/BiblioBox
Added all my files
Merge branch 'master' of https://github.com/dlees/Scalise-Audio
Update hm package

Signed-off-by: Oleg Bulatov <oleg@bulatov.mobi>
Removed host-nibbler package

Signed-off-by: Oleg Bulatov <oleg@bulatov.mobi>
Do not fallback to full root scan on index errors

Signed-off-by: Oleg Bulatov <oleg@bulatov.mobi>
Update include/fix_tag.h
notifications: Fix first_notification_delay

Nagios bug #297, while being light on details, points out a problem with
first_notification_delay that I think this patch clears up.

The problem is two-fold: first, the logic for finding out which state to
use is incorrect - a comment rightly points out that last_time_{ok,up}
is the wrong value to use, and then proceeds to use any value that is
both more recent and less recent than last_time_{ok,up} - this condition
is likely to fail, meaning we always use the incorrect value.

Second, the logic is impossible to correct, though, because all the
other values are incorrect, too - we always set last_time_$state
whenever a check is executed, meaning the problem last_time_$state
variable would usually be too recent.

This is fixed by redefining last_time_$state. They used to be "the last
time a check returned $state", now they're "the last time an object was
in $state". The change is subtle, and the value is usually updated the
way it was before, but when the state changes, we put the end time of
the previous state in last_time_$previous_state, rather than putting the
start time of the current state in last_time_$current_state. Nagios core
does not use these variables anywhere else, and it's unlikely to break
other peoples code, since last_state_change is a much better way to get
the start time of the current state.

With this change in place, all we need to do to find out when a problem
began is to read last_time_{ok,up}, use that to compare against
first_notification_delay, and we're done.

Signed-off-by: Robin Sonefors <robin.sonefors@op5.com>
Update lib/active_admin/locales/zh_cn.yml
Make spelling in generated migrations correct and consistent
Merge pull request #107 from aderuwe/spelling

Make spelling in generated migrations correct and consistent
patch validator to avoid making mess with global namespace close #13
more comments and cleaning up
added initial test prog
Changed current limits
Revert "Don't sort move list in treeclimber for ~2x speed up" for now

That commit missed that the `if (bscore < 400)` required the scores to
be sorted.  The correct solultion might not have the sort, but it is more
complicated.

Revert for now so the castling fix can be pushed.

This reverts commit b32c79471e9c8ed99628d0893580cd4003f80c40.
Don't mistake a knight for a rook when checking for castling

The sliding pieces -- bishops, rooks, queens -- have the 2 bit clear
and the 4 and 8 bits set for diagonal and straight moves
respectively.

When checking for castling blockers, the 2 bit wasn't checked, so the
knight could be mistaken for a rook and a king for a queen.

Again based on a report from Ivan Yelizariev.  Thank you!
Add Ivan Yelizariev to the contributors list for his excellent testing and bug reports
Merge branch 'master' of ssh://p4wn.git.sourceforge.net/gitroot/p4wn/p4wn
added .h files from book
added sqlalchemy-migrate to requirements.txt
structure stuff
freshened query builder. added contributor type. cleared out some old crufty fields.
Fixed hardcoded parameter that was left from a test case
Use hsqldb as database and ormlite as orm. Added the jars.
HOPKINS: Remove useless tests in CENSURE()
removed unnecessary art
Initial work for Perspective persistence.
some fussing with the proof of the sqrt(2)'s irrationality.
Exit after printing help usage.
Use Totem::Unsummon when new totem replace old totem

Signed-off-by: dr.skull <dr.skull@centrum.sk>
Cambios para empezar a mejorar rutas en OpenLayers
Adding a few more checks prior to publishing reviews
show warn error
Reverted two files.
issue #1603:change pathes of android codes
Merge pull request #1772 from minggo/iss1603-adjust-directory

issue #1603:change pathes of android codes
issue #1603:modify path of cocos2d-x
Merge pull request #1773 from minggo/iss1603-adjust-directory

issue #1603:modify path of cocos2d-x
issue #1603:modify some path for auto building
Merge pull request #1774 from minggo/iss1603-adjust-directory

issue #1603:modify some path for auto building
repair linux cli build
repair linux eclipse build & add 64-bit project configurations
Compilation fix for Android clang 3.1
Merge pull request #1778 from mingulov/clang31_compile

Compilation fix for Android clang 3.1 toolchain
Merge branch 'lnximprove' of https://github.com/ivzave/cocos2d-x into linux
fixed #1621: fix compilation error of eclipe project.
Merge pull request #1779 from dumganhar/iss1621_linux64_eclipse

fixed #1621: Adding linux 64bit target for eclipse project and fix compilation errors.
Transaction to c++.
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini
Jenkins script for auto-generating and committing JS bindings.
Merge pull request #1434 from folecr/autogenscript

Jenkins script for auto-generating and committing JS bindings.
Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-schedule
Merge pull request #1433 from rohankuruvilla/gles20

Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modif...
fixed #1500:make rendertexture work ok on certain Qualcomm Andreno gpu
fixed #1500:fix a memory leak
Merge pull request #1435 from minggo/iss1500_rendertexture

Iss1500 rendertexture
Update to latest generated JS bindings
Allow partial run of script when cocos2dx remote repository is not set.

 * Also fix some comments.
Merge pull request #1437 from folecr/updatescript

Allow partial run of JS bindings script when cocos2dx remote repository is not set.
Merge pull request #1436 from folecr/latestjsbindings

Update to latest generated JS bindings
issue #1469: Added MoonWarriors sources and made it works on windows.
issue #1469: Made MoonWarriors works on android.
issue #1469: Exported 'cocos2dVersion'.
issue #1469: VS2010 compilation works.
issue #1469: Ignored 'getBlendFunc' and 'setBlendFunc' for CCSpriteBatchNode,CCMotionStreak,CCAtlasNode,CCParticleBatchNode,CCLayerColor,CCParticleSystem.
issue #1469: Updated solutions for vs2008 and vs2010.
issue #1469: Added cc.config for js-bindings.
issue #1469: Added 'setBlendFunc' support for CCSprite, CCParticleSystem...etc.
Added "weight_limit" Parameter
Fixed dynamic linking issue for recent gcc/linux versions
Network started

The beginning of a network is created. It will be responsible for
encapsulating the "city network".
Update tumblroauth/OAuth.php

Added check for class existence when defining OAuthExcpetion
corrected save command
...
Merge branch 'master' of https://github.com/dynaclic/jqCalendar
qtip2
Created version 0.1 of Battle Mode

Limited network play has been achieved, up to 2 games can connect for a
match between them. One of them must act as the host and the other must
act as the client. A TCP socket on both ends provides the communication
channel to send and receive the data of each of the players.

This first testing version of Battle Mode will not be like this in any
future version.

A Game server is on development to handle game coonnectivity with a very
scalable approach.
Fixes on titles
[#35167153] Added templates for LDAP users administration
[#37024199] Added border to species image gallery
Merge branch 'master' of github.com:eaudeweb/cms.themes
Moved split-node into a local function inside insert. Is is not needed anywhere else.
Corrected markdowns
newsletter telefilmes
Merge branch 'master' of github.com:edse/cmais-frontend
header
Merge branch 'master' of github.com:edse/cmais-frontend
tvcocorico
arvore Castelo
starting 0.7.3 development
fixed issue with event handler repo storing sequence
reving to 0.7.3
Splash screen implemented in Binary to mask loading.
Sma Ingubreyting
better touch support

the previous touch support detection would'n support android devices, the new one does. The code was extracted from jquery ui touch/punch plugin.
Merge pull request #41 from claudio5678/patch-1

better touch support
static recompilation now works, ignoring self-modifying code
Added deg unit to the file reading utility
added better support for CtrlP and TagBar
Made a sensible behavior for object collisions.

Tiles block you in the direction of collision; objects bounce off
   of each other in the direction of collision.
updated new version bar styling
Set config.assets.compile = true: The World Has Turned and Left Me Here
MDPI Landscape IMAGE_LIST_ACTIVITY
Merge branch 'master' of https://github.com/emobc/emobc-android.git
copying nunit framework dll
Updating default layout to match the correct markup
Added FileContentContext.cs.
Removed ContentInfo.ValidExtensions. Instead, the XNA content
context will strip extensions off of requested files.
Added Ed.Contentious.XnaWindows project.
Forgot that ContentContexts need to track and dispose of their
child contexts. Fixed now. Also did a little refactoring on
FileContentContext to use Dictionary<String, IDisposable> for
the internal object cache. Smoked out a ContainsValue where I
meant to have a ContainsKey, so I'm calling that a success.
Added idempotence to ContentInfo and its fallout to ContentContext and FileContentContext.
Added first pass at a Windows XNA library.
minor cleanups, reduced main project's requirement to 3.0.
documentation
docs.conf: Autodoc defaults.
remove README from dir
Fix #1247, #1201: Don't cache eejs blocks!

Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
Merge pull request #1268 from ether/fix/eejs-block-caching

Fix #1247, #1201: Don't cache eejs blocks!
Added select() to ManyToMany
Agregado reporte de pelicula mas vista de todas, no me jodan ya son las 3:00 am gg con esta shit
collectors/dns - redoing the input mechanism to use hostname as identifier

collectors/dns/lib/panoptimon-collector-dns/dns.rb - refactor
collectors/dns/dns.json                            - reconfigure
collectors/dns - now with nameservers, types correctly

collectors/dns/README.md                           - documentation
collectors/dns/lib/panoptimon-collector-dns/dns.rb - reworked
Add timeout feature for busy_wait
Merge branch 'master' of github.com:ewust/xmaspi-client
ECMS/FQA-182: Admin - content type
Common/FQA-31 - update TestBase
Common/FQA-31 - update TestBase
EXOGTN/FQA-32 - Common function for exogtn
Common/FQA-31 update Testbase, ECMSBase
EXOGTN/FQA-32 - Common function for exogtn
FQA-69 - [SELENIUM] Organization - User and Group Management - add
FQA-171 update poms to use SNAPSHOT version
Bind template new.....
Fix problem where stacked AttrTransforms clobber each other.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
allow URLs bigger than 255 chars
js: Add createAction function to settings object
Remove unused tags
Comment tweaks
making the initrd
fayServe text/javascript. Reverted example devel.cfg to dev settings
Portrait tablet test
Now in Maven Central
Removidos dados de email
aleteracao de grade
Merge pull request #16 from paulociecomp/master

Adcionando a programacao
formulario banda
Removed test slide images from repo.  Use your own.
Added timechart2 src dir
Added the Files/Images folder
some fixes
search fix
Merge branch 'master' of https://github.com/dasasha/punk-shop into dasasha-master
change open file permission and add note for interface
Merge branch 'v0.2.0.undo.120703---flog_adjustment' into v0.2.0
fix bug for sending chunk response
this file is used with the calculator in the program,this/
is used by the cell.cpp file.
Início do projeto.
Alterou-se o projeto para Maven.
specify unitType for spareCPUs
ローカルリポジトリは削除しない

怖いから
注意を出すタイミング変更
update ExcelReader
link to create new scene on project listing page
admin.php gefixt die durch merge fail komisch war
Setup cap deployment
0330 01:27
0330
Updated DB2 info
Use old-style URLs to go with old branch
Move the application url to an environment variable
Tix 371: mic_profile module; name fields; inline css setup
Tix 633: make reload start at top by sending current page to redirect instead of reload
Tix 371: additions to profile form
Fixed typo (as if that matters now ;)
basic tables working
[20121004]Initial upload of apue2-note
Initial commit
Initial commit
Merge branch 'master' of https://github.com/idono1301/mygrades
I forgot what changed.
adding some evals stuff
Changed gemfile rake version.  Added student dependancy on course.
mygrades
working file upload
Merge branch 'master' of https://github.com/idono1301/mygrades

Conflicts:
	config/routes.rb
	db/schema.rb
working file upload
Error in routes corrected
working student upload and grade uploads
with misc. bug fixes
Changed Category Model to accomodate weight.
View Homework Total Based on Student

Will need to implement function into controller afterwards
Student views now shows homework, lab, midterm totals.

Uses student_helper.rb to calculate category totals.
Will probably need to create a session database for storing calculated
totals in order to accomodate weight.
Generic CSS modification, new table layout.
Will try bootstrap
Bootstrap working. New Navigation Layout with CSS
Fixed CSS Error on application.css.scss
Category MIgration fix for Heroku
Item11267: Convert to modern perl version string

git-svn-id: http://svn.foswiki.org/trunk/EmptyPlugin@15689 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Implemented solver based on Cholesky decomposition
- Update my key
- Merge the following from the English version:

	r18652 -> r18758	head/ja_JP.eucJP/books/porters-handbook/book.xml

Submitted by:	Hiroo Ono <hiroo _at_ jp dot FreeBSD dot org>
Reference:	[doc-jp-work 1765]
Подвал готов меню убрано ЛИЧ КАБИНЕТ

ИКОНКИ YESS)
[SCRIPTS] remove backfire
[SCRIPTS] add dns bonjour geo update script.
for geo trace on nabber.org http://bit.ly/UoGAQ2 and Wide Area Bonjour over dns.
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
Merge https://github.com/friendica/friendica into pull
prevent duplicate friend suggestions
rip out fpostit

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #241 from simonlnu/master

rip out fpostit
use zrl to get home again
zrl on mentions
silly mistake
Pridani tasku pro import clenu ze stare databaze

format je
rake import:users[<filename>]
Added .xbm icon for linux compatibility
PEP8.
Add supervisor_args keyword argument to ``up`` function.
A bit more compact.
We don't need to set the config file option, it's being searched in the default location anyway.
Prepare mr.laforge 0.3.
Bump.
Removed structured symbols mode.  Statically allocate QRinput.
updates templates for spidermonkey
adds sorted_classes

list of classes sorted by inheritance (parents first)
Added build profiles for client code
[Contribute][Tests] running tests on a single component
名前の衝突を防ぐために、動作フラグをローカル変数にせずに構造体としてまとめた。
deploying new version
support for multiline stack traces and config file test
Fixed LINT warnings
Initial commit
Aruba cloud.it driver - w.i.p.
Added support, in client, for multiple endpoints
Added server_create
Added valid_credentials function
Initial tests for aruba driver
Reindented code
Added support for addresses collection (create/destroy/associate/deassociate)
update for findAndModifySet
add level interface
Merge remote-tracking branch 'origin/master'
add click show draw view action && response.
Merge remote-tracking branch 'origin/master'
add traditional words.
Merge pull request #1 from gejinbao/master

中文切换
葛进宝

葛进宝
Merge pull request #2 from gejinbao/patch-1

葛进宝
This is China!
Merge branch 'master' of https://github.com/hayzonegjb/helloworld
abcdefg.php
jjjj.php
deleted
Merge branch 'master' of https://github.com/hayzonegjb/helloworld
add file
GH-4: Set up db migration for sti.
upd readme
upd LICENSE
GEOS-5308
Merge branch 'master' of https://github.com/geoserver/geoserver into upstream_master
Updating documentation
Added components to renderer object
General changes, I guess?
Added insertItem() method, and fixed related bug

Bug: when inserting not at the end, the final data object does not get the schemas assigned
Fixed bug with re-adding previously removed object properties
Fixed bug with wholesale replacement of objects/arrays
Additional test
Added basic type switching
Basic type selection
Updated tour/documentation
Updating walkthroughs/documentation
Forwarding error in Facebook demos
Merge branch 'master' into render-components
Fixed forwarding error in Facebook demo
Updating Facebook demo
Small bug (changed to use defined())
Added format() and formats() functions
Updating Facebook walkthrough
Updating Facebook walkthrough
Remove access token from fragment
multiplicative inverse in mod-n (WIP)
update package.json to work with node 0.8
add kmpsearch and bitmap
Inserindo opções no campo "Estimativa"

Inserido choices no campo estimate para limitar a quantidade de
pomodoros, que a tarefa terá.
Google+ plugin: Avoid Undefined property: stdClass:: error when crawling reshares without commentary, closes #1405
Minor code comment fix [ci skip]
Bootstrap play around

Signed-off-by: Gaurav Kukreja <mailme.gaurav@gmail.com>
Created table user_details, some associations, indices

Signed-off-by: Gaurav Kukreja <mailme.gaurav@gmail.com>
Working Devise with multiple models! Yay!

Devise is working. Registration works for more than one models together.

Signed-off-by: Gaurav Kukreja <mailme.gaurav@gmail.com>
Fixed errors

1-  Mobs spawning with no armor.
2- Server crash on plugin reload.
3- Potions not working correctly.
4-  Other things I don't remember.
Alteração do tamanho da Fonte, e no layout da tela de animais
move Person spec to correct location
Integrate Se acceptance testing framework; have one red test
Remove useless header.
Refactor receiver list to generate HTML content from the template.
Properly display receiver list.
Add file uploader
Delte submodules
Start implementing file uploader
* Setup all the required dependencies as submodules
* Refactor code to give better structure (mode ui stuff in ui dir)
* Click to upload a file and we see stuff comming on the backend side
  (IT LIVES!)
Configuring sphinxcontrib.httpdomain on the documentation.
Documenting prefix services with sphinxcontrib.httpdomain
Fix typo
Check _METRICNAME macro, assemble Graphite url in script and more options
move templates notifications.html to popup.html
Comment out what I really really really mean to.
Minor changes to ApiConnect. BaseUrl parameter to constructor made mandatory. New method getInfo added
Typo
Merge pull request #5 from genehack/master

trivial typo.
Added freedom of use and deferred liability clauses.
Ignoring extra eclipse settings
Merge branch 'master' of https://github.com/gpmidi/mediarenamer into gpmidi-master

Conflicts:
	mediarenamer.py
Reverted unnecessary changes from gpmidi-master branch

- Reverted python version from 2.6 to 2.7
- Removed environment-specific exclusion
Converted all remaining prints to logging method
Added usage documentation
Merge remote-tracking branch 'ricks/master'

Conflicts:
	.gitignore
Include installation notes.
seems to be ready to go live
Merge branch 'master' of github.com:grahame/transit2012
Merge branch 'master' of github.com:grahame/transit2012
go!
time zone codes
allow embedded time zones, or time from tweet
support wubi pinyin
many fixes and updates
added C-x k
Merge branch 'master' of github.com:greggoryhz/chromacs
updated list of commands
modify ignore file
delete submodules dir
Merge commit 'origin/master' into WINKSTART-904
Merge commit 'origin/master' into WINKSTART-904
Merge commit 'origin/master' into WINKSTART-904
WINKSTART-904: Work in progress for User Portal
Merge branch 'upstream'
merge upstream
delete temp file
Added  charset utf-8
WINKSTART-904: Work in progress for User Portal
Merge commit 'origin/master' into WINKSTART-904
WINKSTART-904: Work in progress for new userportal
WINKSTART-904: Work in progress for User Portal
WINKSTART-904: Load Module with the proper way instead of using the old loadModule method.
WINKSTART-933: New layout for managing credtis/limits in the account
WINKSTART-934: # is no longer displayed as an option for the newly created callflows.
Merge branch 'WINKSTART-933'
WINKSTART-936: Added a flag to customize the price displayed in the limits popup.
WINKSTART-901: Add SIP URI + reformat names of device types
Add JavaOOP and ScalaOOP to oop
small fix in cachefinder
new screenshots
modified:   README
	modified:   age.py
	modified:   movefile.py
	age.pyc
Fix bug where filter buttons didn't work
Add the project base files