labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed issue with subprocesses never exiting
Added support for spot instances, multiple db instances, and db backups
Lein pom throws exception when :parent is set; Fixes #362

The updated maven-ant-tasks uses maven-model 2.2.1.
This has removed the setModelEncoding method.
reinstated rlwrap usage and added clj-words completion option
removed tests of internal tasks that would disable the use of rlwrap for plugins - the $TERM test should suffice
Implicitly exclude clojure & contrib from dev-deps and plugins. Fixes #375.
ok - always pass the trampoline cmd-directive - only added the rlwrap - and no exec… - we'll get it right eventually ;-)
removed space between option -p and color for rlwrap (0.37)… works with space on macosx but some other unixes seem to get confused (?).
Don't search "disabled-central" repo. Fixes #361.
Keep lib/ directories and poms off the classpath. Fixes #330.
Fix CLOJURE_JAR checksum warning.
Better hand-off of JVM_OPTS. Fixes #326.
Fix bug in stale-plugin deletion.
Fail gracefully when rev is not found. Fixes #372

This will allow duplicate plugins to be placed on the classpath
on cygwin/solaris systems that don't have rev available, but at least
it won't explode.
Update NEWS and todo.
Mention using lein classpath to see how checkout deps work.

[ci skip]
Merge remote branch 'franks42/1.x' into 1.x
Fix whitespace issues.
Ignore .lein-plugins
Update lein-pkg for 1.7.0.
Clarify non-trampoline exit code.
Don't set prompt to black.

Need to make the prompt readable in all terminal color schemes.
Update Sizzle: fixes fail in traversing tests
Using solarized scheme as default
Mapping F5 depending on the FileType
Added Conque shell plugin to run interactive programs in vim buffer
compatibility to newer vim versions with feature filetypes
change slider indicator
Rubyの場合はタブ幅はスペース2つにする
Merge branch 'master' of github.com:tkengo/dotfiles
fixe try: position
Remove player image styles.
Use square images of a fixed size.
Update src/RunAllLoginElements.java
Initial working version of simplified rating plugin -- still needs a lot of cleanup.
Removed some obsolete PHP stuff.
File renaming.
Fixed css file name.
Transparent background to stars by default.
Introduced stepInterval option -- an option that allows you to configure the fractional star level.
More explicit star options.
More work on star optinos.
Progress on documentation.
Removed obsolete method and option.
Removed rateMax stuff.
Removing PHP stuff.
Removing PHP stuff.
Formatting.
Documentation.
OverlayDecorator: set better blending function
Using proper blending function in OverlayDecorator.
Merge branch 'master' of github.com:gwaldron/osgearth
Fixed setting of out_isFallback in Map s_getHeightField in case you have elevation files with multiple resolutions.  If a single elevation layer was "falling back" then the entire tile was marked as fallback when it was possible you got valid data from another elevation layer.
Added getEquivalentLOD function to help with converting lods from one profile to another.
XYZ driver: fixed bad caching issue. HTTPClient: add "network failure" simulation. CachePolicy: add "DEFAULT" static for clarity
Merge branch 'master' of github.com:gwaldron/osgearth
Removed unused vars in getEquivalentLod
Caching the VRT in ReaderWriterGDAL if it was created.
Setup a blend func separate for the OverlayDecorator to handle the fact that the RTT's FBO is initialized to 0 alpha so blending works properly.
Merge branch 'master' of github.com:gwaldron/osgearth
MemCache: removed a bad local-scope static init (caused crash)
Not clamping extents in getEquivalentLOD, just transforming them.
Exported getTempName in FileUtils.
Fixed caching of VRT in GDAL plugin, it was just writing to a local file previously.
Not using the clientdata based TerrainCallbacks in AnnotationNode anymore so we can safely add terrain callbacks in the constructor.
ShaderComp: add code branch to merge shader code (for GLES support)
Add min/maxResolution property support
Change to ImageLayer to actually cache fallback data so that intermediate fallback tiles don't need to be recreated on each run of a Map.
Removed the clientData version of the TerrainCallback as it was potentially unsafe b/c of the danger of taking a ref_ptr to a node while it was still being constructor (or not yet added to the scene graph).
TerrainLayer::minResolution and maxResolution.
Merge branch 'master' of github.com:gwaldron/osgearth
ShaderComp: Renamed applyTexturing() to applyColoring() in the shader framework b/c this better describes what the builtin function does. Updated SkinResource to build a VP for feature rendering. Modified the default shaders to work properly with non-textured feature data (mostly). Still more work to do...
Shaders: rewrote the lighting shaders to work more generically with terrain and models; got FMG to install default shaders and work (somewhat) with shadowing (although more work is required here);
Decluttering: fixed the RTT case (no View lead to a crash)
shaders: label the main shader programs for Debugging
Merge branch 'master' into topic-shaders

Conflicts:
	src/osgEarthDrivers/engine_osgterrain/OSGTerrainEngineNode.cpp
quadtree: skirt in a Geometry instead of separate geode; slightly faster cull time
Added ability to change the min/max visible range at runtime for ImageLayers.
Merge branch 'master' of github.com:gwaldron/osgearth
shaders: working on general support for shaded features and shadowing
Stencil: force face culling off for stencil volumes
FIX #176 - min_level didn't force subdivision past other layers' max LOD. Also fixed clampAndTransformExtent, which did not correctly return INVALID when the transformed geo extents did not intersect at all.
Merge branch 'master' of github.com:gwaldron/osgearth
Merge branch 'master' into topic-shaders
VirtualProgram: add "inherit" flag so you can set the Program in mid-graph; FIX the shadowing issues w.r.t. the OverlayDecorator
OverlayDecorator: remove event visitor customizations; ImageOverlay: add texture support shader
quadtree: gcc compile issue
shadow: fix the demo so all the annos aren't under the shadowed scene
Fixed issue that prevented model layers from loading with visible set to false from an earth file.
Merge branch 'master' of github.com:gwaldron/osgearth
QuickReleaseGLObjects: remove non-const temporary (gcc compiler error)
Day two exercises
[A] Improvements to API functions
[A] View improvements
Observer для перерисовки,  перерисовка вынесена отдельно
Raemde!
prebuilts: missing revision
Displaying depreciation improvements (4178)
v1.1

Adicionado analytics tracking code em send_rfp.php
Remove a file foo
Add a file foo
Merge branch 'develop'
Add a message
Merge branch 'develop'
Add a new message
Add README
Merge branch 'release/1.0.0'
Merge branch 'release/1.0.0' into develop
Add a file bar
Modify bar
Add a new message
Add timestamp to a message
Merge branch 'feature/remodify-bar' into develop
Version 1.0.1
Merge branch 'release/1.0.1'
Merge branch 'release/1.0.1' into develop
Add a message to bar
Add a new message
Add timestamp to bar
Create js directory in ../perl/... if it doesn't exist.
Added ignore file.
Self-contained demo directory.
no-op commit to test a hook (take 2)
buffer: fail verbosely on all bad offset values

offset === -Infinity used to fail silently
buffer: consolidate write assert tests

Assert tests for all write methods have been consolidated to a set of
three functions that can be called as needed. This prevents unnecessary
duplication of assert checks.
buffer: consolidate read assert tests

Incorrect offset values could still get past pre-existing assert checks.
They have been updated to prevent this from happening. Also have been
combine into a single arguments check function.
Accept selected word
Update lib/route66.js

Errors being thrown by route method handlers were being swallowed.  This change bubbles any error down the Connect pipeline so it can be handled using the standard errorHandler techniques.
Add doc header
Annotator refactoring
rewriter, generator tests
removed TokenPicker test
removed Data::Dumper
improving api doc
making heatmap of configurable variable width
fixing a bug: don't annotate heatmap dimensions if there are no heatmap dimensions names
Added header to twitter extension
Changed the colors of the exercise buttons showing the status.
1) Gray means the exercise is not submitted and there is no pass limit
2) Red means the exercise is submitted but the exercise is not passed
3) Orange means the exercise is passed but not full points
4) Green means the exercise is passed with full points
The exercise number is shown in the list.
Added a header to the total points box and a word 'points' after some cryptic numbers after the name of the module
fixed bus
Merge branch 'master' of vps:git/swift
First commit
Merge branch 'master' of http://github.com/turiyag/filebox
Ruoran: modify block setting to feature itself
[Issue #7] Fix gem not working with Thin
Ignore .gem files in repo
Increment version
anim stars
Standard button style tweak
Extents are now always return valid data after crossing transaction
boundaries. Data may still be incomplete/duplicate.
adding uTest theme
trying to parallel remote repo
adding utest theme
ACCUMULO-674 Merge log4j date format changes to example configuration files from 1.4 to trunk


git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1382614 13f79535-47bb-0310-9956-ffa450edef68
Changed storing of file header instead of index so that filename can be retrieved via getFileNames
Merge pull request #1 from brentbrownfield/master

Store file header in files for later use.
New docs

added new documentation in Markdown formate
Updated mark plugin.
Tmux to maximize/minimize with _/- keys.
Merge branch 'master' of https://github.com/umitkablan/vims
Updated specs for Polygon updated
curate order
 curate order
adjusted points for steam
Update README.md

explained the static page rendering
moved old files to old folder
Merge branch 'gh-pages' of github.com:unhosted/ToS-DR into gh-pages
moved old files to old folder
some more readme information
some more readme information
better summary for twitter and facebook
adjusted copyuright licenses summaries
add links in popup
merge conflict
merge conflict
merge conflict
add the test case
Merge branch 'master' of ssh://192.168.8.22:58422/cat
bugfix
add ip
Merge branch 'master' of ssh://192.168.8.22:58422/cat
fix ip report
fix small bug
modify the cat
refactor
merge
modify small bug througth findbug
Merge branch 'master' of ssh://192.168.8.22:58422/cat
remove debug info
Merge branch 'master' of ssh://192.168.8.22:58422/cat
dev
modify the pom
configure model refactory
Merge branch 'master' of ssh://192.168.8.22:58422/cat
modify the cat jdbc problem
small bug
fixed nosetests error
Multiclass example for all BMRM algorithms
viewer/pano: fix rubber
Correctly link to Lua and Python libs...
ページ上部にログインユーザの名前を表示するようにした
Restarting the VIM setup.
Adding pathogen for plugin manager.
Adding NERDTree plugin.
Adding some colorshemes.
Clean up code style

Use whitespace for tabs.  Make code more readable.  Tabs mixed with whitespace was causing github.com to display the code all weird like.
Merge pull request #26 from mfairchild365/code-cleanup

Clean up code style (examples)
Add group admin possibility edit plan
Adding setup configuration file. setup.py install runs build_ext with the --inplace option by default.
removing of pieces now works
almost all demo now working
changed api favorites and others
handling Enter button (not tested)
primitive phantomjs integration
remove console.log
update mongodb module, travis.ci was using the very latest which changed the api
allow numbers for id in mongodb
possivelmente versao final
Finished styling

Just images remain
stats : add new 2012Q4 season
FoosballDB : skip players who have not played any games
FoosTrueSkillServer : min required games now a query param
Heat map gnerator
Added gitignore for heatmap build and dist dirs
Minor bugfixes, but still not compatible with older gnuplots
Merge branch 'master' into ui2.0

Conflicts:
	stats.html
Extract outputDirs to avoid code duplication.
Initial commit. Lolguides v4
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
Automated git commit from paver
use cube for results server
more cube fixups
Merge branch 'cube-server'
Changed some style stuff... noticed a subtle difference between lhsNav and rhsNav, trying to get them to be the exact same, put in some inline css (sorry :<) to test
merge kanemura's pull request
small bug fixes
Merge branch 'master' of github.com:wangfowen/yoshi
Added Azure deployment config files
Minor edit
Correct reference
Fixed multitude of typos in testning
Correct label
updated; stylus
fish3
fio6
Added test for setting path on bare root URL
Fix fulltext migration
vimrc tweaks, added csapprox
add include path "os".
Added file for C++ pointer/array explanation.
Fixed a small bug in name generation and refactored.
Added some comments to document various files
Changes so that D3DCompile is dynamically loaded
dashboard
fix live reloading
Bug 677364 - Fix broken call to scrollIntoView for elements which do not have this method.
Bug 764442 - Application disconnect errors because of invalid frame objects if a test file restarts the browser - Part II. r=jhammel
Corrected a comment in the stylesheet
added view rendering
Another gitc push fix
remove .class file and ignore class files
add gitignore
bootstrap css & js
crate login page
Implemented ScoreTrackerSerializer.
Fixing get views in vob
Adding mastership to baseline load
Adding mastership to stream load
Removed lacy-load mastership
Dont mix up vob names
profiling working (EC2 starcluster)
[#30810063] Delecao de turmas e roteamento
[zshrc] at between %n and %m
Remove examples link.
filtering out songs played in the current session

MAKE CONFIGURABLE EVENTUALLY
some solve code
set version to 1.0.1 for bugfix release
Fix bug #8112: don't special case Comparable and Comparator methods anymore.

Before this fix, Comparable.compareTo(Object) and
Comparator.compare(Object,Object) are specially removed and hence only
generic-bound compare() remained in Mono.Android.dll. This resulted in a
side effect that is bug #8112 - when generic information was unavailable,
it still removed Object-based compareTo() and compare(), which were the only
one implementation and resulted in missing method error.

This fix changes the way to lookup methods to save in API XML; only
"really-declared" methods remain. For generic methods JRE automatically
adds overloads for those methods with Object. We now skip them (which
gives consistent output with AOSP XML).
Fix error "Unsupported operand types"
diagnostics fix2
参加上海R会议PPT用到的代码
CP-3334: enable license checks

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Merge commit '361b3808a0f997f6cb9deb079b759e7bfc4078be'
Allow bytecode compile with 'COMPILE_BYTE=yes make'

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Merge commit '07b00719a9449a95a8193763c148e15b43629f4e'
removed duplicate code (use global *_delta functions).
added input parameter checking for the sse functions.
第一次尝试提交啊
#1133 If the Kunena profile is disabled there is an error in the
statistic page
fixed categorys last post info counting
#1133 If the Kunena profile is disabled there is an error in the
New configuration setting for rss via feedburner and changes so that the feedburner url is shown instead of the generic forum rss
Fixed grammar errors and shortenned title of configuration value
Trim text posts in the jomsocial activity
#1138 Little and old language "issue"
#1123 Missing file path
#1107 Rename BBCode class into \libraries\external\nbbc\nbbc.php
#1143 Click on "Announcements > Edit" results in "Access Denied"
Revert "#1143 Click on "Announcements > Edit" results in "Access Denied""

This reverts commit d68f7a69c92b91218210c1361e461acdc220cf0c.

Delete commit in wrong branch
Remove usage of kunena.link.class.php in frontstats
When you disable show poll voters, parenthesis are still here
Merge pull request #1136 from koyan/master

Fixed issue with identifying last post per category
Merge pull request #1141 from xillibit/bugs13

#1138 Little and old language "issue"
Merge pull request #1142 from xillibit/bugs10

#1123 Missing file path
Merge pull request #1144 from xillibit/bugs9

#1107 Rename BBCode class into \libraries\external\nbbc\nbbc.php
Merge pull request #1146 from xillibit/bugs7

Remove some usages of kunena.link.class.php in plugins and attachments
Merge pull request #1147 from xillibit/bugs6

Remove usage of kunena.link.class.php in frontstats
Merge pull request #1150 from xillibit/bugs5

When you disable show poll voters, parenthesis are still here
#290 build option number
update artifact name
update copyright
ignore @NoMapping types and methods
Updating libpurple to work around #16081.
Added examplesfor tomcat realm use in webapp
Added new project examples.tomcat.realm.webapp
main layout and searching in progress
0.2.2.237 のリリースノートのテンプレートを追加. #184
Merge branch 'prepare-v0.2.2.237' into develop. #184
calc-mode で日本語の変数名をサポート. #183
Merge branch 'feature/calc-mode-kanji-ident' into develop. #183
「人生、宇宙、すべての答え」を他の計算に組み込めなかったのを修正. #181

    $ 人生、宇宙、すべての答え
    42
    $ 人生、宇宙、すべての答え * 2
    84

この変更により「人生,宇宙,すべての答え」など、単語の区切り文字が「、」
以外の場合にエラーになるようになった。
いきなり非互換だが誰も使っていない機能なので問題ない。
Merge branch 'fix/calc-answer-to-life-the-universe-and-everything' into develop. #181
Correct wintype detection
Bumped version number to 0.2.2.237.
Merge pull request #185 from m-takagi/fix/correct-wintype-detection

Correct wintype detection
Merge branch 'develop' into hotfix/v0.2.2.237. #181, #183, #184, #185
0.2.2.237 リリースノート更新. #184, #185
Merge branch 'hotfix/v0.2.2.237'
Translations in messages.
Synchronizing players and ball, and some code rewrites.
Adicionado querydsl no pom.xml
updated the package.json information
add currency convert
use the latest version of oh-my-zsh
correction export excel
New release 305
Using TextContent instead of abstract class Content. Requires migration.
スペルミスを修正
バージョン履歴ファイル追加
sectionsモジュールのimport方法修正
version指定方法変更
added a couple of rules to gitignore
Updated Rakefile for webfaction and changed hosted by in footer
Merge branch 'webfaction' into source

Migration to WebFaction completed. No longer need Rakefile settings for Bluehost,
nor temporary Mint location URL.
Whoops. Missed change to Mint URL. Corrected.
changing form from post to get in order to work with mobile safari, maybe there is a better way
Small fixes

Icon font, removed anchor underline
Better color support in xterm
Ignoring changes in git submodules
Changed the Terminator theme to Solarized dark
1206181907
Invalidate public list when adding a new cert
del some ~backfile
Added variables for default text and float direction
Fixed name of variable
Added new char to regexp that can be present in locale definition
add mocha test
add test/proxy.js
add merge
proxy recursive
sql lit eheroku fix
Added a Pages controller
done with the sample app
Implemented type checking and some other check for programs, also modified the language a bit to be less ambiguous.
files reorganization and some other stronzates
adding tests for request
Fixed bug where cells didn't come to life correctly
Update the position on the map is now working
Skapa ett vettigt protokoll.
Merge pull request #1 from fabianbergmark/master

Update protocol
deleted test files
ajout du fichier app.js
index removed from static, is now a view
mise en place de la structure
added channel file
Enh: change REST method for save/Update (POST vs. PUT)
New: add 'Note delete' fature
kicked out auto save files reuploaded normal README.md
deleted unneeded icon
JDO test and ANT build script
returned old opt page. Switched in new validate

v2 now uses a programatic method for validations. Will need more testing
later.
Verify the account name after it's been typed.

Show glyphs to indicate whether the account name is verified.
Fix: new charge preset may be blank.
Fix: also set index when dragging a module.
Add missing header side container in layout header
Move layout header to layouts directory.
Fix crash when bluetooth mouse is plugged in, wrt issue 27
Capitalize first character of synaptiks->Synaptiks wrt adaptee's merge
request
Fix .desktop file validation
Add Ukrainian translation.

Conflicts:
	synaptiks.desktop
Merge remote-tracking branch 'ascaf0/master'

Conflicts:
	autostart/synaptiks_autostart.desktop
	synaptiks.desktop
Remove several features that will no longer be exposed in future
releases of the synaptics driver.
Add Italian translation to synaptiks.notifyrc
Fix a couple i18n issues in glance/common/auth.py.

Change-Id: I6944bb46fbd6784b7e9b84d05d453b56bf62d21c
Drop unfinshed parts of v2 API

The v2 API will be implemented over time as the spec develops. We
shouldn't implement anything that we aren't 100% behind. This drops
all of the things that we aren't in love with:
* Drop access records and related schemas
* Drop owner attribute from image

Related to bp api-2

Change-Id: Ieef2c141282e7018d56e79aee8f20af0542af25b
Call stop_servers() in direct_url func tests

The recently-added direct_url tests aren't spinning down their
api servers. This was causing arbitrary failures when running
tests in jenkins and smokestack.

Change-Id: I06293fdec8449c15fe993653157c327c8a7e8418
Merge "Fix a couple i18n issues in glance/common/auth.py."
Merge "Call stop_servers() in direct_url func tests"
soporte para claves foraneas
simpler miglayout constraints
and delete one file
! Typo
+ Updated readme for development branch
+ Updated readme for development branch
- Deleted binary
+ Updated readme for feature/refactoring branch
! Markdown formatting fix
! Proper readme after rebase
Merge branch 'feature/refactoring' of github.com:Averethel/thesis into feature/refactoring
! Proper readme after rebase
Add the test example for the Venn Charts
Improve the haar hand classifier, create more positives
Specified a good NonText and SpecialKey color
Possiblitée de supprimer l'attachement à une communautée
Added Akshay Katyal
Merge pull request #1 from MrDHat/master

i've added myself (Akshay Katyal)
v7.0beta Fully implemented EIOS in a way Simba can work with.
Truc du soir
Removed unrestricted union from Result Class because of likely memory related bug - NEED further investigation. Added Controller and View support for VertexConnectivity algorithm.
started VertexConnectivity algorithm implementation
icon panel manager item order
bit of animation stuff
forgot navigation
Tweaks to panel view
some fixes for tripanel banner
...and another texture gone
split zsh
modify sometips
Feature and category fixes
fix urls and typos
Allow line continuations for any number of lines.
IPC for Wingo commands is working.
Uploaded source rpm of 1.30 version (SLC 6 ONLY)
Revert "Use span10 for layout"

This reverts commit 8c665a1e99a30ebcc469a8edf285d38f75796820.
Alot

Did alot
Lots of ui tweaks as well as adding loading image on the search.
Wrapping search result in single transaction has resolved database performance issues. Will add service caching as todo.
Merge pull request #2 from CalvertYang/master

List Lv1Classify from remote server not finish
Change Menu to Topbar
Merge pull request #5 from AndyYou/master

Merge code from Andy
Added TextInputStream
Interim
Removed unnecessary context member.
Set project description in upload dialog.
fixed colors for text highlighting
started fixing multi edittext bricks for editor landscape
-
Reduced Dummy Data

Reduced some of the dummy data in the json file.
Apply same Trim and Replace operations to Text and OriginalText properties in the check for IsModified
Merge pull request #28 from IanRandall/ismodified

Apply same Trim and Replace operations to Text and OriginalText properti...
Implement CompileGlobal
Cleanup global code execution code
Updated the event handling.
Event handling update.
Updated how the plugin handles the kick and message event.
Still unsure how event handling should be done.
Also working on the PlayerListener for CB.
Add SoulAbyss
Added TextLink example.

Signed-off-by: Grant Skinner <info@gskinner.com>
Fixed support for the use of canvas elements as source images in SpriteSheet.

Signed-off-by: Grant Skinner <info@gskinner.com>
First build of SpriteSheetBuilder.

Signed-off-by: Grant Skinner <info@gskinner.com>
Bug with OAuthWebUsage.
Add VP8 dct4x4dc (Walsh transform)
Add py2exe with for agent and forwarder

The agent and forwarder have two different entry points for win32 and
each is used as the console script that will be compiled into an exe.
Update windows packaging
clean up logging config
rotate logs
dump the vestigal 'get_logger_name()'
print the whole traceback when logging fails
syslog logging. on by default, and configurable.
show deprecation warning if old-style python logging config exists
rename 'logger' to 'log' for oli
Delayed camera recoil
The "TryExec" desktop entry key is not meant to be used this way
fixing button states
3 stage complete
parent template selector
data binding for editing template, redirect on success

fields are still mocked
d
Add title block to gpp.
Prompt : traitement réel des commandes (une seule pour l'instant)
return user profile via get request
Something
Merge remote-tracking branch 'alex/master'

Conflicts:
	src/hikst/frontend/client/pages/NewSimulation.java
	src/hikst/frontend/client/pages/ViewObjects.java
Commented out upcallback and fixed remaining merge conflict in
ViewObjects
Lagt til en inputbox, laget en onchange-handler for listboxen.
Fixet bug. Var hikstcomponent som overskrev getparent fra widget lengre
opp i treet. parent og getParent er fortsatt i bruk enkelte steder og
skal erstattes med hikstCompositeParent og getHikstCompositeParent i
morgen
Små endringer i ipmactfactors.java og ui.xml
Debugging ferdig. Fungerende versjon ute
Merge pull request #11 from palell06/master

Pull Me
Merge remote-tracking branch 'sentral/master'
Fikset tilbakeknapp i viewobjects
Can now send simulation requests to the server
Merge remote-tracking branch 'paal/master'
Errormessage klassen ist complete
NewUsagePattern begynner å ta form
La til to nye sider i pages
NewUsagePatteern er grafisk ferdig. Callbacks mangler
Arbeid på impact degree og callback
Laget ViewSimulations og callback
Merge remote-tracking branch 'vegard/master'
Merge remote-tracking branch 'paal/master'

Conflicts:
	src/hikst/frontend/client/DatabaseService.java
	src/hikst/frontend/client/DatabaseServiceAsync.java
	src/hikst/frontend/client/pages/NewObject.java
	src/hikst/frontend/client/pages/ViewImpactFactors.java
Add names of entities
You now can't start a new game until the previous world has finished being unloaded
Fixed crash when mousing over an unknown control.
Tightened up Exception use.
Remove debug fodder.
pvr: build external add-ons
X11: ditch SDL for video and window events
X11: Add xbmc icon
X11: add SDL joystick until we have a better solution
X11: factor out code handling device reset notification
X11: move xrandr events to WinEventsX11
xrandr: remove method RestoreState
xrandr: observe orientation
xrandr: allow getting info for multiple screen's

Refactored by: Joakim Plate <elupus@xbmc.org>
X11: fix multi-head setups
X11: remove all DefaultScreen and RootWindow macros
X11: remove all DefaultScreen and RootWindow macros (VideoRefClock)

Note this is on a separate display connection.
X11: recreate gl context after output has changed
X11: hook video reference clock in windowing
X11: fix video calibrations
X11: deactivate screen saver on startup
X11: change method of going full-screen
Fix timezone build on older PHP versions
Small test with World of Goo-like balls
email
Merge branch 'master' of heroku.com:dragpic
Merge branch 'master' of https://github.com/songz/Facebook-Album
merge songz with fongfb
disallow crawling thumbs dir
disallow indexing
made a cjs module called installer that can put views into a database refs #21 and #22
Merge branch 'master' of github.com:FourSquad/portal
cleaning up IsPlaying() and IsPaused() to reduce compiler warnings
added gitattributes for automatic line ending conversions
Fixed: Issue 135: HTMLViewer.CopyToClipboard - broken?
Removed: unused code due to Issue 135.
Fixed: Since reading more than just div tag here, end tag may differ from DivEndSy.
- use matching end symbol instead.
Fixed: warning "uninitialized" removed.
Fixed: Issue 150.3: Errors styles: After r277 no longer displayed grid table.
Fixed: Issue 163: Table borders not rendered correctly.
Fixed: Lazarus failed to compile CopyToClipBoard()
Changed: don't use deprecated methods
Version 11.3
Version 11.3
Fixed: DemoSubs.StartProcess() failed with Delphi 2009+
elec q2 merged with Lucas Nyssens' one
differential symbol in math q2 done in a better way
Added "misc" Bobfile statement to build miscellaneous files.
Used for copy/generation of built files from source files.
Applicable for:
* Scripts
* Data and configuration files
* Documentation
* etc.
Cleaned out some unnecessary code.
Cut and paste
Merge branch 'master' of github.com:Habibi/DarkStone
Ajout de la page classement 1ere partie

Samuel fera la partie 2 avec  le classement dans un tableau avec les
nouvelles couleurs. & nous linker la page.
Add GV
updating Test for DataBossUtils
tutorial - splitters
Linking builds and release notes to Breezejs.com
RelabelingArraySource: allow to a single relabeling entry relableling[index] to a specific value
Viewer: new function to add a random color layer (for segmentations), color layer
Datasources: fix createDatasource function, which would make (unnecessary) copies of the data with the wrong dtype
Add initWithCoder in IIViewDeckController
Merge pull request #114 from gpascale/initWithCoder

Add initWithCoder in IIViewDeckController
Hardcode it. [ci skip]
OnMessage Event eingebaut.
Connection Send Funktion um Debug Meldung erweitert.
Adding string section.
Site navigation for Simple App
Merge pull request #13 from IrisMa/filling-in-layout

Site navigation for Simple App
Merge pull request #1 from IrisMa/static-pages

Static pages
Merge pull request #2 from IrisMa/static-pages

add idea's configuration into git ignore.
Merge pull request #3 from IrisMa/static-pages

Static pages
add statis_pages/about and integration test for static_pages/about
add statis_pages/about and integration test for static_pages/about
Merge pull request #4 from IrisMa/master

add static_pages/about
Only set $chroot if not already set

To allow re-use of the stemcell staging scripts,
allow for $work & $chroot to be the normal root of the VM

Change-Id: Ib9fb095fcdc801531e6942c311cba4642448a246
Add OpenStack Agent

Change-Id: Icb3447fb454f8cba40e054ab37f87f2dcf9909d4
Add OpenStack Stemcell builder2

Added suport in builder2 to create OpenStack Stemcells, both for Kvm and Xen

Change-Id: I25e49577adda0d7796806d3f266a503dac226c38
Remove invalid/duplicate :scp route

Change-Id: I2a619406be2cd95240afc71fbcdfe69d6967fd85
Merge "Add OpenStack Agent"
Merge "Add OpenStack Stemcell builder2"
add 'bosh edit deployment' command

Change-Id: I670acd7d4d8bd2c3f3214da30e322fb117be1e63
bump openstack registry gem

- 0.0.2 is needed so the cpi & registry both use the same fog version

Change-Id: Ic561003c6d5cdb9c1edb6d7068261ceda41abd62
bundle_install: 'bundle install --local' run in root of proj folders

Change-Id: If5907a30aa444487add297cce5dae5439bc31b7d
update_persistent_disk should always call save_state

Change-Id: I4ae8001d2a2b85c1d4af83989a776290cc9eb6a7
updated micro tests

Change-Id: I5f37ae7bc069dcc16b2bbe98f4b315b2279bc721
add bosh_cli as dependency

- clean up fog dependency

Change-Id: Ibb28404c8471f0c04c5aa7117d596ab53af32902
bump deployer

- include bosh cli dependency

Change-Id: If39e36e77285f6a6eb6f41c922775ecf37d2a3df
Merge "bundle_install: 'bundle install --local' run in root of proj folders"
upload release should look two levels above the .yml file

Change-Id: I8d06dfc372d8c2f30894b8c8351e81ac79df9635
Should only create VMs with number of vCPUs being a power of 2.

Change-Id: Ia363b7fa76cf923cc360c45acdbcd8d300b6352a
Merge changes I5f37ae7b,I4ae8001d

* changes:
  updated micro tests
  update_persistent_disk should always call save_state
Merge "add bosh_cli as dependency"
Merge "bump deployer"
Merge "add 'bosh edit deployment' command"
read/write from/to txt file
html memo editor resized
Merge pull request #37 from Slashfaith/master

one html memoeditor fix
adding power line theme
Merge branch 'master' of github.com:JGrubb/oh-my-zsh
fix drush cc theme-registry
Added MortalEntity
Remove Readme.md from demo.
Merged running changes with github
Stub for JetProperty
JavaDescriptorResolver should not crash if there is no original for alt-header

(before this commit it crashed because package was not searched in alt-headers)

This commit makes JDR ignore alt-header if original is not found
JDR: do not crash if signature references nonexistent class
fix more errors of incomplete classpath

after this commit project without JDK configured is not all red
ant: Add build file
git: Remove jars from ignored
Add jars
enable travis
Move travis file
Merge remote-tracking branch 'origin/master'
travis: Notify irc
Skeleton for scheduling-related classes
Implement RecurringTimeslot and basic test
Fix RecurringTimeslot for one-time occurrences. Comment a bit.
test: Add Event tests
tests: Add Timeslot tests
Merge branch 'scheduler' of git@github.com:JohnBrodie/cs451.git into scheduler
Fix RSTQuickstart.rst Figure display
More model changes... mainly base object name and adding new()
init
changed gem file

added production so heroku dont complain :)
Fixing module dependencies.

1. Adding extra modules for vtkPVServerManagerApplication to ensure that object
   factories were setup correctly.
2. Making plugins depend of vtkPVServerManagerApplication instead of
   vtkPVServerManagerDefault. This ensures that plugins inherit all link-time
   dependencies that the ServerManager needs.
3. Removing hack from SciberQuestToolKit/.../TestUtils to overcome the factory
   initialization issues.
Merge topic 'sqtk-testing' into next

72cd3bb Fixing module dependencies.
Add QuadView tile display testing

Change-Id: Ia62d7cad91f545c8e44bb9786819a0e333e4a643
Merge topic 'quad_view_slice_view' into next

cb2b6aa Add QuadView tile display testing
Disable Git diff for buggy_scripts.pl
Fixing root id on categories
Fix creating uncategorized categories if database prefix changed
Fix a bug in menus where page header was shown when show_page_heading=0
Merge pull request #28 from mahagr/master

Fix creating uncategorized categories, fix menu headers
Fix #23 Main Menu module looses its menu assigments
Fix category ordering to be the same as in Joomla 1.5
Fix #29 Uncategorized items (no category) get moved into wrong category

This also fixes a bug where articles having a missing category get lost.
Fix #31: Category ID=1 gets lost during migration

* Last item was calculated from the new and not old data
Merge pull request #32 from mahagr/master

Fix bugs in category assigment/ordering and Main Menu module having no menu assigments
Fixing JCE migration
Adding AceSEF plugin
Adding AdminTools plugin
Adding aiContactSafe plugin
Adding AllEvents plugin
Adding Ambra Suscriptions plugin
Adding JComment plugin
Adding FLEXIcontent plugin
Adding Highslide JS plugin
Merge branch 'master' of github.com:fastslack/jUpgrade
Adding HikaShop plugin
added create_vm.rb script
add video filedata to database
Merge branch 'add_video'
Add Images
fixed Skin saving
Merge pull request #1 from mentox/master

bug fix skin saving and added missing images
deepFind()
EC_GraphicsViewCanvas: implement mouse scroll input + some code cleanup.
New Canvas demo scene for demonstrating the EC_GraphicsViewCanvas.
Merge branch 'master' of github.com:spewia/spewia into feature/baseController
Created the factory interface.
Merge pull request #19 from Lumbendil/feature/factory_interface

Created the factory interface.
Added a default value for the FactoryInterface, and wrote the ResponseFactory skeleton.
Added the test for the ResponseFactory class.
Fixed some errors in the test.
Added the code to pass the requirements defined in the test.
Merge branch 'master' into feature/baseController
Created the ControllerFactory class and implemented it's tests.
Implemented the code to fulfill the test requirements.
Documentation updated.
Merge pull request #20 from Lumbendil/feature/basic_factories

[WIP] Creation of the basic factories
Changed the tests to use the factory.
Created the basic controller that create the reponse with the template render.
Merge pull request #12 from patxi1980/feature/baseController

[WIP] Creation of the Controller
Created the test for the case when there exists no class with the given name.
Implemented the validation of class existance in the controller factory.
Merge pull request #22 from Lumbendil/feature/controller_factory_throw_exception_on_unknown_class

Controller factory throw exception on unknown class
Merge branch 'master' into feature/dispatcher_basic_implementation
added files for voxel and assembly stages
Fix exception when no connectivity during group download
tiny bug in tile copying. used tileHeight instead of tileWidth.
Merge branch 'master' of https://sfuller@github.com/MANEtainers/MANE.git

Conflicts:
	LevelEditor/LevelEditor.pro.user
	LevelEditor/editorview.cpp

I meant tileWidth. I need to take a break.
Also, I have no idea what I am doing with git. lol
Fragment placeholders

Finished the pretty on the welcome page (only pretty on a Nexus 7 at
present).  Then I made simple placeholders for the three fragments.
intro + various changes
Removed buggy bold texts
Fixed wrong way link
Try /boot since /run requires additional permissions.
Algumas linhas por traduzir
operation: added 'inplace' parameter (currently not in use)
fft: removed support_inplace option
TODO: added task
cluda/helpers: added missing import
cluda/vsize: using wrap_in_tuple
cluda/cuda: fixed bug with list instead of tuple as grid
cluda/cuda: prefixing product() from itertools with module name
test/pytest_contextgen: fixed typo in ctx_and_double generation
core/operation: using static compilation
tigger/matrixmul: updated to use static kernels
cluda/vsize: added template for a stub set of virtual size functions
cluda/vsize: added a simple algorithm for finding local size
cluda/cuda, ocl: finding local size in static kernel if it is not given
Updated kernels according to new virtual sizes API
test/test_cluda_vsizes: changed test kernel name (OpenCL does not seem to like 'kernel')
cluda/vsize.mako: using normal functions in virtual_ stub
blah
Merge branch 'master' of github.com:MasonMcGill/rift
[wip] started the model / view for tutorials
P# Please enter the commit message for your changes. Lines starting
Merge branch 'feature/integration' of https://github.com/McGill-CSB/PHYLO into feature/integration
Merge branch 'feature/integration' of https://github.com/McGill-CSB/PHYLO into feature/integration
nearly done with the tutorial model, integrated with the new router.js
Merge branch 'feature/integration' of https://github.com/McGill-CSB/PHYLO into feature/integration
fixed readme
added google analytics
added read me to this folder
added readme
fix typo
Merge branch 'master' of github.com:McGill-CSB/PHYLO into feature/RNA
Mac compatible: DYLD_LIBRARY_PATH
Compile fix: .h -> .hpp
Don't use SDL when it's turned off
Added settings activity.
Added main menu.
Added CameraPreview activity to Manifest.
Added void statement to separate comments

Uglifyjs obivously thinks that the huge chunk of documentation at the top
of the file belongs to the copyright comments, so void(0) was added to
separate them.
Reminified the minified version
break support and some refactorings
switch for + break
while
give references of true and false
Museum.
- added French version
- spacinazi. (Plenty of unneeded spaces, tabs etc. removed)

plugin.php:

- A "?>" added at the end (why do I see these removed so often...?)
- $total_size instead of $totalsize at one point
- check whether the session variable is set -- otherwise it generates errors when going to the post page.

attachui.js:

- added 'undefined' var to the main function, to avoid doing typeof's. This usually compresses better.
- multiple set to true instead of multiple (same, just simpler)
- change() tests whether this.files is set before processing it -- in case there's an error... Which happened to me.
- new Date().getTime() all changed to +new Date()
- $.event.props.push('dataTransfer') called to allow dataTransfer to be copied to the jQuery event objects -- alternatively, and what I'd recommend doing, using e.originalEvent.dataTransfer, probably compresses better in the long run.
- most events converted to .bind()
- weUrl() instead of we_prepareScriptUrl()
- a couple of "fileName || name" remained to be done
- commented out a console.log (I suspect you can remove it entirely... I also added another console.log which is commented out, too.)
- chaining a jQ call (.element stuff) -- please note: .element is generating an error for me when reaching the .prepend() call.
- some var optimizations.
Continued > Item dragging

Items can now be switched with the adjacent items
Added install instructions for Komodo Edit (Needs to have instructions for
OS X). (themes/+Komodo Edit/install.md). Feel free to merge with readme.md
and remove.
Add cdm config file.
Added cache timeout option. Added useful methods to WhoisDomainBase
Gradle Release Plugin - new version commit:  'astyanax-1.56.15-SNAPSHOT'.
replace ccblade with update fork
Basic pages added
Add media to item json
Merge branch 'api/items' into develop
Merge branch 'develop'
Added background color, fixed parallax background. Fixes issue #12.
Merge pull request #15 from fwenzel/parallax

Added background color, fixed parallax background. Fixes issue #12.
fixed animage.hh to compile without -I flags
small restructure, new options
added gentoolkit to default software
add first userinfo stuff on league site
fix configuration location
SitCodeHelper: Es wird nun bei GetRandomZug ein IField alsParameter erwartet
Fieldhelper erweitert
GetRandomField für das erzeugen von zufälligen Spielfeldern  hinzugefügt
Versionsnummer auf 1.5 erhöht
Screensaver: innere If in die äußere Eingebaut.
IFieldPlugin entfernt, wird durch die neuen Interfaces ersetzt
Die Plugintypes sind jetzt auf Player, LearnableAi, PlayableAi und Field ausgelegt
Den neuen interface Namespace hinzugefügt
FieldHelperTest: Typo im Klassennammen gefixed
Player: Ausgabe einen Strings mit der Information, wer zurzeit Dran ist, entfernt. Dies muss in der Game Klasse erfolgen
Unittt.Pathsystem -> UniTTT.Logik
Game: Spielerausgabe implementiert
Eine statische Klasse für Zugriff auf zum Beispiel ein Random und den Pluginmanager
UniTTT.Logik: Hauptnamespace von UniTTT.Pathsystem zu UniTTT.Logik geändert
AiPlayer: Es iwrd das Pathsystem nicht mehr benutzt um die AI's aus .dll nachladen zu können, sonder das Plugin System.
PluginManager: es wird jetzt zur Laufzeit einmalig nachgeschaut, welche Interfaces sich in der Interfaces.dll befinden.
Fourconnect: Es wird jetzt das Intfaces.Field implementiert
Interfaces Projekt hinzugefügt
Updating, and adding art...
cec: fixed keypress handling. handle diagonal buttons properly
cec: display a warning if the port cannot be opened because of permission problems or when the port is busy.
cec: include system.h in Peripheral.h, or HAVE_LIBCEC may not be defined
cec: updated to libCEC 1.7.0, which adds physical address autodetection for AMD graphics cards, and some nVidia cards on Linux. when the address is autodetected, then the 'HDMI port number' and 'connected to HDMI device' settings will be hidden
cec: don't reinit the connection when libCEC detected that the connection was lost, but just display a warning message. the OS will detect that the device has been removed and will already close the connection
add testdata
rename testdata files.
support for linux
update
Add error checking during connection
Все ок!

работает
reset publisher css height inside "clear" (fixes #2867)
Forced database file to be included with hidden placeholder file
Ignore Library/*
Draw gestures. If on windows (i.e. the editor), gestures is tracked with the mouse
Inital Upload
Merge branch 'master' of github.com:Repooc/ElvUI_RPE
Updated ruby-nxtSample.rb
Ultrasonic sensor is now also working.
I think the original ruby-nxt code was based on NXT1.0 and the NXT2.0 is slightly different. Had to make some changes to the ultrasonic_sensor.rb code.
update statusline
0
Added Access-Control-Expose-Headers support
justifying that a bit
renaming the prototype.py to what it actually is - views.py
deleting a comment now decreases post comment count
now showing avatars with comments
cleaned up packages
avatar tweaks
fixed twitter share body text
css tweak
trying to debug problem on telesc.pe
check if comment has author first
working on notifications
polling experiment
Added Item Resource, resource tests, and changed commonContext to support needed beans for resource
The rake tasks are much more completed, and have relevant history updates. Also changed the registrations email slightly. Looks a little better.
updated readme, yet again.

Added ideas.
SCPU override ostream for better outstream
	modified:   src/core/scpu.cpp
	modified:   src/core/scpu.hpp
	modified:   src/main.cpp
Interface Node + class AbstractNode
parse method in AbstractNode
remove ejs and jinsoku from deps
added ssl and static files support
- Fixed unite#do_candidates_action().
WidgetAgent Completed
Use now PDO for database connection - closes #116
variables buttons added, first implementation try for variables workflow
fix: missing setReduce
Merge pull request #160 from mmklee/libfac_fix

fix: missing setReduce
fix: freebsd port
fix: memory leak in if (#430) (from master)
start PPS methods and tests for connecting and config
Home + Forum view styled correctly. Read counts perfected
Added file whatever.txt. Whatever.
Merge pull request #3 from frankrolf/master

Changes from Frank
Update src/Gaufrette/StreamWrapper.php
Update src/Gaufrette/FileStream/Local.php
Typo
use realpath instead of readlink while defining local adapter's base directory.

Lets consider such example:
we set base directory to '/Users/alex/Sites/test/shared'
which is a symlink to '../anotherTest/shared'.
In case of using readlink function, base local adapter's directory will be
'../anotherTest/shared' and if you try to read file via that adapter you get
`The path is out of the filesystem` error.
In case of using realpath function, the adapter's base directory will be:
'/Users/alex/Sites/anotherTest/shared/' an everything works as expected.
Merge pull request #82 from AlexKovalevych/local-adapter-symlink-fix

use realpath instead of readlink while defining local adapter's base directory
Merge pull request #78 from sgrodzicki/master

Fixed Typos in AmazonS3 adapter
Move functional test to separate directory. Stared create adapter unit
tests.
Tests changes. Added Apc test methods and change name of others.
Merge remote-tracking branch 'nervo/master' into stream-fixes
Merge pull request #85 from l3l0/tests-improvements

Tests improvements
Fix and change stream implementation. Add unit tests for local file
stream.
Merge pull request #86 from l3l0/stream-fixes

Fix stream wrapper implementation.
Fix of url_stat. Stream have to be opened.
Added missing stream_cast method
Ftp : bug on exists on / dir
Cleanup as well as Skies/PointObserver/RegionSpawner should have NO
collision.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Moved some inline styles out.
Send StreetEasy alert emails if possible when raising exceptions
fixed jsonp filter
添加分拣主表和细表查询类和接口
Signed-off-by: zxl <loou@vip.qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
分拣页面修改
Signed-off-by: zxl <loou@vip.qq.com>
Merge remote-tracking branch 'thok-zxl/master'
A python script that loads a json config file, and a mustard template and generates output
Merge branch 'master' of https://github.com/TNOC/MustacheGen

Moving local repo to github repo
+ Added new brush usage to metrics
* Version number change
* Changed one more bad behaviour pattern, missed in the last commit.
Une (toute) petite centaine de warnings doxygen en moins. Et
documentation kernel et libc séparée.
implemented the infrastructure to write packet handlers.
Add XOR gate example.