summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-034-0/+27
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-031-0/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-312-0/+16
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-281-0/+8
* | merge master into filesystemRobin Appelman2012-12-254-5/+19
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-231-0/+8
| * Merge pull request #913 from owncloud/fix_settingsFrank Karlitschek2012-12-181-4/+2
| |\
| | * cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-151-4/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-181-0/+8
| * | Change post_write hook to write to prevent creating a duplicate of the origin...Michael Gapczynski2012-12-161-1/+1
| |/
* | merge master into filesystemRobin Appelman2012-12-152-3/+5
|\|
| * Fix some of "Closing brace must be on a line by itself"Bart Visscher2012-12-151-1/+3
| * Fix "Line indented incorrectly"Bart Visscher2012-12-151-2/+2
* | Merge branch 'master' into filesystemRobin Appelman2012-12-111-4/+4
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-101-4/+4
| * fix typo in variable nameBjörn Schießle2012-12-021-1/+1
| * fix regression in file versioning for shared filesBjörn Schießle2012-12-021-6/+6
* | merge master into filesystemRobin Appelman2012-12-022-4/+7
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-021-1/+4
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-301-3/+3
* | merge master into filesystemRobin Appelman2012-11-301-0/+7
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-291-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-281-0/+6
* | merge master into filesystemRobin Appelman2012-11-214-6/+23
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-213-6/+15
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-201-0/+8
* | merge master into filesystemRobin Appelman2012-11-181-1/+1
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-171-1/+1
* | fix incorectly merged versions.phpRobin Appelman2012-11-161-1/+1
* | merge master into filesystemRobin Appelman2012-11-071-9/+9
|\|
| * Checkstyle: Fix the last two InvalidEOLCharFelix Moeller2012-11-041-277/+277
* | merge master into filesystemRobin Appelman2012-11-044-4/+4
|\|
| * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-044-4/+4
| * Checkstyle: many fixesFelix Moeller2012-11-022-5/+5
* | Merge branch 'master' into filesystemRobin Appelman2012-11-011-1/+5
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-311-1/+5
* | Merge branch 'master' into filesystemRobin Appelman2012-10-281-1/+1
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-281-1/+1
| * remove remaining line from merge conflictBjörn Schießle2012-10-271-2/+1
| * fix broken paths in versions appBjörn Schießle2012-10-271-280/+279
| * don't call $('#found_versions').chosen(); after opening the history drop-down...Björn Schießle2012-10-271-1/+0
* | fix broken paths in versions appBjörn Schießle2012-10-271-22/+19
* | don't call $('#found_versions').chosen(); after opening the history drop-down...Björn Schießle2012-10-271-1/+0
* | merge master into filesystemRobin Appelman2012-10-252-3/+3
|\|
| * Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-232-3/+3
* | merge master into filesystemRobin Appelman2012-10-233-2/+15
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-233-2/+15
* | Merge branch 'master' into filesystemRobin Appelman2012-10-212-1/+12
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-212-1/+12
* | Merge branch 'master' into filesystemRobin Appelman2012-10-203-2/+13
|\|