labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed typos
Merge pull request #19 from nfedyashev/patch-1

Fixed typos
Changed version and reverted slop dependency bump
Added icons for status, warning, and error messages. As well as a text file icon and network status icons.
Added more icons and moved all oxygen sourced icons into a dedicated folder with a file indicating the license. Included sha256.js so I don't have to keep waiting for the slow google-code servers.
Moved to dgrid for the user admin module.
default gamestate intro
Minor improvements.
Fixed foaf:knows relations. They should be resources not literals.
fixed merging problems

stuff
[TASK] Whitespace-fix; space indentation
Added author resource to routes
Added scenario for books
Added paragraphs on metric and nonmetric MDS, explaining the difference
MDS: out_dim → n_components
Fixed some typos
Merge branch 'feature/connectionCallback' into develop
Merge branch 'develop' into ndReleases
Added image/x-ms-bmp
Added text/rtf
Merge branch 'develop' into patchReleases
Allow adding and removing entities during thinks
cleaning up

cleaning up bad codestyle
Data updates.
Moved file on schur(5)-investigations into dedicated sub-directory.
Update of general information on Schur-problems.
Fixing minor nit with makefile
bootstrap-tooltip.js needs to be ahead of bootstrap-popover.js
ack. it's '/js/bootstrap.js' not 'js/bootstrap.js'
modifying style info for dictionary lists (<dl>)
* renamed server.js to kickstart-http.js
* added DAO mockup
* added new icon files like favicon.ico & touch-icon-*.png
* added a few functions to vitesse.
* removed old views
* created new home view.
* updated most other about views.
login works(ish)
Better exception handling in OptionParser
All menus noe display correctly.

Found a bug in the displayAllEmployee funtion that cause all subsiquent
menus to come out left oriented. Added small bit of code to fix that.
added a .gitignore
Merge pull request #3 from eux/master

added a simple .gitignore
Modified the monthlies to be stored in a collection as opposed to stored as meta on each individual monthly.
fixed some small readme errors
added APIKEY
added cansel button
rework memdisk command line processing so only last line skips memdisk options (less likely to skip options unexpectly)
remove some debug printfs
allow user to more easily override preexisting options specified in last cfg line on memdisk line
remove unneeded printfs and properly handle multiple options on memdisk specified last line
Spaceship-Klasse umstrukturiert

+ SpaceCraft zu Spaceship unbenannt
+ Nach ProjectXGameComponents verschoben
added default mongo address and port in __init__
added better description for MongoDB
[updated] TODO markups
progres on mapgen.
Merge branch 'master' of github.com:PongUIO/AndroidWars
Implement cassandra read all
[maven-release-plugin] prepare release praqmajutils-0.1.22
make project_name to be optional in bash script
edit syntax of bash script
fix parameter
Merge branch 'develop' of github.com:Proteus-tech/deploy into feature/192_project_name
edit README to show simple and full step
Merge branch 'feature/192_project_name' into develop
first commit
Merge https://github.com/QScience/epfmigrate
Removed superfluous logging calls
Removing balast
Moved module dependencies
fix the upper case
Fixes, added update-checker.

Signed-off-by: Ollie <dzineit@live.co.uk>
MSVC debug: fix memory allocation
fix return value of read() function
MSVC: define _USE_MATH_DEFINES
force linking of slam2d type library
Merge branch 'master' of github.com:RainerKuemmerle/g2o
config.h reflects whether CSparse / CHOLMOD were found
SBA demo with CSparse solver

- fallback to CSparse if CHOLMOD is not available
fix error in SBA / BA demo

- make sure that the vertices of an edge are added before adding the
  edge (thanks to Peter Henry).
fix infinite loop
Merge branch 'master' into statistics
fix sba_demo to work with MSVC
drop TR1 sampling
improved MSVC shared library support
Merge branch 'master' of github.com:RainerKuemmerle/g2o into statistics
avoid segfault if build without OpenGL
fix OpenGL warnings in types SLAM2D
fix OpenGL warnings
fix OpenGL warnings in types SLAM3D
Merge branch 'master' of github.com:RainerKuemmerle/g2o into statistics
Adding Fade in for Nearby Locations Screen
Updates for nearby view
Updates for some of the animations
Merge pull request #1 from Raizlabs/DefaultAnimation

Animation kaWOW
Now posting animationCompleted notification name
Constants file and updated animation key
Correctly count time.
Added shared delegate method and animation called from LKMainMapViewController
fixed join messages, added modified value to messages
Add some transparency stuff.
Bringing in fix for non-standard ports, courtesy of @theorm
Reorganize all labs to be more AWESOME
2 more levels
Merge branch 'master' of github.com:RileyA/STATICly-MAD
fixing bug from leftover code
upping version.
Adding some personal messages. Still need content for Jim, Nick, and Christina (and Christiana?).
Adding success-message in E.
Fix Drupal project installation paths
UC2 select opdrachtgever fix
CSS issue
New textures and pictures for menu
Creates ViewEventController in Demo
Rewrote toString to tell what kind of event, added more event types
Colonies now have a name
Colony menu implemented and many clicks now send proper events. Some test scenarios implemented to check how buttons would react and how the menu will look
trouble?
Initial commit of datepicker.js forked from http://www.eyecon.ro
Fixed bugs with NaN NaN NaN values in calendar widget.
Add missing foreign keys & make all tables trackable
Косметическое изменение

Укороченная инициализация массива элементов
Fix "Do not know if error code is fatal"
Fix JarClassLoader: findResource() was not tested for null.
Javadoc.
Imports.
Comment explain
Merge remote branch 'sadao/fix-JarClassLoader' into next
Merge branch 'stable-1418' into next
Javadocs.
Show a different message if the store is being migrated to slot filters (i.e. the filters are new) vs it's just dirty.
Build 1418, mandatory in 3 weeks.
Add new country to geoIP country list.
More robust when handling an unknown country.
Build 1419.
Merge remote-tracking branch 'upstream/next' into next
Correcting typo in Javadoc. Fixes BUKKIT-3200
Fixed Javadoc typo. Fixes BUKKIT-3201
Update javadoc for PlayerFishEvent.State.IN_GROUND.

changed from "grund" to "ground"
Fixes BUKKIT=3202
Allowed for local naming of steps in train
OGM-174 add a new test case for composite key

OGM-174 update test case
OGM-174 add support for composite key
OGM-174 update test case by adding @OneToMany relation

update copyright
OGM-174 makes composite id saved into _id field
OGM-174 force the update when the object to persist just contains the id field
fix format, make the diff easier do read
OGM-174 fix possible nullpointerexpection
OGM-174 update the object id preparation (fix typo, and add some comments)
OGM-174 remove persisted object and check if they have been deleted
OGM-174 update debug message for composite id objects
OGM-174 update comment style
OGM-174 change property separator name
OGM-174 use EntityKey in the MongoDBTupleSnapshot to be symmetrical with the RowKey
OGM-174 Fix test which was not properly referencing associated columns

This was leading to inconsistencies in column ordering
OGM-174 Update compositeIdTest to respect the one to many constraint
OGM-177 First experiment to get AssociationKey.getEntityKey populated in all situations

This is a non working experiment with elements that will disappear down the road.
Don't read too much into this commit.
OGM-177 Read and propagate AssociationStorage.IN_ENTITY option from configuration
OGM-177 Make sure getAssociation is not called in the collection embedded case (MongoDB)
OGM-177 Store inverse side association information in the associated entity document

Specifically properly populate the EntityKey in the AssociationKey.
TODO: the collection role is arbitrary
OGM-177 Clarify hibernate.properties on association.store
OGM-177 Do not compute nbr of associations in tests for AssociationStorage.IN_ENTITY
OGM-177 Make reading of an inversed collection use the same collection role as writing (ie the assoc table for now)
OGM-177 Add unit test for unidirectional collections and bidir many to many
bugfix when parsing timezone
BaseModel - mostly array support for keys added, isFree() added
changed form height, swiched submit and cancle so pressing return submits the form instead of cancleing
changed ip to website in javascript bookmark
JasonLeyba: The SafariDriver should be able to handle NodeLists when encoding script arguments/results.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16904 07704840-8298-11de-bf8c-fd130f914ac9
JasonLeyba: WebElementToJsonConverter should handle array arguments the same as lists.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16905 07704840-8298-11de-bf8c-fd130f914ac9
correctly showing navigation blocks
Updated libraries paths
Update console class name
Main routing file
Kuria update
Renamed routing file of test module
Kuria update
Temporary compile fix.
Merge branch 'master' into passive_anticheat_new
BUG: Fix for as.array when swig is updated.

The next release of swig will fix the currently broken
class structure used by the bindings. This patch changes
the as.array call slightly to support the new class.

I've also corrected some exception messages in the
backet operator code.

Tested with the svn version of swig. All but the following
tests pass:
The following tests FAILED:
        338 - R.GaborSource (Failed)
        339 - R.GaussianSource (Failed)
        353 - R.GridSource (Failed)
        423 - R.PhysicalPointSource (Failed)

This patch should not be integrated without swig version being
updated.

Change-Id: If2b85da3488623e2e42d934b03f5a73a7d3f2e17
BUG: Fix R test of ImageSources

Fix out of bounds array access when not image inputs are provided.

Change-Id: I5306d51570b40baa4e8e4b8d9cfc69a8a317ffb1
Merge topic 'UpdateSWIG' into next

ae35b62 BUG: Fix R test of ImageSources
372f150 BUG: Fix for as.array when swig is updated.
Always copy ez_setup.py to build directory

Previously, testing needed to be enable to copy the ez_setup.py
file. Now it's always copied.

Change-Id: I798992eb6587674965531603ec1de09bdc00372e
Adding shamefully omitted closing parentheses

Change-Id: I599acac7ac5af9294a181b33666c3222e48a7af6
Merge topic 'AlwaysCopy_ez_setup'

f0e2f0c Adding shamefully omitted closing parentheses
913ab67 Always copy ez_setup.py to build directory
Removing AddConstantTo header in operators header.
Merge topic 'SIMPLEITK-322_AddBinaryFunctorTemplate' into next

451b744 Removing AddConstantTo header in operators header.
trying to fix ios bug
added homescreen icons, touched up in-app icon buttons
put icon metadata on all pages
added startup images
Connecting socket and proto
Better memory cleanup mechanism and implementation. Some generation cleanup.
Not using the cleanup file anymore. Each test is responsible for adding cleanup to the queue itself.
start of making tests work again
Add dataBase.
Add a test project.
Add some basic classes.
sign up basically complete
integrate to watch functionality
integrate want to watch functionality
Initial work on 1.4.3 merge
Added rcirc configuration.
Enabled spacific-rcirc, and minor embellishment.
assert: added AssertionError.
creating directory structure & basic rcon class
Save/Load/Delete update

The error and info messages generated by saving, loading or deleting a game now appears in the terminal.

Signed-off-by: Sverre Skuland <sverre.skuland@gmail.com>
Started off in process transport
Created in process transport
Final touches to in process messaging
Fixed broken test project
Fixed speed problems in Webrequestor
Created seperate web requestors for metro and windows
Fixed web requestor faliure handling
Fixed up ioc initialisation problems and made pipelines more robust as regards handling deserialization failures
Added monodroid version
Dev Final fixes for MSSSQL upgrade and DB creation script
Updated translation: Czech by slansky
Updated translation: Italian by lfanfoni, flocs
Merge remote-tracking branch 'origin/Yii' into Yii

Conflicts:
	application/helpers/update/updatedb_helper.php
Dev Fixed  DBVersion number not being raised in creation scripts
Fixed issue HTML error in hidden field for equation question type
Dev extra period before closing >.  Does not appear to prevent accurate data collection, but shows up as error when viewing source.
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii
Fixed issue #06177: uppercase logical operators (e.g. 'OR') in EM yield JavaScript errors
Dev authors can now use uppercase versions of operators (e.g. OR, AND, EQ, LT, etc.)
Fixed issue "Please check at least one item" not appropriate for single select list questions
Fixed issue #06186: Array Question Type: EM doesn't convert condition correctly, AND becomes OR
Dev ConvertConditionsToRelevance was not ANDing together conditions from different sub-questions within the same question.
Dev the automatic upgrade to database version 155.5 will fix this in the database for all questions
Fixed issue #06187: Javascript Error on em_javascript.js : attr is undefined
Dev Had to ensure that LEMval(x) returns x if x is a number (and not a reference to a variable)
Fixed issue #06187: Javascript Error on em_javascript.js : attr is undefined
Dev Gracefully handle LEMval('')
Fixed issue #06200: if enter text into other box, then click the other checkbox, the entered text disappears
Fixed issue #06201: Fatal error: Cannot redeclare replacenewline()
Dev was preventing translators from calling Show Logic File
Fixed issue #6131: Images for questions upoaded to server but not showed up
Fixed issue #6147: "Please rank at least x items" not being translated
Fixed issue #6130: Response emails sent as "text/plain" but with HTML embedded
Fixed issue #06196: Misplaced PopUpEditor icon
Dev Cleaned up HTML and styles
Fixed issue #06159: On Chrome 19 and IE 8 jqGrid is too wide
Dev Update to latest version of jqGrid
Fixed issue jqGrid table overflowing .wrapper element
Dev Resize the .wrapper and .footer elements after the jqGrid table is rendered
Fixed issue : No group managment in Yii
Fixed issue : Javascript error with alert in public survey
Fixed issue #06193 : AdminController cannot find the requested view "/admin/user/setUserRights"
membership & ratings foreign key
DO NOT MERGE: Add binary gitian-updater files: Gavin should do this.
The included versions are:
Python 2.7.3
PyYAML 3.10
cx_Freeze 4.2.3
GPG4Win 2.1.0
Install gitian-updater binaries.
added configuration file and finished UI upgrade
remove accidentaly commited debug message
Bugfix: redirect header should use $redirect instead of $_REQUEST['redirect']
Throw when double[] size exceeds serializable.
Incremented version number to 1.7
ended up not looking how i wanted
Settings integration
fixed Episode sorting
Traductions des controlleurs CAS et Wiki

(et déplacement de la logique d'affichage d'erreur dans une vue)
Traductions des modèles (dans fr/models.yml)
- Show start and end time widgets correctly when adding a research data
- Add generator forms to ontology when adding new start and end times for intervals
updates bootstrap to v2.1.1, adds web-based automated installation wizzard
Latest StoryJS Core
Added tests for the decode_characters option in the PHP test file.
08-May-2012: Updates for theme, libraries, core and modules
refactored TypeDefs parsing and dumping
add a "turns exposed" variable to battleUnits

and a couple of functions to access it.
add some missing notations.
break all of the saved games.
start manipulating the variable

oooh, yeah, just like that.
a little to the left.

an alien spots a soldier, set him "visible" to the aliens for a number of
turns relative to the alien's intelligence.

decrement the counter at the beginning of each XCom turn, and set it to 0
if the unit dies.

if a soldier panics or goes berserk, give away his position.
psi aliens and launchers

they should revert to blaster launcher target if applicable, as there won't
be a chance for them to pick another target for it if they decide not to use
Psi. also, they pick their targets from the list of "exposed" soldiers,
not from team LOS, when calculating targets for such attacks.
standard development, working on testing a socket connection.
Fix marketplace creation in tests. Label field is not used anymore
First rework of download_http_content
added a first version of fi-ware marketplace interface and some interaction with remote marketplace

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
added store support to interface and functionality

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
added a better implementation of store support

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Initial marketplace management code

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
repaired some bugs in store and marketplace management

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Fix whitespace problem in gadget/test.py
usdl parser added to commons/template.py

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
added a better implementation of usdl parser

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
added rdf mashup parser to commons/template.py, some rdf files and some test

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
next() method calls replaced with _get_field() calls in commoms/template.py

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
translation functionality added to usdl Parser in template.py

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
added n3/turtle support to usdl parser

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Changed usdl:resource by blueprint:artefact

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Fix pep8 problems

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Add averange popularity to the fiware marketplace support

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Return an empty requierement list when parsing usdls

Signed-off-by: Álvaro Arranz García <aarranz@conwet.com>
Fix some jshint errors
Add a setTitle method to StyledButton
Convert some iGadget buttons to StyledButtons
Reword gadget with widget
Move part of the delete widget code from deleteWidget to the delete method of the model
Test mashup merge
Remove tags attribute from ShowcaseTestCase
Fix endpoint ordering in the wiring editor
Initial upload, smarty libs
Added Bounding volume/Ray intersection
grails-smpp-3 Switch version of Release Grails plug-in to 2.0.2.
grails-smpp-3 Clean up BuildConfig.groovy.
grails-smpp-3 Clean up application.properties.
Update Source/Themes/default/languages/BugTrackerAdmin.russian-utf8.php
Merge pull request #2 from dragomano/patch-1

Updated Russian translation by Bugo
added basic flightpaths
Fixed EncryptedInputStream trying to include a file from /usr/include/IOStream
Added FileIOStream, more fixes/improvements
faksjdf
Don't set null reconnectStrategy
Add constructor for executor
Commented out a test that was giving us issues.
New LOGO Image
descarga codigo mugutu
only stroke lines
Classes renamed and made private
ASM Interpreter annotations fixed
More annotations for ASM
More annotations for JUNG
BasicInterpreter behavior reproduced in a custom interpreter
Ensure declarations happen; prevent redeclarations

Previously, a variable declaration would only happen if there was not a
field with the same name, which was wrong.
Also, a declaration in which all of the variables had previously been
declared would work fine, despite the fact that they should not be
redeclared.
This commit fixes both of these problems.
Fix NullCoalescingOperator codegen for compounds
Fix TupleExpression codegen for nullable tuples
Fix null check codegen for compound and null types
Add FunctionType's native type: {opaque*, <func>*}
Split Comparisons into Equality and Relational

This not only splits them into two different types, but allows Equality
comparisons on a much broader set of types than Relational comparisons
(which can only be used on integers and floating point values).

'==' and '!=' can now be used to check whether something is null, or
check whether two values of the same type are equal to each other.
If two values are not the same type, but can be converted to a common
supertype before the comparison, then the comparison can be performed
with that type.
Updated schema to support the scenario damage calculator
Added demo files
Added calculator structure
Added fragility parameter
Added validators
Merge pull request #717 from acerisara/bug-943890

[r=larsbutler][f=943890]
Merge pull request #718 from acerisara/bug-947813

[r=larsbutler][f=947813]
Merge pull request #721 from acerisara/bug-954096

[r=larsbutler][f=954096]
Implemented review comments
Removed demo files
Added config file
Merge pull request #722 from acerisara/bug-922106

[r=larsbutler][f=922106]
Inherit keywords from State superclasses
A few more commands
Temporarily remove redundant routines between io.h and inline.h

In the near future, I want to come up with a cleaner solution for this.
Finished implementing verse range overlap test
Added a few new weapon types. By my estimation, we are at roughly 60 million possible combinations
Update install.sh for Gnome3 MGSE desktop install
Back to salaried
Add indent guides plugin
ajout du chargement correct du niveau d'aggregation, rafraichissement et cookie...
Petite correction de bug dans GenyProfileManagementData

- la méthode getAllBillableProfileManagementData() retourne désormais les profils "billable" ET actif !
Merge branch 'arnaud_dev' of github-geny:adupuis/GYMActivity into arnaud_dev
Detalles detallados

detalle ligado :)
change model design.
Typo fix
Merge branch 'master' of https://github.com/agiledevday/add2012.git
We are in Master

We are in Master
/ ‘app/app.coffee’
+ ‘app/assets/partials/admin/dashboard.en-us.html’
+ ‘app/assets/partials/admin/dashboard.pt-br.html’
/ ‘app/assets/partials/admin/nav.en-us.html’
/ ‘app/assets/partials/admin/nav.pt-br.html’
/ ‘app/assets/partials/admin/offices.en-us.html’
/ ‘app/assets/partials/admin/offices.pt-br.html’
+ ‘app/partials/admin/dashboard.jade’
/ ‘app/partials/admin/nav.jade’
/ ‘app/partials/admin/offices.jade’
...
Types.GetType on DynamicObject with test; evaluate object method with test
Implement transform(), copying the original document for now

Include probability node types from Serge Abiteboul et. al (2009) and have the
transformer include the probability namespace.
Fix some typos and small errors
Add temporary main() method transforming from /tmp
Update mono3.rb

Updated mono to 3.0.1, updated fsharp to 3.0.22
Fix submodules
Fix tabular
Added age to specialtags.
Solve problem 8.
Add ; at the end of line xxx
Update version in package.json
Fixed application manifest.
update db replication logic
txt_1

Signed-off-by: 716 <allanpk716@yahoo.com.cn>
bla
301212
Revert "Revert "Use a separate user collection""

This reverts commit 76d6d6599695b857d57012fe617e7b4d054a192c.
stupid boxes
read data from file
use cereal data
temporarily change scale factor to work with new data
add data table
Revert "add data table"

This reverts commit 66ec5dd8d31c00ae6b6d06637db52d472308f973.
cache jekolized pages
パズルによってより速いエンコード方法を選べるようにした
Third party readme update
Core/Wintergrasp: fix possible crash when rebuild hits non rebuildable buildings
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore into teste2
adding gemfile lock to the gitignore
This is a practice commit.
Appended newlines to Geshtu.
Consolidated some Jarasandha code.
Added zeta.png.
Fichier changé.
ruby 1.9.3
Tested with latest dependencies and ruby 1.9.3
Rvmrc uses 1.9.3 now.
Merge branch 'dependencies'
Removed link/footnote confusion
Massive overhaul of expense markup to match group index
Cleaning up
added new $dom function broke a bunch of stuff too
added the beginnings of a todo app example
Properly handle errors for attempted pushes to non-channels
README and some docstrings
first use of ajaxForm
Message Queues - Introduction Article
neeed refactor to normal rails structure...
Added reselection after shifting
Modified to allow saving individual networks; Modified to save best uncompressed.

I modified the saveBest routine to save as uncompressed. For some reason the compression
stopped working for me... -_-'
Update web/outputs/articleOut.php
Added singleton methods
new version
listview columns is now a map
.live Exercise
Fix bug in CourseIntegrityCheck.pm

Change code so that course names with a dash (-) do not cause
problems when recreting missing tmp directories.
Added python-dev add the dependencies installed at the start of the script.
Add a download progress block
asdf
Merge branch 'master' of https://github.com/arjunmathur/147proj

Conflicts:
	app/index.html
asdf
fixed:
新建事故单，“应用系统”下拉列表，采用拼音排序
add default authorization
fixed:
增加mantis中事故单审计历史多种类型数据导入
fixed:
增加mantis中事故单审计历史多种类型数据导入
working generic scheduler handling code
from  to
user	user
user 	sys
user	svc

sys	sys
sys	user
sys	svc

svc	user
svc	svc
svc 	sys
omniauth-google
more endstops progress, needs final move
Adding more changes to the project
removing members view files
synced up to new blog post

fixes, etc.
Fixed bad link to node.js.
minor updates
merged mediaDisplays into one class using ViewStubs. Tracking locationKey in a Singleton class rather than by intent-- more reliable.
Fix for mapfind results summary file, return NA if target_bases_mapped undefined
Added another class based solution which is the more natural OO
style.
Fix extjs-all.js link in index.html
disabling vertical centering and removing hard-coded image path
Commiting some vendor listing changes
Publishing and scaling of pngs now work for different resolutions (iOS/Android)
Updated to latest version of cocos2d & jsbindings
Updated cocos2d version
Added device orientations for iPad
Enabled fallbacks for to -hd extensions for CocosPlayer on iPad
Fixed crashing bug
Bug fixes in publishing
Updated CCBReader/CCFileUtils to work with directories for resolutions
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	CocosPlayer/CocosPlayer.xcodeproj/project.pbxproj
	CocosPlayer/CocosPlayer/Resources/Info.plist
fix the typo in example's namespace
Merge pull request #7 from harikt/typo

fix the typo in example's namespace
tables/linkExtension.pyx removed from .gitignore
integrando el repo de bashmarks
[CORE] Add VMM_EIO error code.

Signed-off-by: Anup Patel <anup@brainfault.org>
[CORE] devdrv: simplifications and clean-ups.

Signed-off-by: Anup Patel <anup@brainfault.org>
new node definition for updated nagios3 module
Fixed back-button for ticket view, added controller
updated on Tue Oct  9 05:00:12 UTC 2012
Log successful world file save.
new tactic. using li to choose charts. working.
Size is now reported in the texture response and used by the system
joystick st00f
d2: done.
Fehler beim erstellen neuer Datensätez behoben (verursacht durch window.open). SpeichereKoordinaten: Keine leeren posts mehr.
Raumliste wird nicht mehr in localStorage gespeichert
Removing extra stuff
Updating readme, fixing some tabs->spaces issues in generated controllers
json optional(optional(text)) null use case works.
Added average line for keystrokes
content views - fix for specs failing in ruby 1.9.3

For ruby 1.9.3, need to explicitly list arguments.  In ruby 1.8.7,
the call where no arguments specified would succeed.
delete profiles rake task for heroku scheduler
Reject false matches: require "status:" or "status," as a command prefix

This avoids a false hit when someone says things like "statuses are
immutable" or "status codes are neat" in the channel. It also rejects a
space delimiter, like "status working on IRC bots", which I think is
probably ok.
Merge pull request #31 from warner/reject-statuses

Reject false matches: require "status:" or "status," as a command prefix
lots of PTU stuff and it probably is less broken this time
Merge branch 'master' of github.com:benadler/octocopter
document update check
fix minor bug with isVisibleWhenHidingGui logic: when set to false, shapes should still be rendered if there is a GUI screen active, regardless of whether the GUI is set to hidden via F1
refactor update check to separate class
replace unnecessary ModLoader method call
update development roadmap
attr no longer calls methods
Re-engineer taxonomy again
adds ratings to conversation stream
Merge branch 'master' of github.com:benoertel/unplagged
Merge branch 'master' of https://github.com/benoertel/unplagged into simplereport
Now properly cleans up spawned children straight-away.
Fixed bug where features were given click linkouts, which conflicted with click-to-select behavior in WebApollo.
Dotify: added hyphenation tables manifest
Remove our version of texhyphj

Because the upstream project (http://code.google.com/p/texhyphj) now has a pom that generated an OSGi bundle.
Until the JAR becomes available on sonatype-nexus-snapshots, we can get it from my own repository at http://bertfrees.github.com/snapshots
Blocks can be locked by hitting them with a stick
Blocks can really be locked by hitting them with a stick
Put all the stuff to do with metadata in one place
solved 0028 with python
Break out shape and fixture handling into a new class.

Also, no replace a whole suite of ivars with a single b2BodyDef ivar, which is deleted when the body gets created, and recreated when the body is destroyed. We either have a body or a body def, never both.
Replace collision methods with collisions blocks. Fix bugs.

Wrong property generation declaration for world. Wrong array when iterating shapes.
Add #import.
Update to block-based collision updating.
Fix memory problems.

Shapes have to be allocated so that they're kept around. This differs from the normal usage pattern of creating a body def and immediately making a body. Instead we're keeping the body def around, and need the shape to stay around, too.
Fixes for incomplete property definition, fixture positioning, and block invocation when block is nil.
Shapes are NOT offset relative to a body's global position.
Correction to comments.
Add missing -dealloc.

Also, possibly prevent some weird behaviour.
Added landing page slider, w new images, added tool tips on doctor list and display, added maps infobubble text.  Also moved to a simpler brief api call to get doc list
Merge
Added comment about left-recursion
add custom style to local maven repo, pom and web.xml
Make retrieve_pdb_file() work on Python 3.

This applies the fix outlined by Michiel de Hoon in Redmine #3382.
Merge pull request #129 from cbrueffer/pdblist

Fix for Bug 3382
alerts working + declining sites instead of skipping them
Merge branch 'master' of https://github.com/bittorrent/zero-lib
added auto-gc
browse updated
the implicit refresh is useless the API should never be used in that way
main함수 추가
no action_mailer
[FIX] Bug on subtitle display
Fix Exception when ip_lock enabled but null
work on skyeye
rename : items --> words
patch `getSelected` if browser work without w3c or ie
deleted last proxy args when proxied
popup window demo
New logo and home screen text labels
update README and setup.py for 2.0 release
Fixed the infinite looping, but it might still not work.
Switched to using the full month name in the date at the top of a post.
Added a footer with copyright, and granting freedom to use code samples.
changed backup file
part of newsletter (shit)
Add operator<< for ublas::matrix<T> and vector<T>.
Don't crash in sample_subst_history( ) when we have no ancestral node sequences.
Generate Login, Explore and Welcome Page. (refs #12)
Updated View system
IPSModuleManager - Added Retry for File Download
IPSModuleManagerGUI - Disabled Buttons during Update
prevent Dependencies#remove_const from autoloading parents [fixes #8301]
Use "refute" instead of "assert !"

Remove FIXME tag from abstract adapter test.
implementação da classe Axis

Essa classe representa um eixo do gráfico.
Consertei os gráficos estarem espelhados no eixo y. Note que a
posição do Line.draw é ponto o superior esquerdo, e não a origem
xmas comes early
fixed small size fonts
adding 'main' field to component.json
Correction normalement fini reste carte
Added support for .jpeg image file extension
console screen
Merge branch 'master' of https://github.com/c0bra61/Endure-It-2.git

Conflicts:
	entities/entities/ei_power_source.lua
Remove boxes menu entry in HK nav
Remove plugins menu entry in HK nav
Remove plugin check in HK nav
Fixed broken construction in global
Pseudorandom improvements
drop stack fixed
drop node fixed
onLoad fixed
api.createStack get
Extracting duplicate code into function
require_once by dirname(__FILE__)
Adding a responsive version of the photo gallery
added error pages for 404 etc.
Update state link text
Using image rather than ID in template
examples/geneseq: better convert Char->GBase
refactor, no longer uses forked engine.io
bump (v0.3.4)
fix premise of bug
fix service test
unactivate services test until the semantic for the metadata is clarified
fix metadata not displayed for the arguments / statements
prototype actually done
Add implementations of production languages you might need.
Rudimentary date parsing support.
Experiments with JSON.
遊び時間を変更
Moved Box behavior out of DefaultController and into BoxController
Created some placeholder stuff for App, etc.
Added some icons
Fix typo
Merge branch 'master' of github.com:ccampbell/mousetrap
A step in the right direction to use the correct keycode on events
Наговнокодил чуток
Initial source commit

Initial commit of LD source. Currently has issue where sprite is not
drawn on screen.
"test"
test again
new R3 Heroku
Friendlier array coersion
Spec for #method behavior
Celluloid#method routes through the proxy
Move grammars into separate folder
ProgramReader should skip spaces
Parse simple program
Filter specs based on ActiveModel version
Drop the global Object mutation in favor of working around the Ruby 1.8 anonymous class spec use case with class_eval
Adjust multiple attributes not using method_missing spec to not give a false positive on Ruby 1.9 and adjusted code so it doesn't add unused class-level instance variables in newer versions of ActiveModel.
Remove unnecessary requires and cleanup code
Mark the release of 0.5.1
Merge branch '0.5-series'

Conflicts:
	CHANGELOG.md
	lib/active_attr/version.rb
Added nokogiri to gemfile
Merge pull request #5 from mtscout6/missing-gem

Added nokogiri to gemfile
[TSan] s/internal_memset/real_memset

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158200 91177308-0d34-0410-b5e6-96231b3b80d8
[TSan] port all output tests to lit and move them to lit_tests directory. This makes 'make check-tsan' command test both unit and output TSan tests. Old custom makefiles for running TSan tests are still functional as well.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@164110 91177308-0d34-0410-b5e6-96231b3b80d8
[asan] fix one test on 32-bit Mac 10.7; enable another test on Mac

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157237 91177308-0d34-0410-b5e6-96231b3b80d8
Change path to science data; uncommented line defining SAC.
Iniciando CSS das statistics
[client] Add "replica-set" property.
Initial description.
Update list of ignored files and folders.
check for finished boxes
last update. project on hold
graceful error handling, kinda
Supported initialization with runtime arguments
Supported initialization with runtime arguments
シンボルテーブルを表すクラスEnvironmentを作成した。

あと、これを参照して評価をするためにidentityという演算子を追加。
Add spinner.gif to STATIC_URLS

In order to support use of the spinner image in js, I've added it to
STATIC_URLS.

Reviewed at http://reviews.reviewboard.org/r/3330/
Fix several issues with the new site style.

The dropdown menus at the top of the page should no longer sit below
other UI elements. In fact, the whole z-order of elements is now defined
in one place, so that we're not using random numbers all over.

The borders of the review request action menus are now set correctly.

Primary column contents in the admin UI are no longer inheriting the
column header styling.

The trophies no longer cause the review request action bar to shift
down.
fix article word-break.
added some clarity to the "spacing" option
fixed get configs to handle multiples instead of one config
Travis Patch 2
Update TODO.
Purdify.

* Use 'wells' to differentiate the bookmarks, rather than the crappy
bottom border.

* Promote the title by increasing the font size.

* Highlight the domain by making it green (similar to a certain well
known search engine).

* Spread out the title and comments to make it easier to scan.
Update TODO.
SAKIII-5393 - Check whether the rows property exists
Add an i18n message for saving the page
Revert the order of requests - all the revisions were the same
Removed the wrong line in the last commit, that's fixed now, and I've fixed a typo in the code, though rumors abound of a rotating borad.
beter symlink script
carl9170 firmware: toolchain newlib 2.0.0

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Merge branch 'master' into radar
remove the default label
Do not use time constants in files the WP bootstrap is not or may not be loaded. see #20987.



git-svn-id: http://core.svn.wordpress.org/trunk@21997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Always attempt to embed URLs in content, removing the Auto-embeds (autoembed_urls) option.

Remove the UI for setting the default width and height for embeds. Width was confusing as it
was blank by default (inheriting the content width from the theme, or 500px). The height is
now calculated as 1.5x the content width, or 1000px, whichever is smaller.

The [embed] shortcode can still receive manual height and width attributes. This just removes
the global settings.

props wonderboymusic. see #21719.



git-svn-id: http://core.svn.wordpress.org/trunk@21998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Move WP_Embed into its own file. props ocean90. fixes #20533.



git-svn-id: http://core.svn.wordpress.org/trunk@21999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Add a login_body_class filter to login_header(). fixes #21133.



git-svn-id: http://core.svn.wordpress.org/trunk@22000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
more prominent forking button
merged with master, keeping my changes to fork button
Modified header. Extended API of annotation tree.
Merge branch 'master' of https://github.com/cidles/pyannotation
Correct test module name

Change-Id: I6da97ca65e1f80e0dc6e37ab713f5238f9d8d818
Use an explicit source list for Tcl and Java too.
Patch the volume rendering factory.

Always need OpenGL for volume rendering.
preserve order in photo queue over all chunks
widget scrollbar
prettify workspace's home
workspace users & groups management: translations & some bug fixed
refactoring urls: 1 => multiDeleteUsers
refactoring urls: 2 => multiDeleteGroups
refactoring urls: 3 => multiAddUserToGroup
refactoring urls: 4 => multiDeleteUsersFromGroup
refactoring urls: 5 => multiAddUserToWorkspace
refactoring urls: 6 => multiDeleteUsersFromWorkspace
refactoring urls: 7 => multiDeleteFromWorkspace
refactoring urls: 8 => multiAddUserToWorkspace
fixing workspaceUserControllerTest
adds a test
Changes from cathedral.
Merge branch 'deploy_test' into develop

Conflicts:
	helloshopply/devops.py
Commit before merge.
Merge remote-tracking branch 'plankton/develop' into develop
Began filesystem tests.
Adding default post layouts
Fix views.rst to reflect change from 0.5.1 to 0.6 where bundles are now added (and service name is set) in the initialize method instead of the constructor.

Pedantically changed Freemarker to FreeMarker.
Merge pull request #239 from tedyoung/master

Docs fix for Views
configured console plugin
CODE STYLE Formating workflow/engine/methods/authSources/authSources_kindof.php

Change format files in workflow/engine/methods/authSources/authSources_kindof.php
 CODE STYLE Formating workflow/engine/methods/authSources

Change format files in workflow/engine/methods/authSources
Merge pull request #798 from norahmollo/master

CODE STYLE Formating workflow/engine/methods/authSources/authSources_kindof.php
CODE STYLE, changes...

FILES:
gulliver/system/class.headPublisher.php
workflow/engine/classes/model/AppSolrQueue.php
workflow/engine/classes/triggers/class.pmSharepointFunctions.php
Merge pull request #854 from Jennydmz/2460cb7ad42610067dafefe181a1fa47d0478266

CODE STYLE.
Events library - priority sort fix

The events library was trying to sort the arrays by checking non-existant 'priority' key (hence always returning '0' because integer comparison would fail, and no actual sorting would take place, despite usort() firing as true). The extend method doesn't include array keys when storing, so i've amended to reference the priority setting by array index.
add gravatar fallback option for user avatars

This adds a configurable option for user avatars to fall
back to pull from gravatar.com. Options can set set through
the dashboard on the existing profiles page.
Allows for error display in BlockCont action_

Changes from current implementation to show errors while in action_
method of BlockController if debug or error reporting is enabled.
Current method uses @ which has the side effect of suppressing any error
messages that come from the BlockController action_* methods.

The new implementation uses method_exists() to check for the existance
of the method with action_ prepended. This allows errors in the action_
methods.
Merge pull request #543 from mkly/block_action_error_reporting

Allows for error display in BlockCont action_
Merge pull request #512 from arcanepain/events-priority-sort-fix

Events library - priority sort fix
Merge pull request #521 from triplei/user-gravatars-552

add gravatar fallback option for user avatars
merge master
single page bug fix
Merge pull request #459 from mkly/request_get_unneeded

Unneeded Request::get() call
update git project names
Implement hearbeat and create new mobile web role
MB-6632 Extend couch_notification msg to notify checkpoint changes

If a new checkpoint is created for a given vbucket, this event is
now notified to the external couch component.

Change-Id: I80bdce663c2ac243db4d578179b8ffb2dbe06990
Reviewed-on: http://review.couchbase.org/20810
Reviewed-by: Junyi Xie <junyi.couchbase@gmail.com>
Tested-by: Junyi Xie <junyi.couchbase@gmail.com>
Reviewed-by: Damien Katz <damien@couchbase.com>
Tested-by: Damien Katz <damien@couchbase.com>
Tested-by: buildbot <build@couchbase.com>
Handle /custom with a redirect.
How fuck it is!
mark all as purchased button now works on grocery list menu
remove an uneeded shift in the java implemention (thanks go to Ray for finding this)
renamed libCore to libKinskiCore
boost now linked statically, refactoring
Merge branch 'workingBranch' into decklink
Accept ECONNRESET from close()

Although not a POSIX behaviour, FreeBSD can fail with ECONNRESET.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Improved AxisGuessing for ImgSaver

Added a more robust algorithm for determining missing axes in ImgLib
AxisTypes.

Algorithm was moved to AxisGuesser, while the implementation to use it
correctly was added to ImgSaver.

This algorithm should always be able to put out some ordering of
X,Y,Z,C,T as long as there aren't more contiguous blocks of unknown axes
of size >1 than there are missing known axes.
Added jdk 1.7.0_07 to version control

Allows us to bundle the JRE with Anathema without relying on the
JDK installed on the developer's machine.
DefaultTabbedPane
InfoNode TabbedPanel removed from Anathema.
Transparency for ItemTabs
Tabs non-focussable
IObjectValueChangedListener -> ObjectValueListener
Extracted ItemTabComponent
Cleanup
Ensure replaced with Precondition
Ensure replaced with Precondition
Deleted
Removed note
Removed dependencies from disy.commons StringUtilities
Own UnreachableCodeReachedException
Used Apache IOUtils instead of disy.commons IOUtilities
disy.commons IClosure removed
MigLayout
SmartAction from disy.commons no longer used
Cleanup
disy-commons integrated
disy-commons test-libraries removed
Replaced umlauts
fixes 100% cpu problem
Revert "Revert "added another paragraph""

This reverts commit 3989ff4295694a0a1760e871514a9b141681aaec.
Revert "added another paragraph"

This reverts commit 762f710444f9ecc6ca4a32ab5c02118f80c68bfb.
add a new super-simple test + form, rename the old form + JS
rename complex test
improve i18N
almost finished with single instance almanacs
movement 2.0
Fixed the table in the readme, yet again. Unclear documentation is unclear.
Adding setup for ThreadedConnectionhandler.
sedia p2
compile test classes in IDEA
Improved UUPerf test
Add vanilla JS version, change style removal to maxHeight = 'none' (fixes #1 and #2)
module to handle stock prices that have already been scraped
del ticker.py
working on level changing
Changed transparency in .gvimrc
Fix: Added unit tests to iOS project
Added re-write rule for pythagorean example service
checkpoint - all test pass. still need to create proper output
TODO and README
Firefox css loader bug
Added QuoteViewModel and scaffolding for views, and linking between Games and Quotes
Defaults are ok
A bif of css...
Defaults are ok
Avancement
Merge branch 'feature/oauth_google' into develop
New Document class et stub REST service (#19)
upgrade rails to 3.2.3; some test code left
more
Merge branch 'all_numbers'
initializing files
initializing files
Merge branch 'master' of https://github.com/deathpillow/website
Added script to push all necessary design docs
made asmall change
Envio de correo. Denisse Marquez
it seems string is not correct, there is also boolean or array for content
optimized login to predatum
re-login when user changes in preferences
minor bugs
Moving overall behavioral execution count in MBE hardware to reset for each class (as it should).
same-parity
Added local fonts, using font loader to enable events on fonts loading, to avoid FOUT in IE9, #71, #189
removed font loader as was not solving FOUT #189, #71
Updated readme with how to add a new font #189
Added desaturation css filter as option for horus theme nodeweing at bottom of content section #199
Resoled merge conflict in README
Updated config path variable to match format of jekyll url variable. Updated relative_path variable cater for this (removed trailing slash). Added active class to active link in navigation #180
Updated page title to not show page name on homepage. Now uses sections variable in config.yml, rather than front matter on every page #118
Merge branch 'gh-pages' of github.com:dharmafly/dharmafly-docs
Changed GLOBAL var to satya #160
Moved up to jQuery 1.8.1, moved 1.7.1 to config.yml for demos. Added jQuery to satya global. Moved demo.js code within singleton, passing in satya.jQuery
Limited modifier on animation to be a function of a maximum of 8 times the current viewport height. #181
Merge branch 'gh-pages' of github.com:dharmafly/dharmafly-docs
Removed unused functions, variables, updated syntax on jshint recommendations #193
Merge branch 'gh-pages' of github.com:dharmafly/dharmafly-docs
Remove unused assets folder
Updated documentation to refer to new satya build tool #173
Merge from docs template
Remove README from gh-pages
Update project documentation
updated credits and reqd modules info
mod config to allow password storage through keyring
substantial work on encryption
major work to implement encryption
Formatting updates.

- Use 2 space indentation.
- Opening brace on same line.
automatically lower height
And another manifest
postgres stuff. Now back to main task
velocity support
Closed #45

modified:   index.php