labofsahil/github-event-dataset-2012 huggingface dataset:
removed marketing site
rename stylesheets to scss
update lib
don't include sass-cache files
updated compass project template
remove unused jammit assets
setup test/ directory for local testing of the gem
updated readme and gemspec
base size default should be 14px
move scss files into scss folder instead of stylesheets folder
Merge branch 'master_marketing_merge' into 3.0-remove_marketing

Conflicts:
	config/assets.yml
	marketing/docs/elements.php
	marketing/docs/forms.php
	marketing/docs/gem-install.php
	marketing/docs/grid.php
	marketing/docs/reveal.php
	marketing/stylesheets/docs/presentation.css
	marketing/stylesheets/presentation.css
	public/assets/foundation.js
	public/assets/marketing.js
	public/assets/marketing_docs.js
	scss/foundation/common/_globals.scss
	test.html
update test files
updated styles
updated README.md and moved information about contributing to foundation to CONTRIBUTING.md
updated accordion to use direct child selectort
updating contributing guide
updated buttons style bit
added navigation test file
Merge branch '3.0-remove_marketing' of github.com:zurb/foundation into 3.0-remove_marketing
remove test/ css directory
Typo in tooltip selector.
added better responsive styling to tooltips, thanks isarmstrong! Fixes #974
updated app.scss in gem
add some questions/issues
cleaning
remove trash
cleaning
Make html was throwing the following : awk: line 1: illegal reference to array arr.
Fix : @find $(APP_PATH)/templates | grep .html$$ | xargs -L1 -n2 -I % env val=% awk 'BEGIN {split(ENVIRON["val"],arr,"[./]") ; print "<script type=\"text/x-handlebars\" data-template-name=\"" arr[length(arr)-3]"-"arr[length(arr)-2] "\">"} {print $0} END {print "</script>"}' % > $(TEMP_ASSETS_FILE) ; sed -e '/templates/r '$(TEMP_ASSETS_FILE) -e '/templates/d' $(HTML_LAYOUT) > $(HTML_OUTPUT) ; rm $(TEMP_ASSETS_FILE)

to

	@find $(APP_PATH)/templates | grep .html$$ | xargs -L1 -n2 -I % env val=% awk 'BEGIN {arrlen=split(ENVIRON["val"],arr,"[./]") ; print "<script type=\"text/x-handlebars\" data-template-name=\"" arr[arrlen-3]"-"arr[arrlen-2] "\">"} {print $0} END {print "</script>"}' % > $(TEMP_ASSETS_FILE) ; sed -e '/templates/r '$(TEMP_ASSETS_FILE) -e '/templates/d' $(HTML_LAYOUT) > $(HTML_OUTPUT) ; rm $(TEMP_ASSETS_FILE)
framboise home nearly done
fix weird page bug & reorganize
WINKSTART-732: Patch for queues (Member timeout, hide caller exit key)
Custom messages on invite code errors
Merge remote-tracking branch 'origin/master'
Employee Db Context rename
Employee Db Context rename
Employee Db Context rename
Julia language: update to a fresh version

Update julia and some of its dependencies

Split PCRE because a lot of packages depend on it and I am not sure we
want to test them in a hurry (and Julia specifies exact version).
libjpeg-turbo: Update to 1.2.1

CVE-2012-2806
spamassassin: disable taint mode, without it we cannot configure the PERL5LIB search path
trying to fix brackets again
remove unneccesary sh stuff, and add sh support to index.
Initial people
Initial 7
Dump a couple of points from germany
proper markup for embedding images
edited readme for demo
Removed the email filter so that every user will now
get a UAA token

Change-Id: Icae09aa2e26cc70c0cb406b6c4a033ab7322bd46
Updated the access token validity for vmc
to a week to retain existing user token expiration policy.

Updated the access token validity for cloud_controller
to a week as well so that it does not need to frequently
refresh it's access token.

Change-Id: Ic8147ad4ee9d28ddd898f103bdf959507b5e6522
Bump the submodule pointer to tests.

Change-Id: I565a822f35b3c1d69f403d1458eacba84dfe491c
修改上传图片的那个按钮的样式。。
0.2.0

Continued work on SpriteBatch.
Rendering works. But not entirely, some artifacts persist. Will
investigate.
0.2.0

Finished SpriteBatch. Fully Working for now (tested with ~1400 sprites,
running with ~1000FPS, good!).
Modified Text to use their own VBO.
Mesh class has been eliminated. It s not really necessary, I only need
vbos for SpriteBatch and Texts, so, a generic class isnt really useful.
Fixed some bugs with rendering (SpriteBatch & Text).
Added static functions for renderer resources
(Shader,Sprite,Texture,Font), so that you can Bind/Use and Get them
anywere with something like Texture::Get( name ). Those wont return
anything if the Renderer pointer in those classes is not set (when the
Renderer class is instanciated).
DRY up database configuration
pushing submodules
Modified downver (should currently do nothing but is untested)
Fixed JBoss Messaging Topic discovery to work with SOA-P
mudando o incremento de linhas e colunas da média
Add turret DPS.
Use git-describe(1) to get version number.
Fallback to a temp pid file in glance-control

Fixes bug 1046593.

Previously if the pid file was not writeable by the current user
then glance-control bombs out, *after* spawning the required service
but *without* caching the process ID anywhere.

Now we fall back to a temporary file, so that at least user can supply
that file to the corresponding glance-contol stop command.

Change-Id: I6c1daf36221f731fdb5a8bb59d3f91a595337af8
Merge "Fallback to a temp pid file in glance-control"
I missed something re Mac OS X.
Added: Bacteria
-Asyncronous
chenged nori status
commented conflict
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
修正本科生页眉
修正本科生页眉的各项小问题
Merge pull request #34 from JosephPeng/master

修正本科生页眉问题
by dron
Merge pull request #81 from ChineseDron/dev

by dron
[Change] _instances 与1.x版本的兼容
[Change] _instances 升级兼容1.x版本
Merge pull request #500 from huangfangrong/dev

Dev
[testcase]修改build_run.xml
Merge pull request #427 from tianlili/dev

[testcase]修改build_run.xml
Fixed filename clobbering
add parsing support for %Natives syntax
Add support for ForIn, fix up $NativeFunction, add support for %Natives syntax
change posy of thumb
added pvr settings window to top bar animations
playing around with pipes
Gallica advance search added function to do "not in" search
Just a mergeMerge branch 'params' of github.com:Blanko2/vic-mdid into params

Conflicts:
	rooibos/unitedsearch/views.py
Add GanOptimizer to manifest

Change-Id: I402976922bae44192cd300d2add206abb450bb15
Организована папка с текстами для тестов разбора текста по BNF-правилам. Сам механизм тестов пока не готов.
Fix to breath pressure tresholds.

This also increases default breathing speed a good deal.
changing zIndex values
+ ‘JMON.php’
Removed comment
.
..
Added the Title-case a string Function
Added decimal function.
switch from irssi to weechat
fixed problem with main tag attributes in xml; adapted more tests for
xml schema v.0.3
Merge remote-tracking branch 'origin/XmlTesting' into XmlTesting
different line spacing on Android 4 should now work correctly
updated brick UI tests for new formula names
Merge branch 'FormulaEditorFragments' of https://github.com:443/Catrobat/Catroid.git into FormulaEditorFragments
Keyboard bracket button added
Parser unary minus in front of multi level brackets bug fixed
Parser testcases added for brackets
Merge branch 'FormulaEditorFragments' of https://github.com:443/Catrobat/Catroid.git into FormulaEditorFragments
Keyboard bracket tests added
new save/return behaviour
Merge branch 'FormulaEditorFragments' of https://github.com:443/Catrobat/Catroid.git into FormulaEditorFragments
Formula interpretation ln and log fix
Formula interpretation trigonometric functions degrees to radians fix
Formula interpretation tests added
Merge branch 'FormulaEditorFragments' of https://github.com:443/Catrobat/Catroid.git into FormulaEditorFragments
fixed tests for new save/return behaviour
Merge branch 'FormulaEditorFragments' into FormulaEditorFragments2
Conflicts:
	catroid/src/at/tugraz/ist/catroid/ui/dialogs/FormulaEditorDialog.java
fragments - many things are working (but no changing from one textfield
to the second one)
rebuilt my first commit from Issue56 branch
forgot to add files
text in bottom bar now black, rename and delete now working from context
menu, autoformat
refactored ProjectActivityTest, added util method to click on bottom bar
refactored tests to use new play button on the bottom
text on button wasn't black --> fixed
removed chunk of commented code
add sprite under list is back!, checkboxes on spritelist items,
show/hide details
test for show/hide details in sprite list
menu items cleaned up, rename and delete from option menu done
Merge remote-tracking branch 'origin/master' into
ProjectActivityForRealNow

Conflicts:
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
Merge remote-tracking branch 'origin/master' into ProjectActivityForRealNow
delete/rename test, fixed newSpriteDialogTest
wrong string value --> fixed
trying to fix projectActivitytest
previous changes undone
testOrientation fixing
navigation spinner in actionbar for switching between projects
NXT test gets bluetooth device MAC dynamically now
debug
Basic networking; server starts, client connects, and the render test
loop runs. Credits list with some gathering copyright statements.
asking travis to create db
Bumped version to 1.1 Beta.
Removed TODO.
Added added gitter and setter for the Canvas in Window.
Added .gitignore.
Added ScrollingCanvas and ScrollingEntity for scrolling support.
Added code to check if there is 1 or no Colliders and if so, skip
collision checking.
Changed version to 1.1.
addEventListener Convert to jquery

converted to jquery
Added NetBeans-Projectfiles
and removed an old unused class
Moved Map#GetOwnPropertyNames to map.h
Refactored to more readable ToPropertyDescriptor
Fixed railgun::VM operation
add jit_code.h and jit_fwd.h
Merge branch 'aero-jit' of https://github.com/Constellation/iv into aero-jit-advice
rm push / pop in prologue / epilogue
Merge branch 'aero-jit-advice' into aero-jit
Merge branch 'aero-jit' of https://github.com/Constellation/iv into aero-jit-advice
rbp access is not necessary
fix hardcoded movespeed for vanilla
реструктуринг
New IO system
- Main rewritten (cleaned)
- Possibility to chose which device to use to move camera/cursor
- Common io handling system in IOManager
- Separate wiimote configuration file loaded by WiimoteHandler
@fixme Memory leak
@fixme SegFault when firing bullets at long range
@todo Put wiimote src files in mrio namespace
Accidentally the yml
Closes #153.
Fix Input Handling
Fixed a bug in COBAGenericNaivePlane.ih

An iterator dereferentiation caused DGtal's build to fail with option
GMP.
Merge branch 'master' of http://github.com/DGtal-team/DGtal into fixCOBAGenericNaivePlane
Merge pull request #514 from xprov/fixCOBAGenericNaivePlane

Fix coba generic naive plane
c5 -Rename "JdbcExample" to "JdbcDemo".
change load config nodrop to nodrop-ondeath
Merge branch 'master' of https://github.com/CSEMike/OneSwarm into fileBrowser3
Merge pull request #68 from joelkuiper/develop

Various fixes in CT.gov importer and added new example to WelcomeDialog
Remove unused files
Merge pull request #69 from joelkuiper/develop

Development 1.16-RC1 release
Add some data for NCT00846365 (story #562)
Complete NCT00846365 data (story #562)
Merge branch 'develop' of https://github.com/gertvv/addis into develop
remove whitespace
don't send diagnostic stats in main statsd flush
Tabs to spaces and trailing whitespace kill
Updated MPTW empty
Fix typo in Someday/Maybe with no tickler (thanks Susanna)
la til stringtokenizer
Merge branch 'master' of ssh://git@github.com/Daveiac/TestRepo.git
Harmonized icons some more (including emblems on any icon)
Fixed the monitors tab when unable to obtain the geometry for a specific monitor
Uluchsenie fayla README
ulu4shenie faila readme
Adding all files to the repo
Merge branch 'master' of github.com:Dempf/MockBuster
Deleted stuff to make file hierarchy better
Added toto in current task
Build fails if lint fails
Updated to-do list: Continuous integration is finished
Beginnings of Node server
Added todos concerning the test framework
Cleaned up copyright comments
Installed nodeunit and added test task to Lint
Nuneunit test runeer is working
First running test
Switched test runner to use minimal reporter
Switched test reporter back to default
Our first test-driven method on the server
Added node assertions
Added LICENSE.TXT
Modified jakefile to wait for all tests to complete before integrationg
Build now fails if a test fails
Switched back to nodeunit assertions so that assertion count works
Added note about nodeunit not properly working in windows
Updated todo
Added a Node HTTP server spike
Updating 1.0pre1
document depedencies
Merge pull request #5 from Djiko/master

Fr : New strings translated
share buttons plugin for post page
added share buttons plugin to post page section
added share buttons plugin to post page section
Removed no longer used code to call plugins
Removed no longer used code to call plugins
Updated titles
Merge pull request #6 from syndicatefx/master

Share buttons plugin for post pages
05/07
05/08/2012
added <ul> for category list
updated button styles
Merge pull request #7 from syndicatefx/master

Plugin updates
08/08/2012
Translation updates for core french translation and analytics. Translation added for new categories and share plugins
New Strings methods, and Object List is created, now the objective Fenix virtual Machine can execute List Objects. (It don't be tested)
Merge remote-tracking branch 'origin'
Solved a little bug...
Integer Optimization
First prepare of the reference counting
Merged from github
Adding proposals for DB schema in docs section
Ajout param 'passwd' dans la classe team (permet une déclaration plus
rapide des équipes)
Fix a spot where I missed a change to mount_spec
Allow physical volumes to be a single volume as a String.
Make sure to update the resource if any logical volumes are.
Merge pull request #3 from DrillingInfo/add-providers-for-volume-management

Add providers for volume management
video link update in readme
video links
code zip file
Forgot to ensure function export
Use PsCx 2.1.0 RC instead of 2.0

2.0 doesn't work properly with Powershell 3
PsGet accepted PsCx pull request, so no need to manual install PsCx
Merge pull request #16 from Iristyle/Pscx-fixes

Fixes issues with PSCx
Make this code work without built-in types.
Allow us to print functions... somewhat.
Git Ignore.
Partial and Curry functions.
Partial.
README update.
old widgets are reused in launcher widget
Make work in browserify
recursive-once is now an inside business
wdconf w: export the goddamn thing
recursive-once is now an inside business
reflect changes in the code
Bluetooth address patch merged.

Change-Id: I25b5f3d5aa65939641006d6ddc09bc52518acdf6
add tests for new api functions
Fixed profile saving for content optimizer
Create and install options.cmake
Rename hasLostFocus to hasFocus and some changes in firebug.js
One way scripts initialisation: make it framewok independet
Exercise 35 about planes Queue working.
Disable Yadif activated by mistake for first frame decode
jobmanager: add functions to pause job creation

useful for delaying all new job creation until later. As an example, we may
want to disable thumbnailing during video playback.

Not currently hooked up to anything.
Merge pull request #869 from theuni/pausejobs

jobmanager: add functions to pause job creation
CCurrentStream hold a int for the player identification
Refactor calculation of min/max dts to allow additional streams
Changed extend NextStream functionallity for what is needed by dvd navigator
Factor out the menu's commands in dvdplayer from dvd navigator to a generic interface
[bluray] Factor out retrieval of title
[bluray] Check if disk is encrypted and log messages about lack of libs to decrypt
[dvdplayer] Add support for a group of overlay pictures with same start/stop times
[dvdplayer] Add constructor for CDVDOverlayImage to copy another image
[bluray] Delete support for older libbluray

xbmc will abort configure if an old libbluray is found
and configure is auto or yes. To skip libbluray support
in that case explicitly disable it.
[bluray] Initial support for menu's, no BD-J supported

Code will fall back to longest item if there is not first play
hdmv item. However it will still try menu's if there is only
some unnsupported BD-J titles. This could possible fail to
play if it switches into BD-J mode later in menu's.

Starting index.bdmv will still only play longest title,
to attempt playback with menu's, start the MovieObject.bdmv
[dvdplayer] Rewrite wrapback/forward detection to adjust timestamps instead of trying to syncronize players

This avoids a lot of the stutter that occurs with streams
with concated streams or timestamp gaps in them and almost
makes the timestamp correction logic for dvd's redundant.

With this in place it should be also finally be possible
to handle looping still frames in dvd's by having dvdplayervideo
respect timestamps and not limit itself to minimum 1 fps.
Merge pull request #773 from CrHasher/yadif_hwdfix

Disable Yadif activated by mistake for first frame decode
[LINUX] fixed: Compile error on systems without libbluray installed
[WIN32] updated libluray to 0.2.2. New packaging format. Will make it easier if we might get another depdownloader someday.
fixed: File sizes & file dates didn't work properly for lighttp HTTP servers
[WIN32] fixed: receive response from the bonjour daemon if one is available. for easier maintenance we only talk via one connection to the daemon now.
Merge pull request #871 from wsoltys/bonjour

[WIN32] fixed: receive response from the bonjour daemon if one is available
Add JTAG_STABLECLOCKS and JTAG_RUNTEST handles
Fixes for CB#2520+
modify utf
updated and retinified favicon.ico
Production database settings add username and password
Minefield: Changes to the map dimensions and added an anti-jump event
Update to gearman 0.33
Change strategy for Monitoring, use fanout exchange, declare temporary queues
Added vim-instant-markdown.
Bug with request variables called from webmethod. Unreadable!
Create ~/.composer/cache.hg directory if not exists
Added a lot of report stuff
Merge branch 'master' of github.com:Grutn/TDT4240-X2
l
Merge branch 'master' of github.com:Grutn/TDT4240-X2
l
l
Pin from nearby.json + zoom level fix

More Kittens!
Merge branch 'master' of github.com:HKCodeCamp/bartr
Added different healthbar and different audio track for the music.
First commit
First commit
First commit
Merge reaver/master
Adjust for new setup of project
Remove old features
Remove old lucid
Fixed gitignore
Fixed a bug when parsing fasta
fix up license attribution
Limiting number of results
Merge remote-tracking branch 'origin/master'
Fixing GET POST issues plus limit result numbers
Merge remote-tracking branch 'origin/master'
Modulo de Localidades con Georeferenciación
Simplified the TodoSample code
Merge branch 'master' of https://github.com/IdeaBlade/Breeze
Bug #1590: Fix problem calling several times the same method in OrderModel

The problem was that OrderModel.getOrders() was been called several times to
show the list of projects.

After reviewing the problem several issues were detected:
* Util.createBindingsFor was always calling .loadAll() for each binder it
  creates, however this was not needed. Moreover a lot of times
  Util.reloadBindings is called just after Util.createBindings so the same thing
  is called twice.
* If you go via the entry point or the icon to the project list, the binder for
  the page is properly initialized or not. If you come from the entry point, the
  binder is already working as expected, however if you come from the icon the
  binder has to be created manually. It has been added a method
  CreatedOnDemandTab.afterCreateAction() that is called or not depending if the
  user comes from the entry point or the icon.

FEA: ItEr77S04BugFixing
app-i18n/fcitx-table-extra: bump version to 0.3.3
app-i18n/fcitx-configtool: bump version to 0.4.5
app-i18n/fcitx: bump version to 4.2.6
setup.py: install drtile.so, too
Issue#141  and Issue#144 Arrow key issues fix
Merge branch 'jeeva' of https://github.com/Imaginea/matisse into jeeva
FB Redirect
present reshares
fix reshares in interaction presenternavigate replace states on next or previous so back and forward work
default user image
new getting started page [ci skip]
the landing page.
whoopsies on landing [ci skip]
landing fixes for moz [ci skip]
use .erb for custom landing page instead of .haml [ci skip]
Upgrade Rails Admin to latest gem

This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
looks like there are sometimes objects passed into post presenter that respond to root while root is nil
Merge upstream/master
added by unnui
Remove that dumb text shadow on hover.

Y U SO DUMB TEXT SHADOW??!?!?!?!
- Chrome makes stupid changes to their JavaScript Engine.. what can I say?
Done some job!
Load memo list when click memo tab
Load memo list when click memo tab
Merge pull request #58 from haria02/master

Call load function when memo tab is clicked
Reversed statuses on profiles
Revert "add fix to allow primary keys and nested strings"

This reverts commit 6c52a33f60b63776bbfbccf6d647895918831ff3.
Removed checking for with_id from dumpModel

Checking with_id true overrides without_protection false
Sync to wall clock time instead of arbitrary 10-second delays.
Updated styling of active blog.
commit11111

123123
Fix hardcoded "id" column in Eloquent auth driver.
Fixed wrong return type in phpdoc

Signed-off-by: Daniel Bøndergaard <db@helmstmt.com>
Fixes XSS vulnerability in Profiler
Merge pull request #1305 from nmalcolm/develop

Fixes XSS vulnerability in Profiler
Update laravel/helpers.php

The e-helper and the __-Helper used the core-classes. 
So if I would like to override them, the helpers would still use the core-classes.
See this thread for further explanation: http://forums.laravel.com/viewtopic.php?id=2656 
Improving laravel relationship performance
Merge pull request #1314 from vFragosop/eloquent/relationship_performance

Huge performance increase on Eloquents relationships
Merge pull request #1307 from tillsanders/develop

Update laravel/helpers.php
Merge pull request #1294 from danielboendergaard/phpdoc-fix

Fixed wrong return type in phpdoc
Added a getInner method for retrieving the inner exception

Signed-off-by: Dejan Geci <dejan.geci@gmail.com>
Added Serbian translation

Signed-off-by: Dejan Geci <dejan.geci@gmail.com>
Fixing pivot on has_one aswell as properly indenting
Merge pull request #1322 from vFragosop/eloquent/relationship_performance

Fixing has_one iterations
increment version. refactor eloquent eager loading matching.
Merge pull request #1320 from dejangeci/feature/dbexception-inner

Added a getInner method for retrieving the inner exception
Small tweaks to semantics

Signed-off-by: Dejan Geci <dejan.geci@gmail.com>
changed date format in validation documentation to match ISO8601
Spelling mistake correction in documentation

Added missing 's' in the word 'is' (Laravel Overview).

Signed-off-by: matz3 <osswaldm94@gmail.com>
link_to_route requires 3 parameters if wildcard values are required
Trivial improvement to Laravel, while it is not documented, it has been a standard in Laravel to use tab as indentation and new line for curly bracket

Signed-off-by: crynobone <crynobone@gmail.com>
support express-server sample
Starting to edit the Readme file with useful information
180 degrees trying Backbone framework with Jquery

I figured I would try this to at least have a working app in jquery
fixed compile errors
allow the JS compiler to take a list of files, verbose flag and a flag to indicate if a main call is required; plus added a test case to ensure we can compile some of the kotlin standard library using the K2JSCompiler directly
applied pull request with thanks https://github.com/JetBrains/kotlin/pull/46
stream integration test logs
libraries: redundant ${project.basedir}
libraries/runtime: copy runtime module sources locally to help IDEA find them
Merge pull request #68 from JiFish/master

Just a small fix to allow the creation of Magma cube spawners
Updates from JiFish.
Merge pull request #69 from JiFish/master

Very simple additional spawner types
JiFish's extra hard mobs.
Bumped maximum levels to 42.
Note to update halls dirs for piston traps someday.
Merge remote-tracking branch 'upstream/master'
Merge pull request #74 from JiFish/master

Proposed system for configurable spawners.
Custom spawners by JiFish.
Merge pull request #75 from JiFish/master

Suggestion: Changes to default loot
More updates from JiFish.
Adds optional dungeon maps. Issue#72
README additions and formatting.
EditMyInf
Create ntlib.py
Several additions have been made, but much still needed

Majority of 'general' interface now exists. Hooks to other system components are not yet organized or in place.
added about to index.txt, added my previous edits to about.txt
Typhoeus 0.4.2 is out and works fine with VCR
Sidebars and starting to move some admin stuff around; redis user orm
sunday final push
gbhgh

hhh
title
Merge pull request #1 from KarolUrb/master

pull
Still working on prob 11.

Signed-off-by: Karunesh Kaushal <k1821kaushal@gmail.com>
Solved problem 11 and removed java class files from the repo.
Headers shouldn't be same size in the sidebar as the text
Фиксация. Версия 0.5.0. Доработал Режим Уроков
modify via web
lograge now logging params
Cleaning up the time information.

There taking out some unneeded cruft and adding in a warning if
the requested update time is different than the current one available.

Change-Id: I1c3f636de6774bd292e1e38c99bf7766bb5f93d3
Merge topic '13355_vtkPVTrivialProducer_time_info' into next

8b7761c Cleaning up the time information.
Fix bugs because of the AMR data structure changes

Change-Id: Ie5c9404314599a1094d7669757d212da8f59302a
Merge topic 'amr-datastructure-changes' into next

1ae8a76 Fix bugs because of the AMR data structure changes
Ensure ParaView_BINARY_DIR is quoted

When appending ParaView_BINARY_DIR to VTK_INCLUDE_DIRS the property
must be quoted. Build directories with spaces in path will cause issues
otherwise!
Merge topic '13390-fixes-for-external-modules' into next

3d58f52 Ensure ParaView_BINARY_DIR is quoted
Making vtkPassArrays filter accessible and creating a custom panel for it.

Change-Id: I1e2f3b5a3f62cdc7932c8600ef48371201229a80
Merge topic '13216_expose_vtkPassArrays' into next

8af43d5 Making vtkPassArrays filter accessible and creating a custom panel for it.
vtkForceTime: Update according to temporal data API changes in VTK 6.

VTK 6.0 no longer supports vtkTemporalDataSet and vtkTemporalDataSetAlgorithm.
The change derives this class from vtkDataObjectAlgorithm instead.

Change-Id: Ia997ffdba2162e4d78f9b5faa3cadaed12c1a128
Merge topic '0013683_fix_vtkForceTime' into next

d72aa8a vtkForceTime: Update according to temporal data API changes in VTK 6.
More fixes for GMVReader tests due to panel changes

This fixes the remaining GMVReader basic read tests to work with the changes
made with the multi-apply support in the properties panel.
Merge topic 'fix-gmv-test' into next

dffc613 More fixes for GMVReader tests due to panel changes
BUG #11065. Added support for "enhanced outline" for AMR.

For AMR, instead of showing merely the outer outline, we now show the outer
outline etched with the dataset outlines. Unlike in past, the internal block
outlines are not shown, merely those on the outer surface.

Also for overlapping AMR, outline doesnt' need any heavy data. It merely uses
the AMR box information.
Merge topic 'amr-datastructure-changes' into next

0c1121d BUG #11065. Added support for "enhanced outline" for AMR.
fix warning

Change-Id: I3030c4fc71b2bd8ed208abee25b79e449e09d098
fix bug introduced while solving warnings

Change-Id: Ieb41b035c605b99f217082b06d2f1f64b29107d8
Merge topic 'fix_warning_seb' into next

82d3309 fix bug introduced while solving warnings
f68ba9a fix warning
Add multi-block testing

Change-Id: I358a31c943e31e506928be9226cff08c2b99fa99
Merge topic '9810-using-calculator-expression-to-annotate' into next

8a87ff9 Add multi-block testing
Clean again the pdf module
Remove one more useless case in split_first_line
changed incl to movl
Fixed error where wrong config var was being used
Nerfed enemy damage
Fix cell label properties
Adjust height
New cell class
Added back information about how to participate and get started with the repository, to the README.md
beheer projecten
New package version 0.1.0-2
Store should throw concurrency exceptions outside
created new project for Cqrs.Portable.Test and move test files
pid & hostname caching for performance

Signed-off-by: Luca Fulchir <luker@codepedia.eu>
adds cache middleware
Merge branch 'master' of github.com:MAPC/bostonparks
Merge branch 'master' of github.com:MAPC/bostonparks
updates permission on manage.py
Varianta finala etapa 3

[BUG 1] Imaginile pe care le scot executabilele nu se afiseaza in label-uri ( ne scot niste imagini pe care java nu le suporta) - intreb pe forum

[BUG 2] La a 2-a apasarea a butonului de preprocesare nu poti adauga decat ce a mai ramas (cele adaugate in prealabil nu mai apar in stanga) - se ocupa Luiza

[BUG 3] Nu functioneaza executabilul crop.exe (intreb pe forum)

Obs: Imaginile se creeaza in spate, dar nu se afiseaza in label.
editing example_role
changing chromedriver
Import apt version 1.5.0
Import opscode-cookbooks/chef-server version 9167f17089cd04b6744822fa19b30e2d6302b048
Import opscode-cookbooks/xml version 155524325ab56ed582fdfe2201d6a4e3a85ba9b7
Import opscode-cookbooks/zlib version db45e4ee4f70b62a2eb268f18d8760a513a3607f
Import opscode-cookbooks/openssl version 7f5b84a942f015191ade6badf65a49f1fe7b05b1
Import opscode-cookbooks/erlang version 58290537b49b495bc18e7a06d9d7560b4d239582
Import chef-server version 1.1.0
Merge branch 'chef-vendor-chef-server'
Import erlang version 1.1.2
Import apache2 version 1.3.2
Merge branch 'chef-vendor-erlang'
Import yum version 2.0.2
Import zlib version 1.0.2
Merge branch 'chef-vendor-zlib'
Import couchdb version 1.0.4
Import nginx version 1.1.0
Import ohai version 1.1.4
Import gecode version 1.3.0
Integration of minisat execution
Create user module
Make JSHint recognise wg and user as globals
Added rights object to user module
Added urls object to user module
added the history html page
edited some stuffs, attempting to have a sub-dropdown menu
- small improvements to events
Update column lengths in migrations

20 or 30 chars is often not enough to contain the class name
Changed token to filter
FIX Strict warning on Less\Node\Mixin\Definition class
Fix missing module errors.
Updates from reviews, correct toString output and ignore propagated errors.
Generate a dummy stack even for XPCOM exceptions.
Include a better toString() for missing module errors.
Merge pull request #691 from Mossop/fix-test-loader

Fix missing module errors. r=@gozala
Make tests expect tracebacks in the right order.
Merge pull request #693 from Mossop/fix-traceback-tests

Make tests expect tracebacks in the right order. r=@gozala
Version 1.1 - 3/24/2012
Add authorization system read-only detection. #2162.

git-svn-id: https://ncisvn.nci.nih.gov/svn/psc/branches/releases/2.10-stable@7209 0d517254-b314-0410-acde-c619094fa49f
Do not attempt scope updates with a read-only authorization system. Closes #2162.

git-svn-id: https://ncisvn.nci.nih.gov/svn/psc/branches/releases/2.10-stable@7210 0d517254-b314-0410-acde-c619094fa49f
Don't attempt to update authorization info when you can't. Closes #2232.

git-svn-id: https://ncisvn.nci.nih.gov/svn/psc/branches/releases/2.10-stable@7211 0d517254-b314-0410-acde-c619094fa49f
Updated demo code.

Updated switch case in streaming videoplayer demo.
user acounts working
Added the #! to the generated file.
moved the license to its own file.
Assigned the license to a variabel.
Removed main ifstatement in the __init__ file.
Adding logic to extract Bacjplane channel from URL and apply it to the Backplane.init function call
Update EightB4K.java

Code temporarily deleted
fixes #2430 CFU new rudder logo
Merge branch 'branches/rudder/2.3' of github.com:Normation/rudder into branches/rudder/2.3
Issue #2768: read the SYSLOGPORT system variable from configuration.properties file
Fixes #2897: clean-up SystemVariableServiceImpl system variable initialisation
f - hours
ocp-build: some cleaning in code before adding syntaxes
ocp-fix-errors: prepare for fixing Unbound values
ocp-build: better syntax handling

- "syntax" option should now work
- "rule_sources" option used to explicit non-OCaml dependencies
   (for example, if a preprocessor uses external files)
ocp-build: better syntax handling

- new package option 'requires_keep_order' to keep as much as possible
  the order provided in the 'requires' option
- add only link dependencies of syntaxes to camlp4
ocp-build: add 'copy_syntaxes' file option

'copy_syntaxes' can be used to set 'syntax' to the value of 'syntaxes'
ocp-build: boostrap new version
Update templates/wowhead/js/TalentCalc.js
Update data.php
Talent icons \ Iconos de Talentos :P
Ops, algunas imagenes mas :P
Fix or suppress warnings with clang
clang 3.1 warning elimination, found some legit bugs in DPX and Cineon
Adding ignore file
Added new console application
change made
Merge branch 'initial-application' of https://github.com/OrderXYZ/Testing into initial-application
Updated README demo link
Add a module to do generic postgres checks.

This module is meant to be generic enough that it can do any query based check against postgres. You just need to add the entry to %queries for it to be available.
Bug 9144 - bulkmarcimport.pl - Problem identifying errors

Replace \r with \n for newline in output for bulkmarcimport.pl

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 9287 - socialnetworks is enabled by default

The socialnetworks feature is enabled by default after installing Koha. It shouldn't be.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Added carrierwave gem for file uploads
More changes towards a irregation controller
Game: Eine Eventbasierte Logik implementiert
Normalgame: Logik entfernt
Networkgame aufgeräumt
Unnötige Events, Methoden, objekte entfernt
Fehlende Dateien unter Versionskontrolle gesetzt
IGraphicalBrettDarsteller gelöscht
Die arbeit desssen wird vom IBrettDarsteller übernohmen.
refs #100854 Add the missing string ffor service_started1_msg
refs #100854 Merge remote-tracking branch 'origin/100854-ccnx-android-build-is-broken-missing-string-xml'

* origin/100854-ccnx-android-build-is-broken-missing-string-xml:
  refs #100854 Add the missing string ffor service_started1_msg
Add test for OmniauthCallbacks controller
Better structure for the database...
Applying x offset
Highlight upcoming stop times.
Add Subscription page
Facility Registration page
Instructions Page
permissions where fubar
ISPN-1927 Update to Hibernate Search 4.1.0.CR2
s/easymock/mockito/
Use SimpleConnectionFactory for tests unless necessary
Make sure @Before... and @After... are always run
Upgrade Surefire and TestNG (to latest 5.x)
ISPN-1910 - State transfer should not force all invocations to be synchronous

I removed this limitation and replay support altogether, since it was no longer used.
ISPN-1898 Check whether cache store is writable before logging message
ISPN-1908 Remote prepares should be dealt with in DIST mode
ISPN-1929 Handle JGroups suspect exceptions as well
ISPN-1789 Add RSVP message flag to state transfer RPCs

Add it for CacheViewControlCommands as well
ISPN-1931 - The command retry mechanism in StateTransferLockInterceptor doesn't work properly if a target node died

The JGroups SuspectedException was treated like any other exception, and it wasn't mapped to the Infinispan SuspectException.
ISPN-1922 Deal with local-only versioned puts in replicated caches
ISPN-1922 Added local only put tests for versioned REPL and DIST
ISPN-1907 Spring module now uses new parser to find errors quickly
ISPN-1907 Stop Spring tests from creating ad-hoc clusters
ISPN-1922 Make Spring tests use a managed JMX domain
ISPN-1879 - Add RSVP to the default JGroups configurations
Fix a few test failures which happened after testng upgrade
Fix test by waiting for remote transactions to be cleared eventually.
ISPN-1915 Memory leak in L1 Manager

* Don't record an entry in the L1 manager if the originator is also a data owner
* Don't always use NotifyingFutureImpl when this is not always needed - a regular JDK future is cheaper
* Add new cleanup task in L1 manager
* Introduce new configuration element to control frequency of cleanup of L1 manager internals
* Update XSD to reflect new config attribute
-Formatting for log messages to make them more visible
-Reprint any accumulated errors or warnings at the end of compile
-Recompile if object file already exist in target directory but were compiled with different debugging and optimization settings
-Made it possible to set same output directory for debug and release
-Improved performance of header file checking
-Compile files in alphabetical order
-Changed library checking to use ld, now more performant and less prone to error
-Fixed bug where build threads that encountered an exception would not drelease the semaphore, which lead to an unresponsive app that ignored ctrl+c and had to be killed through the "kill" command
-Fixed bug where built-in debug and release targets would override user settings if they didn't make their own debug and release functions
-Remove output file before linking
- Fixed action__directory.
- Fixed newfile action bug.
AtomPairs should complain nicely when required argument is not passed
Merge pull request #74 from SimTk/atom_pairs

AtomPairs constructor complains nicely when required argument is not passed
fixed a bug where adding a voter would cause that person to vote for everyone
fix: optional code im omalloc
fix: tr. #457 (default cntrl-c handling)
add: silink.h, table.h to libsingular.h
Added spec mirror
ORM : repositories are stored as singleton
Fixed selection problems with the InspectorView.
Merge branch 'sprint4' of github.com:SmartBear/loadui into sprint4
Reasonably functional agent and brain editor plus new view templating features
Fixed a few things for DMG (OSX) packaging. Made NSIS (Windows installer) work, but left ZIP as default package for now.
added links to recaps of research
IDToligoanalyzer plugin
Fixed selective showing of Failed reps by setting the default value in the migration to 0.  It had null before.  Set the other values for Weight and Reps to 0 and added a Sets column to make it easier to export data for charts.  Changed the data type of Weight to float to allow for decimals.  Started work on charts.
ajout de quelques commentaires dans fat_outils.h. refs #118
not?
add k.y.
done for clients demo show
oooleeeee
oooleee333333
background gfx added
fixed conflicts, graphics. now background gfx should show up. still some refresh problems, i think.
tested current photos_controller
Class Debug

Meilleure gestion de la classe Debug.
jars deleted.
Switching to SQLAlchemy
- kill all mongodb things
- make tests
- do correct socketio things
- start using backbone.js and handlebars for frontend
Adding notes from MongoDB: The Definitive Guide
MarginStyle was never used and I don't think I'll actually ever use it because it affects layout, which violates the contract of styles.  Javadoc cleanup and warning fixing.
#6: Added textures, including a functional button texture.
Merge branch 'cleanup' into feature-Button
Little bit of javadoc
#8: Added button styles to the base toolkit.  Changed the button test to be a little more interesting.
#8: Designed and implemented a non-working but much more efficient rendering method for the button texture.  Will debug later.
#8: Fixed the performance improvements and activated them.
#8: Refactored styles so that style types are the same as attribute types and can be parsed the same.  Also refactored lengths into core and added a length attribute type.  Added the "corner-radius" style on backgrounds and got rid of the button styles, since a radius was the only attribute on it.
#8: Forgot to get rid of the button style entry in the base toolkit registry
#8: Removed reference to the button style from the ButtonTest.muis
#8: Fixed an NPE and an error where I forgot to register the corner-radius style attribute
#8: Added the BaseTexture class, which renders the element background like the element used to do itself.  The element, by default, no longer renders anything, but delegates all rendering to its texture.  BaseTexture will eventually support the corner-radius style attribute.  ButtonTexture now extends BaseTexture.
#8: Implemented the corner radius background style.  Button texture now looks awful since it draws over the area not painted on the corners.
#8: Fixed BaseTexture with corner radius for some edge cases.  Added LightedStyle but haven't done anything with it yet.
#19: Added the amount style attribute type to allow specifying things like transparency in percentages.
Merge branch 'devel' into feature-Button
#8: Started working on the button texture with rounded corners.  Build broken.
Committing eclipse preferences
#6: A little more work on the button texture.
Merge branch 'devel' into feature-Button
Delete the internal cursor in the simple demo panel.
UpCore
hide projects when user is in a project view
Merge branch 'master' of github.com:Vizzuality/nexso
Add :: asArray Utility fix #8
refactoring :: code formatting
Add :: basic functional programming util #3
Merge branch 'feature/basic-functionals' into dev
minor changes to text. testing ability to git push
Added events and model classes and fixed some of the view classes to conform with the new UI
Revert "Revert "Config files.""

This reverts commit b4ea2e698e244c7c0ca3da40321e317949122cf4.
Revert "Config files."

This reverts commit f5e3c0f2a6bed9a3f1be695554416743efc87659.
Revert "Revert "Config files.""

This reverts commit b4ea2e698e244c7c0ca3da40321e317949122cf4.
A NoteDictionary is private to this module.
Add unit tests for empty measure tests, and make that test quicker.
Some unit tests for measures.
Make measure clearing more efficient.
mi decimo tercer commit
fix two delete bug when bullet packup
commit voiture
MOD:  Florida Keys -> Marathon, Big Pine, & Key West
Update src/main/java/com/sk89q/worldedit/commands/SnapshotUtilCommands.java

Attempted to fix this thing.
new header in place. fixes #593
removed help button
mergefix
editor style update
removed useless css files
add default cover image for new project
add project cover ux
merge w finch
adding file
Merge branch 'finch' of github.com:Zeega/Zeega-Core into embed
can haz publishing
twitter link working. fixes #1123
sequence frame adding, switching, and embedding works. fixes #1124 fixes #1122 fixes #1128
Update normalizer
updated non item layer addition
Merge branch 'finch' of github.com:Zeega/Zeega-Core into orange
new icons implemented for basic layer types
new icon sprites
Merge branch 'master' of github.com:Zeega/Zeega-Core into finch
geo layer updated
popcorn updates
merge
geo layer now previews
removed useless old geo layer code
Merge branch 'finch' of github.com:Zeega/Zeega-Core into orange
Upgraded to Symfony 2.1
Fixed search query limits
Fixed exclude content filter
Merge branch 'tribecaupdate'
reset should trigger search
change parse to check for items
delint, remove tweets
fix excerpt issue
Fixed project filter; set default limit to 100
Merge branch 'master' of github.com:Zeega/Zeega-Core
Added instagram tag parser; needs support to min and max id for incremental updates
Added location to Instagram photos
Added (ugly, inefficient and temporary) duplicate check
Added new moderation API routes
Changed the moderation API routes
Added new scheduled tasks mapper
Merge branch 'tribecaupdate' of github.com:Zeega/Zeega-Core
allow items to be removed from static collections
Merge branch 'tribecaupdate' of github.com:Zeega/Zeega-Core
Fixed the error pages after update to Symfony 2.1 - closes #1308
Less to css
zlib/libpng Program DataBase files
Thruster textures & generic flat coloured and/or textured shader
Replace old thrusters with textured ones
Implement & use SetWrapMode
increase visibility of timeaccelon buttons, #153
Merge remote-tracking branch 'luomu/libpng-update'
convert to uncompressed
Added Hungarian core translation
Added Hungarian modules translation
Hungarian -> Magyar
Removed dead tokens from Hungarian
Merge remote-tracking branch 'brianetta/hungarian'
set up some dummy gui widgets to act as shortcut targets for switching cameras, avoiding constant repeats and further abuse of the Draw method. closes #949
set up some dummy gui widgets to act as shortcut targets for switching cameras, avoiding constant repeats and further abuse of the Draw method. closes #949
only allow missiles to be fired during open flight. closes #951
Merge remote-tracking branch 'ziusudra/minor_fixes'
Updated Compiling instructions for OSX. Thanks to Neuro from the Space Sim forums for the update
Update Xcode project files
Use Character class for BBS consistency. Fixes #984
Merge remote-tracking branch 'brianetta/assassinations-character'
Revert "Added color to MiniTest output"

This reverts commit 3cc3d03beb11d4220af91d0ef072fac058b3c595.
Updated Paperclip to 2.7.1
Images Modified to remove errors & Marco for Goggle auth 24/04/2012
Second Merge Error Fixes
Add useful rempas and mouse paste options
check db log axis (CO2)
fixed some figures
Minor documentation improvements.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2453 d5102386-fcda-11dd-9fdb-3debd5008f28
Issue #907 - Implementing ModSecurity - ModSecurity File Rules v1.0.1
Fix typon in ssh authorization for catmaidgroup to actually enable port 22.
Harrd-code apache logging to the /tmp dir until the APACHE_LOG_DIR envvar
is set somewhere.
Update the default Ubuntu instance in configuration.py.template to 11.10.

The previous default installed Ubuntu 10.04, which did not support
Postgresql 9.1, installing 8.4 instead. This led to subsequent problems
with at least migrations.php where certain syntax was not supported,
for example the "IF EXISTS" modifier on "DROP COLUMN".
Merge pull request #360 from glebkuznetsov/cmw-integration

Bug fixes to cmw-integration to make the aws instructions work
headerText function, allow disable on any scroller value
Show/hide/format time wheels, day of week on day wheel, support for HTML5 date input types
ENH: simple intervalindex plot check
ENH: added strftime, working to adapt tsplot.py for IntervalIndex
datafsync changelog
Merge branch 'master' of github.com:adrian-bl/bitflu
reply to vote commands
Itsa me
fixed bitmap font height and second touch bug
Merge branch 'master' of github.com:aevum/libgdx-cpp

Conflicts:
	src/gdx-cpp/graphics/g2d/BitmapFont.cpp
Give separate, meaninful DNs to LDAP schemas.
Fix version check for HFM 11.1.2.2
Comment Merjis company since their website is unavailable.
Replaced konsole with urxvt
Switchedto the donbass colour scheme in vim
Don't validate Template XML
Merge branch 'master' of github.com:aholstenson/dust
Cleaned up some non modular variables and added config file
0.0.1a
11/3 - starting on API
updated form field ids and suggest targets

closes #69
Merge remote-tracking branch 'origin/master' into develop
updated protocol_scan to use system supplied IPv4 header, moving to IPv6 now.
jwcha: added comments to PuzzleSolver.py and filled out the README
support native SSH client
new shield picture
new shield picture
Problem 046 [erlang / ruby]
Issue 995: handle illegal argument in vcloud images
forandrea ting
remove ajax error message
Added registration for users, working on logging in and logging out
Added the authentification stuff, just basic functionality but logging in/out works as well as registration
Added seed data, recaptcha, paperclip and some routes to make authentification work
Converted html to haml and css to scss, also made separate pages for admin, member and guest but my tabs got messed up on the member and admin one and since it's in haml I dont know how to fix it, but I dont want to get behind on Unit 7 so its time to turn this one in
add woman.el
Turn on compile once again
Generated documentation (rake doc:app).
Improved README_FOR_APP.
Small addition to TO_DO.
Small fixes
Update valiadtors meta
Use gds-sso, but without any permissions

This means that to be able to use the app, you must have an active
signonotron2 account. We can't support permissions, but that's OK,
we don't need to.
Merge pull request #1 from alphagov/sso_on_rails

Use gds-sso, but without any permissions
Add guard configuration in development