labofsahil/github-event-dataset-2012 huggingface dataset:
sqlite3 fix for heroku
POST用のエンドポイントを作った
moved seed to a parameter of getSimilar
made friends-concerts fake data
fixed concertdrag confilct
Amazing progress in my emacs configuration. This is pretty usable now.

Imagine me saying _anything_ good about emacs. Ya, I couldn't believe it
myself.
make deja vu condensed bold the default system font
Add service action Complete.
change main?page to ./
Hg-Log: added call to hg log which results in raw changesets with their parents (excluding trivial parents)
add manifest.yml into gitignore. adding database.yml into git
Создал методы синхронизации статусов с локальной БД.
Do not read DatagramChannels multiple times on a read event. This will cause a read-block to occur on Android versions prior to ICS.
AsyncHttpServer: rename connect to execute.
optimizations, hsv-scale coloring
Better zero in font, improved mouse location and changed fps ## to ## fps
moving the afterclean library
warn on -I and -L to absolute paths, which may be to local system headers/libraries that are not portable
o Removed unused methods/params

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1376648 13f79535-47bb-0310-9956-ffa450edef68
o Changed clumsy collection interpolation into List interpolation, since it's all lists anyway.

Performs twice as fast, but you'll have to be a profiler to appreciate this subtle
performance increase.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1377020 13f79535-47bb-0310-9956-ffa450edef68
IPT first version
Corrigiendo problemas de despliegue con metodo shuffle
new RE
ukadroid: アニメーションテスト。サーフィス番号を27に変更
add condition enabled to site defaults
functional implement
capfile
Change order of initializers and enviroments

Changed the order for initializers and enviroments, did a test
with an application that get info from the enviroments to set
the mongoose connection right

https://github.com/kuryaki/locomotive-example
protected db disconnect with mutex
Ignoring app/app.min.js from commits.
Merge remote branch 'sgarrity-fork/work-unorderedlists'
Merge remote branch 'sgarrity-fork/bug-744448-techclose'
fix bug in l10n docs
migrate geolocation demo to google maps api v3
managed servers get their server name from their startup args
fixed some level bugs
Merge branch 'master' of github.com:larrySGI/SGICollab
changed app icon convert to VS project and fix charset build error
add ability to use external QML files instead of embedded ones
add toggle button component
split interface in two views, community and library
delete unused files
add rake file back in
add file back in
revert back to using jasmine:ci
SVG import: corretc multiplier for mm, cm and in to match blender's unit system

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3933 96b784f8-4ae3-dd11-aff7-0030488c597c
Made SVG importer handle DPI properly

Apparently internally SVG importer was using 90 points per blender unit,
not per inch. This made files importing with unexpectable dimensions
which could be really harmful if you're importing blueprints as references.

Now SVG importer is using 90 points per inch, which makes imported files
has correct dimensions in both Metric and Imperal unit systems.

However, there's one possible downside -- imported files would look
smaller in blender units system.

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3934 96b784f8-4ae3-dd11-aff7-0030488c597c
style cleanup: pep8


git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3202 96b784f8-4ae3-dd11-aff7-0030488c597c
work on button cancel
Changed types or added casts to resolve warnings in GCC
zmiana sposobu wyswietlania kolek

Przyspieszenie pojawiania sie kolek po evencie 'touchstart'.
user state concept coded - not to make it work
lots of fixes. moved store up from lib/, moved each setup
functionality into its own function, handling done() and callback()
properly, log user in when registering
proper login user on register
get json processor to loop :)
added skeletons for HW 6
Initial Commit
Initial Travis commit
vimrc
vim script 795 xterm16.vim 2.43
Finalizing hdlmake2
msgnode logger, msg object
linking msgstreams, they are now directedgraphnodes
Code snippet format fix
add "unless" keyword
only highlight discrete symbols as keywords

#99
refactor `coffee-line-wants-indent` function, fix BOB bug

- bug: beginning of buffer returned t
only highlight discrete symbols as keywords

#99
refactor `coffee-line-wants-indent` function, fix BOB bug

- bug: beginning of buffer returned t
rename coffee-dedent-line-backspace to coffee-backspace
bind keys using kbd macro

- easier to read than hacked strings
add coffee-space command
indent even when keyword isn't at col 0
Merge branch 'fix-bob-indentation-fontification' into add-tests

Conflicts:
	coffee-mode.el
pressing <enter> on blank line after "->" caused more indents
coffee-space and coffee-backspace work anywhere in indentation
rearrange valid indents list

- insert +2 into position 1 in list when line doesn't want indent
- tab on line now rotates through valid indents
rename coffee-basic-indent back to coffee-tab-width

- avoid unnecessary API changes
pressing "ENT" in indentation re-uses current indentation
remove extraneous bind of comment-start
stop indenting twice during the same command

Conflicts:
	coffee-mode.el
coffee-comment-dwim indents according to next line

- previous behavior was looking at last line
coffee-comment-dwim on last line indents to previous line
Revert "Fix syntax highlighting for variables containing keywords bounded by"

This reverts commit 1c8aea383f8dc6c32b3bec69b3ceb0363cf5f55f.

- This has been fixed by changing font-lock keywords.  Making "_" word syntax
  breaks word navigation.
Fixed missing splash screen
Update the default max tap interval of a double tap
500ms -> 250ms
Apply pcap_nametoaddr_fix

[#41484869]

Apply patch from
https://github.com/rapid7/meterpreter/blob/master/source/libpcap/pcap_nametoaddr_fix.diff
Remove pcap-usb-linux.*

[#41484869]

Remove unused header, source, and ifdefs in dependent files, inet.c and pcap-linux.c.
move database platform from h2 to postgresql
by dron
Merge pull request #3 from ChineseDron/compress

修复全局变量逃逸问题
Updated translations
Updated NEWS file
Massive code cleanup and bugfixes

User concerned:
Fix ProximityHiderEnd not working
Fix ProximityHider causing ConcurrentModificationsException
DarknessObfuscate now only works on Chests and Monster Spawner

Coder concerned:
Reorganized code
Removed obsolete code, resulting in much smaller package size
Changed the way config interprets integer lists
Removed verbose mode
Removed eclipse files
Updated .gitignore, Removed RawInput.cpp
Roughed in extremely simple 2D Terminal graphics engine
update contrib module geofield to 7.x-1.1
Add support for manage list items in wysiwyg toolbar
Fixed quotes
Merge pull request #4 from abtris/ngx-wysiwyg-toolbar-items

Added support for defining items in wysiwyg toolbar
fixed Vector3.PseudoRapidity (result has now the right sign)
vector3_test improved
app/model attr_accessor
delete js in home
 no
111
Merge branch 'master' of github.com:lmr3796/CCSP-Activ

Conflicts:
	app/controllers/new_event_controller.rb
Imported module
Default rules
New deps for building some plugins
Specific customizations and improvements for JBoss7
Принято решение: один файл бекэнда на несколько файлов фронтэнда (по одному на страницу)
First Gem
meh
Merge branch 'master' of github.com:logen-zack/testgem into second
Removed dangerous returns
Replaced fors with for each
Removed empty tags
Removed redundant log4j.properties
Removed disabling of logging
Removed unused variables
Made tests access ComplexityAnalysis directly
Merge branch 'master' of https://github.com/lolcatzlol/JProffa
random access feature steps
Disabling caching on dashboard
added insert to linkedlist
created type(linkedlist)
Detail View Controller now subclasses pull to refresh
Add True FixPoint Project (bluetooth setting is not ready)
Added debug output to state changes.
Cambios que se me antojaron
having fun with styles
canorus-svn ffmpegthumbnailer-svn ibus-rime-svn imagemagick-svn rosegarden-svn zsnes-svn
i think it is done
fixed this one up too
starting it up
fixed dirs
why all the flags?
knfoviewer
rewriting for clarity
checksums
fixed deps
added install file
Merge branch 'new': kfnoviewer
update infobox plugin
changed font :)
Some changes.
Fixed tooltip color nil error.
Added battlepet link type to Hyperlink function.
Fixed BattlePetToolTip error.
Added Earthquake to ChannelingTicks.
Global to local.
Added some spells to NameplatesDebuffs.
Some changes in Profiles.lua
Typo.
Cleanup.
Some changes in CombatLogQuickButtonFrame_Custom skin.
fixed ToolTip position
Merge branch 'master' of git://github.com/Shestak/ShestakUI
to serve Flash/AIR websocket clients, adding a netty handler to satisfy Flash policy file requests e.g.  https://github.com/cgbystrom/netty-tools
GaussEliminator son solves equation sets correctly.
deleting two icode-dependent tests
updating resolveDups() to use MethodTFA.mutatingInterpret()
updated my.cnf inno db values
DGIndex: Revert the return value of PTSDifference()
made instructions more clear
fixed variable capitalization, removed Herobrine, changed documentation.txt to more apt TODO.txt
Merge branch 'master' of github.com:maldridgeLASA/Zork
Where to get
new autoloader
changed namespace, added range support
Fixed a bug that occured with certain album layouts
[s2617] Cleanup and improve script for Leotheras the Blind - SSC
Fixed Bison 2.5 bug
update sass gem dependency
Spanish translation typo
Fixed a minor bug with the BackToList link in a budget detail view reported in Dolibarr.es
You'll see a lot of lines changed because of incorrect line endings
Added some missing translations in es_ES and fixed a typo too
More comprehensive gitignore.
Tint the selected tab bar item

...since the app requires iOS 5 now.
Add subject to mail composer

Also add kickass branding footer to mail composer.
Implement double tap feature request #73.

Single tap to go to comments, double tap to go directly to article.
Merge branch 'refs/heads/feature/subjectline' into dev
Merge remote-tracking branch 'origin/feature/doubletap' into dev
fix header not hiding when set to 'hide'.
primer commit CodigoHTML topic1
Rails 3.1.0
Remove cucumber and unused files
Added info about S3 region
assuming heroku is default
iphone allow scaling
dont gitkeep
heroku
bundle update
flash upload should work with any session storage
flash as default uploader. plupload keeps having issues with html5 upload (though works now)
dont ignore photos folder
unicode ftw
latest plupload. beta - beware
rm unused files
better tag handling. give 404 for non existing ones. link to tag.title for non-ascii chars
bundle install
MIT License
using the MIT license now
Rails 3.1.3
Updated readme with Rails 3.1
support for HTTP POST, PUT and DELETE parameter passing via request body instead of GET parameters
live unit feeds, repl namespace
open up home view
add String Class and Unicode functions
prod
update
start documenting evaluation; provide a high-level overview of the language; start discussing syntax trees
update docs:  grammar
hack out rough version of combinator parser
Changed WrapperGen interface to allow String input.  Decouples ANLTR from user classes.  Fixed typo in makefile.
Issue #1, here we go.
A little problem with calling a page 'new' which is a php reserved word.
mm: Fix malloc.

Dereference the end of text pointer, so that we're not picking up
what's at that memory location but rather the location itself.

Signed-off-by: Matthew Leach <matthew@mattleach.net>
Fixed styles for recently viewed products (overflow and floats at the bottom)
Fixed 'Cart' text color in header
Fixed order line items removal button
Added taxon's child taxon list
Added pageless browsing to product list
macmanm1ke
Things Change

Damn
added a devkit that was missing
fixed issue #30
fixed issue #30, #38
Add some build information to the readme file.
Remove note about 'additional parts' being usually used for MPEG TS streams from BluRay discs

See #799.
Update list of translatable strings; update German translation
Formatting.
Add a disassembler function. Add a field in the state viewer for disassembling the current instruction.
Resolve merge conflicts.
Finish hwk2
Better use of NSURL
* Don't highlight search string in red if match has been found (type-ahead search)
adding createOrUpdate method to tree
newest build
Dalsi test komentare
please...
all tests OK
do not ignore doc
[fe102] Added initial fe102 course materials.
[fe102] Added design files.
[fe201] Added FE201 course materials.
add import_lib action
Merge branch 'master' of github.com:melodron/mp3player
Updated example package description files
MB-100: use more relevant name for initializer thread

Change-Id: I72882270102dbe43a0816620b55ba40c87724d31
Reviewed-on: http://review.couchbase.org/21841
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
MB-100: get rid of paramiko logging

Change-Id: Ibb5bcf6ebb5855854a45f3db42317262c86b4578
Reviewed-on: http://review.couchbase.org/22625
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
Tested-by: Pavel Paulau <pavel.paulau@gmail.com>
clases: formulario con clases user
new simplified interface for fstouv_by_name
Parsed the rest of the torrent metainfo file.
exercicies cap 9
Add user microposts
merged
fix merge errors
Remove autotest/
Fix PHPDoc Block.
Fix return bug
Fix broken tests.
AmazonS3 FS Class.
Test cases for AmazonS3 FS class.
Update BeanstalkSampleDaemon to comply with chkconfig settings.
Add require-dev to composer.json.
parse lisp in script tags
added localized template handling
UID check
Merge branch 'master' of github.com:miggaiowski/junker
manteniendo el formato maricon que se desea en todo administracion
lo que faltaba
Merge branch 'master' of https://github.com/miguelavg/FlyTrack
Se implementaron las cidudades y delegaciones/municipio

Signed-off-by: Miguel Rugerio <mikerugerio@gmail.com>
working out the kinks from the wimba session
That's my first commit
First MySQL query
some git commands.
included TEST
management view subquery revenue
varchar is no valid data type, changed to string
sub rev working with static months
page 4 views
subselect p4 views working
sub select listingstats1 working
sub select listingstats 2 working
logical mistake in create table, semantic check ok
wrong filename in note
UNIX_TIMESTAMP()-->FROM_UNIXTIME(UNIX_TIMESTAMP())
corrected table alias
error in GROUP BY or MULTI JOIN ERROR
error in GROUP BY
sub selects on track and photography working
deleted note from files
management sub select tasks working
LICENSE => COPYING
Remove nginx.conf... don't want to prompt for that.
ignored maven target
changed look of iPhone activity view
Don't just remove *one* padding zero if there are two
Fixed bug related to featured posts
Changed default encoding to  UTF-8
Fix Unquote.arguments
Changed database name
Rails updated
Updated guardfile
Merge branch 'hotfix/update_rails' into development
Twitter Bootstrap Installed
Cruds on twitter bootstrap
add functionality for favorites
UriTitle 클린업

* 플러그인 정보 올바르게 표시
* 'Link Title' 등 우리말로 표시
* StringUtils 사용 코드 제거
* deprecated AbstractBotPlugin.bot 사용 제거
* 코드 흐름 개선
Merge pull request #68 from changwoo/master

UriTitle 클린업
README.md の更新
Version 20120515-1038
Set log_level and log_target from xPDO constructor options

These were never being set by the xPDO constructor, essentially ignored when passed via the options parameter
[#8423] Add multi-node support to flock-independent file locking

Also removes LOCK_EX from file_write_contents() when writing the tmpLockFile to prevent errors on platforms that trigger PHP errors when flock functions or flags are used
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  [#8423] Add multi-node support to flock-independent file locking
  Set log_level and log_target from xPDO constructor options
Bump version for 2.2.7-dev
Address additional flock-independent file locking issues

Merge remote-tracking branch 'xpdo/develop' into rscloud-fix

* xpdo/develop:
  [#8423] Add multi-node support to flock-independent file locking
  Set log_level and log_target from xPDO constructor options
[#8420] Add changelog entries for flock-independent file locking issues
[#8420] Remove LOCK_EX and add multi-node support to flock-independent file locking

Merge branch 'rscloud-fix' into release-2.2

* rscloud-fix:
  [#8420] Add changelog entries for flock-independent file locking issues
  [#8423] Add multi-node support to flock-independent file locking
  Set log_level and log_target from xPDO constructor options
Dispatcher test improved + Controller message passing
John Done
ASN1: Support enumerated types by processing them as integers.
ASN1: asn1map(): do not rely on input fields to determine mapping parameters.
ASN1: process input NULL fields.
ASN1: asn1map(): fix handling of optional CHOICE and ANY children in SEQUENCE.
ASN1: _encode_der(): do not encode optional fields with value set to default.
X509: avoid some "undefined" errors.
X509: set-up key identifier upon certificate loading.
X509: factorize some code in prevision of CRL support.
X509: new setExtension() method.
X509: implement CRLs.
X509: setSerialNumber(): new optional parameter $base
add ignore
add architectures i386 armv7s
change TextView
add table view
change project
change app data
Fixed problem with privileges
update autogenerated files
Add libraries needed by new funfactory.

Adds the cef library as well as the multidb library (via an
updated affiliates-lib) to work with the recently-updated
funfactory.

Also adds in mock and factory_boy, which were needed by the
FacebookDebugMiddleware.
Fix FB app login sessions breaking main site.

Changes the FacebookAuthenticationMiddleware to not run
if the user isn't viewing the Facebook app, which fixes an
issue where request.user was overwritten on the main site
with a FacebookUser if the user had previously logged into
the Facebook app.
Fix broken reverse_lazy.

Fixes the expected return type for return_lazy and adds
a test ensuring that logout works properly, which was the
view that failed and brought up the issue in the first place.
[fix bug 767454] Fixes ugliness of fallout from bug 765957 in search results page

Fixes in groups page

spacing nits
Merge pull request #266 from sammybahamas/searchresultfix

[fix bug 767454] Fixes ugliness of fallout from bug 765957 in search res...
The Complete Works of Shakespeare\!
Blegh.
Yeah...
moving readme to correct format
added recurring loop for grabbing more than 10,000 cookies.
Working on the calendar.
will get it done by Saturday.
edit hw5
github trigger for updating
gevent + 2 workers is really overkill for a default setup, also use anonymous github url
quick zdab dispatcher hack for airfill
Merge branch 'release/1.1.0' into develop
Needed to remove deck and player specs, which were empty anyway. Going to leave the_gambler as *just* a poker and blackjack hand evaluator.
Moved seven or nine spec.
Some housecleaning. Made it so that cards can be initialized with a fixnum.
Changed method for #straight? to be more functional.
This works for nine-card hands now. BOOM.
Version bump to 1.2.0
Updated readme.
Merge branch 'release/1.2.0'
Regenerate gemspec for version 1.2.0
Fix wrong result handling in render(component)
Error checking for module names
French and Turkish translation improvements
minor code improvement for version check
Adding patch for old plugin in diffff.xml for beta28
Fixed win check when typing
Actually add the sql update
bromley fms test system admin access
fixed edge removal from best
removing TODO file
cant remember what changes we made
derp
Draw a simple rect (as antoher GitHUB test)
fixed bug awk script
initial code to create blog posts
fixing embedded rspec tests
added enemy representation and fixed enemy not respawning bug
dissection results
transferred some methods to Composition model
Punto di Update
some holiday spirit
Fixed issue #521
Tidyup
V0.6
Ability to ban specific IP's without a player
Scan for a specific IP
Unban a specific IP
Moved a bunch of static methods to Utils.* from BanManager()
working on standalone player
changed removed the manage clinics action
more operation submit forms enhancements
Introduce the freescale project.
New prompt Virtualenv compliant
Download map context from a workspace work with the new API
unEscape html while parsing map context list, have to import org.apache.commons.lang to do this ..
Add Michael Wu
Merge pull request #112 from wupuck/master

Adding Michael Wu
change version gems
change size favicon
aftn 3
instant push working
Restart if not connected after 5minutes
Restart if stuck in reconnecting for more 5 mins
Wifi sending config when actuated, more robust reconnection logic
Fix merge conflicts
Fix merge conflicts
Sending IP as config event
Fixed merge conflicts in ethernet reporting
Block scope for child process
Change host
Bump version
No longer scan wifi, check utilities folder for its version
Report all versions when awaiting activation
Whoops
Reference execfile now
-First Commit to Master

Signed-off-by: Nathan <nathan.isaac@wallawalla.edu>
add basic http-trait
Merge branch 'feature/core_http-trait' into develop
rename Http -> RwsHttps
Merge branch 'feature/core_http-trait' into develop
rename Http -> RwsHttps
implement simple HTTP GET with dispatch
Merge branch 'develop' into feature/dispatch_init
Merge branch 'feature/dispatch_init' into develop
add "initialCommand"
Merge branch 'feature/create_sample' into develop
add "cleanupCommands"
Merge branch 'feature/create_sample' into develop
Merge branch 'develop' into feature/core_http-trait
change HTTP get return type into scalaz Validation
Merge branch 'feature/core_http-trait' into develop
implement scalaz dispatch
Merge branch 'feature/dispatch_scalaz' into develop
create Ichiba search
Merge branch 'feature/core_ichiba-itemsearch2' into develop
starting to work on sequential vs. random writes experiment
bug fix
Merge branch 'niv_experiment' into copy_back

Conflicts:
	ssd.conf
Merge branch 'copy_back' of https://github.com/nivdayan/EagleTree into copy_back

Conflicts:
	ssd.conf
Bump to PHPMailer v2.1
Fix email links
Use multiple separators for mail export
Fix #998 : do not display a validation viewer as a validation participant
Update authors and contributors
Update french en english locales
Update french, german and english locales
Bump Phrasea minimal version to 1.20.1.8
Merge pull request #268 from romainneutron/PHPMailer

[3.7] Fix mailer bugs
Merge pull request #269 from romainneutron/Fix998

[3.7] Fix #998 : do not display a validation viewer as a validation participant
Merge branch '3.7'
Update dependencies
Update build script
Merge branch '3.7'
Modify collections filter & add JOIN on log_colls table

Create entries in log_colls table

Fix SQL issue

Fix SQL issues

Update version

Add patch

Remove debug output

Fix CS

Fic CS

Add table schema

Fix Cs

Update patch

Update patch

Update patch

Update patch

Update patch

delete all coll_list call

Fix logger issue

Fix log_colls table structure definition

Rename patch

Fix SQL Issues

Fix patch

Fix test

Fix tests
Added view experiment participation feature for admins
References #33 - Thoughts can now be edited. You simply blur (leave focus) to submit the changes.
Podemos intentar abordar el problema desde un hola mundo propio en C y su equivalente en java listo para Android.
Registered InstaSoup.
commented out tsc build setting from CrossFront.csproj
documentation, script and schema changes to support adding the module to a pre-existing vanilla DSpace
update binary release script
explicitly add binary release to repository, as the download feature is no longer available in github
Merge branch 'master' of github.com:nye-duo/Duo-DSpace
add test for product & category dao
adding position to photo model for photo sorting
added inlines for photo addition on gallery admin form
Fix MongoDB version
Fixing DecadeName and DecadePluralName (typo)
Merge pull request #15 from pyricau/patch-1

Fixing DecadeName and DecadePluralName (typo)
removed listoptions plugin
Remove ssh auto reconnect feature, has some issues
Update sign of dmg
Remove ssh auto reconnect in changelog
minimal valuable stage one
vim submodules cleanup
Modify repository URL
Map generator is configurable
Created pathfinder: an efficient route finding algorithm which tries to find the shortest route from one point to another while performing as little computation as possible.
Moved player control into HumanController, so it will be easy to create a ComputerController to make AI players and other enemies.
Reduced the amount of console logging during game play
Using prototypal inheritence and improved the log output
Route, Module ve Dispatch tek bir middleware sınıfında toplandı (Module) ve Common adlı middleware sınıfı içinden çıkartıldı. Request sınıfındaki resourceUri bilgisi alımındaki sorun giderildi. Özel exceptionlar üretildi.
We can now post Notes
Builds on Mac now also, due to dependency re-ordering of MMDevice and MMCore.
Python bindings build and rudimentary testing done.
Encore dashboard
s/caldate/ccaldate in the simulators.
Bumped iondefs for new associations.yml
admin setpup
Show message when there are no photos to show. Closes #577
ChangedForEaseSourcing
Updates pom.xml for API quick start to 1.5.2.

Adds in some updated json and xml examples for extensions.

Change-Id: Ib8ff27b694133580392cdb719b6baeb9c9bee45d
Adding links to samples for os-flavor extra data extension.

Change-Id: I5245ea93cc1efc38fe2a20dff41f9614dfcf8555
add javadoc ant task


git-svn-id: http://josm.openstreetmap.de/svn/trunk@5263 0c6e7542-c601-0410-84e7-c038aed88b3b
I18n update



git-svn-id: http://josm.openstreetmap.de/svn/trunk@5256 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror
fixed #7673 - select target node after merge


git-svn-id: http://josm.openstreetmap.de/svn/trunk@5265 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror
fix some compilation warnings

git-svn-id: http://josm.openstreetmap.de/svn/trunk@5502 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #8206 - Update presets according to public transport scheme

Based on:
* http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport
* http://josm.openstreetmap.de/wiki/Presets/PublicTransportWMasterRoute



git-svn-id: http://josm.openstreetmap.de/svn/trunk@5594 0c6e7542-c601-0410-84e7-c038aed88b3b
Update waterway relation preset: Allow empty roles (according to Wiki)



git-svn-id: http://josm.openstreetmap.de/svn/trunk@5595 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror
Visitations for chairs
change srcexpl update keymap
activate saiga by default
Merge branch 'master' into ospalh-special
and off again for me personally
added helper for improved date format
Changed build steps
Removed dependency on sugar.js
Change MIT to GPL

Signed-off-by: asamy <f.fallen45@gmail.com>
Fixed: logout link on header
Added : View  เวลาทำกิจกรรม
Added forum page example
Gotta all topics in a forum branch
adding sphinx instructions
Merge branch 'master' of https://github.com/ox-it/spindle-code
Added a StaticPages controller
Finish static pages
Add a title helper
:gem: Added travis.yml file :gem:
:gem: Travis CI image/link in readme :gem:
Merge pull request #5 from travis4all/clean

experimental travis CI support
now using mu4e
documentation fixes for classes in database.drivers.mysql

Signed-off-by: Sam-Mauris Yong <mauris@hotmail.sg>
Adding some alert styles
Adding nav bar styles
Application layout uses authed menu
Adding shared user menu
Adding user decorator in before filter
Adding rescue for cancan access denied error
Adding to the user decorator
Iterating on api tutorial. #549.
Issues are resolved.
end of Monday 2nd April
[#26613223] Исправлен шаблон страницы с авторизацией.
[#26613223] Наполовину работает авторизация. Не проходят тесты.
[#26613223] Полностью работает вход в систему.
Make g open gvim if X vim otherwise
Merge branch 'master' into mpi
added the table
Merge branch 'master' of https://github.com/parhamaram/IDECorr
Revert "TO REVERT"

This reverts commit f9de0d802e5ab996ef5ee61df5c16d8119883666.
A slight fix in logger

Using stdlib instead of self-written dog-nails
 On branch experimental
 Changes to be committed:
	modified:   testlib/logger.py
Added log.syslog into configs

Trying to make logger write to syslog
 On branch experimental
 Your branch is ahead of 'origin/experimental' by 1 commit.
 Changes to be committed:
	modified:   release.conf
	modified:   tests.conf
A cover for syslog.

Not working at all, no code to work
 On branch experimental
 Your branch is ahead of 'origin/experimental' by 2 commits.
 Changes to be committed:
	modified:   testlib/logger.py
A minor fix in logger

Removed logger.find_num from everywhere
 On branch experimental
 Changes to be committed:
	modified:   testlib/logger.py
Fxd profile_links_nologin for Chrome

Subj. Added a single small sleep.
 On branch experimental
 Changes to be committed:
	modified:   test_profile_links_nologin.py
Trying to fix buggy Jenkins reproduction

Subj
 On branch experimental
 Changes to be committed:
	modified:   testlib/testcase.py
Another try

Subj
 On branch experimental
 Changes to be committed:
	modified:   test_categories_search.py
	modified:   testlib/testcase.py
Another one

Subj
 On branch experimental
 Changes to be committed:
	modified:   test_categories_search.py
Now kindof fxd

Subj
 On branch experimental
 Changes to be committed:
	modified:   test_categories_search.py
TO REVERT

Subj
 On branch experimental
 Changes to be committed:
	deleted:    test_add_office.py
	deleted:    test_deposit_update.py
Merge branch 'experimental'
Added deposit update test.

Aaaaaand it works
 On branch experimental
 Changes to be committed:
	new file:   test_deposit_update.py
Added test_titles

To check page titles
 On branch experimental
 Changes to be committed:
	new file:   test_titles.py
Oops.
Revert "Oops."

This reverts commit 43b02aad37214be4f7aaf406e4605a2389750892.
A tight tiny fix in titles

Still not working
 On branch experimental
 Changes to be committed:
	modified:   test_titles.py
Added testlib.TestObject.find_dict_in()

TestObject.find_dict_in(list, name, value):
Returns <element> of <list> such as <element>[<name>] == <value> if found
or {} if not found or KeyError.
 On branch experimental
 Changes to be committed:
	modified:   testlib/testcase.py
Removed search_dict_in from TestCase

Just moved it into testlib/testcase.py
 On branch experimental
 Your branch is ahead of 'origin/experimental' by 1 commit.
 Changes to be committed:
	modified:   test_titles.py
Reorganizing edit-profile json-lists

Subj. Work still in progress
 On branch experimental
 Changes to be committed:
	deleted:    json_lists/edit-profile/objlist-edit-profile.json
New edit-profile lists :)

Subj
 On branch experimental
 Changes to be committed:
	new file:   json_lists/edit-profile/objlist-edit-profile-neg-inn-toolong.json
	new file:   json_lists/edit-profile/objlist-edit-profile-neg-inn-tooshort.json
	new file:   json_lists/edit-profile/objlist-edit-profile-neg-kpp-toolong.json
	new file:   json_lists/edit-profile/objlist-edit-profile-neg-kpp-tooshort.json
	new file:   json_lists/edit-profile/objlist-edit-profile-pos-big-inn.json
	new file:   json_lists/edit-profile/objlist-edit-profile-pos-common.json
Added brand-new cases into edit_profile

(NEGATIVE) kpp too short
(NEGATIVE) inn too short
(POSITIVE) kpp ok, len(inn) == 12
(POSITIVE) kpp ok, len(inn) == 9
 On branch experimental
 Changes to be committed:
	deleted:    json_lists/edit-profile/objlist-edit-profile-neg-inn-toolong.json
	deleted:    json_lists/edit-profile/objlist-edit-profile-neg-kpp-toolong.json
	modified:   test_edit_info.py
Removed titles test for merge

SUBJ. THIS IS A COMMIT TO REVERT!
 On branch experimental
 Changes to be committed:
	deleted:    test_titles.py
Добавлена команда MergeNalogFile
Rewrote test for offers

in UserTest. Now really testing if
rum AND gold medallion.

modified:   test/user_test.rb
Version 1 of the app
official cli tools ftw
sound tweaks in .osx. no translucent dock icons.
spotifycontrol
First commit
changed readme extension to lower case
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
move routing algorithm out of index.php, which should remain minimal
construct APPROOT based on ROOT
Merge remote-tracking branch 'flavius/fix/better-file-organization' into develop
add mysql module file
fix #1
add load module dependencies
fix dependencies content error
move assets files outside webroot folder
structure file reflects reality
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
added Logout module
fix #1
added mysqli connect file
added register/content.php file
added register/register.php file
deleted tmp files
separated dependency module loader
added top level container
changed requirements, renamed my notes.txt
Project description: text was => paragraphs were
Hosting Environment intro text, first version done
server modifications
distributing equations should be better now
Got all unit tests passing for DataService except one for the Phone.
Changed Phone test project from plain Silverlight to Windows Phone. Won't be able to do mocks easily, but at least the tests will work.
Quase, voltamos ao caso escroto
Workaround escroto, MUST EMAIL P[AE]D
Agora sim, sem workaround e limpo em todos os testes
added rubyjack game
fixed remaining conflict in test_axes.py
Added: git tags
Added: ChangeLog
code cleanup and better usage prompt
forgot to commit systraycontext class
Updated navigation, avatar and light
add notes on adding dependency, add travis build
tabsDragUtils: Set dragging related properties for all dragged tabs
added Gale-Shapley matching algorithm
Added the DistanceEnergy class to calculate an energy based on how far apart elements are.
Extra distance energy function testing.
refactored JFrameExceptionRule.java
Merge branch 'Development' of https://github.com/pkmelee337/HUSACCT into Development

Conflicts:
	src/husacct/define/presentation/jframe/JFrameExceptionRule.java
Fixed to store timestamp as part of nonce as required. [Fixes #7303]
Merge pull request #3 from plone/d6e7d0d7413b0ab6cbf3126fcfa685a90d91e2e4

Fixed to store timestamp as part of nonce. This fixes http://dev.plone.org/plone/ticket/11987
more work on organising the processor workflow
Integrating dat_rails_app

Put the contents of dat_rails_app in examples/rails_app

Pointed the rails app's experimoto and the admin app at the same sqlite db file

Added some ab-test goodness on the new-user page, and it tracks sign ups, and sets cookies.
* added sigint to server
Merge branch 'release/0.0.3'
Merge branch 'release/0.0.4'
Merge branch 'develop' of github.com:praekelt/jmbo-poll into develop
seperate count and percentage counts out to properties
added readonly count and percentage fields for option inline
Merge pull request #1 from praekelt/feature/admin-reporting

Feature/admin reporting
base64help
Initial server modules implementation + example
Rename 'plugins' to 'modules'
Modules object now using it's prototype; Typo fixes
Client: Simplar applet interface with .loadOnce() #139
Client: improved URL + channel regex matching; Inline media
Client: Media message styling
Client: Inline media refactor + twitter type
Client: Reddit thread media
Client: Resize handler tidied
Merge branch 'development' into server_plugins
moduls.js refactor; Removed existing module events; Modules now laoding from config
CLI theme control box CSS sizings
CLI theming for inline media
Relaxed theme oversized nicks fixes
Merge branch 'development'
Correctly detecting running from file:
Removing Panels properly
Member comparator update
Missed the second container out of the HTML, woops
fixed default quantity in the database
Template setup
Markup, form
Interactive events
fixed the overridden line of code
Merge pull request #47 from lakeskysea/voteable_bug

fixed the overridden line of code
Add block arg passing specs
Add fn form specs
Add specs for loop/recur and fn/recur
Fix recur to rebind in parallel. Check arity.

Fix recur to rebind arguments all at once, not affecting other rebindings
that use variables about to be rebound.
Put the quotes back
Version bump to 0.6.0
Regenerate gemspec for version 0.6.0
Improved packaging process.
Install the pydoc bundle for vim
Update and clean up vim plugins
Changed references of post to page.
Edited blog post and moved menu-items to a partial.
ENH: Better management of login, when multiple blogs are present.

- Adds a BLOG property with the name of the blog, when posting a new
  entry.

- Checks if the currently logged in blog, is the correct blog, using
  the BLOG property added while posting, before re-posting the entry.

A potential bug: If a user changes the names of the blogs ...

Fixes #76.
Se adiciona el respaldo de la base
continue integration of F#
Make tab consistent and use indent to fold

Retab with 2-space tabs (most of it already was) and use indent for
folding so I can more easily separate functions for autoload.
Remove SID and remove SID hack

Since the mappings are defined in a function and they call functions
defined in this script, we're storing the SID value so we can bypass the
name mangling. Remove all of that.

I think we can do this better using <Plug>. Users would be able to
define mappings, but that's not so bad.

For now I'm removing it all so I can move stuff to autoload before
bringing it back (if necessary).
Extract interface function

Extract the interface. We only need this one function in our API.
Everything else can be autoloaded. Sort out the varargs before we pass
on to autoload.
Remove ! from functions

Should strive to avoid redefining instead of clobbering. I don't think
autoloaded plugins should get reloaded.
Move functions into autoload

Moved functions (except for interface) and script variables into
autoload.

Fixed names with:
    %sm/renamer#StartRenamer/renamer#Start

Removed the load guard since autoload shouldn't get loaded multiple
times.
Move and update documentation

Move documentation so you can read it with :help. Update installation
for bundle.
Bump version to 2.0 and update change date.
Change fdm back to marker.
Expose plug mapping

Expose the plug map so users can use it.
Add new suggestions for improvement
Added activesupport load hooks.
完成头像设置功能
Made EditableData show valMsg when saving invalid data
Some changes to cache
Refactored unique-key-clause.
Added bronze and gold folders and added JQM Templated to each
Added gold and bronze app folders and added modified JQM Template to each
Merge remote-tracking branch 'origin/gh-pages'
D4 Highlight cart
fixes routing bug2
Further enhancements to the ActiveAdmin CSS
Merge branch 'master' of git://github.com/rafagarciag/sepap2
Removed comments from ActiveAdmin interface
Some problem validations
Merge branch 'master' of github.com:rafagarciag/sepap2
Fixed Problem columns on ActiveAdmin
Validate MainUploader
Merge branch 'master' of github.com:rafagarciag/sepap2
Optional module
Finished fixing Problems on ActiveAdmin
Merge branch 'master' of git://github.com/rafagarciag/sepap2
fixed conflicts
Localized log in images
Added definition of template class Circle based on template class Point.
Adding CPF/CNPJ field to ReciboSacado, if sacado_document is provided
merged jeff's stree code.
Clean ups and rule set examples
[vimrc] .ll is for human-readable llvm
Merge branch 'master' of github.com:raphael-proust/rcs
all sorts of maintenance taking place here; moving from github; adding more shared project
added the knight tech test
added the shutterstock tech test
moved the spotify test to the tech test folder
added my latest resumes
removed the cruft
fixed menu issue
added masonry
Fixed focus on addtask, moved add list
drag
Added some TODOs to the parser.
[bug 804132] Mobile login and registration pages
Fix font URLs
Initial Add
Added files directory
Possible fix for encoder commands not working (on windows only?) when there are spaces in the path to encoder
Initial setup for nzbsrus, removed nzbmatrix and newzbin from config :-(
Commented out nzbmatrix and newzbin code, added in nzbsrus api - but service appears to be offline so can't test it right now - might need to switch to rss feed
Merge branch 'provider-update' into develop
Added option to preserve torrent dir for seeding after post processing
Some bug fixes for preserving torrent files after post processing
Removed nzbmatrix & newzbin, added nzbsrus. Fixed encoder path on
windows breaking if it had spaces. Added option to keep torrent files
for seeding
Artwork requests would always use the working directory as the location of the image insted of using the configured CACHE_DIR
Calling _findfilesstartingwith with a non-existing folder would raise an exception, will return an empty list now
Special purpose artists can have multiple ids, 0035056d-72ac-41fa-8ea6-0e27e55f42f7 and 125ec42a-7229-4250-afc5-e057484327fe, added a ban by name in addition to the existing id bans, also removes the artist if its already in the db
Merge remote-tracking branch 'doskir/bugs2012-10-07' into develop
Ajout de la partie decoupage v1 sur moyen + modification lien vers js dragndrop
Modification du dragndrop js pour correspondre  celui present a la racine
fixing spacing and some comments in infopoller
Merge branch 'master' of github.com:rev138/VTrackerAPI
Link to javascript-based player in README.
Importer, including NoticesPage parser, thor task, and db environments
[#6] Migration auf JaCoCo Version 0.6.0 
https://github.com/rgisler/qsreporter/issues/issues/issue/6
Initial commit.

The two cpp files will need to eventually be merged into a single
program.
Use Solarized
Added YML example.

Data in /data/people.yml
Example in /source/data_example.html
CQB module extraction changes
Made riskTree a module

One method, `Draw`, which is called on clicking the GetRisk button.
Todo: switch to doing this using a CoffeeScript class.
Pulled the navigation right and gave the Get Risk button an id
Added placeholder image and removed height on display well
Rebuilt docs
Ignore JSHint directives in docs

Rebuilt docs
Not using _ yet, so not claiming it as a dependency

(Will probably want to use it [and possibly backbone] later, but it's
early days yet)
lahjakaare fixed
- ajustes de nomenclatura
- finalização do MER com inclusão dos insumos e preço por região.
- atualização do modelo e do banco localhost.
delete ssh-agent entry
Update include/tool/gpOutput.php

I have updated following code to display additional.css
if user logged in as any user, I hope this help.

if( isset($_COOKIE[gp_session_cookie]) ){
	$css_files[] = '/include/css/additional.css';
}
Full URL for images
Drying up billing.
Use gemspec and Gemfile properl for a gem.
'personpage'
Added pdf display dev env
restrict to single jenkins
Bug 843710
Updating gem versions
Automatic commit of package [rubygem-stickshift-controller] release [0.14.8-1].
keep usage_records out of the db unless there are entries
fix typo
Updating gem versions
Automatic commit of package [rubygem-stickshift-controller] release [0.14.9-1].
dsp manager
those 2

Change-Id: I0d28222295d3bc2322833aa261c0d300674d8538
Now includes the PGAPack source and a CMake build system
16/06/2012 22:40
[DS-1272] Setting discovery to be the default search/browse engine
Merge remote-tracking branch 'atmire/discovery-default' into discovery-default
DS-1272 add discovery as default for JSPUI/Browse
Update dspace/modules/solr/pom.xml

Remove Version of Maven war plugin from Overlay
Merge pull request #91 from atmire/discovery-default

[DS-1272] Setting discovery to be the default search/browse engine
Merge pull request #93 from abollini/discovery-default

Discovery default for JSPUI
Reverting Discovery as Default
Updated PDF documentation for 3.0-RC1
[maven-release-plugin] prepare release dspace-3.0-rc1
[maven-release-plugin] prepare for next development iteration
Merge erroneously multiple Oracle upgrade scripts
fix copyright year in Mirage
optipng -o9 *.png
remove space from file name
[DS-1210] NullPointerException on /search-filter without field param
[DS-1281] XMLWorkflow throws NullPointerException on "Assign Roles" when not enabled
[DS-1280] Upgrade Spring to latest release possible
Merge pull request #97 from atmire/DS-1280

[DS-1280] Upgrade Spring to latest release possible
DS-1294 Autocomplete in discovery filter doesn't work

The JSON discovery plugin was misconfigured in the dspace.cfg
Add commented-out db.jndi property to dspace.cfg
Fixed hostname in tests.
Add a StaticPages controller
Added tests for static pages
Finish static pages
fix sftp check whether dir is empty
fix sftp deletion of remote files
add Time .uptime function
Rebase from 'release/xdot' @ version '1.9.11'
Generated debian files for quantal
Rebase from 'release/rxgraph' @ version '1.9.10'
Generated debian files for quantal
The feed is a dist_file, so put it in dist.
Only include SHA1 in feed when fciv is available
Include version in python egg installs in webpi feed
Fix template option handling
Some things are only done for msdeploy dists
Imagens de botões
Familias
Germinações

Tela única para 2 controllers
analytics - implemented trackEvent (closes #18)
added team and league relationship
merged
got rid of schema copies
Moved external libs to vendor dir

External libs are now managed with composer and are now locoed in the
vendor dir. Updated the Slim and Twig dependencies.
Revert "Moved external libs to vendor dir"

This reverts commit 5c825a31105624f42c5d9da2b0312a9b889025cc.
Moved external libs to vendor dir
a forgotten vendor file
Created LICENSE file
Changed Rakefile and index.php to deal with the vendor dir
Delete old dependencies from lib folder
HULU in the FUlU ...CTHUlU
Merge branch 'master' of https://github.com/rw507/Traceability.git
First pass at charting service.
rename receiver to parser since the parser will parse
use the api to build charts
dynamodb is not a good fit for this model
make a switch for pg storage
Making change to recap
add wiki link, plus `.addTest` can be chained since 0.5.1
Adding bootstrap, api changes
new feature

Added new corona feature to the emitter class. Some other little
changes ;o)
logged out wording
added favicon
added hairstyle model
Folder verwijderd
formateo del codigo con eclipse
Added sbt-dropbox-plugin
Merge branch 'gen-master' of github.com:sbt/sbt.github.com into gen-master
blob
brings reification up to speed

Implemented some new features (e.g. rollback of macro expansions),
and did some stabilizing refactorings (e.g. moved mutable state into a ghetto).

Also used the refactoring as a chance to fix free and aux symbols.
Encapsulated this notion in a symbol table class, which allowed me
to address outstanding issues with symbol table inheritance and inlining.
SI-5990 u.build now correctly invokes missing symbol hooks
Merge pull request #815 from scalamacros/ticket/5990

u.build now correctly invokes missing symbol hooks
tags for AnyVal and AnyRef