labofsahil/github-event-dataset-2012 huggingface dataset:
readme update, remove jockeyglitch files, update mapinfo for tank banning
Added submodule clone script.
Cleaning up some settings for osx to bring it closer to how I like it.
ignore svn folders
initial commit
Fix layer.tilejson and compositing bugs
a more consistant ui controls on examples
Remove fozzie logger
Increase z index of body for interactions
Tests for namespaced classes
Test for edit template
Fix csv in license report
fileutil: write_atomic() for win32

win32 does not support atomic rename
rename css libs for loding order
readme changes and generation
Paginación de instancias de proyectos
Japanese translation updated by Go MAEDA (#10745)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9520 e93f8b46-1217-0410-a6f0-8f06a7374b81
Remove wallpaper...what on earth was this doing here?
Better .gitignore + Chained makefile
Remove prefetching (doesn't work)
BrowserID img alt tag
little vision change
Add stb_image.c
incorporating pull request to fix filesystem bug
TopicController: логируем использование rss

хочу посмотреть, пользуется ли кто-нибудь
полный url в og:url
переход по ссылке на игнорируемое сообщение

теперь автоматически добавляется 'filter=show'
если комментарий на который переходим не виден
по-умолчанию

fixes #401
ссылки на удаленные комментарии для модераторов
Change text-align
fixed some expect tests
small qtclient fixes on Windows
`paclog' alias opens pacman log file.
Merge branch 'master' into work
jazz hands for today
Merge branch 'master' of github.com:mcglincy/maestro
Game sound manager now plays the maestro sounds one after another! should be easy to customize it during runtime to queue up the next song in any order.
Added the basic Crowbot entry point.

This is the foundation for the application.
First plugin: BZQuery
Make animated object base class.
Fireball collisions. Smarter bad dudes.
updated markmin docs
Tidy up KinkRemover
wip Compactify
Update readme for new packaging
Add checking $prefix for compatibility with mb_string
Fix desyncing of participants
Lectures listing - refreshed.
merge settings file
Merge remote-tracking branch 'origin/master'
Conversion to prime faces. Date picker added. All forms are wrapped in components.
smoosh with bytebuffers
Finish CRUD benchmarks
tabs on listing view, other
Merge branch 'master' of github.com:mhenningsd/parks
add more logging info when bdb fails
Merge remote-tracking branch 'origin/target-4.3.13' into target-4.3.13
add more logging info when bdb fails
add more versions to NetcdfFileWriter
add more logging info when bdb fails;
chars are UTF-8;
handle empty char attributes correctly;
fixes to file writer 2;
tdm can trigger multiple servers
Modified xsl files and GridDatasetInfo for netcd4 support

Added structure (view and controllers) to support nectcd4 in netcdf
subset grid requests. If depends on the availability of the netcdf4
library
punt on utc
migration for punting on utc
more punting
punt complete
Merge pull request #8 from mhinze/scenario1/puntonutc

Scenario1/puntonutc
call for speaker list on organizer home page
can edit a call for speaker
fix typo in layout
no idea
Merge pull request #9 from mhinze/scenario1/eventlist

Scenario1/eventlist
Added contants file. Replaced cube with plane.
convert to bootstrap layout
By fhemmike


git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1796 2b470e98-0d58-463d-a4d8-8e2adae1ed80
On/Off makes no sense in ico filenames.



git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1797 2b470e98-0d58-463d-a4d8-8e2adae1ed80
Removed Debug-Code Data::Dumper

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1798 2b470e98-0d58-463d-a4d8-8e2adae1ed80
0.2
0.2
0.2
0.2
0.2
daycount
daycount
daycount
daycount
support mobile device
Added help pages for mailing and module
Update fetching from queue to avoid to send duplicates
reimp of rockets - this will break stuff i'm sure
new mines
s/ADB/ADB_PATH in setup-tools
Update heartbeat code according to review
Fixed terminator recognition in lexer
Adding a workaround for the dylib => jnilib renaming on Mac OS, JDK 7
Not just remaing, but also copying to the expected extension.
Merge branch 'master' of github.com:mikiobraun/jblas
refactoring Session
Merge branch 'gradingupdate' into 1.3.0

Conflicts:
	src/duke/libraries/dukeapi/dukeapi/protobuf_builder/CmdLineParser.cpp
Merge branch '1.3.0' of github.com:mikrosimage/duke into 1.3.0
updated test fill pattern
[Xresources] Add perl-lib directory to urxvt

This commit adds perl-lib resource to urxvt pointing to my home directory so
that I can put Perl extensions there without the need to fiddle with
directories under /usr.
Merge pull request #955 from minggo/gles20

typo fix
fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati
Merge pull request #956 from dumganhar/iss1282_ati

fixed #1282: Used opengl directly on win32.
Delete libEGL.dll(.lib).
Merge pull request #957 from dumganhar/iss1282_ati

Deleted libEGL.dll(.lib).
Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful.
Merge pull request #958 from NatWeiss/gles20

fixed #1286: Fixes the declaration of tgaLoadRLEImageData()
Update AUTHORS
typo fixed in CCGL.h
Merge pull request #959 from dumganhar/typo_fix

Typo fixed in CCGL.h
Android template's build_native.sh automatically copies new icons from your assets directory.
Enhances CCTransitionScene to work even if there is no running scene.
CCControlButton update. Added zoomOnTouchDown property and setPreferredSize

Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
Update AUTHORS
Merge pull request #962 from NatWeiss/30d53e4155c1a4998d6bbb8382c40b06936a7061

fixed #1287:Android template's build_native.sh automatically copies new icons
Update AUTHORS
Update AUTHORS
Merge pull request #964 from NatWeiss/patch-1

Update AUTHORS
Merge pull request #965 from NatWeiss/gles20

fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
Small changes in coding styling.
Fixing update stock item function
Fixed bug in pct_encode (affecting characters 0x0 to 0xf)
add failing test for #15
Merge http://github.com/mjambon/ocaml-uri

Conflicts:
	lib_test/test_runner.ml
update CHANGES for #15
Merge http://github.com/mirage/ocaml-uri

Conflicts:
	CHANGES
reword CHANGES and mark release (closes #16)
bump trunk to 1.3.6
うえーーーーーい
Update to Rails 3.2.3
Fix issue #16
добавено по ref no
instructions 2x
Master/Slave USART 1mb/s works
Hardware specs and firmware for the new mini motor controller
[#2199] Some style nits. Some horribleness from doing this when tired
[#741] Fix opera CSS
Add csslint and check-css target (requires npm install -d)
Rely on node hashbang in make.js for csslint
Change the dep version for csslint in package.json
Fix most of the CSS warnings and errors from csslint
Fix csslint rules, fix 99% of errors, add dialogs, templates dirs to check-css
Add back changes lost in rebase of t741 to master
Fix two small issues that made it into last commit.
Missed -o-linear-gradient
[t1251] Keep tray outside body contents

1. Fixed up minor CSS annoyances with previous padding attempts
2. Added padding for tray specifically
3. Transitions for tray padding
[t472] playhead -> viewport snapping
[t472] lint fix
[t1251] added cross-browser transition props
[t472] added same functionality for `mediapause`
Merge pull request #327 from secretrobotron/t1251

[t1251] Keep tray outside body contents
[#1267] Cornfield tests fail gracefully without manual input. Fixed Style issues
[t741] Fixes as per review
[t472] removed whitespace
Merge pull request #331 from secretrobotron/t472

T472
[741] Fix alignment issue
-znc (in ::net)
+batctl
Added more check plugins (only as comment)
add php file
Merge branch 'master' of https://github.com/mkfsn/dormnet119
Merge branch 'master' of https://github.com/mkfsn/dormnet119
Merge branch 'master' of https://github.com/mkfsn/dormnet119
Merge branch 'master' of https://github.com/mkfsn/dormnet119
Se reparo lo de contacto.php
Se reparo lo de l aruta default
Se agrego el cambio de el correo
Update 3/0000/0023.txt

etw mehr übersetzt
mmp_ast update, try ubuntu dpkg zaptel to fix app_meetme for asterisk/vicidial
Original binary for the SoftBox terminal program
Ruby script to convert the CBMXfer disassemble to ACME format
Keyboard.. so close I can smell it
added a Close wrapper function
changed rec_size into a macro
use X-ApiKey instead of CosmApiKey
Kiran | Added more village mappings and added individual ANM data files
Kiran | Added test_upload user for testing uploading of forms
Kiran | changed one of the anm data files to point to a different anm, made the anc to ec matching case insensitive
Kiran | Fixed the data upload by adding a path to CA certificates
include additional test for old format cascade xls
slugify field names, handle spaces
Use Blob instead of BlobBuilder
fix: Timing control of audioprocessing for Firefox/Linux
build: v12.07.23 (Mon, 23 Jul 2012 10:25:30 GMT)
v12.07.23
Fixed autogenerated file permissions for backend views/models - now 0664
gui.base.Plus: Make escape and unescape for special chars works.
gui.gtkui.ContactInformation: Remove formatter. Refs 62dcc9e. Closes #1433.
[Refactoring] QuickFix popup now integrates the resolve command.
Переделал рейтинг и прогресбар
poprawienie About
Make possible to have single/simple operation description return type. min-/max-lenght for BYTES
[AS7-5107] connectors & discovery-group alternatives

* use AttributeMarshaller to marshall discovery-group-name &
  connector-refs attributes for bridge, cluster-connection
  & broadcast-group resources
* define connector and discovery-group as alternative attributes
  for bride, cluster-connection, connection-factory &
  pooled-connection-factory resources
* add a AlternativeAttributeCheckHandler in the MODEL stage
  when writing attribute to these resources
* replace JndiEntriesAttribute's attributes by regular attributes
  with custom AttributeMarshaller
remove AttributeDefinition subclasses

* as in previous commits, finish to remove all
  AttributeDefinition subclasses and replace
  them by regular AttributeDefinition instances
  with custom AttributeMarshallers
spelling fix
use OperationDefinition & some minor jca cleanup conversion
ObjectTypeValidator move
Deprecate registerOperationHandler(String,...) in favor of Operation definition
AS7-5572 ObjectTypeAttributeDefinition does not honor key format in resources

- some cleanup of jca
AS7-5536 Lifecycle methods in web.xml are ignored
AS7-784 Put down an .undeployed marker when scanner detects external mgmt client has undeployed
AS7-5549 Add support for @PersistenceContexts
spelling fix (milliseconds)
AS7-5577 Disable JGroups diagnostics service by default
Upgrade logging processor

* rename package with annotations to non-deprecated
AS7-5520 Warn "IllegalStateException: channel is not connected" on clean shutdown
Don't require session ownership lock if expiration is localOnly.
[AS7-5354] update HornetQ RA properties

* pass compress-large-messages attribute to HornetQ RA
* add support for initial-message-packet-size & initial-connect-attempts
cli deployment-overlay command: changed --server-group argument to --server-groups that accepts a comma-separated list of server groups
cli: refactored completion of argument values that are lists separated by commas
cli deployment overlay command: fixed server groups argument handling for the add action
fixes for cli deployment-overlay command
MDL-33529 course/externallib.php PHPunit test
Bug 807438 [System] Move e.me and homescree bookmark wrappers to system app content processes. r=vingtetun
Merge pull request #6764 from ochameau/oop-window-open

Bug 807438 [System] Move e.me and homescree bookmark wrappers to system app content processes. r=vingtetun
Bug 819182 - improve startup time by enumerating files quickly r=dkuo a=bb+
Bug 808470 - fix jumpy scanning by improving change batching r=dkuo a=bb+
Merge pull request #7008 from davidflanagan/bug819182

Bugs 819182 and 808470: MediaDB scanning and enumeration improvements r=dkuo a=bb+
Auto-merge from branch 'master'
Bug 805756 - [UI][SMS] Small fix in header for including 'separation bar' between icons
Merge pull request #6018 from basiclines/sms_apply-building_blocks

Bug 805756 - [UI][SMS] Small fix in header for including 'separation bar' between icons
Auto-merge from branch 'master'
Using new or old DeviceStorage API
Merge pull request #3182 from albertopq/contacts-image-picker

[Contacts] Using new or old DeviceStorage API
Bug 807545: Add a membuster test app. r=jlebar a=gal
Followup to 807545: Fix typo.
Merge pull request #6127 from cgjones/add-membuster-app

Bug 807545: Add a membuster test app. r=jlebar a=gal
Avoiding change removed fields
Merge pull request #5138 from albertopq/contacts-bugfix

[Contacts] Avoiding change removed fields
Auto-merge from branch 'master'
Bug 804080 - [WebPayment] Make pay flow OOP; r=vingtetun
Merge pull request #5926 from ferjm/bug804080

Bug 804080 - [WebPayment] Make pay flow OOP; r=vingtetun
Auto-merge from branch 'master'
bug 810386: proper timezone selection in Settings and FTU
removed the obsolete timezones database
Merge pull request #6693 from fabi1cazenave/timezones

bug 810386: Timezone selection is incorrect
Auto-merge from branch 'master'
Deal with the case where short name is empty, fix #4599
Show Brazil region name on status bar with LAC, partial fix of #4545
Merge pull request #4608 from timdream/statusbar/carriername

Status bar carrier name fixes
Auto-merge from branch 'master'
Disabling button when all inputs are empty
Changing opacity instead rgba
Fixing lint
Checking disable button when coming from Activities
Merge pull request #3041 from albertopq/contacts-bugfixing

[Contacts] Disabling button when all inputs are empty
Fix a typo in the grid.js to check if a page overflow or not in the homescreen
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Add more consistency to the keypad code
Lint fixes
Merge pull request #2614 from vingtetun/dialer5

Small change to keypad.js to make it more consistent.
Bringing back the pick contact activity in the sms app erased by error
in c342f9bbf2c7eee0610418ce0663dbef330c570e
Merge pull request #2449 from etiennesegonzac/bring-back-contact-pick

Bringing back the pick contact activity in the sms app erased by error
Bug 812123 - [UX Incomming call] The incomming and outgoing call should not show a generic avatar (r=basiclines) (r=fcampo).
Merge pull request #6461 from gtorodelvalle/dialer-bug-812123-no-generic-contact-avatar

Bug 812123 - [Dialer] [UX Incomming call] The incoming and outgoing call should not show a generic avatar
Auto-merge from branch 'master'
Bug 802583 [Apps] App Install Cancellation Prompt r=etiennesegonzac
Merge pull request #6317 from benfrancis/app-install-cancel

Bug 802583 [Apps] App Install Cancellation Prompt
Bug 810031 - Remove ActiveSync autoconfig mapping for Gmail; r=asuth, a=blocking-basecamp
Merge pull request #6381 from mozsquib/gmail-imap

Bug 810031 - Remove ActiveSync autoconfig mapping for Gmail
Auto-merge from branch 'master'
backout of PR #2898
remove temp file
Merge pull request #2924 from fabi1cazenave/settings-apn

backout of PR #2898
fixes for binaries
delayed all callbacks
surface field names that are understandable by mere mortals, rather than things like iat,aud,exp which are the JWT spec details that need not be visible to the developer using the API.
Merge pull request #14 from mozilla/v0.2

V0.2
bump Django (bug 820092)
Made AMD dependencies relative and added a compile method.
using compile function in sjs
redirect to login if vote while not auth
Log last execution of ansible-pull to /var/log/ansible-pull.log

TODO: logrotate script and append to log instead.
Left-align table headers
edited bundles
Adjusted the minion animations one more time
minor fixes to pin definitions
Update trans/williamsparon_vol_1/27_palindrom.json
retry the longtap
Made .s3 and .aws files hidden under Windows
Fixed empty ouput for verbatim-string-simple test
cucumber-rails gem needs "require false" set on it
setting spec helper file up for database clearn
removing devise registerable module
pointless layout tweak that will certainly be undone when I get round to styling this app later on
layout tweak
Added checkbox and shit
remove different fonts,
centre some of the credits in footer
update the local yui css/js
about us is the main page
route to advanced search
advanced search page
select attributes to be searched
search for different model fields
search for different fields in the search controller
keep track of which fields and types have been selected for searching
year picker for dataset searching
search by year and location options
sidebar with latest surveys
permissions on dataset page
Merge branch 'obe-358-ccsr-requirements' into advanced-search
create hidden fields when search options are changed
create new hidden fields when advanced search options are changed
exclude/include fields on the controller side for searching
ensure normal searching works with the additional advanced search fields as hidden fields
location search is false by default
no location searching in default search
change dataset year to int for solr indexing
search dataset by year range in sunspot query
tweaked FB and wtit logos
applied last migration ok
Constructing multi-perspective datamodel #28
Constructing multi-perspective datamodel #28
update gaia submodule to incorporate changes to overridden user-agent string
argcv Add
argcv/main.hpp Add
argcv/base.hpp Add
argc test
argvc test
Merge branch 'argcv' into develop
Merge pull request #2 from myun2/develop

Argcv Merged
マクロを使って、 io_exception を定義
update local gem
Merge remote-tracking branch 'origin/master'
removed configatron files
updated setup script
getting expression
fixed editing creators
Added line2curve function
mensaje de nueva session
bad csv
fix0312
Updated pom.xml for SpoutPlugin/API merge. :/

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
`!=c` now uses `walk*` on pairs in the prefix

It seems like there should be a better but this works for now.
 test case demonstrating why the current `!=c` implementation needs
 `walk*`.
Merge branch 'master' into nominal-base

Conflicts:
	src/main/clojure/clojure/core/logic.clj
Untabified interface declaration.
change metaCacheFile name
Merge remote-tracking branch 'nao-pon/dropbox' into 2.x_n
Added <%= %> --- missing = %>
test if statement
change if statement format
CAUTION: be careful with <% <%=
Insert most recent moisture data
change <%= to <%-
check insert sytle
change style again
change if statement < ==
adding comment 'most current moisture value'
change if statement
checking error
display number
Change in if statement
if statement change
If statement change
IF statement change
Change current --> recent
Fix: discovery for safekit cluster
Fix : Typos in shinken-discovery
implemented framework for shared worker resources. created default executor resource, need to add in worker hook so users can define their own shared resources
remove example _005_protected
no version number in test outputs
Bullshit explain plan (hi @pirroh) for query K. Sorry @greut.
tweaked filename to include class name and section number
Minor fix to Enumerable recursive finder
Inicio de proyecto con entidades basicas creadas
authenticate in test_action_links rather than hack the app's status attribute to get past permissions checker
xpdfrc
Updated RulestoImplement
adding json formated description of properties and methods
DocAdd: link to the demo of AlgoView;
Add: TerminalExpression parsing;
Add stdin support to tools/cli
Changes in validation.bat/.sh and updating .gitignore
Just a few rest edits, line changes etc. Nothing with any effect
Removing APIs used by the repo--ec2 and neptune
changed ['username'] to ['user_name'], added ['user_id'] in user.class.php
Bug fix: 記事更新後に表示される記事の "編集" ボタンが正常でなかった問題を解消

その他コードリファクタリングするなど
Refactored
Now using ZappaJS instead of Zappa and CoffeeCup instead of CoffeeKup
Merge branch 'master' into zappajs_coffecup_replacement

Conflicts:
	modules/ionize/helpers/helper_article.coffee
Merge branch 'zappajs_coffecup_replacement' into develop
Page and database caching with Redis.
Adding Page cache functionality, using Redis for memory storage.
Merge branch 'optimization_in_memory_tables' into develop
CoffeeCup corrections in backoffice (some code error where accepted by CoffeeKup and not anymore by CoffeeCup...)
Sending Settings to views, in @settings
Page caching, using ZappaJS & CoffeeCup instead of Zappa & CoffeeKup. Merge branch 'develop'

Conflicts:
	package.json
slimmified
* init.el: Use color-theme-solarized. Fix ledger-mode.
  Disable highlight-cl mode.
Removed sqlite3 from Gemfile
updated gemfile.lock
Adding additional static pages and rspec files
L::L::Entry: Fix _init croaking on existing entries

In some cases, _init would croak on loading an entry that exists but
where the "package symlink" (i.e. the one pointing the underlying
package) is broken.  This happens whenever the Laboratory outlives the
package itself (e.g. on lintian.d.o).

Secondly, as both constructors now (almost) always have a path the
package, there is no need to do the "resolve symlink" trick to find
the "correct path".

Signed-off-by: Niels Thykier <niels@thykier.net>
NXP-8054: fix hot reload of core schemas/types/facets
add ogrinfo (describe), lowercase, uppercase, and rename functions
Merged @erichs changes for the bash-it function.
Merge branch 'enable-disable-aliases-completions'
[api] Implemented some crusher api's
[minor] Cleaning up
[cli][api] Make the new cli the default version.
day ci
Finesse toggle shadow
Use jsonpickle if available

jsonpickle https://github.com/jsonpickle/jsonpickle
remove deprecated function set_magic_quotes_runtime
added style for player-page main element borders
main changes on player-page

- style fixes for main playlist
- search fixes & automatic tab change
- time & progress updating
- dropping & shuffling main playlist
minor fixes

- sjq event fix for click (all need to be redone)
- progress changing in player on player-page
- not changing resume/pause button when trackList is empty
player-page main playlist

- selecting active track in pl (rbList & mainList)
- playing tracks from main playlist
- changed adding to main pl alg.
Rename package, and change procfile
Add .godir
Solved bug viewing packages due to datetime in "created" field (due to schema). Add missing form tests - dates. Added DGU create-test-data. Fixed language of displayed form errors.
Prepare for switch to 1.7.1 where there is no create_roles / AuthzTools.
Try again with middleware. This time using modified auth_tkt (untested). Move related files to authentication folder.
BASE64 decoding added.
started using slabtext, slogan now reacts to window resize
Little bug fix: mispelled variable.
cleaned and fixed movement
dockment_table.rb: remove_all の高速化

remove_records に共通処理を抽出
cdstk.rb: milk remove --all を DocumentTable#remove_all を使って高速化
asciisvg generator
- retabify (untabify for pysolv)
Make "symbol_value" return a symbol

This is in line with other *_value functions that always return an
instance of the corresponding type.
Remove useless "to_s" call in "symbol_value"

All values passed to symbol_value are strings already.
Cleanup attr parsing specs
Fixed the handling of flash messages on registration page
Merge branch 'master' of github.com:openlabs/monstor
Update notes for submitted changes

* Drop unfinshed parts of v2 API
Disallow image uploads in v2 API when data exists

When data has already been uploaded for an image (determined by the existence
of a location attribute), reject any subsequent requests to upload data with
a 409 HTTP error code.

* Related to bp api-v2-image-upload

Change-Id: I0c4d2ebf548862ecb9c760bac9e96348f8377567
use events_page instead_of page
Replace jQuery ajax library with d3 ajax library
[vim] add commentary binding
[vim] make bufonly bundle a submodule
[vim] remove php stuff
[vim] remove tlib bundle
AweThinks Idea
test
todos test
Try avoid bad rotation
really ocd
Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder
Add Game._draw_line_of_fire()
remove compiled and log files
insert log of es5
rename es6 files
update es6
rename es6 srcs
add tuple exercise in es6
.vimrc: add some settings and remaps
Create Outline file
merged with devil branch (plg updater)
No need to throw operator exceptions since we're checking for their existence in the parsing.
printer-applet delete
Merge branch 'master' of github.com:pardus-anka/2013
SuiteSparse version bump
analysis manager results page. implemented simple urls, views
Ajaxed: analysis_status.html updates UI w/ progress of downloading files and progress of galaxy analysis
Merge branch 'develop' of https://github.com/parklab/Refinery into develop
Removed refinery_repository.
do() method renamed to run().
Made sidebar not scroll when screen < 600
sys-email - slight refactor
Disable cleaning between frames (again...).

Tested to behave as expected.
Change default ProEMExposureShortcut to 5ms.
Restore libftdi option for simpler linux operation
Extract packet parsing into its own function
Test PICAM callbacks instead of polling.
fixed some UI inconsistencies with milestone process
Add enable_metrics setting.
Merge remote-tracking branch 'origin/dev' into dev
Don't truncate application messages
Fixes #1064

It's much better to use str(user) since it takes
care of verifying if the user has filed his full
name or not (and if not, return the username).
Remove unnecessary inheritence in a test case.
Port video/tests/downloads to the new test style.
Minor formatting adjustments.
Remove a stray print statement.
Port can_be_synced to the new data model.
Start porting the upload tests to the new data model.
Removed production app servers pcf-us-cluster{6,7}
Merge branch 'production' into staging
Fixed #1221

Sorry.
If workflow is not enable, return unmoderated and
don't create a task.
Don't sent the video's title when syncing with YT

https://unisubs.sifterapp.com/projects/12298/issues/633357/comments
Fix #1193

If the user that makes the review edits the
subtitles, we create the approve one with the "wrong"
review_base_version (as in, it's not the translate
one but the review). That means if the approve task
is sent back we were assigning it to the reviewer
(he was the user from review_base_version).

Remove the code that was assigning using review_base_version
so we always go after the user that translated/subtitled
the view.
Merge branch 'staging' of github.com:pculture/unisubs into staging
Update integration repo
console.log calls make IE explode
(cherry picked from commit fdcdb75663c520ae2a0e771c7fa3848636b68b15)
Merge remote-tracking branch 'origin/staging' into staging
Update integration repo
Remove trailing comma screwing up the activity tabs urls, dammit.
Fix #1193

Now, if you send a task back, it will go to the
previous step instead of going directly to the
Translate/Subtitle task (i.e. Review -> Translate and
Approve -> Review) and assign to the user that
last did this step for this language.
Fix issue that created new tasks on save and exit

Since we were just querying subtitle/translate incomplete
tasks, if the user tried to save and exit a review
or approve task, it would create a new translate/
subtitle task.
Merge branch 'staging' of github.com:pculture/unisubs into staging
Merge branch 'staging' into x-nf
Merge branch 'staging' into dev
Updated transiflex translations -- through update_translations.sh
Fixed localized traditional/simplified chinese names

https://unisubs.sifterapp.com/projects/12298/issues/578408/comments
Merge branch 'dev' of github.com:pculture/unisubs into dev
Implement a first version of the team video moving.

For https://unisubs.sifterapp.com/projects/12298/issues/574325/comments

This isn't complete.   It needs some frontend work to make it look nice, and we
still need to add the reviewer/approver metadata to subtitleversions so we can
track it across teams.
Merge remote-tracking branch 'origin/dev' into dev
Update integration repo.
Fix tests to be more robust again fixture changes.
Fix one more test.
Front-end for moving a video to another team.

For: https://unisubs.sifterapp.com/projects/12298/issues/574325/comments
Make move-video form more consistent with edit-video form.
Add a SubtitleVersionMetadata model.

For https://unisubs.sifterapp.com/projects/12298/issues/574325/comments
originally but will have much more far-reaching uses.
Merge remote-tracking branch 'origin/dev' into dev
Remove unused imports in videos tests.
Remove unused variables, etc in videos tests.

Basically shuts pyflakes up and removes unnecessary noise.

This whole file could really use a cleanup though.
Display a notice about losing tasks when moving a video.

For: https://unisubs.sifterapp.com/projects/12298/issues/574325/comments
Add a TODO to remind me to escapejs translations that go to JS vars.
Updated transiflex translations -- through update_translations.sh
Support for youtu.be urls on embed

https://unisubs.sifterapp.com/projects/12298/issues/579313/comments
Don't let user control playback of video with DOWN key.
some error 'avoition'
Merge branch 'master' of github.com:pdxwebdev/yadapy
better support for multiplicity
폴더구조변경
Merge branch 'master' of https://github.com/peas314/hoyTest2.git
Add more docs and example about app_globals and tmpl_context
Document WebFlash
Document lurl usage
Document flash and caching
IST076, fixed typo, updated bol form
Fix for MONDRIAN-1205. A better exception message is sent to the user if a drillthrough is performed on a calculated member.
Fixed pagination some.
Fixing a bug in the cleaning dependancies (and potentially more than the cleaning)
Changed the movement controls to be more confusing but also conducive to shooting.
fixing named graph add to memstore
added a bunch and getting frustrated with rules
moved shiftround nearer to shiftwidth
Revert "trash commit"

This reverts commit 64f036dfcad960d75b0cf26bb986c653769f8c72.
modified group layout
Bump to 0.1.6
Bump to 0.1.7
Don't know what's going on with prawn
Update & clean-up code to follow latest `knplabs/github-api` client changes
Merge pull request #292 from stloyd/feature/github_client_update

Update & clean-up code to follow latest `knplabs/github-api` client changes
Update dependencies
Add bundle versions history to store all available bundle versions
- depricate to use symfonyVersions use instead versionsHistory
Replace updateSymfonyVersions with updateVersionsHistory
- with new method fetch symfony versions and dependencies
Remove symfonyVersions from Bundle enity
- generate migrations to add new versionsHistory field
Update dev config to have ability use twig debug
Prevent foreache activities if its empty, check if require-dev and suggest really exist
Add temporary check for symfony versions before full bundles updates did not pass on server
- remove this stub after
Show tab with dependencies list first preview
Add display bundle dependencies macro
- udpate translations
Update bundle dependencies list styles
Update fixtures, include now full bundle versions list
Update repo test to base on versions history instead of just symfony version
Add bundle versions for the dependencies lists
Add bundle versions history to the behat feature context
- add behat test for dependencies tab
Check if readme field is defined
gitignore file
just a helloworld
Clean out remains of the old EEPROM driver.
Move the last of the board-specific code for PX4FMU out of the NuttX tree.  Now it's just configuration.
Merge branch 'master' of github.com:PX4/Firmware
Initial commit
added REST API calls
rectified String.format subtitution variable
json data from response
Update src/main/java/com/plivo/sdk/client/RestAPI.java

server response code >= 400, throw an exception.
added serialized names for attributes
added xml generation
cleaning a bad commit
added number resource
replaced misnomer substitute expression
Merge branch 'master' of https://github.com/kaydarla/plivo-java-helper into new

Conflicts:
	.gitignore
	README.md
	pom.xml
Add Latvian flag closes #11451
update changes
Add note about configuring nxtcode.
Updates to standard movement blocks.
Code to perform basic left/right proportional
following.
MIT MOTOOLBOX - ADDED EFFECT COMPARATOR
The .gitignore file is no longer necessary
Minor changes to fabfile.
Fixed minor bug with invmaxrec error message.

Fixed minor bug. Meshes are now the same colour as their counterpart function.
Cool hint from Poeschko.
Merge pull request #33 from sn6uv/parametric_plot

Fixed minor bugs with invmaxrec error message and the colour of Meshes.
Merge branch 'parametric_plot' of github.com:poeschko/Mathics
fixed simplejson import
Merge branch 'release/0.6.32' into develop
Add no_www middleware
Update merit requirement

Point to main repo because of https://github.com/tute/merit/pull/14
Minor changes
Add before filters and update by_day and by_hour actions according to new
Tomato model methods
Add diligent_tomatoer and assiduous_tomatoer badges (draft)
Add cache to rankings
Update badges image; add diligent tomatoer badge images
Add group_by_day method
bump version number to 0.6.33
Merge branch 'release/0.6.33'
Merge branch 'release/0.6.22' into develop
Refactor of rankings controller to have a RESTful interface. Rename rankings models to be consistent with the naming conventions of time periods.
Add heroku to development group (used by new tasks)
Add rake task to dump and load db
Fix memory error

Tomato by_day and by_hour methods must return mapped array not ranges!
Remove references to old domain
Merge pull request #46 from matteodepalo/develop

Refactor of rankings controller to have a RESTful interface. 
Rename type variable to time_period
bump version number to 0.6.23
Merge branch 'release/0.6.23'
Room now loads cartridge only at powerOn
First pass with node API -- fails due to underscore dep
node deps
prettyprint
Added sub-projects for Lua sources
Still setting...
PC_site::Get_favicon() method integrated
Colored log messages work!  Only with log4cxx so far, though.
Started implementing cout version of colored text.
Cleaned up debugging and unnecessary comments.
Colored text output now works in the cout/cerr version.
Made all color member variables const static.
Added submodule Monarch; removed submodule Lice
Modified CMakeLists file to match change of submodules.
Merge branch 'IntegrateMonarch' of ssh://github.com/project8/katydid into IntegrateMonarch
modified ne10_init function
Move event handler.
model set value check for update as well
tweak the info window copy
特殊化したstd::swapを実装。
commentの整備とtextの整形。
thread部分をCLX C++ Librariesに対応。
template引数の順番を変更。
template引数が足りてなかったので追加。
Switching to solarized dark.
Just store login info in env vars
Remove start_node.sh since it is not used anymore.
Merge pull request #66 from HarryPan/master

Remove start_node.sh since it is not used anymore.
Updated hiera.spec to include puppet functions and put in the right place.
Merge pull request #51 from haus/add_spec_file

Updated hiera.spec to include puppet functions and put in the right plac...
a few tweaks and corrections before beta3
tweaks before release
Update pages/about/ru/conference_objectives.md
intermediate
Merge branch 'master' of /home/jessey/projects/bumerang with conflicts.
fixed images, tests, api and forms logic
Grass bindings improvements in SEXTANTE
Fixed minor bugs in SAGA an GDAL merge algorithms
Add minorVersion() method, fix doc of majorVersion()
Drop orphaned TopoGeometry objects on deleteFeatures
fix 'unused' warning
160 tests, 8 errors, 71% coverage
Merge branch '0.4' of github.com:quantmind/pulsar
refactoring
fixed master
merged
87% test coverage. Tests failed when run with multiple processes
added annoyance buttons
added "the zone" bounds to session score plot
back to some older shortcuts
Address new sonar issues
Merge branch 'daley', remote-tracking branch 'origin'
Merge pull request #388 from rackspace/fran

TK34792: Start refactoring auth service clients:
Sonar Issue: Loose coupling
removed auto clean up from init.d script as it is a configurable variable in the container.cfg.xml file
TK34792: Start refactoring auth service clients:

1.  Refactor the unmarshallers by deleting two duplicates and using a single one.
2.  Have the client components create the OpenStack serivce client via Factory.
Create replicated datastore filter
Update checker-core to 1.0.1.1
Validator security fix: Role should be compared using equals NOT contains.
Process validators in the order that they appear in the config.
Ensure that the filter chain builder is destroyed when repose is shut down
Merge branch 'daley', remote-tracking branch 'origin'
Clean up eh cache manager shutdown code
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'validator-fixes' of https://github.com/RackerWilliams/repose into validator-update
Merged pull request from RackerWilliams 'Validator fixes' Updated to latest version of checker core.
[maven-release-plugin] prepare release papi-2.3.6
[maven-release-plugin] prepare for next development iteration
Jmeter performance tests to test Distributd Data Store
Merge branch 'master' of github.com:rackspace/repose
Add optional datastore attribute to rate limiting
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'master' of github.com:rackspace/repose
Added changes to Jmeter to do Performace testing on distriburted data store
Merge branch 'master' of github.com:rackspace/repose
jmeter performance test for Distributed data store
[maven-release-plugin] prepare release papi-2.3.4
[maven-release-plugin] prepare for next development iteration
Merge branch 'daley', remote-tracking branch 'origin'
Update via header JMeter.
Update Rate Limiting JMeters to include test that ensure user limits get updated when the configured http-methods for the configured limit is set to "ALL".
Merge pull request #416 from rackspace/fran

Update Rate Limiting JMeters to include test that ensure user limits get...
publications table and maintain stylus code in this repo
Merge branch 'release/0.4.3' into develop
tweak parameters.
Truncate topics in the bar chart for more sensible bucketing.
Death to the MessageColorizer consumer.
Removing homeboy's code.. the license was no good.  Going to rewrite it.
Really, now.  Death to the MessageColorizer consumer.
0.4.5
Merge branch 'release/0.4.5'
Grid for /admin
Figured out context-sensitive sqlalchemy defaults.  Fixes #7.
Checkpoint para limpiar la compilacion. Errores corregidos al momento de compilar.
Checkpoint limpiando errores de compilacion al modularizar.
moved all images to images directory
replacing su with sudo for REL/CentOS support
AbstractDbMapper::getSelect should use default table name if no $table argument given
Merge pull request #57 from adamlundrigan/hotfix/db-mapper-getSelect

AbstractDbMapper::getSelect should use default table name if no $table argument given
extended list of necessary packages
Merge branch 'master' of github.com:ratschlab/oqtans
added xwrite to write to files or elasticsearch before xitems is reached
vagrant commit
extra ignore
Bumped required version of PHP to >= 5.3.4
Start slides from first slide
add all
doit
local cmd runner class to run the run_locally methods
Adds Default Opts, Increments Version Number
Adds default opts :size_in_em and :use_ssl, for tags.
add postgresql and tomcat aliases

add postgresql and tomcat stop/start aliases
Added the last changes commited by Bruno from the other branch.
Updated the bootstrap to the latest version:
- Mainly new icons last added by Bruno.
Added icon gray 16x18 manage
Merge pull request #29 from redu/issue-28

 Added icon gray 16x18 manage
Generalized text data file loading.
Moved text file loading into Game.init_files()
Moved sprite image loading into Game.init_files(). Closes #19
updated TypeConfig.ini so that donut charts work independently in flot
fixed a couple of loose notices
flot doesn't support double donuts, and we shouldn't pretend like it does
update support for bubble points with bubble factory!
less verbose file.copy/move logging.
Added missing comma
Added missing comma
Fixed html typo
Fixed typo
Fixed json typo
Merge pull request #182 from pborreli/typos

Fixed some typos
Update vignette using latest version of pkgmaker
Added weather information to the map.
optione for less, prompt fixes
Merge branch 'master' of github.com:reyjrar/dotfiles
skip .git in .vim rsync
re-added exit time
reworking core framework
Merge branch 'master' of github.com:rhomobile/rhodes
use __send__ instead of send to delegate surely
improve layout
PAF demuxer and decoder
wip
wip
ajax with breaking test
carrierwave defaults for image
update crontab via capistrano deploy
month error in timespec pdf subtitle corrected
Added JQuery and Jasmine to lib directory.
Merge remote-tracking branch 'origin/api' into api
Don't save original objects
Decide single strategy
Remove unnecessary parameter - me
Make MyStrategy more intelligent :)
first commit of R
Merge branch 'master' of https://github.com/rjcarroll/psc505
Comments are working, need to be styled.
Stricten focus a bit. (Needs testing)
Merge branch 'master' of github.com:rking/rking-dots
added check box.
Added connection from pushbutton to toogle on check box
fix ctor bug
remove macro
Work on new baseline system
Removed another compiled file
notif and sunscription (no styling yet)
Description changed
Merge branch 'master' of github.com:rodchyn/notifier
Fixing null xvfb wrapper script
ps should not use -auwx, only auwx. The extra dash is David's bug.
Fixing special case when nothing is identified so the legend is empty.
BugsId: 917
Add Kinect depth map collision detection
Merge branch 'master' of github.com:rools/Sculptnect
Fixed the dependency between the ORB and the configured security domain. Changed appclient.xml to use version 1.1 of jacorb subsystem.
Added guard to prevent NPE when building the JBoss Principal.
minor clean-up/refactoring
AS7-4385 support for unmanaged deployment content
AS7-3468 cli preferences: operation requests validation
added the missing method impl
[AS7-4438] Allow for the keystore password to be specified as an expression.
[AS7-4410] First step to add support for multiple schema versions.
[AS7-4410] Add parsing for version 1.1 of the cli schema.
[AS7-4410] Add support for specifying both an alias and a key password.
[AS7-4394] ConnectionFactory factory-type is broken

* add factory-type attribute to ConnectionFactory read
  and add operations
* fix the attribute allowed values in resource description
[JBOSGI-527] Unique error and warning message codes for all jbosgi projects
[JBQA-5855] SecurityDomain annotation in cluster and passing credentials after stopping nodes
AS7-4450 fix - set the default locale to en_US for LDAP-related tests (LDAPServerSetupTask)
AS7-4054 - convert xts subsystem to resource def

- add compatibilty with old model
- fixed ObjectTypeAttributeDefintion so it can be used properly with ResourceDefintion
connected twitter and level one marker done
Agregado breadcrumb
Ajout d'un item "Generation d'un BI" dans le menu
Page génération BI : ok.
Page Generation BI : ok
#
Merge branch 'master' of github.com:royguo/SouYouDao
lm: Improved header
Fixed season stats of players specs.
Merge branch 'points' into development
add git and Rbuild ignore files
update gitignore
add missing imports
[TASK] makes gh-page link lowercase
Licencia y README
All-uses fixed.
rewritten vim config
Added mouseover highlighting and colros and pathway db
I've added an a replacment for d3.sv.diagonal that is aware of directed edges Ie instad of placing control points half the y distance between the two points it places the first one past the source and the second before the target (where before/after means below/above, left/right depending on projection.) The distance of the controll point away from the source and target is the min of 16 and one half the distance between them to give a nice bundeling even for edges that travel perpendicular to the tree direction.
Removed old artist controller related files
graceful thumbnailing for pngs. attacks #121
Always write UTF8 BOM
Merge branch 'master' of https://github.com/sachmata/less.js
SAM-1835: Student able to submit second assessment after due date

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@114442 66ffb92e-73f9-0310-93c1-f5514f145a0a
Fixing SolutionDir path.
Merge pull request #5 from dragan/master

Simple typo fix for SolutionDir
some new files are added

This is treuly the final version of the package
it works
add license to image_display
started implementing artist search for DSM 4.0
Continued support for V4.0 of DSM. as of now, in this commit, we are bound to use V 4.0, but this can be changed with a different enum injected as a dependency. We need to find out how to detect the version to use.
added deactivated callback to salsita.content.openMenu
clean up the movement logic to combine it into one function
Criado View para cadastro de author, arquivo CSS, feito metodo create no model, validado campos de cadastro do autor
Lift neuron error calculations to the top level of weight update

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Git: local identity.

~/.gitlocal works only in Git 1.7.10.2 but .gitlocal works in 1.7.10.
eclim, autoclose plugins added
More DW pokes, and now sorted by dex num.
fixed issue with Opera in the tests and hashing directly with ArrayBuffer
Reduced the number of `var` declarations and no longer breaks the ECMA-262 standard
http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml#Function_Declarations_Within_Blocks
Merge pull request #9 from cotag/master

Fixes satazor/SparkMD5#7
More title bar changes

Removed title bar on splash and endpoint
Added options menu (but not the options themselves)
Updated tmux color scheme
design-update uml
Merge pull request #1 from scelfo/add_pickle_read_write

Add flags parsing and pickle read/write
new files are now added to repository
Bundling and minifying options for Makefile
fix for CC2540 reading secondary MAC address

read the proper location of the secondary MAC address in a CC2540 chip. Also pretty print the secondary address to match the normal standard (not byte reversed).

Signed-off-by: Scott Gustafson <scott@garlicsoftware.com>
fix makegreen git submodule to point to the correct repo
Implement format-aware 404 errors when loading invalid mutex instances.
Added scrollto
fill in socket creating boilerplate
memo works
Added New Relic, using canonical compass-rails gem
pylint fixes for ca modules
extension_modules added in root_dir comments

I still don't know what it's for, but I know where it goes! :)
Merge pull request #2082 from seanchannel/patch-10

extension_modules added in root_dir comments
Make the ca module code clean and consistent
Merge branch 'develop' of github.com:saltstack/salt into develop
clean out unused imports
more unused imports
remove unused var
Fix uninitiated value split
Clean out unused pathsep var
remove unused import
clean up unused vars
Clean up master config template a little

I got rid of the cluster stuff, since it does not work and needs
to be pulled out of the core anyway
Point links to Github blobs to 'develop' instead of releases
Missed the hidden 'v' in last commit
add smf module to support virtual service module on solaris 10+
Merge pull request #2083 from romeotheriault/add-solaris-service-smf-module

add smf module to support virtual service module on solaris 10+
extention modules is internal, my bad
corrected error in error message for json renderers (jinja and wempy only)
Some minor changes to the minion conf template
Fix #132 by tidying up code, fixing thread safety bug and bumping framework version.
took out the executable and debug symbols and well as updated .gitignore
simple app with data store
Added 2 methods for cones.
updating color scheme, etc.
better javascript support, control-backspace and control-space for omnicomplete
Fixed Mantel function tests to be more robust to stochastic p-values.

git-svn-id: https://pycogent.svn.sourceforge.net/svnroot/pycogent/trunk@1109 4565cf14-4326-0410-8d81-eccf4396eebe
z bar to 500mm

total depth limited to 600mm
Merge branch 'master' into fixed-y-bar
find strange bug...entry.coffee line 35...
Merge branch 'master' of https://github.com/seyon/eAjax-CRUD.git
align interval timings with olsr
Fix padding/height of header