summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
Commit message (Expand)AuthorAgeFilesLines
* Replace OC_FileCache usage in files_versionsBart Visscher2013-02-061-1/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-051-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-042-1/+5
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-021-0/+5
* fix merge conflictBjörn Schießle2013-01-313-86/+86
|\
| * fix files_version hooksRobin Appelman2013-01-281-17/+17
| * change required ownCloud version to 4.91Robin Appelman2013-01-281-1/+1
| * Merge branch 'master' into filesystemRobin Appelman2013-01-281-0/+5
| |\
| * \ merge master into filesystemRobin Appelman2013-01-163-7/+9
| |\ \
| * \ \ merge master into filesystemRobin Appelman2013-01-1556-392/+300
| |\ \ \
| * \ \ \ merge master into filesystemRobin Appelman2013-01-034-0/+27
| |\ \ \ \
| * \ \ \ \ merge master into filesystemRobin Appelman2012-12-254-5/+19
| |\ \ \ \ \
| * \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-152-3/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-12-111-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-022-4/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-301-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-214-6/+23
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix incorectly merged versions.phpRobin Appelman2012-11-161-1/+1
| * | | | | | | | | | | | merge master into filesystemRobin Appelman2012-11-071-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-044-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-11-011-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-10-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-233-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-10-212-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-10-203-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-175-13/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-132-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-114-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | don't use depricated OC_FilesystemRobin Appelman2012-10-102-10/+10
* | | | | | | | | | | | | | | | | | | | | | | | fix merge conflictsBjörn Schießle2013-01-281-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-271-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | listen to post delete event to allow the trash bin to create a copy of the ve...Björn Schießle2013-01-221-1/+1
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Spaces to tabsBart Visscher2013-01-161-4/+4
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1192 from schiesbn/versioning_history_issue_1189Björn Schießle2013-01-161-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | initialize $versionCreatedBjörn Schießle2013-01-161-1/+2
| * | | | | | | | | | | | | | | | | | | | | | fix for issue #1186, missing variables addedBjörn Schießle2013-01-151-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-masterBart Visscher2013-01-151-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-1411-258/+304
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | remove silly assignmentThomas Mueller2013-01-061-1/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1547-138/+0
| |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-01-142-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-111-1/+6
| * | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-101-0/+6
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | merge conflict fixed, settings-personal.php is no longer neededBjörn Schießle2013-01-149-257/+292
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | - code clean-upBjörn Schießle2013-01-111-64/+58
| * | | | | | | | | | | | | | | | | | | | function description fixedBjörn Schießle2013-01-111-5/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 19:25:12 +0000