labofsahil/github-event-dataset-2012 huggingface dataset:
photo is made big
Merge branch 'master' of https://github.com/herbps10/scrapsule
Merge branch 'master' of https://github.com/herbps10/scrapsule
lightbox stlyes
GEM_HOME me handri ?
oh yeah, I like all cmds in history except duplicates
Convert source files to unicode(UTF-8) encoding.

Convert source files to unicode(UTF-8) encoding.
---
ソースファイル・リソースファイルなどのエンコーディングをshift-jisをunicode(UTF-8)に変換しました。
GitHubのサイト上で直接ファイルを開くと、文字化けするなどしていた問題に、これで対処できたと思います。
Changes to the README....
lisätty testikansio, jossa pitäis olla tiedosto
Test resolution on stream_open().
[auto] Merge from Core

    • #2a1f5f9 — Test resolution on stream_open(). (Ivan Enderlin, 2012-09-30)

---

Merge remote branch 'library-core/master'
pautina-9 Show new photos on scroll page
Merge branch 'dev' of https://github.com/home-work/vpautine into dev
pautina-9 Show new photos on scroll page
updated hoodie, create cake update_hoodie
fixed path
fixed for latest hoodie.js version
build
fixed initial navigation
store API thoughts
Добавил 4 лекцию, первые 3 вопроса, 27 октября
Мануфактуры и Петр I
Конец 4 лекции
Change Readme Format.
add InnerShadow spec
tableViewに背景画像設定､ボタン押下時の処理追加
1. added elem paramenter to bindVal function
1. fixed to auto refreshing second level of projects listvew when add new project
Progress : Report Center.
Report Center : Changes.
Commit Test Cloud9
added demo on how to check for successful JSON fetch
roundup of adding async methods for all networking
added an umbrella exception for all json model exceptions
Split Paper implementation into files, Stephens cleanup is included
Reverted list styles
Switched to utf8 safe base64 encoding (not native) and added LZW compression for links
Complete the crag resource PUT request handling
Removed uneccessary config file
Small rename of one of the Links functions
Work in progress on the Crag resource.

Mostly tests, which fail at the moment.
Start of refactor of CragDao
WIP - refactoring CragDao test spec.

To allow it to test the mock CragDao class used by other tests.
Added support for hi1 (high IO/SSD) instances
added
changed describtion
adjusted to ext dir
moved getRssSources call in a background thread
infoview label newline character
NSLog reenabled for test method
Instead of wrapping the entire AstropyBuildSphinx definition in a try/except block, add a HAVE_SPHINX global variable a la HAVE_CYTHON; put the AstropyBuildSphinx definition in an if statement instead.
mime-edit.el (mime-edit-encrypt-pgp-nonmime): New function.
mime-pgp.el (mime-display-multipart/pgp-encrypted): New function.
mime-view.el (mime-view-multipart-show-all-children): New customizable variable.
formtastik ist doof
paper_trail dependency
addImage now sets Content-Length correctly upon piping a stream through
PUT. Modified intro docs to match the parameter signature of function.
Merge pull request #3 from andreasrs/master

Fixes addImage so that Content-Length is specified. README correction.
added phantom section to catalan_content
checklist german
Merge branch 'master' of github.com:imeos/metanetpaper
maltese new version
Merge branch 'master' of github.com:imeos/metanetpaper
apache backup and page turn sound
Generate checkers
Upgrade to 1.51.
release version 0.5
next version 1.0-SNAPSHOT
Versão 1.1

Correções
add some TODO comments
Merge pull request #2 from ipa320/master

added some TODO comments to cob_trajectory_controller
Rejecting with timeout if arm doesn't go into velocity mode, aborting action on control failure, see http://www.care-o-bot-research.org/trac/ticket/275
Merge pull request #4 from abubeck/master

Coded without possible to test. Please verify on robot.
O meu relatório de actividades.
Put away PackageEq type
Delete parent dir if only one ghc dir exists

On Windows, shared files are also put under library directory,
so count only directories in format of "ghc-x.x.x" to check if other
versions' directories exist.
That's a little better.
Added stones.
Updated for next version
New changes for next release
Begin de-duplicating some code...
More code de-duplication
- changed input type of PLZ to text
- introduced and refactored facades
Merge branch 'play_port' of github.com:jack-kerouac/RoomR into play_port

Conflicts:
	app/controllers/Applications.java
	app/models/RoomrModule.java
- added sending of mail when creating an offer
- adjusted width of some fields
Merge branch 'play_port' of github.com:jack-kerouac/RoomR into play_port
- review
fix typo and add one picture in the list
Merge branch 'gh-pages' of github.com:jackdbernier/wllpx into gh-pages
Added uptime to plugins
development progress (template LiB)
fix small issues
update todo list!
Fix incorrect deco colors being selected
Newtonian gravity in HUD, fixes #152
Fix crash when you get an error while saving, fix crash when deleting stamps (delete this called twice?)
Fixes bug where songs were not saved from new or new songs created from updating an existing song.
Merge branch 'development'
Added support for PHP FFI
highlight edgest on node hover nodelink
bump npm version
Merge pull request #191 from chesles/master

npm version bump
Merge remote-tracking branch 'upstream/master' into test_replication_with_deleted_docs
test for replication with deleted documents
test for replication with deleted documents
added to css/screen.css defns for h2 to h4
modified grid position of some patterns, to put them up in top-left corner of grid
small bugfixes
two more small bugfixes, giraph master.compute function name changed
Code generated by Giraph backend now compiles.
Anvil worlds should now be compatible with block IDs >255
unnecessary temp vars
fix raising of ArgumentError
more thorough validation of point arguments
Setup spine main controller and aligned controlers with Spine Stack
Looking for self image in image hash search
Dummy login
Implementing logout
text sql
Updated RSA key generation/load exception message
Fixed Gemfile Error
Basic for a Cartoquist::Client class
Ensure that we don't screw up environment variables with our tests
Basic interface to index actions for applications, databases, operating_systems, servers and tomcats
Move each CI type methods to their own module
Now using settings.py config file, and Github instead of SVN for
self-updates
Add AST support for single nesting level IF statements.
Fix Firefox absolute position bug
Fix services pricing positioning
SOCGameList: +getGameNames(), Parameterize types
SOCGameList: javadocs, add missing copyright
Initial commit for this project.  VS Organizer.  It was available for
download for free previously
Ignore the install directory because it's basically bloat.
Merge github.com:jdvolz/VSOrganizer
Adding sessions controller to handle authentication
use status short version
markdown license heading
fixing self problem in bootstrap
Adds experimental Shifty, updates some internals to play nicely.
Displaying index.html in a web browser built into the demo application main window
* Make choosers default to current directory, and make intial settings keywords match.
fix to xfs, add some functions
add xfs context to runtime
Fixed 2 bashism and now works on bash and dash
Merge pull request #122 from jespino/git-effort-with-dash

Fixed 2 bashism and now works on bash and dash
fix git-extras whitespace
add initial git-pull-request(1) implementation
add default of HEAD to git-pull-request
fix git-pull-request curl body quoting
fix some quoting in git-pull-request and ensure the remote is available
remove debug shit
Whitespace changes
Fix for problem when using AnySoftKeyboard (and possibly other keyboards too) - http://code.google.com/p/softkeyboard/issues/detail?id=971
Disabled auto update check
Handle EOFs different from other net io errors
final checkin for refactoring
Refactor git-dangling-commits to use awk better
more ses stuff
spect fix
minitest fix
added towers, unit ids, mouse coords and a grid
this makes no sense in retrospect
Merge branch 'master' of github.com:sunlightlabs/openstates
NH: drop _code, wasn't reliable
Merge remote branch 'openstates/master' into upstream_merge
added delivery method to customer pages
Add support for JSON requests to tokenize arbitrary data bags.
Created as a simple Scala project
added ability to fetch tweets, need more refininf but basics are there
remove blank line
add .gitignore
Bigger margins for bigger grids = better whitespace.
MovementRequest: use defaults
Final code cleanup

client close is still not tested!
Sync and fix play button.
Merge branch 'master' of github.com:johnliu/07.21.2012
Don't autodie in die wrapper.
Fixed Date/Time papercut
Merge pull request #13 from snwh/master

Fixed Date/Time papercut
updated package.json
added .gitignore to root
Changed from foldr1 to foldl1
added exam 2010
Adding getNiftiCodeForDataType(); other datatype-related changes
showImagesInFslview() no longer writes to Analyze when not necessary; show expt is no longer interactive
Add Global Components into Pages and PageManagers
Change the Event beforePageShown to be triggered as triggerWithCallback
Add nested creation objects from config options. Config options for a component can be set in a script template or data attributes. Eg: { type: 'page', transitionHandler: { 'type': 'FadeInOut', 'duration': 800 } } would create an 'Page' object an pass into the Page constructor options a property called transitionHandler which is of type FadeInOut and has a property duration of 800
Make Mmapdict inherit from Dotdict. Create pardir if not exists.
Allow multidimensional arrays for load_memmap_offset.
Shoehorn multi-dimensional record array into HDF-compatible form.
Deleted file not needed.
Merge branch 'master' of https://github.com/jorgeas80/hackaton

Conflicts:
	app/routes/routes.class.php
Undid dumbness
Fix some issues with minibufexpl
admin role, destroy
Rename Identifiable to ObjectIndentifier
Avoid use of internals getters and setters

http://developer.android.com/guide/practices/performance.html#internal_get_set
added deco image for part 2
New demo
More updates to demo
merge
more styling changes and updated book images
css changes
merged ericasunday
poniendo cuadro modal a grabacion de menú y mejorando página de inicio
peque cambio en error.tpl
Merge branch 'master' of github.com:juananruiz/recetas
AMDfying
Amdified FuncUnit
Renaming to animate in builder
Highlight column and change row highlight color
Fix colorcolumn for Vim <7.3
fixed tasks' newId method infinite loop
Added toggling ready state on and off.
Aded API docs to APIDriver
change wording of registry section
bump font size by 1px. get rid of unused css
swapping talk - Shabbir can not make it
Refactored subscriber
Added pid file & daemonize options
Refactored tests
Fixed pidfile option
Added pidfile tests
Cleanup pidfile if pidfile exist
Added wait server bind to test helper
Refactored SpawnHelper
PidfileTest teardown
Refactored spawn test
Daemonized test
Haiku: Fix target host define
Remove yii repository, add maintenance extension.
capped the timeout
active > passive
fixed to work on Firefox
unite-font/unite-colorscheme導入
minor change
Merge branch 'master' of https://github.com/kbarlow918/voronoi
Merge branch 'master' of https://github.com/kbarlow918/voronoi

Conflicts:
	Voronoi/RndPointSet.cpp
Fixed some crashes from memory deallocation
Merge remote branch 'gs-tegra/android-tegra-moto-2.6.39-ics-mr1' into moto-mr1-testing

* gs-tegra/android-tegra-moto-2.6.39-ics-mr1:
  net: wireless: bcmdhd: Fix mac setting from platform hook
  ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
  usb: gadget: fsl_udc_core: re-prime USB controller
  usb: gadget: Gadget USB optimization
  ARM: tegra: Gadget USB optimization
  net: wireless: bcmdhd: Add SET_RANDOM_MAC_SOFTAP option
  usb: gadget: f_usbnet: Do not enable intr_out ep
  net: wireless: bcmdhd: Increase pm_notify callback priority
  net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failure
  Revert "proc: enable writing to /proc/pid/mem"
  HACK: ARM: tegra: pm: disallow lp2 while hotplugging in suspend
  net: wireless: bcmdhd: Fix proper scan command even if request is NULL
  net: wireless: bcmdhd: Fix scan crash in ibss mode
  sched: Fix rt_rq runtime leakage bug
  mmc: sdhci: Prevent sdhci irq handler to schedule card detect if it is broken
  mmc: sdhci-tegra: Add SDHCI_QUIRK_BROKEN_CARD_DETECTION
  ARM: tegra: pm: keep a local cpu online mask for lp2 idle
  ARM: tegra: stingray: Increase delay after enabling power ON to 300 ms

Conflicts:
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
Minor fix for preference dialog on OS X.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
Refactoring and texture loading.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
modied gitconfig
modified readme
Merged results from experiment branch
changed directory structure
moved all sources to src directory
extra plugins little stuff in vimrc
Implemented marker data and switching

Properly brought on top!
present? better than any?
Single action to return observations with spots
Draggable spots
New markers now behave like the old ones
Add hover title to markers
Autofit
Add crosshair
Better instantiation, implemented singleton.
fill more gaps
kirby 09/05 taff
kirby 09/05 taff
changed tsp.cc to tsp.cu, changed create_new_generation in both .h and .cu file to return void instead of int
build: Compile with ubuntu 12 32 bit
Show filename in Sampler and Fluidsynth instruments
PowerTip updated
Elements added or modified with tooltip-* classes are now handled
New build and updated NEWS file
Fix typo
Merge branch 'master' of github.com:korolevdima/la-mod
Actually added sixgk, also add post/pic.*
DCPU16: Add first regression test. It's overly strict, mostly for training purposes. Later, we'll need to only check important things in this test, like function name, and ADD.
finally found a working workaround for chromium bug 124926
add option to add closure compiler arguments in EMCC_CLOSURE_ARGS env var
move gl docs to wiki
make GLEmulation depend on everything, we will be adding a lot more there
Bætti við Ant
Changed location of touch icon
Modified kernel.cl
showError into class
FEATURE: Adding PoC calendar
update todo, testing new git install
Merge remote-tracking branch 'origin/master'
server.use does not throw up when passing in non-functions
Merge pull request #187 from kevinykchan/master

server.use() does not throw up when passing in non-function(s) as argument
fixed paths for vs2010 projects to work outside ofxCv folder
changed the API calls for violations from a single call for all, to custom calls for each violation level.
Add birthdate to patron.java and remove usertype.
Add birthdate to patron.java and remove usertype.
Merge pull request #1 from laiam/charlie

Add birthdate to patron.java and remove usertype.
add debian directory
requires libpurple >= 2.8.0
Debian packaging for version 0.0.0+git20120829.01fdff2-1~lainme
add build-dep libglib2.0-dev, pkg-config
add debian patches. fix issues #54, #56, #59
keep debugging symbols
more strict requirement on libpurple
do not add epoch
Debian packaging for version 0.0.0+git20120829.01fdff2-2~lainme
requires curl>=7.22.0
suggests pidgin instead of recommends
Merge branch 'upstream'
delete patches not needed
Debian packaging for version 0.0.0+git20120909.48d67c4-1~lainme
Merge branch 'upstream'
Debian packaging for version 0.0.0+git20121006.0ed2cdf-1~lainme
Merge branch 'upstream'
Merge branch 'master' of github.com:lainme/pidgin-lwqq
Debian packaging for version 0.0.0+git20121011.d4ce6f2-1~lainme
Merge branch 'upstream'
Install TinyMCE editor
Merge branch 'master' of github.com:lamberski/padamini
it's a sun!
fix #16713: on windows, copy text and exit causes crash
adding aws-sdk gem to gemfile
stuff
stuff
added top votes page
Relax pattern matching in some cases

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Allow start with default arguments (taken from config-file)

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Moved SuPyLearner.py to supylearner/supylearner.py and added __init__.py to supylearner/
Making navigation numbe2
renamed BaseProperty to Properties
renamed PropertyInterface to PropertiesInterface.
Refactored Properties class to be simplier and removed all XML logic.
Updated boilerplate example.
Refactored the base Element's a bit.
Updated Writer\XML a bit.
modify: 实现globalfifo的poll，增加轮询支持。另外添加驱动的测试程序
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram2 into dev
Merge pull request #258 from linlingyu/dev

Dev [Change] move _smartInsert and _smartInsertTo into _util_
补充文档
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram2 into dev
Merge pull request #259 from wangxiao/dev

补充文档
[Change] 更改_xxx接口到_util_.xxx
Merge branch 'dev' of https://github.com/BaiduFE/Tangram2 into dev
Publish the project
myreverse IMPROVED!!11
Update history and bump version number
Merge branch 'release/0.5.3' into develop
Don't hardcode /tmp when testing

/tmp does not exist on Windows, so this change causes the test suite to
create a dedicated temporary directory for use when testing instead of
hardcoding /tmp.
Handle symlink creation on Windows

On Windows, os.symlink takes a third parameter to indicate whether the
symlink is to be a file or directory symlink.  This change creates a
wrapper function named symlink.  On non-Windows OSes, it is just an alias
to os.symlink.  On Windows, it passes the necessary third parameter to
os.symlink based on whether the source is a file or a directory (and thus
requires that the source actually exist).  All uses of os.symlink are
replaced with calls to the new wrapper function.
Use os.path.samefile instead of os.path.realpath

In Python 3.2 on Windows, os.path.realpath does not yet follow symlinks
(Python Issue 9949).  Work around this by using os.path.samefile instead
of os.path.realpath to see if two paths are the same.  On non-Windows
platforms, the new implementation should be slightly more efficient.
Make path handling cross-platform

This change updates code that assumes the path separator is always '/',
since that assumption is not true on Windows.  A few other minor
pathname handling cleanups were made as well, including fixes for some
unlikely but theoretical corner cases such as a file name starting with
more than one dot or ending with a dot.  One result of this is that any
non-absolute pathname passed as the name argument to the Dotfile
constructor must now explicitly begin with a dot, whereas previously
the dot would be assumed if not present. (Explicit is better than
implicit.)
removing nuget restore
Checks user input for "backdoor", updated "backdoor" hints (colour & example commands)
Restructured the class so every module has its function in the class.
Much easier to call modules through function dictionary self.commands .
New module for searching for exploits on exploit-db.com
Merge pull request #4 from s3my0n/master

New executer.py with same functionality but better implementation
Fix dendrogram default initialization

Vector sizes should not be negative.
que demande le peuple
Custom dialog adicionado
improvements to translations, etc
better templates
make author names unbreakable
Destroying a zfs without a key, would call keystore_remove with
references to deleted object. Changed to create variables to remember
the values.
Merge branch 'master' of github.com:lundman/zfs-crypto

Conflicts:
	module/zfs/dsl_dataset.c
api.js 게시판 쪽 제작
Updated gitignore file -> Ignoring ncrunchsolution
Arhitecture review : UseQueryText property moved from dataprovider to dbmanager class
Working on testSelectingTargets
Merge branch 'master' of https://github.com/lwalen/CluePlayers
Fixed mass assign for episode.content
JRUBY-6708: NullPointerException instead of proper exceptions output
Be gone magic 3! JRUBY-6713: win32/registry.rb warning
jline 2.7 should be released soon, and at least before preview2.

Revert "Remove JLine from being seen by maven and jarjar'ing our internal committed version to a non-conflicting package (to be reverted for next release when jline 2.7 is out)"

This reverts commit 47d42eb911b739b3b6f53f89c31a708b06e78aad.
Remove Enumerable#join. This resolves JRUBY-6703.
Merge branch 'master', remote-tracking branch 'github/master'
Fixes JRUBY-6697: --1.9 is default

Signed-off-by: Hiro Asari <asari.ruby@gmail.com>
JRUBY-6714++: Various circular require warnings
Fixes JRUBY-6677

* Passes the `mode` argument correctly from Kernel#open to IO#popen, so
  if a non-default mode is specified (e.g., "w"), it is honored

Signed-off-by: Hiro Asari <asari.ruby@gmail.com>
warning: loading in progress, circular require considered harmful - rubygems/spec_fetcher

Signed-off-by: Hiro Asari <asari.ruby@gmail.com>
upgraded idea project files to jdk 1.7

Signed-off-by: Hiro Asari <asari.ruby@gmail.com>
Merge branch 'master' into dalvik
with polyfill
Added TextPath shape (extension of Path shape, but renders text along path instead of stroking/filling the path)
Fix for Scientific Notation bug in Path
Enabled all tests
finally got around to documenting the Node, Group, Stage, Shape, Layer, and Container constructors
updated Shape constructor docs
fixed bug with fillText in Shape class
merged jfollas's new TextPath shape, and moved non-primative shapes to the plugins folder as shape plugins
merge from eric
Extend cf_meter enum with user/internal meter keys.
Contact page header added
cleanup benchmark script
add support for log_caller option
convert all attributes to strings
make ImprovedLogger a subclass of IO
version bump
SI-4831 Fix ambiguous import detection for renamed imports.
An IntelliJ module for reflect.
better unreachability for selections

Consts are hashconsed modulo static-approximation-for-dynamic-value-equality
thus, two value-equality tests in patterns should reuse the same ValueConst
if and only if the tested values are guaranteed to be equal in all possible executions

the implementation uses unique types to track unique consts
for an Ident with a stable symbol, we simply use the corresponding singleton type
for a Select, we have to indirect some more: we store all the unique trees we've encountered and a unique type for each of them
this unique type is then used to find the uniqut const that approximates the run-time value

this may seem roundabout, but we need to standardize on types for representing "value" tests,
as a type test against a singleton type must give rise to the same ValueConst
as a value test using a tree that refers to the same symbol as the singleton type test
Merge pull request #695 from adriaanm/topic-virtpatmat

better unreachability for selections
Merge pull request #696 from retronym/topic/intellij-reflect-module3

An IntelliJ module for reflect.
Merge pull request #694 from retronym/ticket/4831-2

SI-4831 Fix ambiguous import detection for renamed imports.
SI-5696 Detect excess constructor argument lists.

An apply method fooled the usual mechanism.
SI-5162 Exclude super.foo from the erasure cast of SI-4283

If the target method is defined in Java, treat the super reference
as an error, otherwise allow it in the knowledge that Scala loosens
the access restrictions on its generated classes.

Moves the test for that bug out of pending-ville. It's sufficient
to place Test in the empty package to exercise the right code paths.
restoring previous log format for shouldInline
Merge pull request #699 from retronym/ticket/5162

SI-5162 Exclude super.foo from the erasure cast of SI-4283
Merge pull request #698 from retronym/ticket/5696

SI-5696 Detect excess constructor argument lists.
Forkjoin and fjbg are now always compiled in the build.

* forkjoin.done/forkjoine.clean can test forkjoin source
* fjbg.done/fjbg.clean can test fjbg source.
MSIL now build as part of compiler.

* MSIL is now compiled/embedded with compiler
* Tested building new STARR, everything groovy
* Can probably remove msil/forkjoin/fjbg from STARR now that they're properly embedded/built.
allow inlining of accessors whose owner is (anon) closure class
Merge pull request #700 from jsuereth/fix-libs-in-build

Fix libs in build
Merge branch 'master' into recoveringOptimizedStability
review: Fold ChangeStatusLog into CodeReview
Don't use "obj"
extensions: Remove _json things

Not sure why I ever did this...
modified build file to delete temp files because they were not properly recognised by gitignore
Jack driver: Update calls to convert_array with new argument
One more sentence to exceptions.
The getter method in Phonegap api should be Camelized as well
Ahora la clase Session solo obtiene el parametro app_dir del container.
creado test para la clase Session
Mejoras en la clase Flash...

Ahora pueden haber varios mensajes de un mismo tipo. y cuendo obtenemos
los mensajes para un tipo especifico, lo que obtenemos ahora es un array.
debemos recorrerlo he ir mostrando cada mensaje.
Git ignore
Moving .htaccess to reference; .htaccess added to ignore.
Using public bonita url for us poor mortals.
Test framework.
use new routes
Upgrade doliwamp
Merge branch 'develop' into bug-569

Conflicts:
	htdocs/install/inc.php
Fixed bug #569 - Notices & Warnings when installing Dolibarr
Also translated a string & variable and improved html use
Merge branch 'develop' into bug-569

Conflicts:
	htdocs/install/inc.php
fix wrong last update in cleansep function
Minor changes to es_ES translations
Merge pull request #441 from marcosgdf/minor

Code improvements
Merge pull request #442 from cbattarel/develop

fix wrong last update in cleansep function
Merge pull request #443 from marcosgdf/translations

Minor changes to es_ES translations
fix wrong update in previous commit
(it was always remaining on step 5 !)
Fix: [task #146] Remove table llx_categorie_association

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Fix: missing drop foreign key
Merge pull request #444 from cbattarel/develop

fix wrong update in previous commit
Missing translation
Fix: uniformize variable name
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: convert line delimiters
Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits
Task # 186 : Forgot to add the new box in the mod definition...
Correction for new box inclusion
Fix: add import_key field
Fix: missing comma
FeatureNotYetAvailable wasn't being translated
Clean dead code
ECM Area page title translation didn't exist
Merge pull request #287 from marcosgdf/translations

Little fixes to translations
Merge pull request #288 from marcosgdf/style

Little refactor to img_phone function
Fix: tr_TR
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Fix: Bad fix
Fix: Project validation
Fix: strict mode tour
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Merge branch 'develop' into style

Conflicts:
	htdocs/core/lib/functions.lib.php
Ensure cursor doesn't end up outside of visible window

Closes #738
Fix problem with ghost scrollbar in self-resizing editor
[css mode] Treat parenthesis as punctuation

Closes #737
Implement a new gutter system

- Multiple gutters are explicitly created with the gutters
  option
- Markers go into a specific gutter, new setGutterMarker,
  clearGutter methods
- The line number gutter is separate
- The 'fixedGutter' feature is removed (painful to do now,
  was shaky anyway)
Implement arbitrary-height lines

Experimental for now.
Move to {left,top,bottom} objects throughout

No more random {x,y,yBot} thrown into the mix.
More stable drawing of selection
Also measure a 'right' in measureLine

Get rid of eolSpanContent mess.

Preparation for RTL text handling.
First stab at bi-directional text support

Issue #249
Add vim-less and Buffergator (ctrl-B) + small tweaks
added samba and samba config
Ajout de distance et aire

Ajout des méthodes setDistanceMax, setAire, calculerDistance et
calculerAire pour les formes.
Yandex Metrika support
Implement hacky wrap detection.
Fix twitter handle in docs for matt_connolly :)
Flip Switch Module
BF: copy fixed io_orientations from nibabel trunk

There was a nasty bug in io_orientations in nibabel, that could cause
the process to hang when getting orientations for affines will all-zero
columns.  To allow use of nibabel 1.2.0, copy the fix into our fixes
tree until we depend on a later nibabel.
RF+BF: simplify meaning of xyz_affine

I was trying to be too fancy, because I was trying to return a valid xyz
affine for coordmaps that did not have output order X, Y, Z.  In the
process I got confused and failed to check the correspondence of input
and output axes, letting past cases where input axes had been dropped or
were in the wrong order.
NF: add results comparison helper

This commit also records the regression testing I did against the
results of the ``fiac_example`` script from June 2009.

I ran the current ``fiac_example`` script against the same preprocessed
FIAC data, found on Fernando's machine.  The results from Fernando and
Jonathan's run of June 2009 were in the same directories.

There have been some extremely small precision changes in the NIPY code
since then due to changes in nibabel used for reading / writing images,
but these should not affect the results.

In order to make the current code replicate the previous results I had
to:

* Temporarily revert some (correct) more recent edits of the design code

    diff --git a/examples/fiac/fiac_example.py b/examples/fiac/fiac_example.py
    index c635287..cfb37f0 100644
    --- a/examples/fiac/fiac_example.py
    +++ b/examples/fiac/fiac_example.py
    @@ -55,7 +55,7 @@ def run_model(subj, run):
        # The TR of the experiment
        TR = 2.5
        # The time of the first volume
    -    Tstart = 0.0
    +    Tstart = 1.25
        # The array of times corresponding to each volume in the fMRI data
        volume_times = np.arange(nvol) * TR + Tstart
        # This recarray of times has one column named 't'.  It is used in the
    diff --git a/nipy/modalities/fmri/fmristat/hrf.py b/nipy/modalities/fmri/fmristat/hrf.py
    index e468dcb..02fe624 100644
    --- a/nipy/modalities/fmri/fmristat/hrf.py
    +++ b/nipy/modalities/fmri/fmristat/hrf.py
    @@ -57,7 +57,7 @@ def spectral_decomposition(hrf2decompose,
            TODO
        """
        if time is None:
    -        time = np.linspace(-15,50,3251)
    +        time = np.linspace(-15,50,3751)
        dt = time[1] - time[0]
        if delta is None:
            delta = np.arange(-4.5, 4.6, 0.1)

  This caused some small changes in precision only.

* allow for sign flip in image comparison

  The statistic images include tests on the second of two basis
  functions from the spectral set.  In 2009, this had a more or less
  random sign.  About a year ago I put a constraint on the sign (after
  discussing with Jonathan) so the sign need not be the same as the
  previous run of this analysis.

* Zero out the first two slices of the group mask

  There were some very low signal voxels at the bottom of the mask that
  were causing some numerical precision errors in the statistic images
  (but not the effect, sd images) for subject ``fiac_06``

* Reprocess subject ``fiac_03`` run 1 with TStart of 0

  It turned out that fiac_03 run 1 had been rerun a few days after the
  others, in 2009, with a Tstart (time of reference slice) of 0
  instead of the previous 1.25 (see above).

After these changes, the comparison script passes all runs and subjects.
Removed some obsolete code from run commands.
Bug fix passphrase module.
Minor change to new run module.
Fixes missing local_only key.

Also adds in warning to delete from CLI.
whitespace fix
initial fix
rose-config-edit: fix
moved print statement out to reporter.
Merge pull request #283 from benfitzpatrick/config-edit.fail-if-fix

rose config-edit: fail-if errors should disappear
moved message location into event.
Merge pull request #281 from arjclark/delete_bugfix

rosie delete: bug fix
Merge branch 'master' into bash.login
Add checkwinsize to .bash_aliases
changelog added, npm installation and kick start Travis
spec empty check
Changement du makefile

make clean supprime le client et le serveur aussi
Nouvelle fonction de découpage en trames
Merge branch 'master' of github.com:maxClog/jeuDeLaVie

Conflicts:
	makefile
Finished grid. Added toolbar
pull head test
Bug fixes, renames, etc
A few updates to ensure that enum types declared within a class scope
are discovered
Changelog updates
Merge pull request #66 from mballance-sf/master

Enum content-assist updates
allowed to substract two units with type
fixed a bug in the unsigned comparisson warning
Merge branch 'master' of github.com:mbeddr/mbeddr.core
first cut at OS config DSL
textgen added
task-c-integration
more code for OS config example
finished the OS config tutorial
fixed perf. issues
Merge branch 'master' of github.com:mbeddr/mbeddr.core
Fixed bug selecting menu item and advancing to next menu
more status stuff.
xml status works.
Added timestamps to file events in Windows (and polling); Linux and OSX are still behind (now broken)
-->Deze versie werkt (exclamation mark)
代码差不多，提交一下，等下测试
代码写得差不多了，等下调试
修复几个小bug
Holman gave the last talk
mysql schema
add indexes
JetPack バージョンアップ対応 (ver.2.0.4)
modified wp-setup.sh ( update WP Booster CDN Client ver.1.2.1 -> 1.2.2)
blogs 1 file rename + install link update
MB-100: added reb confs

Change-Id: I432bf31b2bb632a25f2ab28ccc40856ccc6abe35
Reviewed-on: http://review.couchbase.org/16695
Reviewed-by: Ronnie Sun <ronnie@couchbase.com>
Tested-by: Ronnie Sun <ronnie@couchbase.com>
CBD-557: triggering reb from master client only

Change-Id: I8168bae9ab7e8885688a5e75bb32f7d2b7c06342
Reviewed-on: http://review.couchbase.org/20542
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Ronnie Sun <ronnie@couchbase.com>
Cambios en sendmouseposition
Add params to authorize()

Add an optional OAuth1 parameters to forward to the authorize URL.
The 'oauth_callback' parameter should be passed through authorize URL in
Dropbox OAuth1 implementation.
Support old OAuth 1.0, for Dropbox

Dropbox does not support OAuth 1.0a nor 2.0 yet. I don't recommend this
patch.

See http://forums.dropbox.com/topic.php?id=43212 and
http://oauth.net/advisories/2009-1/
Dropbox (old OAuth 1.0) example

Dropbox supports old OAuth 1.0 only, which has security issues.
See http://forums.dropbox.com/topic.php?id=43212 and
http://oauth.net/advisories/2009-1/
replaced all occurences of etherrape with ethersex

Ethersex is a fork of etherrape.
Ethersex supports various targets, with etherrape being only
of them. To clear things up, the name "etherrape" will only be
used for the etherrape hardware.

Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
maj_debase
add prefix_root with prefix_dir attribute setting. dropped path as it shouldnt be required with prefix_root.
Fixed warnings
Suppressed warnings
SyncKit project update to latest Xcode
Support for horizontal scrolling via the method scrollRectToVisible:animated:
Added suites handling
Add shortcut to search the word under the cursor with ack
double bacon removed
workarround for qt4.eclass removal.

just change that to qt-r2 should be fine. please give it a test.
bug with templater cache.
PluginConfiguration and setup updates
Improve database schema to handle vote
Improve default production configuration
Model base improvement
Improve Question and Comment table and add Vote table
Update model class to follow schema updates
Update homepage to display current question list
Improve layout/footer/header
Question controller creation
  Display a question
Add support for binary XOR with positive numbers
Merge pull request #7 from mikepb/feature/xor-uint

Add support for binary XOR with positive numbers
Bump version to 0.5.2.
Cleaner output of errors.  Allow tracing for the raw stack trace.  Fixes #4.
Support static sites.  Gemspec needs to include templates in the gem.  Fix a typo.  Expand paths in the built in templates.
modified notes text by Werner's better suggesttions. :-)
added ETH_A3V3, ETH_A1V8, ETH_PLL1V8 components to fix ErrType(3): Pin connected to some others pins but no pin to drive it. (i.e. a local lable can't drive to a type of Power input).
allow accounts to be bookmarkable
Fix cmp operator and indentation.
emacs setting updates, solarized theme etc.
(+)add test cases based on QTest framework
(*)use different point sizes for Mac and Win/Linux
Corrected github account
功能更新
Merge pull request #2 from mixteam/gp-pages

功能更新
nightly build for Vietnamese
Tries Data Strutuce in Python
Ignore emacs *~ files
Clean up Gosu solutions to run with sample input
Better checking of Controls in ContainerControl, added Application-Name, cleaned Program.cs, added basic console-benchmarks
ISPN-2319 Add ability to take a site offline into x-site implementation
- ongoing work
ISPN-2651 fix condition in InvocationContextTest.testMishavingListenerResumesContext
코드 클린업
이벤트 로거와 디스패처 분리
Update ARM example.
Merge pull request #2 from acjf3/master

Update mention of ARM example
JQuery blocks
Merge branch 'matnel' of github.com:mnelimar/waterbear
Do not redirect when file is loaded
hipchat notifiers
hipchat notifiers
fix sorting issue. dry up a few things
remove hipchat from settings
remove hipchat from settings
added documentation for g:pomodoro_notification_cmd
fixing the failed test with a new bambooid
Merge pull request #11 from modilabs/node_server

fixing the failed test with a new bambooid
[#7925] Fix error editing Resources in multi-context sites

* bug-7925:
  [#7925] Update changelog
  Revert redundant patch for #8039
  modified:   core/model/modx/processors/security/access/getlist.php
  modified:   manager/controllers/default/resource/resource.class.php
  modified:   manager/controllers/default/resource/resource.class.php
Reduced cache storage

Updated market prices
Remove old MapExtra
Fix invalid normals in OBJ import
Update copyright notice
Update copyright notice
Update YUI doc generation
Use of angle weigted normals in MeshData.recalculateNormals
Fix YUIMessage problem in shader editor
Document Scene.str method
Simple scene hiearchy test
Simple scene hiearchy test
Update build script documentation
Update transform update
Add highDPISupport
Add comment to Transform about right handed-ness
Fix issue in shader editor
Fix webcam demo (problem due to updated WebRTC API )
Prepare for Firefox 18 with WebRTC
Update examples to 0.4.2
Update binaries to 0.4.2
Issue #25: Modified demo project to show the layout direction effect
Bug fixes
 - Handled corner case while updating rxBps in BlockPlacementPolicy
 - Removed erroneous character from mapred-site.xml
 - Added entry for 'dfs.replication.netaware.oldfactor' in hdfs-site.xml
Simplify Subscriber, remove additional handler store
Remove router from the mediator.
Router subscribes to !router:route and !router:changeURL events.
Router mixins Subscriber and gets disposable.
AppController: Use params.path for history URL first
This allows setting the URL properly even if the models aren’t loaded yet
and the controller cannot create a full URL yet (with slug and so on)
Improved AppController tests
The string changes just keep on coming.
Criando paginação no menu de notícias
opisy dodatkowych pol podczas rejestracji, zakladka O mnie w profilu, uzytkownicy online, lista uzytkownikow
General tweaks to get things working smoother
tweaked the workout profile display
sendfile on, now that I know what that means
new default task
start to cleanup README and move TODOs to own file
linkify
task namespacing
namespace
Merge pull request #10 from mseknibilel/milestone

CategoryFramework re-worked
Merge pull request #10 from mseknibilel/master

CategoryFramework re-worked
Merge pull request #11 from mseknibilel/milestone

Milestone
Merge pull request #11 from mseknibilel/master

CategoryFramework re-worked
Merge pull request #12 from mseknibilel/milestone

Milestone
Merge pull request #12 from mseknibilel/master

Database requests optimized
README update with the couchdb-build
Merge pull request #13 from jordan-developer/milestone

Milestone
README update
Merge pull request #14 from jordan-developer/milestone

Milestone
Merge pull request #15 from mseknibilel/master

Read Me update
Egregious hack to quickly open and close menu after everything's loaded
thus forcing realization of all elements of the menu.
temporary fix for rewards sets return null location
Project Report1 Section 5
Alteracao para trabalhar com container web 2.5
Merge do web.xml
Changed the featartist plugins to perform case insensitive searches for " feat."
Button loading states and render saved list on create
Removed afdsmgrd tmp,(gcc 4.7.0)
Empty place spinner doesn't crash app anymore.
error de paginado solucionado y otros
Updated index file so data points are clickable

next step will be to make a call to the flickr API to get images that
are related to that datapoint
cmake path fix for tests
using more signals
experiment with setting headers in middleware
Finish conversion of record spec to coffee
Convert Difference spec to coffee
Convert InnerJoin spec to coffee
Convert Limit spec to coffee
Convert Offset spec to coffee
Convert OrderBy spec to coffee
Convert Projection spec to coffee
Convert Selection spec to coffee
Convert Table spec to coffee
Convert Union spec to coffee
Convert Monarch.Remote.Server spec to coffee
Convert Repository spec to coffee
Convert FakeServer spec to coffee
Convert jquery extensions spec to coffee
Fix bug where strings were being used as transformers
Convert Signal spec to coffee
Convert monarch.js and Monarch spec to coffee. All specs pass again.
Convert Util.Signal to coffee
Convert jquery_extensions to coffee
Convert Util.Node to coffee
Well, this just makes more sense.
Fix glitches in manpages

Correct the different hyphens used as minus characters and fix spelling
mistakes
bugfix: errorcheck test fails on FreeBSD

This commit make sure that SIGXFSZ signal is ignored in errorcheck test so
that the process is not terminated but read fails
Pass errorcheck if setrlimit is broken
workaround freebsd bug in errorcheck.c

Bug report: http://www.freebsd.org/cgi/query-pr.cgi?pr=164793
Remove Debian packaging
Use gnulib for fsync replacement
Set hidden visibility to replacement function
Add autogen.sh to quickly run gnulib-tool and autoreconf
use gnulib for defining O_BINARY
Add support for big endian architecture

The support is done through "static" swap functions: since the currently
supported file formats assume all little endian data, all read/write from/to
disk are swapped on big endian arch.
Remove the gnulib related .gitignore from versioning
Add byteswap to gnulib imports
Turn unsafe sprintf into snprintf
Fix unused variables
Use autogen.sh to import the gnulib package
Release 0.3
preliminary code to process missing points
Change "Scribbler" to "Scrobbler" in the README

Also add a link to my website and remove the unnecessary "/" on the
Scribbler URL.
Renamed baseUri to baseMedia

baseMedia now corresponds to the serialized container which can be obtained
by calling GRiloMedia::serailze()

There is no unified way to create GrlMedia except by unserializing.
There is no proper way to start browsing from the middle of a tree in grilo.

Due to the way the declarative bindings are created, we will have to accept a
serialized media string and the model will have to unserialize it.
Now with:

- timestamp
- dodgy CSS
Verbindung fehlgeschlagen Message
mit rotem button und 2. activity
test
add check for jsl
some work on the summary of knuth's paper
Remove silly Eval class. Not sure if it still works.
More tweakage of the APM charts.
Added total actions to the replay APM analysis.
Adding in race info and icons.
Added some notes to the thoughts file.
Deleted stuff
Didn't fix!
Really fixed!
Merge branch 'master' of https://github.com/nickbradley/gitfun

Conflicts:
	Test.txt
Replaced old implementation with cleaner implementation
Made RelativePath serializable
Fixed dijkstra sp
Fixed binary compression of graph
Fixed zoom-point in controller
aftn 5
please
auct.php rewriting, getting new exp_records
new auct.php part created
auctions work
Issue #62 Fix

Fixing Issue #62 of overlaid text on buttons when refreshing issue list.  This was due to not cleaning up the scrollView subviews prior to creation of the new refreshed ones.  Should be fixed.
UIWebView on Info View Controller

Added UI WebView for loading local HTML file.
cylinder capping and spline corrections
modified cylinder shaders
Add thumbnail url to json-encoded responses
Merge branch 'master' of https://github.com/nlaplante/Profolio.git
Add supersized slideshow
Integrate supersized slideshow plugin
Prefetch json photo data after page load instead of when the user clicks
on a thumbnail
fix status delete, use media-alchemy service to resize status image
update composer.lock
Now enforcing expiration time on content pieces.
* Now restricting URL lookup to proximity (only possible to get URL of spots nearby).

* Geocode search field to quickly browse different locations.

* Added proper error message when trying to add content to area out of bound.

* Now only possible to add content to current proximity.
Fixed genomera redirect (signup in new window), and started fixing admin view users
Continued trying to fix view users feature, not done yet
Merge branch 'master' of github.com:nnevvinn/Checkmate
Disable title bar

Set theme in manifest.
Merge pull request #73 from 0x64746b/disable_title_bar

Disable title bar
removed MemcacheStub in InternalProxy to allow memcache usage based on config
log_common memcache passthrough to internal_proxy
fixed imports
Merge pull request #47 from notmyname/internal_mc

Internal Proxy Memcache
Some progress but need to understand/manage/kill callbacks to make it work
...
disable dalli cache
removed featured users
apply image lazy loading to places
Merge pull request #272 from tomkuk/disable-gravatar-cache

Disable gravatar cache
Refactoring.
Gave the threads a name
Save the login blob and try to login better.
API enhancements to support grade and embargo setting as per requirements

1. Add new methods to Depositor to support:
  * permanent embargo
  * setting embargo at the same time as grade
  * setting embargo as an entirely separate operation

2. Add new methods to DSpaceIntegrationTests to test the above additions

This satisfies Github issues:

* https://github.com/nye-duo/StudentWeb/issues/7
* https://github.com/nye-duo/StudentWeb/issues/5
made the Found list load dynamically
Point to point fixes plus others (REPORT)
Report changes, threading update for 3g
Fixed require('nano')
set global geolocation
Kaminari finally working
Update socket i/o code to expose some helper functions

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Add random_bytes and random_chars

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Add a new specialisation to CDRStream

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Add a safety check in CDRStream

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Add get_peer_uid to Socket

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Tidy up the socket connect/accept primitives

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
lobby class

please review
blue tank image
updated loader to accept simplelist phone numbers
Extended find_resources_ext with attribute name/value search. Bumped iondefs and pyon
Fixing markup to be responsive on front page. #563
Update notes for submitted changes

* Limit token revocation to tenant (bug 1050025)
Update notes for submitted changes

* Docs: SQL-based vs File-based Service Catalog
Merge "Add MAX_PASSWORD_LENGTH check in backendutils." into stable/diablo
Robustness in "plugin.requires" parsing

git-svn-id: http://josm.openstreetmap.de/svn/trunk@5508 0c6e7542-c601-0410-84e7-c038aed88b3b
Remote control: don't try to zoom to an empty selection in `load_and_zoom` handler

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

Forgot `forward_stop`/`backward_stop` in legacy relation preset.



git-svn-id: http://josm.openstreetmap.de/svn/trunk@5596 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror
emotional states code. mostly empty. working out design issues.
fixing typos / formatting on protocol
update gauge.coffee
fix typos
Projeto funcional. Falta publicar no AppHub.
General (exists.py) end special (the other files) cases to get words with apostrophe to work.
Moved polygon code directly to the NapePhysicsObject
Modify fix for issue 2183 by adding missing Join buttons on blurbs
Merge pull request #818 from sarken/issue_2183

Modify fix for issue 2183 by adding missing Join buttons on blurbs
Update packfire/application/pCommandParser.php
Fix more user serialization.
Profile: Added Calc, and all of my crazy katara paths.
gvim: Turn off bell.