labofsahil/github-event-dataset-2012 huggingface dataset:
Fix option wrappings of the bound values
Binding to nested options
sdaSDADSASDASDA
Merge branch 'master' of https://github.com/xesj/tmp_repo

Conflicts:
	sio_paradicsom.txt
переписав зміни масштабування
fix nested store behavior
WIP: relation open and new
handle case where relation is already loaded correctly
move towards more sophisticated context implementation
WIP active contexts
Revert "fix nested store behavior"

This reverts commit 03022505eb5a5a171e63f9757e151944fe79942d.
correctly handle lock behavior on nested records prior to the record loading
more activeContext fixes
fix scaling on iPad
Revert "fix scaling on iPad"

This reverts commit 4de0566756455720e067e29027a65d89557bb629.
fix only the viewport scaling issue on iPad
doesn't need more
radeon_hd: Fix pre-emphasis shift

* pre-emphasis shift was always for lane b
radeon_hd: display port improvements

* Remove non-generic radeon dp_get_lane_count
* Set lane count and link rate at set_display_mode
* Pass entire mode to pll_set vs only pixel clock for DP code
* Add helpers for DP config data to common code
* Obtain more correct link rate
Close alerts with ESCAPE key.

Added SetFlags(B_CLOSE_ON_ESCAPE) or SetShortcut(index, B_ESCAPE) to BAlerts
depending if the result gets used later in the code, or if it's a one-button
BAlert.
Debugger (and some friends): 64 bit fixes
Use be_control_look != NULL everywhere in the Interface Kit.

Should not be a functional change. It is not in the Haiku Coding Guidelines but
I feel like 'if (object != NULL)' is generally preferred to 'if (object)', plus
in this case of be_control_look that is the more common style.
Update translations from Pootle
Rename ICO translator format name to "Microsoft icon".

This matches the MIME type and is part of fixing #6782.
Sort the translation formats in AddTranslationItems by name.

This is used by ShowImage and CodyCam to create a list of image formats which a
file can be saved as. Tracker sorts the image MIME types used in the Find
window by name, so this makes these Save As menus match that (minus the icons
which I think are superfluous.)

Fixes #6782.

If the use of BList is no longer recommended, I welcome better suggestions
for sorting which will work in both GCC2 and GCC4. But this works ;)
Removed redundant x86 sources/headers.
x86_{read,write}_cr{0,4} can just be implemented as macros, put an x86_ prefix on the other read/write macros for consistency.
Fix #19 : optimisation du chargement des prorammes (passage de 12,9s à 7,3s sur l'émulateur)
<esc> 自己还是不禁用了
transfer over service net when enabled. closes #2
dellis: live model creator remembers if previous actions on the instance
failed.
dellis: propagate fail to new model.
dellis: red==error
dellis: refactoring to bring model to be more cohesive
dellis: completing changes to engine to fail faster
dellis: will not attempt to retry if an action failed tfor that instance
http code
Set X-Frame-Options to SAMEORIGIN and add description to application.rb
Closes #6311
young table
young table and knapsack.c
-Agregado boton para logout
-Corregido la redireccion del usuario al deslogearse
-Traducido palabras anglosajonas al español
¿
add push new file of build
mv udev rules to common
update my env setup
Cannot save complex obs - TRUNK-3353

git-svn-id: http://svn.openmrs.org/openmrs/trunk@27427 5bac5841-c719-aa4e-b3fe-cce5062f897a
Responding to review comments for: Move drug.route to order entry process - TRUNK-3323

git-svn-id: http://svn.openmrs.org/openmrs/trunk@27429 5bac5841-c719-aa4e-b3fe-cce5062f897a
Follow up fix for: Move drug.route to order entry process - TRUNK-3323

git-svn-id: http://svn.openmrs.org/openmrs/trunk@27430 5bac5841-c719-aa4e-b3fe-cce5062f897a
ColladaExporter does now cache material-names on export by default which leads to smaller .dae files.

git-svn-id: https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk@4279 dfc29bdd-3216-0410-991c-e03cc46cb475
add unit test for GetGlossaryhandler
refactor GetGlossaryHandler for better readibility
add DBUnit data for testing glossary
add jpa test for GetGlossaryHandler
remove unit test and use jpa test
refactor GetGlossaryHandler
remove time measurement from code
Rename result for TranslatorStatusUpdateAction
[maven-release-plugin] prepare release server-1.7.2
[maven-release-plugin] prepare for next development iteration
rhbz702252 Increase lock timeout when creating translation workspace
Check for leftover Lucene locks on startup
Merge branch 'release' into integration/master

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/ZanataInit.java
Fix NPE
Merge branch 'release' into integration/master
rhbz804871 - add close button to translation history popup
rhbz844820 - fix problem: user click on buttons at different row should ensure row selection event first
rhbz844820 - fix css style for transUnitDetail and validation panel after merge
rhbz844820 - change all image buttons to fontello css
Fix firefox css, fix test
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Bug-fix: Lazy loading collection in security checks.
Merge branch 'master' of github.com:zanata/zanata
Fix wording https://bugzilla.redhat.com/show_bug.cgi?id=854799
Reorganize for clarity.
Add smart beginning of line and case toggling functions.
Bind C-/ to toggle case.
Add find-dired, whitespace.
Made iwatch-for-change compatible with both atoms and iotams
Deleted compiled files

Deleted compiled files
ezadazedf
Merge branch 'master' of github.com:zeld1/miniSIG
Whoops, forgot to uncommit when request not found
add msgpack library
add new UI for grid view
* configure.in: update ac_prereq to 2.64


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4795 a8d146d6-cc15-0410-8900-af154a0219e0
sosospider
mobile safari update
index.priv
added simple stupid expressions that wont work in real life (tm)
Don't show exceptions multiple times
Fix indentation and IE parse error
page_account is back!!!!
rqt_param) Buttons added (expand/collapse node trees). Bug fixed for editor pane (Bool data was not shown).
Don't pass '--disable-benchmarks' to setups built with Cabal < 1.14.

Fixes #932 and #1004.

Without this patch:

    $ cabal install -w /home/gman/bin/ghc-7.2.1/bin/ghc syb
    [...]
    unrecognized option `--disable-benchmarks'
    Failed to install syb-0.3.7

With this patch:

    $ cabal install -w /home/gman/bin/ghc-7.2.1/bin/ghc syb
    [...]
    Registering syb-0.3.7...
    Installed syb-0.3.7
new activity style - Beat -
Restructuring README file to make it nicer.
Se actualizaron los estilos correspondientes, se segmento todo en Vistas Parciales, se utiliza completamente BootStrap.
fix z-index in conjunction with spatial
fix list styles in conjunction with spatial and bootstrap
fix popover style in cojunction with spatial and bootstrap

The twitter bootstrap overwrites the container class. This commit
changes container to rdfauthor-container class.
Thorfile is now mighty
cookbook projects bumped to "0.1.0"
Improvements at Character window header.
Merge remote-tracking branch 'origin/master'
Fixed some tests to be compatible with code changes related to interrupts
Add ability to set red, green, and blue individually
Test file
Trash
Merge branch 'master' of git@github.com:Acronic/Plugin.git
Deleted Trash
Cycles framework added but not finished. Attempts to rewrite the gauge
drawing mechanism all failed.
Merge remote-tracking branch 'mike/master'

Conflicts:
	src/CUDACode.java
Add feature for signing in via the devise-privided form
Added two arguments in Aleph\Cache\Cache::getInstance method
Fix instances of incorrect ban time offset parsing.

- Added timegm() from C++ RTMP.
- Replaced strptime() with C++ RTMP version.
- Also added a few commands to clear the list of bans and exceptions.
Update for SpoutAPI changes

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
TODO FIX
Merge pull request #2041 from Alkaelis/master

Fix texture orientation
Turn off sound and the loader for now until its fixed for machines that
cannot do OpenAL (around Client Sprint 4).
Signed-off-by: Chris Sanders <zidane@outlook.com>
Made RenderMaterial and SpoutChunkSnapshotModel Comparable
- This gives reliable sorting
Added material for just rendering color
The game screen doesn't take input
ClientFont serializeable serialID
First pass Source->Causal system
Set of RenderMaterial to know limit batch update
Time back (for benchmark only !)


Signed-off-by: L5D <cholley.thibaut@gmail.com>
Implements ChatChannel

Signed-off-by: dredhorse <dredhorse@breiden.net>
Clean up chat channels a bit. Closes #1985

Signed-off-by: zml2008 <zach@zachsthings.com>
Update to use ChatArguments for GUI like intended

Signed-off-by: zml2008 <zach@zachsthings.com>
Fix ChatArguments render.
Signed-of-by : Karang <arthur.hennequin@free.fr>
Merge pull request #2043 from Karang/master

Fix ChatArguments render.
Merge pull request #2042 from L5D/batchface

Set of RenderMaterial to know limit batch update
Shader compiled in renderTask

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Fire block change events for data state changes
Added RenderMaterial change support for the render queue
- old and new state information is recorded by the block store
- dirty render materials are added to the render material set
- force option for first snapshot marks all render materials
Merge pull request #2044 from L5D/batchface

Shader compiled in renderTask
billy eat saves config
Document forgotten close-brace command.
Add Function class.
Change Function notation convention to match RTL conventions used elsewhere.
Correct argument types in Function::exec_t.
Add Function-based tokeniser.
改成hidden

Signed-off-by: AmeryHan <749001531@qq.com>
logger
 convert score to time
hopefully
UPDATED Version
List all stored objects
Remove unneeded require
Refactored the stored requests code in Application
Refactored the create route in Application
Refactored the delete route in Application
Refactored the stored_objects route in Application
Refactored Application
version
ChampShip categories manager dialog has been implemented
DB REWORK in progress
added fix for missing uri params
Buffed controlled entity (fix)
Merge pull request #16 from Anvil0008/master

Added control utility functions
Converted patrol into main thought process
Patched minor conflict in control
Fixed minor bug arised from previous commit
Add game over screen with win/lose scenario and allow to start a new game (on the same dungeon)
Fixed minor bug with conversion to think from patrol
Fixed minor bug with deselection of units
Fixed map movement while controlling
adding positional audio
fixed audio distance constant
Dodanie szkieletu klienta.
- Added timestamp to the obtained GeoTags.
mon: make pool deletion dne error code consistently ENOENT

This matches the check in _prepare_remove_pool() now.

Signed-off-by: Sage Weil <sage@inktank.com>
filestore: remove btrfs start/end transaction ioctl code

This was an ill-conceived approach to getting atomic transactions out of
btrfs.  It doesn't offer rollback, which means that any error means we need
to wedge the file system and reboot in order to avoid corrupting the
data set.  And that's silly!

Snapshots are more robust and only marginally slower (because we have to
quiesce our writes while waiting for the snap to start, and btrfs resume
work in-kernel slightly faster...maybe).

Fixes: #2623
Signed-off-by: Sage Weil <sage@inktank.com>
docs: clarify example in radosgw-admin

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Proposed change in partsDB.java didn't seem to make the last commit… Here they are.
bump spraycan and deface
Finalized getUserID

Returns current token or 0 if it is not defined
Initial pointer type implementation.
check if internet available
Skeleton for Attribute serialization, moved Serializable impls to new detail header
Next version on this branch
Some work on the new type resolver
Some cleanup and work on a better type resolver, still missing user and hash types though
Fix issues with bool literals in the lexer and parser. Also add errors and warnings for casts
Some work on returns, calls and a few scope cleanups
Refactor type and operator stuff in preparation for user types and member resolving
Clean up error reporting
A bit more work on the resolver. Fixed function call validation, list type parsing and added support for ellipsis on int ranges
Some more work on the resolver (namely condition validation). also fixed parsing of invalid prefix operations
Minor cleanup with names and assignments
For loop support as well as mostly working list comprehensions
Some more work on comprehensions
Fix reference position errors in comprehensions and add support for map type returns
Merge branch 'valid'
Removed parameter assignment
Made account->label nullable
added embedded css style type
fixing-orders
Changes APIs to fix active users. Listen to unsubscribe instead of disconnect event. Changes user list to new APIs

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds improvements and plugins

* Adds /me plugin
* Adds link plugin
* Changes the way activities are rendered
* Cleans up the broadcaster
* Fixes modifier
* Adds template helpers
* Adds base and message templates for activities

Caveats:

Inline formatting doesnt work with history [fixing it]

Signed-off-by: Akash Manohar J <akash@akash.im>
Working chat app with jQuery tabs and Backbone. Adds a small chat posting box

Signed-off-by: Akash Manohar J <akash@akash.im>
Simplifies identifying current channel

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds helper methods and appends new activities to the chat area

Signed-off-by: Akash Manohar J <akash@akash.im>
Moves fetching current user to a helper

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds user notifications, basic Kandan.Data APIs and some other re-organization

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds perfectly working 007-style user spying

Signed-off-by: Akash Manohar J <akash@akash.im>
Removes a console.log line

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds basic+buggy user list

Signed-off-by: Akash Manohar J <akash@akash.im>
Fixes channel message rendering

Signed-off-by: Akash Manohar J <akash@akash.im>
Changes APIs to fix active users. Listen to unsubscribe instead of disconnect event. Changes user list to new APIs

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds improvements and plugins

* Adds /me plugin
* Adds link plugin
* Changes the way activities are rendered
* Cleans up the broadcaster
* Fixes modifier
* Adds template helpers
* Adds base and message templates for activities

Caveats:

Inline formatting doesnt work with history [fixing it]

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds a few plugins and fixes

* Adds basic styling for sidebar
* Adds link plugin
* Adds image plugin
* Adds Youtube plugin
* Adds basic music player plugin [WIP]
* Adds a stub Kandan.Store API to get music player working
* View fix: escapes message if not processed by a modifier
* Template fix: unescape certain elements in templates
* Switch from jquery template to underscore templates
* Deletes unnecessary templates
* Removes ember-rails dependency

Signed-off-by: Akash Manohar J <akash@akash.im>
Fixes embed plugins and history formatting

Signed-off-by: Akash Manohar J <akash@akash.im>
Merges link, youtube and image modifiers into one plugin

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds pagination; after a lot of 'vada poche' moments

Signed-off-by: Akash Manohar J <akash@akash.im>
deletes views,templates that are not used

Signed-off-by: Akash Manohar J <akash@akash.im>
adds basic file upload widget, dependencies and resources for attachments

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds channel data API, upload notifications  and some fixes

Signed-off-by: Akash Manohar J <akash@akash.im>
Adds a per-channel file list

Signed-off-by: Akash Manohar J <akash@akash.im>
uncomments STS token option

Signed-off-by: Akash Manohar J <akash@akash.im>
Fixes tabpane tests & behaviours
Adds more info in the example
Adds setBounds function
Merge branch 'master' of github.com:CartoDB/cdb.js
zoom widget fixed
You stupid if you can't guess what type of change I did here
premier sprite à l'écran
Merge branch 'master' of github.com:ClubEngine/gj4
replace save with update in findone
Fix memory leak on ML that could leak hundreds of objects…
Use TXRenderStyleTemplate in writeLine:
Working on methods for OdinManager instead of variables.
make sure mail chimp gets updated on bulk action
delete user and group in Acme
half done tickets
change the spec file to do better things with the git hash
Updated to new coding standard.
Started account creation implementation.
Updated README.md to add usage.
This is not going to merge well
Merge Fix
Stop using oh-my-zsh and use antigen instead
Add hwsd finder
Merge branch 'master' of https://github.com/Eyescale/CMake
Fix default module env
Merge cleanups
moved some css form the footer into applications.css (rules for images in links) and the popup stuff into popup.css
Added feature to extract version number
fixes in extract_data
fix to raise exception with logging
Fixed Error message in extract_data
Merge pull request #104 from RanjitK/master

Extract data fixes
Revert "Ranamed scan_parameters_multiscan.csv for consistency."

This reverts commit 8f276561dc81dd60ef1a611f0d0a9db856f9868e.
tmp: nicolas only chris admin email
resolved commit conflits
Added urlencode to the email for user authentication
Merge branch 'develop' of github.com:Feowl/Frontend into develop
Put eigenstaendigkeitserklaerung after abstracts
Merge remote-tracking branch 'origin/master'
added LoaderCompleteGraph, that creats a complete graph with $n vertices
Fix a bunch of string formatting problems
Fix closing the console window
add HACK to fix saved login info strings
Clarify nature of login info HACK
Use https for login.
Disable SSL.
Merge https://github.com/peterix/MultiMC4 into dev
Moved string conversions into a macro.
Update data/maps/Map Installation README.txt
Přidán obrázek zobrazení relace
Background

Changed background color
Header

Changed stuff for the header
Search

Added less-code for the Search-field
Merged Bahdan fixed conflict
implemented the print function
Ver 3.34.007

FCCore:
none
Form,main module:
-Fixed:
-Recalculation process
Ver 3.34.007

FCCore:
none
Form,main,module:
-Fixed:
- Recalculation error with Limit Counter.
added step2 template (WIP)
Merge branch 'master' of git://github.com/HEP-KBFI/stpol
Fix MAL's shit
a simple change of the folder of the Makefile
add ranlib when generating the .a to the windows compialation
commit bomb comin
bug 795: small layout changes in pages/account/40.php and pages/index/11.php
axis tick labels nwo with correct formatting
Fix css for gallery page
Minor fixes for project list.
Fix height for project list page
Lauria: falsche Zeitwerte korrigiert
Rostock: Einen der Banker aus der Bank entfernt, damit sie nciht mehr so überfüllt aussieht
Rostock Tavern: Ein paar Pinke Tiles entfernt
invertika lib: Parameter number der function add_items in amount umbenannt
Lo he puesto bien
Espaços entre os acordes tinham se perdido.
update to three.min.js r53
humanMove() shortened
misc shit
new file:   Research/Games/ltsstar_1vs1_veigar.pacs
Paste from clipboard in Vim
proba 1
proba 2
proba 3
Merge branch 'master' of https://github.com/Kaef/FTIMSGame

Conflicts:
	Debug/Game.exe
	Game/main.cpp
konflikty w pliku exe nie sa problemem.
Fixed the ignore file to ignore unneccesary project files. May decide to add them later.
Merge branch 'master' into design-core
Core design notes.
other 3 fix
Added Python 3 support, made Pyinotify optional.
SIGTERM handling.
Tidied up output.
Merge branch 'master' of github.com:Krenair/PyIRCd
Fixed array out-of-bounds error

whoops :P
gsdggdfgdfgd
utilizadores

update utilizadores
insert game into repository
Merge branch 'master' of https://github.com/Leiron/yahtzee
Update doc/guide_for_non_perl_user_to_download_photos_from_wassr.md

もう一個あった
setting user message when buildid is older than 30 days fixes bug 770878
preventing multiple error messages fixes bug 772587
Merge pull request #688 from ossreleasefeed/prevent-repetitive-error-messages-772587

preventing multiple error messages fixes bug 772587
Fixes bug 772860 - Update forced versions for correlations for Firefox cycle starting 2012-07-17
Merge pull request #689 from KaiRo-at/master

Bug 772860 - Update forced versions for correlations for Firefox cycle starting 2012-07-17
relocated logging to its own namespace
Fixes bug 773006 - Removed obsolete code from branch model and admin controller.
HBase mods fixing retry behavior
Merge pull request #686 from ossreleasefeed/notify-user-build-date-older-30days-770878

setting user message when buildid is older than 30 days fixes bug 770878
added from string coverter for sentinels to fix ini writing
Merge pull request #690 from twobraids/bug772961-crontabber

fixes bug 772961 - relocated logging to its own namespace
Merge pull request #692 from twobraids/bug773019-signature-fix

fixes bug 773019 - added from string coverter for sentinels to fix ini writing
Merge pull request #693 from twobraids/bug773010-hbase-exceptions

fixes bug 773010 - HBase mods fixing retry behavior
Merge pull request #691 from AdrianGaudebert/773006-cleanup-branch-model

Fixes bug 773006 - Removed obsolete code from branch model and admin con...
Modified add_new_release.sql based on Fennec/mobile issue reported in staging.
refactored DRY in various tests
More practical database names, r=rhelmer
Merge pull request #694 from jberkus/master

Fix add_new_release to work properly with FTP scraper on Fennec.
Fixes bug 755265 - Added ignore_duplicates parameter to buildutil.insert_build and called it from ftpscrapper.
Merge pull request #687 from AdrianGaudebert/755265-fix-ftpscrapper

Fixes bug 755265 - Added a try block around buildutil.insert_build to av...
add api to  delete a video
* fixed 'require' test script
* 3.1.4 rockspec
* discard old rockspecs
* when a transfered function is not found in source, guess its name to help the user find out what's wrong
* new function lanes.nameof()
Fix lanes.timers()
Implemented epsilon expiring links
Handle backspace in user input while using INPUT statement, keyboard support according to Notch spec (circular buffer)
renaming CWQueue add methods to start with enqueue
using new CWQueue api names in CWTree
Field must be public to be saved as a KSPField
export html ok
GameManager finished+ Definition of ILinkPlayersGames
Putting the correct atlases back
Added elrte WYSIWYG editor.
Added a javascript function for execute elrte in every .elrte class.
Updated campaigns form: added elrte in header and footer field
Udpated email form: added elrte in body form
:en is now default lang
Rewrote the color codes parser to be one function, not two
Merge pull request #109 from Justasic/insp20

Rewrote the color codes parser to one function, not two
Merge branch 'insp20' of git://github.com/inspircd/inspircd
[10648] Other/Checksum: 9716979aee3679e1371c80ac88d862e2

Signed-off-by: Chiruclan <administrator@chiruclan.de>
Update recipe index content
Another public schedule style fix
Mocha browser coverage test
Set the font size of the reporter so mocha dosent change it and breake the layout
Merge pull request #115 from msaglietto/mocha-adapter

Mocha adapter
missed nether star
加入记录相关API
remove ruby-debug and all other MRI 1.8 related stuff from Gemfile
number of dots tells the number of dirs
improved nerdjump function
confirming that new input methods handle text with pick one and pick any questions. closes #236
Added init method, fixed colors
test commit der dritte
Updated license topic
Merge branch 'master' of github.com:Nmeum/dotfiles
'DanKiV11 Released!
CMake: make sure input mesh has been generated before converting to H5, fixes #22
fix makefile for intel compiler - rollback to icc and ifort instead of mpi compilers
Use glamour texture
fix for paid app
exclude RootTools classes and methods from proguard
Alpha 2
- One root request
- More asynctask
- etc
fix crash in cm7 (if sd-ext not found)
cleanup script
small changes in app strings
о_О
update Russian translations
update version to 3.0.0 (21)
fix "script not installed"
some fix for cm7
update version to 3.0.2 (23)
adding home page from eden.openovate.com
Added documentation for isnull()
BugFix addMemento
Cleaned up models, so it corresponded to the object model
Merge branch 'master' of https://github.com/Panum/sw701e12
Added controllers and views for privileges
Merge branch 'master' of https://github.com/Panum/sw701e12
slides pouvoirs publics
merge
hw1aq6.2
add multi category(max7)
add CS category(content 0xe1)
add program attach information(content 0xe0)
add category middle english
add json output
Updated description of flushall test
If the variable arg is a array then flat it before you continue
+ del command
Moodle 1.8.9 - 15 May 2009
usuniecie wszystkich pyc
fix py25 tests
Not rewriting SuperUno
Didn't really get started with Remote
replicated paint example
testcase_13_resize2fs implemented
Creating site for gaedo-guice - 0.3.0 in site/0.3.0/gaedo-guice
Added rest of the line parsing
Published new artifacts
renaming the app
sqlite3 adding to the setting
Added admins to settings.py
added database
enabled admin
core.py added
Merge branch 'master' of github.com:Romin/DeltaLab
added question class
Merge branch 'master' of github.com:Romin/DeltaLab
imagefield added
Merge branch 'master' of github.com:Romin/DeltaLab
edited moels.py
adding admin page
Merge branch 'master' of github.com:Romin/DeltaLab

Conflicts:
	matwork/models.py
more spacing
pushed
Merge branch 'master' of github.com:Romin/DeltaLab

Conflicts:
	matwork/models.py

fixed
Merge branch 'master' of github.com:Romin/DeltaLab

Conflicts:
	matwork/models.py

fixed
Merge branch 'master' of github.com:Romin/DeltaLab
Merge branch 'master' of github.com:Romin/DeltaLab
voting now works as expected for posts
basic calendar component done, needs integration with parts
[#12086930] fixed history change from launching non in-app links
made a note on a development only issue.
Merge branch 'topic-tablet-support' of github.com:Sage/argos-sdk into topic-tablet-support
selecting none in a lookup will now fire onchange event
fix for a strange scalac bug where `new Impl { protected val targets = _targets }` simply didn't execute the anonymous class' body for whatever reason (perhaps getting confused by `Impl` having an apply method?
bit of clean up. add 2.10 as cross version, go back to 2.9.2
Smoke effect for the chinook husk
Add a nearEnough field for RallyPoints (to be used as an argument for their AttackMove activities) so the Soviets don't get stuck on their rally point, and scatter the units a bit before they attack
initial commit
added readme
commited since branches blah
added rudimentary scenes
oops
There's a bug; event not showing.
aptana project file
Merge branch 'master' of github.com:Senevri/webgdm into development

Conflicts:
	index.html
	js/game.js
	readme.md
merge
Nocorrect plugin: prevent corrections on certain commands.
manpre by default now.
Mouse support!
- Fixed initialization tests.
Change log for when a new app is registered
facebook paging wasn't staying up to date since it was using the 'next' url from facebook versus constructing a new one, which wasn't the right thing to do and always lagged live...
didn't git in
disable resolver for now, bad http out there to be caught yet
instrument the new apps-profiles-accounts metrics too to track them over time
Lint GData-js

- Dot notation
- ;
Lint lib/friends

- ;
- ===
- Avoid reserved keywords (`in`)
- Twice-defined variables
- Variables used out of scope
- Long lines
Fix behavior after scope fix

The code in `lib/friends#bump` was actually relying on mismanaged variable
scope, and when that got fixed, `indexMe` started crashing. (In fact, indexMe
_always_ crashes the way we're calling it, but because of the scope issue, it
was never actually running).

Here's what happened:
- `var self` was declared in `bump` and set to `false`.
- Immediately, `cset.forEach` opened a new scope. Halfway through, `var self`
  was declared again.
- This created a new `self` that was hoisted inside `forEach`'s function and
  manipulated
- When the `forEach` finished, the inner `self` was thrown away (its scope
  closed), and we came back to the outer `self`, which was still `false`.
- The outer `self`  was passed to `indexMe` as `entry`, and `indexMe` promptly
  returned, accomplishing nothing.

When I cleaned up the doubly-declared `self`, suddenly we began manipulating the
outer scope's `self` and ended up passing a profile ID (eg `'34301'`) into
`indexMe`. `indexMe` tried to parse it as an IDR, but it isn't, and the worker
or dawg would crash out.

To fix this, I removed the outer `self` and passed `false` to `indexMe`. This
looks all sorts of daft, but it's what the code was doing before and I bet
someone who knows what's supposed to be going on will want to fix it. In the
meantime, `indexMe` will continue doing what it's doing on `master`: zilch.

cc @quartzjer
Addition of SSL confs and support for client revocation.
a lil mo
Test runner now allows specification of apps in command line again
Changed readme to reflect API changes.
implementation for ServerStop and ServerStart events.

Signed-off-by: Sleaker <sleaker@gmail.com>
Merge pull request #1949 from Sleaker/master

Implemented ServerStart/Stop events
Texture Refactor
0.0.9 :sparkles:
Merge branch 'develop'
Merge branch 'develop'
rename module and started to work on Configuration
Merge branch 'develop'
missing call to `_external_program_handler`
open URLs in browser
multiple visible timelines
cleanup
remove unused decorator
Twitter API backend as argument for controller
remove setter
explicit imports
keep cursor in same tweet when inserting statuses in timeline
minor
tests for `turses.models.VisibleTimelineList`
rename `turses/util.py` to `turses/utils.py`
move consumer keys to `turses/api/base.py`
remove legacy identi.ca authentication code
started plugging `tweepy` API backend
fixed a unit test regression
Brought the physX code up to date with the Physics Constraints and CCD function calls that were added to the abstraction layer with the CE Bullet improvements.\

This should allow everyone to build T3D CE with physX again.
minor... i think
minor
resolved conflicts
Merge branch 'master' of https://github.com/TDimaline/neon
bridging
bridging
resolved conflicts
ログイン、チュートリアル初期コミット
updated Jently to now allow pull requests from different forked repositories.
Fixing multisalvage
Added "No Dropoff" to the Dropoff Type list in Hauler.  In this mode, the hauler will follow your pickup instructions, but will not do a dropoff.  Instead, it will move ore to the Fleet Hangar so another hauler can come empty it.  Hence, you can have your orca looting jetcans and being unloaded by another hauler.
Minor cleanup of Text\Table\Table related to Blank tables.
Fix param lists having redundant blank lines due to wrapping.
Normalize modules' output from getConsoleUsage(), increase readability.
updates to fix documentation errors
Moved names of tags to compound tags.
Fixed problem in parameters for querySingle
Fixed problem in parameters passing to execute/query/querySingle
Scope can now take as parameter a class constructor
Endret relasjoner mellom entiteter
Fixed issue with tracking URL replacement
Merge commit 'fa040f43390113a50cb3ab3de25b43ff4c69d423'
Update parser to recognize the new operator identifiers, properly handle empty parameter lists in function calls.
v. 0.7.1 build 2

* changed folder from CPPS to Social_Shooter
add service_nav.html
serv
Added script for use USB-radio
Some addititions and updates
Add some orientation utility methods of ClientInfoEvent.
Avoid compile warning of AuDropUploader.java
Merge remote-tracking branch 'origin/master' into minor-fix
Merge remote-tracking branch 'MontyPan/minor-fix'
Merge remote-tracking branch 'VincentJian/master'
Bug ZK-1315: grid column doesn't reappear if columns menupopup set to auto and grid is sizedByContent
http://tracker.zkoss.org/browse/ZK-1315
[ICC] Add RUS teleporter #2
Fixes in header, footer, etc.
Adds new infowindow sprite
Merge pull request #8 from Waterfox/David

Switched to new handsontable stylesheet
rollback, still messing around
fixed the dash CSS
fixed more css
trying to build category string to add
Added some old browser compatibility stuff
added replace query and updated update query
Further enemy changes
Added new encode method = faster read
Test github by C file
new: print routine for divisors and overload for +
fix broken tests
Merge pull request #1 from jonnii/develop

fix broken tests
Merge remote-tracking branch 'origin/develop' into DynamicTables-experimental
* complete rewrite of the gfx class (now called gfx2d): separated primitive point computation and actual draw code, this allows for easier combination and addtion of new primitives or draw styles (currently supported: primitives: point, line, triangle, rectangle, rounded rectangle, circle/ellipsoid, circle/ellipsoid sector; draw styles: fill, gradient, texture, *border => total of 42 draw functions for now)
 * gfx2d is also a fully static class now -> changed all engine code accordingly
 * some work on gui_theme (still wip)
 * rect is a "global" type now (instead of gfx::rect)
 * xml_nodes store their name now
 * completed migration to SDL2 (and SDL2_image)
 * fixed camera rotation on os x (with wacom tablets)
 * added shader reload event (use this to rebind shader objects)
 * added/fixed nvidia 600 series recognition
 * moved DRAW_MODE enum to platform.h (still no idea where to put it ...)
 * fixed icon loading (must be done after creating the window with SDL2)
 * misc improvements and fixes
Basic sapling based dynamic materials
Inventories implemented

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Merge pull request #216 from bergerkiller/master

Inventories fully fixed and Windows implemented
Removed debug message and reversed window invs

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Added Respiration enchantment and drowning and suffocation damage. The damage system will need some work, but for now this can provide a trace of survival behavior.

Signed-off-by: aPunch <theapunch@yahoo.com>
Updated file names, added two files for Steven.
Update README.md

Some whinging.
Remove type checking from wiget prepare method
generating random function for hash
md3 is back
Preparing code to compile in advanced mode with Google Closure
fixed bug with lightmaps in release
improved the sql needed for question page and reverted question id variable
intermediate checkin for first unit test
initial set of tests complete
git munged high ascii in file name, so use only low ascii
remove high ascii file
Merge pull request #1082 from adobe/randy/loadstylesheet-unittests

Unit Tests for loadStyleSheet()
squashed js-quick-edit-perf
fix codemirror submodule
fix merge error
Merge branch 'refs/heads/master' into jason-sanjose/squashed-perf

Conflicts:
	src/extensions/disabled/JavaScriptInlineEditor/main.js
prevent context menu from being clipped
Merge remote-tracking branch 'origin/master' into randy/context-menu-position
Merge branch 'refs/heads/master' into jason-sanjose/squashed-perf

Conflicts:
	src/thirdparty/CodeMirror2
fix submodule
add comment for createPerfMeasurement
Code review comments. Add getDocumentForPath measurements to JSUtils perf tests.
Merge pull request #1049 from adobe/randy/context-menu-position

Looks good
Code review. Docs for logTestWindow. Fix usage of finalizeMeasurement.
Merge pull request #1041 from adobe/jason-sanjose/squashed-perf

JavaScript quick edit performance instrumentation & test suite
Merge remote-tracking branch 'origin/master' into nj/js-end-brace
removed source coffeescript, jade and stylus files
Use CodeMirror tokenizer to find the end brace of a function
Merge remote-tracking branch 'origin/master' into nj/js-end-brace
Merge pull request #1055 from adobe/nj/js-end-brace

Use CodeMirror tokenizer to find the end brace of a function
Added static section to force delete the Vars library from Icy (it is integrated into EzPlug v.2.0+)
added ubuntu packaging
changed to 5 lives (test branches)
start iv rewrite; canvas -> css3 transform
Update dotCMS/html/portlet/ext/roleadmin/view_role_permissions_js_inc.jsp
Merge pull request #257 from agemogolk/master

Fix range reduction bug in k_rem_pio2 (fixes trig funcs for large args)
eliminate intermediate name in typedef
regen macosx libc and unix with @crabtw's bindgen
add @crabtw to AUTHORS.txt
Fix exp(Float32)
Add some native integer math tests
ortest: check pcre version.
ortest: various updates.
Updating methods in announcements to take advantage of new structure.
implemented save new product after submit button save
fixed processRelativePath if parentId is undefined or null
::Storage::Own: fix test passing
::Storage::Storable: fix test passing
::AlphaPattern: implement with tests
Wip jump to def
Awesomness with F12
Remove console.log statement
Remove shift-click to jump to def because it doesnt work
* fix for "Disable editing options when in readonly mode"
* fixes ajaxorg/cloud9infra#2584
fixes #2650, panel caption not updated when clicking runbutton or configure
Merge branch 'master' of github.com:ajaxorg/cloud9 into fix_editing_opt_readonly
* remove disable from editor menu
Fix node_debug test
Generalize node debug test & some cleanup
removed timeout, fixes error
Merge branch 'master' of github.com:ajaxorg/cloud9 into fix_runpanel_caption
Fix process_manager_test
Fix shell test
Fix 2/5 of revisions (needs rewrite for the new revisions impl)
merge conflict
Spatial matching instead of exact matching
Merge remote-tracking branch 'origin/master' into fix/node-debug-test
log the full message to see in CI builds
Merge remote-tracking branch 'origin/fix/node-debug-test' into fix/node-debug-test
Add linux/openshift binary
Extracted autosave plugin in its own module.
Revisions have been restored, and added autosave to the config
Small improvements to autosave and revisions.
More small fixes to autosave and revisions
Keep `onExternalChanges` reaction in revisions, where it belongs.
Keep showQuestionWindow in Revisions, where it belongs
Merge branch 'master' into extract_autosave

* master: (23 commits)
  Remove extra include
  Blacklist ftpParser_test
  Replace Makefile test target
  * fix ui issues in gotofile
  Add blacklist-based test suite
  Disable broken/misconfigured tests
  Add all tests following Bas's list
  Bump jsDAV version to include the latest bugfixes for FTP
  * update after feedback
  change snippet triggers that conflict with keywords adding a space after the snippet
  Put all the JS keywords to the scope analyzer
  Updated jsFTP version number to the version that solves reconnection issues
  Remove non-standard library objects from completions proposals and change to typeof, instanceof completions
  Delay applying completions to work around concorde delays
  * fix for "Menu item 'font-size' in wrong menu section" * fixes ajaxorg/cloud9infra#2305
  remove dependency on the first break event that may never arrive (in node) - don't halt the debug waiting for it
  * fix for "Wrong message: "You are about to remove the null xyz.js"" * fixes ajaxorg/cloud9infra#2297
  Never show parameters of events because they're ugly
  Restore renderOutline() call
  cleanup
  ...
Moved event listener function definitions out of hook method, other minor changes
Merge branch 'master' into extract_autosave

Conflicts:
	plugins-client/ext.revisions/revisions.js
Fixes, cleanup and code standards
Removed markup string replacement based on @mostafaeweda feedback
Merge branch 'extract_autosave' of github.com:ajaxorg/cloud9 into extract_autosave
Merge pull request #1999 from ajaxorg/extract_autosave

[Knuth] Extract autosave
Not specifying the type of the file we're reading gives you a buffer, which you cant parse
Merge pull request #1437 from ajaxorg/lets-specify-the-type

Not specifying the type of the file we're reading gives you a buffer, which you cant parse
This code fixes the 'sometimes I get an empty revisions list'
* fix for dockpanel notification
* fix for "Collab: chatting and 'new msg' indication"
* fixes ajaxorg/cloud9infra#2302
Update README.md : Requirements: NodeJS v0.6.16
Merge pull request #2018 from dodyrw/patch-1

Update README.md : Requirements: NodeJS v0.6.16
Merge pull request #1944 from ajaxorg/fix_empty_revisions_list

Fixes the 'sometimes I get an empty revisions list' problem
Update reference to jsDAV in order to update to jsftp 0.3.8
Merge pull request #1974 from ajaxorg/fix_dockpanel_notification

[Dijkstra] fix for dockpanel notification
Merge pull request #2022 from ajaxorg/update_jsftp

Update reference to jsDAV in order to update to jsftp 0.3.8
Comment readonly line that was causing the IDE to stay always in readonly mode
Merge pull request #2025 from ajaxorg/remove_readonly

Comment readonly line that was causing the IDE to stay always in readonly mode
Update test/run-tests.sh

Excluded several unit tests
Revert "Merge pull request #2002 from ajaxorg/fix/offline-save-ui"

This reverts commit d7460faac216fa1fcf369a37dfa76cbeb45b4035, reversing
changes made to 9de07ccd781e4668349e9c37398994712a152f28.

Conflicts:

	plugins-client/ext.offline/offline.js
Merge branch 'master' of github.com:ajaxorg/cloud9
Update test/run-tests.sh
Code used to do a weird thing where it iterated over the keys of an array (with 1 element), thereby rejecting any command that had "0" in it.
Let's use a nice filter instead.
Revert "Let's use a nice filter instead."

This reverts commit 3b0c3a85feb25f5cb3b7a3bde182265b795b9183.
Nicer filter
Merge pull request #2029 from ajaxorg/fix/0-bug

Fix commands containing "0" not working in console
Bump jsDAV version
* Fixed ace rendering during animation bug
* Fixed tab styling for console and dockpanel
added rails app and postgres setup
spring-data-mongo project was added
filtered tab in raw export too
Initial map tinkering work commited.
Added vim .swp files glob to .gitignore. Paul uses vim.
Merged latest changes from feature/frontend.
Added tileLayer to Leaflet map.
Added demo marker data to maps.
NavMapsView.cloudMade -> cloudMadeConfig.
Abstracted center and zoom level into mapOptions config object.
Conflated configuration options into a mapOptions object.
Fleshed out NavMapsController with some content.
NavMapsView.config.url is now tileUrl.
Added placeholder for map legend.
Hiked vars to top of function scope in NavMapsView.didInsertElement.
Changed FLOW model Location -> SurveyedLocale in keeping with FLOW data model naming conventions.
SurveyedLocale -> SurveyLocale. Maps template updated.
Minor change to SurveyedLocale fixtures.
Merged with latest feature/frontend. Fixed conflict in .gitignore.
Added typeMark to SurveyedLocale.
Removed trailing comma from fixtures.js to pass JSLint.
Added (broken) marker fixtures to FLOW.NavMapsView. Needs further investigation.
Removed ArrayController testing code from navMaps template.
Implements details of a Placemark (Issue #95)
修复bug
添加springexample中spring3相关jar
移动包
添加spring中使用jdbcTemplate的例子
修改package
添加spring例子文档
Deleted docs/1.0/context.jsonld
+curl tryout
+not sure if --connect-timeout is the exact replacement for wget's -T
+updated dependencies
+migrating leech to curl
Merge branch 'curl-dev' into curl
+fix after merge
+writing downloads to DOWNLOADS_DIR
+removed not-working --retry from curl options
+tests
+removed RETRY from default
+reverted FORCE_SUFFIX in default
+cleanup
+additional output for troubleshooting
+some tests, work in progress
NOVA: fix overflow in address check
Merge pull request #40 from alexeyten/master

Поправил приведение типов аргументов функции
now using latets versions of deps
Add build step for stamping Butter with git commit sha version info.
Fixes from review
Use new Textbox wrapper with Edit Source... input box
Rewrite focus+select code for editor textbox to be cross browser.  Inline src/ui/widget/textbox.js until editors can work with butter directly.
Add note about editors using butter api bug
[#636] Adding a scroll target to src/timeline/scrollbar.js that allows us to easily change what element to use for scroll events.
Simplify config by using default-config.json
Fix config defaults to properly override.  Remove config/ and roll it into src/
Fix bug in config init when user doesn't provide a config file, add config tests.
Add data-butter-exclude for preloading image div
[#636] only allow vertical scrolls on the track handles.
Move image preloading css into separate file, use visibility: hidden
Remove css styling on video element in test.html template
Merge pull request #309 from ScottDowne/t636

[#636] Ability to scroll down when moused over track names
Merge pull request #304 from humphd/t796

Use new Textbox wrapper with Edit Source... input box
Merge pull request #297 from humphd/t1082

Simplified config by using default-config.json [#1082]
Merge pull request #306 from humphd/t1142

Rewrite focus+select code for editor textbox to be cross browser.  Inlin...
Create SpecialPowers + EventUtils + QUnit testing template
Fix config stuff to work with #1082 landing
Remove DEFAULT_USER from cornfield [#614]
[bug 796228] Feedback application r=me
Merge branch 'new-input-visuals' of https://github.com/rnowm/gaia into new-input-visuals
added new case: when form goes after a header.

We need to use the class "full" again.
fixed clear icon and placeholder
added new case: when form goes after a header.

We need to use the class "full" again.
fixed clear icon and placeholder
Merge branch 'new-input-visuals' of https://github.com/rnowm/gaia into new-input-visuals
Bug 798751 - Data usage meter and widget in Cost Control application
Merge remote-tracking branch 'upstream/master' into new-input-visuals
Bug 799037 - basic integration tests for calendar.
Merge remote-tracking branch 'upstream/master' into new-input-visuals
removed shadow under header´s search box
Bug 796717 - [Email] Fix the timing of display 'no message' text
Merge pull request #5677 from rnowm/new-input-visuals

New input visuals
Bug 798265 798263 798256 798266 [Email] Message list layout polish.
BB sucks
bug 798189 fixed
Merge pull request #5725 from borjasalguero/bug_sms_fixed

[SMS] Bug 798189 fixed
[Bug 797291] New Add to Home Screen action in wrapper [r=vingtetun]
bug 799030 - add error event listener for getting retry count
1. add error event listener for getting retry count
2. fix wrong args of API
Allow realtime replacements to change and stack headers
Autoaprove set to true.
make sure specs can be repeated as often as we want
Forgot about is_a?
Use version file.
Update makezip scripts accordingly.
Fix bug with getting version from module folder.
Display full release in index of docs.
Include VERSION with distribution.
Merge pull request #13 from amorilia/feature/version-file

Use VERSION file.
fixed eventless SELF transition to keep ->next_state
changed used CPUs in build all to be more comforable
show default & set default command added

Hello,
I fixed the show/set default commands and tested on the following host
platform: OSX(x64), Linux(arm), FreeBSD(x86), Windows(x64),
OpenVMS(VAX).
The commands are very simple and the code is the same for all the  *nix
and VMS, and it is a little different for Windows.
Andrea
Merged pull request #216
some logic for the player in PlayState shifted to Player class
Binary build support
suppressed the dialog box before About!
adding the menu to other controllers
Removed a bunch of old nasty code from ParametersUtil. Now we can add our new ConflictSet stuff...
Added some new comments and logic to ConflictSetCalculator #93
Checkpoint... moving more logic back into the ConflictSetCalculator
add how to in README.
announcements added find fish, resized slightly
too much padding on usertext-edit. Fixes #16.
Fix related to TISTUD-1266
    - If the loaded project description is underneath the worksapce, we need to force a null location on it
APSTUD-4193 - Temporarily hide the HTML help docs link from the hover component until we'll have better docs.
Related to TISTUD-2088: incorporated Nam's review feedback.
Add classes for stochastic oscillator.
Merge branch 'master' of git.alipay.im:dialog
Merge branch 'gh-pages' of github.com:aralejs/dialog
apf release and debug update