labofsahil/github-event-dataset-2012 huggingface dataset:
adding scala-redis-client to clients.json
Merge pull request #170 from top10/master

Add scala-redis-client to clients.json
Fjernet https til mac
BVH stuff + testGui.
Fix APSTUD-3644 Dreamweaver theme not colorizing the same as on TextMate
  - enforce root scope of 'text.html.jsp' for *.jsp files
Fix APSTUD-4137 String @return is automatically encoded into @&#x21A9; in PHP comment
  - Modify HTML snippets to use scope selector of 'text.html - source', not 'text.html', so they don't apply to embedded langauges (i.e. JS, CSS, PHP, ERB)
Fix APSTUD-4137 String @return is automatically encoded into @&#x21A9; in PHP comment
  - Modify HTML snippets to use scope selector of 'text.html - source', not 'text.html', so they don't apply to embedded langauges (i.e. JS, CSS, PHP, ERB)

Conflicts:

	cache.yml
Ignore cache files
Externalize UI strings from top level menu
Merge branch 'release'

Conflicts:
	cache.yml
Fix for APSTUD-4377. The string externalization improperly munged a command, keeping the menu from showing.
Suppress already defined constant warnings
Fix APSTUD-3938 Ctrl+Shift+/ has two available commands
Fix APSTUD-3938 Ctrl+Shift+/ has two available commands
Fix APSTUD-3938 Ctrl+Shift+/ has two available commands
Merge branch 'master' of github.com:aptana/html.ruble
APSTUD-3938
Ctrl+Shift+/ has two available commands
More work on APSTUD-4221 Externalize UI strings in HTML ruble
Merge branch 'development' into release

Conflicts:
	cache.yml
Merge branch 'release'

Conflicts:
	cache.yml
Fix APSTUD-4221 Externalize UI strings in HTML ruble
Added failover for context completion for SuperTab.

This allows to play well with latex-box and
also complete references and latex commands
depuracion case DATOS
Automatically convert channel name to lowercase

JTV seems to only track channels by lowercase, even if they are
displayed capitalized.
Fix Gemfile for heroku deployment
complete pdf generation for instrument booking
Merge branch 'master' into pep8
Authorize.net online payment feature for payment from patient portal.

 -Changes as per comments in gihub.
 -Incremented version.php database counter
 -Re-ordered the payment_gateway_details in database.sql

Signed-off-by: Ajil <ajilpm@zhservices.com>
Bug fixes for online payment feature from patient portal
strip spaces or dashes in zip code of X12
Added access control to vitals info on patient summary screen
Fixed SNOMED import script to work with recent SNOMED release

 -Supports old and new filename format
 -Supports old and new package structure (uses RF1)
Bugfix.

- Fixed bug in _gather() related to solutions not necessarily being put
into queue in any particular order.
- Fixed minor bug with misspelling odeconfig as "odeoptions"
Merge branch 'office'
fixed filepath and removing entry
Bump Rails to 3.2.3. Add Guard+Spork.
ChangeLevel: Fix use of uninitialized data in ARX_CHANGELEVEL_Push_Index.
Fix use of uninitialized data in Particle::Validate().
Make sure ParticleParams are always fully initialized.
SDLWindow: bump maximum msaa level to 8x.
German for "Fullscreen" is *not* ""

Use the [system_menus_options_video_full_screen] localisation entry
for the fullscreen checkbox if [system_menus_options_videos_full_screen]
does not exist or is empty.
Testing asp.net ashx handler with json
Add runtime source target
Clarify use of TAI for _EQUINOX_B1950
Updated all transform graph priorities to 1
Added UKIDSS and MAGPIS docs to index
// aat issue #1 : 9/28/2012
// added tiny icon at the top of each date in calendar
// right now this icon is only visible for today's date
// But in future, we need to set it for date which will be expiry 
// date of some product
update to cef r585
update README.md, first urumaco.cpp
gui --> first display
added a temporary controller execution
* Store permanent audit command logs as per @gugod
closer to grade
added grade to results view
extra padding for next 7 days
use request constant, not string
Much simpler and much better solution for issue #52 (improved coverage for relative paths)
Eliminating the use of relative include paths
fedex api soap v10 suport was added
fedex const was fixed; new fedex module release(&)
small code review; fixed #193 ;)
Merge branch 'feature-fedex' into develop
perfomance improved
and few bugs fixed
First version of scaling-algorithm implemented, still missing the actual add/remove node
removing validator.js file
adding 'debugger' gem to Gemfile

It fixes a lot of the issues ruby-debug19 has.
Merge branch 'master' into debugger

Conflicts:
	Gemfile.lock
cleaning up in the debugger corner
Merge pull request #3227 from tsujigiri/debugger

adding 'debugger' gem to Gemfile [ci skip]
Actually only load rails admin in production mode

This is what I think 28f8db51e79 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. :grin:

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
hopefully fix another weirdly fluctuating test failure
don't test for opacity but for the selector
use post cuke step instead of old skool steps
delegate frame_name in reshares
create a new publisher using the new composer. only for beta users
see, if this fixes those nasty cuke timeouts
don't block stdin when using install script [ci skip]
Refactor Post Presenter
and comment presenter
well, then let's try the other thing that is suggested on that page to fix cukes
DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages)
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]
Better error handling + version bump + made it 'private' in the package.json for now.
Add some usefull ignoring rules
Cleaned up straightMU bid-SS interface.
removed static properties
add read me
Merge branch 'master' of github.com:bao4541110/hunter
selects first device as default
added audio buffer class
added test for silence
Configured background.
Configured matching brackets.
Configured ruler.
got newest mcc from mcc-master
removed unneeded syso
FROM TODAY: sentinal_main is a V2
teste leleco e elmer

Signed-off-by: lucass-cit <lucass@ciandt.com>
Merge branch 'master' of https://github.com/bchaves-cit/Teste

Conflicts:
	IDB.SharePoint.UserStatistics.Designer.cs
set logger to debug when running in foreground
rough project ideas
Added missing images and a unit test to check for their existance
update bam
In Convert branch master update submodule tuneup.
Merge branch 'dev'
In convert.sh run Instruments on simulator, comment out running pre-installed Convert.app, instead try to run from Jenkins build directory.
Add border to canvas
Fix GLUT mouse func.  Clicks and drags must be initiated in the canvas
Fixed bad gemspec
Update the virtualenv section in README.

`virtualenv .` is not a *best* practice.
Merge branch 'release/0.4.0' into development

* release/0.4.0:
  Version bumb 0.4.0 and cleanup
  Version bump to 0.4.0
remove rvmrc as it is a local file
move test-images into fixtures
whitespace.
testing images from issue:5
Whitespace
Fixing issue:2, "imagemagick did not return a result"

The cropper attempted to slice off slices smaller then one pixel.
there is no such thing as "less then one pixel". 0.7 pixels?
Version bump to 0.4.1
Version bump to 0.0.0
bumped version to 0.4.1
Merge branch 'release/0.4.1'

* release/0.4.1:
  bumped version to 0.4.1
  Version bump to 0.0.0
  Version bump to 0.4.1
  Fixing issue:2, "imagemagick did not return a result"
  Whitespace
  testing images from issue:5
  whitespace.
  move test-images into fixtures
  remove rvmrc as it is a local file
readme lies
Restore the document info and the search
Fix JS saving
Merge pull request #322 from bhollis/master

Fix ignore with a regex
Make frontmatter always return a hash, and freeze it. This reduces the need for nil checks and prevents users from accidentally trying to modify frontmatter data which may be cached elsewhere.
add another determinant unit tests which utilizes every value of the matrix.
correct instructions based on lastest work
update from table pc
Add default headers, fix bug

Add date header
Add server header
Add parsed headers to the request object, not the response object.
added better fix
lockolasi error a hibak adatlapra
Add mapping for scrolling another window
Modified how to install section
Update Git java/src/HelloMan.java

other dev changes
Add fixed caching results of regex
clean up CTFE, workarounds--
fix Issue 7300 - std.regex.ShiftOr!dchar.search is broken

Rework problematic memchr codepath to properly test for end of string. More importantly it's overall cleaner.
add missing unittest for issue 7300
fix Issue 6217 - [GSOC] result of std.algorithm.map is not movable

It's so simple, and it's been ages as it was broken.
apply code review suggestions, extending SortedRange
update changelog.dd
fix Issue 7718 - regex and ctRegex produce different results

also fix unittest in std.range
renaming  + what to work on next
move opf parser to seperate file
Form Builder revs
Merge branch 'bootstrap' of github.com:blueriver/MuraCMS into bootstrap
Continued clean up...
Related to Pull Request 437: https://github.com/blueriver/MuraCMS/pull/437

This new tag will render IE9, IE8, and IE7 (in that order) while disabling "Compatibility Mode".
Merge pull request #457 from ronnieduke/develop

Related to Pull Request 437: https://github.com/blueriver/MuraCMS/pull/4...
Adding text-block to form builder
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
fix padding on categorization tab
Merge pull request #537 from stevewithington/bootstrap

fix padding on categorization tab
Update jquery and tweaking link to getmura.com
Added converter Reflection params to array
Унифицировал имена переменных
check yo browsah
yaml, tabs, spaces...grrrr...
Deleted _posts/trent.md
removed (most) graphics code from physics.py
Updated Haskell packages.

 - DSH: updated to version 0.7.8.1
 - alex: updated to versino 3.0.2
 - certificate: updated to version 1.2.2
 - language-c: updated to version 0.4.2
 - xhtml: updated to version 3000.2.1

Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to
avoid lots of build errors, i.e. with monad-par.

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@34042 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Reverted changes to the Haskell package defaults.

The current versions are the ones being proposed for the
new Haskell Platform. If they cause problems with other
packages, those packages should be fixed, not the defaults.

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@34043 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
check 18 with bugs
Function to add a column of data; offset option for functions to insert data.
aggiunto il file def.h
Updated to revision 28946.
Updated to revision 28947.
Status bar active on console messages when not in console
merkleht: change print out format

Signed-off-by: Daniel Borkmann <daniel@gnumaniacs.org>
Removed whitespace, removed unused file

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Added TMBETADISC-RBF plugin for gram_neg.
Merge branch 'master' of github.com:boscoh/inmembrane
add supertab
update
add colors, module tagbar, vimExplorer
added some scratch files for postgres
trying to account for different  starting states for models.
add item polished.
Fixed some small typos
Changed recPos to double integer to cater for cases when the number of particles written is huge.
A couple of typos and cleaning of the syntax
Added furels to exclude valgrind output files and emacs crud
Small changes to ecco025 for the NA testrun.
Harpo
Add Stateful.
fixed issue with build aborting in carrierwave config
adding adjust_pagination_url
new admin settings
Bad text editor ... stop removing tabs
update dropdown code
adding a schematics back ground image.
adding data
do a better job of cleaning up after master tests
added item purchased screen
Turkis Translations Update for Phone

Change-Id: I298633fe2cf685cc994011a785996b43f4957528
Signed-off-by: Faatih Erdem <fatiherdem@outlook.com>
Phone: Updated czech translation

  Patch Set 2: Remove 2g/3g toggle translations from
  Ic59668716f735bab491df9905bfe99bae90afa31 they are
  added in that commit too.

Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Change-Id: Ifc2e154e8a1d1af2d07b22ff8836734f009cb006
2G/3G toggle for applications

Allow applications (like Tasker) to change Network mode.

Patch-set 3: I don't know what is wrong with this commit, for me is working well.

Change-Id: Ic59668716f735bab491df9905bfe99bae90afa31
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Support GSM AT commands for SMS over bluetooth (2/2)

Modifications required to support the older GSM "AT+" commands for SMS over
the bluetooth transport for use with car radios, etc. This must piggy back
on the existing handsfree code as the spec uses that channel for the commands.
(2 parts: frameworks/base and packages/apps/Phone)

packages/apps/Phone:
hooks into BluetoothHandsfree for watching/sending AT commands via
BluetoothSMSAccess, and also for the special PDU handler done at the JNI
level (see frameworks/base changes.) BluetoothSMSAccess contains all the
functional code for handling the actual SMS related AT commands and the
contentObserver for the SMS database.

Change-Id: Ia3e8d28e4676c7b5bf1b9afd828ab5e8ca05464a
Signed-off-by: Gary Dezern <garyd9@gmail.com>
Version bump to v1.3.5.pre2
Ignore Autobahn native extension JARs
Make sure the JAR is built before release
MsgPackLzfEncoder now correctly says it encodes batches
Version bump to v1.3.5.pre3
small update, fixed some fonts in a table and slightly updated my part of the report (he he :P)
maried: small update

Signed-off-by: Bas Westerbaan <bas@westerbaan.name>
Updated org init for better default configuration on unconfigured
systems (e.g. win32).
commented input package
Merge branch 'master' of github.com:byang223/TurnBAPI
added maxAttacks and attacksLeft to attributeAttack
merged
+Added basic spawner
Shifted the getCurrentLocation method out of validateAndsaveAnswer method in ResponsesNewView
Merge branch 'master' of github.com:c42/survey-mobile
quitando señales síncronas
[#2163] Add inject scripts to too-tips.html
pretty pleeease
trying to fix travis build still.  is travis just slooow?
Fix a MissingReference
Prepare to retry the migration
Update AntWeb
Create antwiki_valid_taxa
Populate AntWiki table
AntWiki source data
AntwikiValidTaxon
UTF-8 versions
Utility SQL for loading AntWiki
Antwiki.compare_valid
Add id and result columns to antwiki_valid_taxa
Don't pp result
Antwiki.compare_valid
Reverse synonymy feature
Move create_xxx functions into factories, so specs and features can both use them
Fix spec
Fix highlighted search result
Comment out feature for reversing synonymy.
Save dump of local db that has had the AntWiki comparison
Schema
Un-ignore pkg for gem src
Built 0.1.1 into pkg
added the structure of a database table of a test
fixed maven pom so widgets work again
fixed backup scheduler
disable backup features
update pom versions to 1.0.2
updated poms back to snapshot
typo
fixed mckoi dependency
fixed bug with linkage

Conflicts:
	web/src/main/java/org/fao/geonet/util/XslUtil.java
	web/src/test/java/org/fao/xsl/CharacterStringToLocalisedTest.java
make run and setup scripts easier for all to use
translation for downloadBackup
Translation for downloadBackup
Merge remote-tracking branch 'origin/geocat_stable' into geocat_trunk

Conflicts:
	bin/clean.sh
	bin/config.sh
	bin/config_fgravin.sh
	bin/config_fvanderbiest.sh
	bin/config_jeichar.sh
	bin/start.sh
	web/src/main/webapp/WEB-INF/overrides-config-geocat.xml
	web/src/main/webapp/loc/fre/xml/strings.xml
	web/src/main/webapp/loc/ger/xml/strings.xml
	web/src/test/java/org/fao/xsl/CharacterStringToLocalisedTest.java
Caching of renderer
add: pyperfstore 2 and ecosystems
fix better default value
area to line, improve performance
setting up logs manual structure format
Add slideshow for Heapsort.
Added the first AMP command to FireSim's AMP server
Revert "Add comment in Readme. Python 2.7 is required since subprocess.check_output has been added in this release"

This reverts commit c3de79069b190887763581bf6e45ba9da5c4048b.
[maven-release-plugin] prepare release v0.2.6.4
Updated missing parameters on survey/upload.

Before, we were failing the request "by hand" and then throwing the exception as opposed to including the failure information in the exception, which is the way we started doing it a while back. This has been updated to include the failure in the exception as opposed to doing it "by hand" and then throwing the exception.
Fixed a bug when aggregating Mobility points.

The time between points was set to 60 minutes instead of 6 minutes like it should have been.
Updated Bootstrap and made minor modifications to EasyPost.

EasyPost is now slightly more usable. Resizing to the extremes and scrolling are still a little wonky, but, overall, it is slight easier to navigate and use the page.
Merge branch 'ohmage-2.13' of github.com:cens/ohmageServer into ohmage-2.13-showcase

Conflicts:
	.gitignore
build allowed with java7 and release profile to allow import in Intellij
ignore intellij files
typos in javadoc
gitignore
Use new Float.strictlyPositive attr to distinguish +0.0 from -0.0
Stop ignoring per-module build directories. They shouldn't exist
When doing a local compile, use the parent build directory, not a local one.
Add LinkedList.reversed (though it currently returns bottom), so avoid compilation error
Change makeArray -> arrayOfSize to fix compilation error
Fix some occurances of String.split()
Initial import of code from bitbucket repository.
Added compile comment in README
going back to master after failing to add icons
removed everything related to icons
Merge branch 'master' of https://github.com/cgoodmac/datester
tightening up design
Fixed minor issue that caused outline to appear around links in the popup when first opening it
Refactored background script

- background script now maintains a history of tracks
- background script now handles scrobbling logic
- injection script will now send updates correctly to the background script
Aenderungen Content
Merge branch 'master' of git@github.com:ch3ck3r/Lecturate.git
install libyajl too
Join: Adds content and markup for new designs.
Added Analog write
Run gofmt, tabs and that
Fix bug causing github repo urls to not be parsed properly.
MySQL back on 2012-05-11
wordpress uploads backup on 2012-05-11
Fix javascript for xml/json response
Add OutputStreamVisitor
Small fixes for linux, threaded gfx and some small speedup for the gl3 part(~10%)
Still got to do more tests concerning sync
Update lm_sensors to 3.3.3.

	renamed:    base/sensors/lm_sensors-3.3.2-config.patch.xz -> base/sensors/lm_sensors-3.3.3-config.patch.xz
	renamed:    base/sensors/lm_sensors-3.3.2-slackware.patch.xz -> base/sensors/lm_sensors-3.3.3-slackware.patch.xz
	modified:   base/sensors/sensors.build
Fix first mutex for rake

Signed-off-by: Clark <giorgos.lamprianidis@gmail.com>
Show snippet info in query json export.

Signed-off-by: Clark <giorgos.lamprianidis@gmail.com>
Show error message when static config files (.xml) cannot be found
Adding documentation for the debug middleware, including docstrings.
Autodoc commit for master/1e055c68
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Update notes for submitted changes

* Message of the day and other miscellaneous changes from the old vmbuilder.
bump tests for npm support

Change-Id: I2d8fd5843d6f6ad37258e23830507cfd9098c547
noinit
moved in existing files; organziation all wrong
Merge remote-tracking branch 'cmgriffing/ReadingTestsTable' into testWebDisplay
moved to setUp()
fileformat=unix
tests for existence of table, getDBTests, and html wrapping

html wrapping probably doesn't belong in DBManager...will move elsewhere, html table packager maybe?
red point
merged
more exception handling: validation errors and general Exceptions
ThreeJS fix/improve

* Vertex -> Vertex3
* Since we're no longer adding normal information, switch to
  TriangleMeshFormats
Add config template

Signed-off-by: Rick Waldron waldron.rick@gmail.com <waldron.rick@gmail.com>
allow video to display at size streamed from hardware (temporary)

Signed-off-by: Rick Waldron waldron.rick@gmail.com <waldron.rick@gmail.com>
Read and write to local disc for development

Signed-off-by: Rick Waldron waldron.rick@gmail.com <waldron.rick@gmail.com>
Rebuild files

Signed-off-by: Rick Waldron waldron.rick@gmail.com <waldron.rick@gmail.com>
added prev_word to CWord
fix min distance calculation to landmarks bug
Added TEAL to colors
Copied/modified some code for weighted logistic regression
Merge branch 'master' of https://github.com/arebgun/bolt
Merge branch 'master' of https://github.com/arebgun/bolt
Merge https://github.com/marcovzla/bolt

Conflicts:
	model2d/counter.py
	table2d/run.py
start making Age

almost finish,next localize.
csc496
Styled dropdown for moderate inside browse content and added conditional display of appropriate buttons
Added adiabatic eta den 2 simulation with colder outer medium Tamb ~ 100 K.
Added a vim plugin for blockdiag.
man: corosync.conf seqno_unchanged_const description incorrect

seqno_unchanged_const is used to determine when the rep should hold the
token. The merge detection timeout is started after any idle rotation of
the token.

Signed-off-by: Tim Beale <tlbeale@gmail.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Remove unused structure

Nowhere in the corosync codebase references this structure.

Signed-off-by: Tim Beale <tlbeale@gmail.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Add an index counter to status bar.
Minor name refactoring, make flow list refresh after limit is applied.
refactor name of the business template to use - instead of _
Added enable and disable for the C API
Updates in response to feedback

* Changed video poster image
* Changed video overlay
* Removed Play link from thank you page
Temp disable request specs
Now perhaps the sound works in own Thread. My Eclipse is broken so the code may be incorrect
Adding the server connection handling code
Added a function for handling HTML special characters
Revert "Added a function for handling HTML special characters"

This reverts commit b47fc6476ae30b8ba700d2883dbb4d77f758c682.
Added function for converting html special characters.

With entities there are problems encoding characters in other languages, for example á, ó, in spanish will become special characters.
Adding support for values in nested lists generated in the HTML class.

Signed-off-by: Ben Corlett <bencorlett@me.com>
added prevent default to anbu events and linted/formatted profiler.js code

Signed-off-by: Guillaume Lambert <falzhobel@gmail.com>
added prevent default to anbu events and linted/formatted profiler.js code, profiler config in application back to false

Signed-off-by: Guillaume Lambert <falzhobel@gmail.com>
fixed a conflict with .hidden class when using twitter bootstrap and made animation smoother

Signed-off-by: Guillaume Lambert <falzhobel@gmail.com>
Typo in documentation

Fixed typo in controllers documentation
Merge pull request #701 from tkaw220/develop

Typo in documentation
Fixed line endings.

Signed-off-by: Phill Sparks <me@phills.me.uk>
Merge pull request #699 from falzhobel/profiler-js-finetune

Profiler js finetune
added alias Authenticator for Laravel\Auth\Drivers\Driver
Merge pull request #709 from daylerees/patch-3

Authenticator Alias
Changed .gitignore in session to ignore all contents

Signed-off-by: Ben James <in@benjam.es>
Merge pull request #711 from benjam-es/patch-1

Changed .gitignore in session to ignore all contents
allow global messages format

Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
allow for overriding core tasks

Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
fix for forelse only matching $vars

Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
commit new-line
Merge branch 'staging' into develop
Increased height of response textarea for debugging
fixed offset and layout in Firefox
adding instructions img
Updated AI Hand
Fix ignoring of JRuby backtraces.
Fixed the formatting of the feature file.
Merge pull request #266 from akiellor/jruby-backtraces

Fix ignoring of JRuby backtraces.
edits for new format
replaced http with git url
Switched the color back to 256 color mode.
Added a script to setup my dev env for rpp_web_app
Added window selection just to be explicit.
fixed login url
test form page
created postdata api
test form page
Merge remote-tracking branch 'origin/master'
Adding version file
Adding feature
Merge branch 'feature-1' into develop
Adding new feature
Merge branch 'feature-2' into develop
Adding feature 3
Merge branch 'feature-3' into develop
Incrementing version
Merge branch 'release-1'
Not sure what this is...

I didn't actually delete this file... but ok...
OH!

I just realized I have to delete and re-add a file every time I change
it?
Added the ability to run this as a program. Both applet and application in the same gemagame.jar
begin updating carbon to html5
Merge branch 'stream/themes' into dev
Update Carbon Theme for HTML5 compatibility closes #17
spaces to tabs, and autofill design
add test init_nbashrc.sh try new functions
Incremental work on basic commands
Merge remote-tracking branch 'origin/static-calls' into static-calls

Conflicts:
	Slim/Slim.php
	tests/SlimTest.php
Build v2.12.06.2001
issue #14: implemented selectFeatureSubsetRandomly() function, notice that this is the basic implementation, we'll make a specialized version for RRF later following the paper
more work on allowing user to log back in on server session timeout
add epoch.py
confirmación fichero index4
tired. Do we need singletons as a separate base type from type? Implementing Booleans may have been premature
make hex2dec() a private funcion
Merge branch 'master' of github.com:davux/huawei_wifi
summary of yesterdays meeting

please read and extend/correct!
know as txt

maybe now it will upload -.-
Merge pull request #1 from joklawitter/master

huhu
Allow '@' in vim filenames
removed itemIdAttribute to allow all data in serialise
expose more detailed version info
Includes .php
Removed borders around Viasat logos
testing that settings doesnt change
Changed SSH key for linux servers
re.pl again
Compatibilização do demoiselle-vaadin com a versão 2.3.0-BETA2 do
framework.
in s32_print_char(), use text attribute byte.
out text color test
modified:   include/console.h
modified:   include/k_stdio.h
modified:   include/k_stdlib.h
  move BOCHS_MB from include/k_stdlib.h to include/k_stdio.h .
  move s32_print_char(), s32_set_text_color() from include/k_stdio.h to
    include/console.h .
  add color macro to include/console.h .
Changed /god to /bus... silly bug fix from copy/pasting
Fixed title from copy/paste
Fixed wrongly named variable
Added zepto
Refactor vim settings around janus project.
[안드로이드] 텍스쳐 꼬이는 문제 & 디버그 로그 제
[99fs-lib] Fix hook names
[99fs-lib] Fix parsing of rd.mount parameters

* Could have been confused by no options being specified
* Would not split parameters separated by : correctly
* Would not notice if parsing failed

All of the above are fixed now.
[99fs-lib] Fixed /run/fstab.* being created with incomplete lines (dump/pass missing)
Merge branch 'feature/fstab-mounts' into feature/nfsmounts
use shallow copy of rails_admin [ci skip]
Re-specifying that they implement the tree behavior.
Adding exception checks.
unset _id before hydration for updates.
updated README.md src/main/java/config.yml
Logic-->Support for action contexts

http://www.expandframework.com/forum/6-bugs/1993-conditionaldetailview-and-wizard-module.html#2038
ConditionalDetailViews-->NewObject & wizard

http://www.expandframework.com/forum/6-bugs/1993-conditionaldetailview-and-wizard-module.html#2038
core-->SetNextSequence Method in SequenceGenerator

http://www.expandframework.com/forum/13-suggestions/2053-implement-a-setnextsequence-method-in-sequencegenerator.html#2058
fixed: it does not remove the Start Menu items cleanly.
include all 3rd party dlls in installer
logic-->make at least on of the context conditional
baseimpl copy local is missing in vb templates

http://www.expandframework.com/forum/6-bugs/2063-vb-template-112106-problem.html#2064
easytest replace RemotingRegistration with EasyTestRemotingRegistration
core--> added generic messagebox implementation

http://community.devexpress.com/forums/p/103663/362083.aspx#362083
ModelDifference-->Log CompillerErrorExecptions for better logging

http://www.expandframework.com/forum/8-discussion/2065-need-help-trying-to-edit-web-model-from-win-app.html
Compilation failed due to Generic messagebox
add connectionstrings for standard authentication

http://www.expandframework.com/forum/6-bugs/2095-cant-run-fc-in-sql-non-integrated-security.html#2097
IO-->Registered missing ModelArtifactState module
SQLDBMapper -->obsolete and remove from templates

http://www.expandframework.com/forum/6-bugs/2100-dbmapper-problem-in-attributemappercs.html?limit=6&start=6#2111
registered persistent objects automatically
DBMapper-->support timestamp for Oracle,SqlServer,MySql and fix onetooneon the key bug
Merge remote-tracking branch 'expand/master'
Lowered default cache lifetime to 15 minutes
Fix potential crash when attempting to free default font

Before setting a new font we try to free the existing font. Sadly if no
config value is set for the default font, we assign a string literal.
Which of course means that subsurface dumps core when trying to free it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Bump version to 2.0.1

That crash is far too easy to hit for people just trying out subsurface.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
marquee image for chrome facebook disconnect 1400x560
Add TocJs to case stub generator
fix docs for hideStepIf
Test that PBChangeSource accepts a codebase

Turns out, it does.  Refs #2358.
Add the ability to check for the existence of remote command args that are not actually comparable
add tests for gitpoller's default gitbin
the actual fix - include os.environ when running rev-parse
Merge remote-tracking branch 'lorentz/gitpoller-gitbin-which'

* lorentz/gitpoller-gitbin-which:
  the actual fix - include os.environ when running rev-parse
  add tests for gitpoller's default gitbin
  Make GitPoller search for git if not specified
Merge branch 'expect-incomparable'

* expect-incomparable:
  Add the ability to check for the existence of remote command args that are not actually comparable
Initial commit

Working version 2.4
Updated Faraday
Updated VCR
Updated Guard-Spork
Updated RSpec
Updated Addressable
Commented out inclusion of google analytics support. It can be uncommented if anyone wants to opt-in to it in their version
Merge pull request #44 from dperit/issue33

Make google analytics support opt-in; thanks to dperit for the patch, r=dmose. Fixes issue #33.
Merge remote-tracking branch 'upstream/develop' into develop
more sweetnes
Null safe Tweet duplicate
Fix some typos in the documentation
Merge pull request #1 from jimbrowne/gh-pages

Fix some typos in the documentation
[Document] Replace text in a single action.
[AspNetEdit] Undo/Redo and Delete editor command implementation
Added an option for the recursion depth
Merge branch 'master' of github.com:dolor/PracticumP2
removed unused method
added description
Removed Starred entries and fixed blank entries
Noch weiter rumgespiet, komme dem Problem näher
removed jsdoc requirement
Ignore LaTeX created .nlg and .nls
Example for new EventCauseSystem based on the BlockGrowCause / Event

Signed-off-by: Don Redhorse <dredhorse@breiden.net>
add snipmate plugin + dependencies
formatted file README.md
[JBRULES-3668] format and shorten kproject.xml file
using wrong stuff in procfile
show merge / no-merge on current branch

Signed-off-by: Andre Dublin <81dublin@gmail.com>
Revert "Try renaming the task to :default"

This reverts commit 001be3495c7be9c6455c50a6af9ede962518f867.
More client logging
Merge branch 'master' of https://github.com/dzstevens/CIS-630
Forgot we can't iterate over cursor.execute()...
Changed Sendfile setting
Remove preceding and trailing whitespace when retrieving the title of
linked webpages. Fixes Youtube titles not displaying.
Merge pull request #53 from amach/master

Removes whitespace padding from the retrieved titles of linked webpages
Add bitly url shortener. Regex and sockets needs revamp
Clean up default event processing configuration
Changing post default text selection color
Fix indentation on github.rb
installed rspec and created the list model
Just bringing the directory up to date with the work computer...
Update app dependencies

Should allow it to work with node 0.8
Updated the app-harness framework to reflect the new embedded texture layout used in launcher
Merge head
Merge tree meshes
pixbuf.save
Merge branch 'master' of github.com:eexpress/eexp-bin
0.88
moving source files one folder above
Creando el sistema de autorizacion
* 작업 흐름의 컨셉을 설명하는 '구분' 추가
 * 협업의 방법과 협업시 발생하는 문제를 해결하는 방법 추가
- Fixes to tab bar and navigation controllers for iPhone 5
- Added nil to @"" macro
merged
github identity file
Fixed conflict
Don't ignore config ymls and move some config into heroku it self.
before shawn has edit rights
Initial commit
Init commit.
.use(plugin)
change callback double call warning
Release 0.0.1alpha3
Fixed missing FIP symbol in French mobile view of Expandable/collapsible working example.
Removed role=alert from inline errors to resolve NVDA bug. Added aria-invalid=true to form fields that are in error.
Removed no white space example since redundant when already letters only.
Changed search field from type=text to type=search.
Added permitted punctuation to the letter and punctuation field label. Applied aria-invalid to the correct element.
Made mobile view loading more event driven to prevent any races from occurring in the asynchronous code. Also added code to prevent $.mobile.initializePage() from firing before mobileinit event.
Merged in changes to Lightbox from @ericpoirier (replaced FancyBox with Colorbox.
Added French support to Lightbox. Added override support.
Added menu bar, share widget, and tabbed interface links back into the tabbing order. Dynamically add/remove menu bar sub-menu links to/from tabbing order when enter/exit a sub-menu. Remove unused style-tabs-* CSS from Tabbed interface.
Added alt text using profile name to profile image used in Web feeds widget Twitter feed.
Removed link from Archived Web page template 'This Web page has been archived on the Web.' (English and French) to resolve an HTML validation issue.
Moved Archived Web page template warning image from demos/archived/images/ to build/js/images/archived/.
Added Language selector from @MaddyDaigle. Filtered out unrelated files from pull request, corrected terms and conditions comments, removed unnecessary JS code, fixed JSLint issues, corrected titles/breacrumb/h1 in examples, and renamed lang-jquery-* to lang-js-*.
Fixed bug where 'Reason for contacting us' field in Feedback form was not cleared after a successful submit.
Added contributor guidelines to README.md. Adde .gitattributes to define which file types should be treated as text and which should be treated as binary.
Corrected indenting of README.md
Pushed recommended browsers to a sub-bullet
Removed intranet example from demos/other since no longer needed.
Corrected minor grammar issue in README.md
Test behavior of equality to other classes
Make EquivalenceTester fail test when .equals(null) throws NullPointerException
Remove redundant tests
Change comments/description to refer to "Unrelated" class instead of "Other" class.

Add an explicit error code for throwing ClassCastException when comparing to an unrelated class.
Add linkroll.
Fixed a bug causing trailing whitespace for some attributes
Removed oh-my-zsh for a sec
Added oh-my-zsh
Get out of here, oh-my-zsh
Added oh-my-zsh
Enabled screen plugin for zsh
Converted cmd/dashboard/dashboard.go to SemanticLogger, shortened
lines
Converted cmd/sky/*.go to SemanticLogger, shortened lines
Converted cmd/skydaemon/*.go to SemanticLogger, shortened lines
Revert original filetype of CakePHP template files
get_absolute_url is much cleaner
Adding Mutators for Fleet in Rep Layer
Updated README
Merged, added files.
modulo de testes
modulo de testes
[component] Updated tart component and tart Carousel Component.
update bib hwysw
Bump version 1.6.8.
added stylesheet references
Added header, footer, css, and removed index.html
Added footer, header, css
Added users controller
Create en page and register component
change user preferences names
MObile page sign in fix
Mobile fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	simplybiz-ui/src/main/content/jcr_root/apps/simplybiz/components/business/bs3-edit-business/POST.jsp
Restored file formatting;
Made actor creation and networking work similar to normal Entities, and added a helper Ray class.
added acts_as_commentable to the model
Added Comments and updates.  Still needs a bit of styling work.
Added node module 'http-proxy' to listen on port 80
Fixed vertical alignment of text field in decimal cell
Merge pull request #330 from tomgilder/decimal-alignment

Fixed vertical alignment of text field in decimal cell
Revert "Revert "ajax""

This reverts commit 58a94d14382a313e373c7bbd4bf94bc03060bf57.
En teoria, SOM terminado
works(?)
Eviline modes now properly display upcoming pieces/taunts
commented
container object should be named plurally
crappy images
cgame: translation.cfg fix
Removed an ugly bug in banIp that made impossible to answer connection
Added automatic test environment
Created methods to get statistics
Removed standalone liblittletest and referenced external project
Removed external reference to littletest
Submodule removal from .gitmodules
Added some tests to the suite
Solved a warning with closure action destructor (it was non-virtual)
Added first test and inserted in automatic compilation
Added tests to travis
Fix macro defs without arg list supplied
add padding-bottom for body
Add name to AUTHORS according to Contribute section
Adding a few aliases to git
Make instructions only play on first demo
Make controls collapse automatically when demo is played
Fixed depth problem with drawn components and custom fills, shadow drawing still needs work
Odstraneni zbytecneho kodu.
#4 Replaced "current" with "now" in lib/piezo.js
ArcanistRepositoryAPI: add getCanonicalRevisionName

Summary:
Resolves crazy stuff like 'HEAD' or '{2001-01-01T01:01:01}' into an
actual revision, with a provided implementation for git.

Test Plan: Tested in a hacky script.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1849
Add various flags to the HgProxy daemons

Summary:
  - Add flags to exit after an idle time or client count.
  - Add flags to control daemonization.
  - Add flags to control output.
  - Add flags to skip the "hello" frame of the protocol.
  - Make the client launch a server if one does not exist.

The one-time overhead to launch a server and run a command through it looks to be ~130% of the overhead to run the command directly with "hg", so even if we never run a second command we're not paying too much.

The incremental overhead to run subsequent command appears to be less than 3% of the overhead to run the command directly with "hg" (and maybe less than 1%, I'm not sure how long the computation part of a command like 'hg log' "actually" takes).

The overhead to launch a PHP client, connect to an existing server, run a command, and then print it and exit is roughly 50% of the overhead to run the command directly with "hg". So theoretically a user can achieve an amortized 2x performance increase for all 'hg' commands by aliasing 'hg' to the PHP client in their shell.

Test Plan:
  - Ran servers with idle and client count limits, let them idle and/or hit their connection limits, saw them exit.
  - Ran foreground and background servers.
  - Ran a daemon server with redirected stdout/stderr. Verified logs appeared.
  - Ran with --quiet.
  - Ran clients and servers with and without --skip-hello, things work if they agree and break if they disagree. The throughput gain on this is fairly small (maybe 5%?) but it seems simple enough to keep for the moment.
  - Ran serverless clients and verified that servers launched the first time, were available subsequently, and relaunched after 15 seconds idle.

Reviewers: csilvers, vrana, btrahan

Reviewed By: csilvers

CC: aran

Differential Revision: https://secure.phabricator.com/D2680
基本完成 UI .. 还缺 JavaScript 部分
rake task to load sample data
basic emacs with marmalade and solarized theme
add config files, readme, and fix starting flow
Add basics for rotation arrow canvas
add course content
zepto -> query (i need scrollTop)
Fade prev/next post links on scroll
removed drm_build_tsf.m as it is integrated in drm_cell_mapping, fixed a bug in drm_mapping.m. TODO: make harder unit tests
rollback alla 0.20.1
added link around embed footer title
merged issues
Merge branch 'master' of code.getpantheon.com:97d52c78-0b43-45a2-9d65-20c8a431706b
add google analytics tracking code to embeds
adding piwik tracking code
link CSV footer menu to directory-daily.csv so that we can have a public, low resource download, alter view to permission link to other CSV for admins only
tweak footer grid to fit extra menu link
adding new csv menu link and now json link in feature
update read me to not point to local
make readme in markdown
Merge branch 'master' of code.getpantheon.com:97d52c78-0b43-45a2-9d65-20c8a431706b
manually nuking spagetti
fixed  missing closing wrapper div in embed index. added css for geocode error
Added undo-tree initialization.
Checkout and update now respect FREE items

Fixes #67
update bootstrap to 2.2.2

Signed-off-by: Patrick Konstandin <support@flatfiler.de>
completed update function

Signed-off-by: Patrick Konstandin <support@flatfiler.de>
Fix user avatar URL
Losslessly optimize images (issue #2596)

Ran all images through this script:

  https://gitorious.org/fmarier-misc-scripts/user-scripts/blobs/master/optimize_images
still trying to map a q command
Update Mincer dependency
Provide better logging for init steps
Improve doc on font_config
Add collections dependency
refactor Hooker to use collections
debugged encoding of query params, spaces to pluses and back
qttools_sql: make DatabaseManager::createDatabase() virtual
qttools_core: fix potential init errors of static variable in log.cpp
FIXED: Multiple errors I created in functions.
Merge branch 'master' of https://github.com/foundrycf/foundry
企业库模板
add some illegal and double tests
Add support divide by zero
Fix important bug (3-2-1 == 2, should be 0) and add test for this
Fix todo statement - only refactoring
Cosmetic UI changes, delete unuseful code
Channels can now receive messages from server.
fix final month application of percentage discounts to bundled packages, RT#17045
add file descriptor 0/1 protection from RT 3.8.13 upgrade, RT#18040
typo
IPifony charge download script, stage 1, #18333
Test suite
Tests more specific to Freicoin
Merge pull request #4 from mhredmond21/master

Unit Test fixes--makes it possible to run the unit tests.
made it so in editor_info: you can provide events: a list of events (e.g. events: ["triggered"]) and these events will be editable in the editor
Merge branch 'master' of github.com:frogatto/frogatto
A generous activation border for smoke generators.
Updates to the owl.
fixed 'flying across the level' issue reported by marcavis
Re-applying some changes to killer-bunnies that I accidentally overwrote.
Fixes to gate events.
Updates to mac project file.
Converted old map-container syntax in frogatto_playable.
really fix logfile sync (buffering must be turned off)
Added classes to hold json unmarshal so there is a transition layer between json.
added layout graphics
having to adjust the next and previous year too
added back in whyzors changes
added README
Merge branch 'master' of github.com:gailo22/chanomyen
move Task to the use_case file
gui shouldn't have logic, deleting doesn't delete
delete with a roundtrip
refreshTask added for future use
add preCompress option to compiler (passed entire source table right before compression); use cwd to determine the path used for fetch (allows overriding of the ENV_node getCwd function)
add a jsio syntax tree generator using parseJS
fixed footer and made adjustments to containers and header
thinkfan patch no longer needed with 0.8.0
Color changes to the message box
Attempt to fix total count bug
Added success/total properties to online stores
Reduce timers

Reduced upload data timer to 1 second.
Reduced status bar timer to 15 second loop.
Added additional error checking
Updated version
Pass config to child of GDB monitor

With this patch GDB monitor provides a 'config' file to the target. Its
content can be defined in the <config> sub node of the <target> XML node.

Fixes #179.
*.properties files automatically updated from ggbtrans

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16186 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Call stopEditing() before calling doEditCell to make sure that we don't edit multiple rows at once in CAS

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16187 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fixed PGF export of hyperbola

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16188 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fixed PGF export of hyperbola

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16189 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Removed code for collecting updates, introduced updateLocation method to distinguish between update of value and update of position

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@21784 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
validation for StatisticsCalculator input fields

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22157 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Removing debug()

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@19082 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Add some new files unused yet (needed by the Web EuclidianStyleBar)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16779 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
First MyToggleButtons shall be implemented for stylebar - still need to program the icons

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16780 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fixed the  replacePowersRoots method in ExpressionNode so that it works in both ways

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16324 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
*.properties files automatically updated from ggbtrans

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16325 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
no longer need gitignore
Added some simple kernel drivers - rtc, pit.
make diffs work again
remove makefile of old documentation
move my documentation to new directory
Possible bug fix in update_indiv_j
add preview for comment notification emails
Merge branch 'master' of github.com:drakmail/gistflow
remove unnecessary bang in notification_email
Merge pull request #201 from drakmail/master

Add preview for comment notification emails
Implement UsersProject project_access validation
Remove path parameter from projects API
Repaired Get patch
Merge pull request #1462 from pipozzz/master

Repaired Get patch
Add font-awesome-sass-rails gem
Import Font Awesome styles
Merge pull request #1715 from riyad/use-font-awesome

Use Font Awsome for icons
Fix MR count for group scope