summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #2317 from owncloud/create_version_on_uploadFrank Karlitschek2013-03-151-3/+10
|\
| * fix var nameBjörn Schießle2013-03-141-2/+2
| * fix var nameBjörn Schießle2013-03-141-1/+1
| * create new version if the same file is uploaded again over the web interfaceBjörn Schießle2013-03-141-3/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-151-0/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-132-1/+2
* Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-093-0/+33
|\
| * Merge in masterTom Needham2013-03-097-10/+23
| |\
| * \ Rebase to current masterTom Needham2013-03-0550-305/+416
| |\ \
| * | | Change capabilities exposure for files_versions since it extends filesTom Needham2013-02-101-3/+2
| * | | Remove debug call, correct app identifierTom Needham2013-02-101-1/+1
| * | | Fix api result merging.Tom Needham2013-02-093-5/+6
| * | | Merge in masterTom Needham2013-02-0917-22/+108
| |\ \ \
| * | | | Add capabilities exposure to the versioning appTom Needham2013-02-093-0/+32
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-091-1/+9
| |_|_|/ |/| | |
* | | | Merge pull request #2189 from owncloud/versioning_sync_clientBernhard Posselt2013-03-081-1/+9
|\ \ \ \
| * | | | remove some debug output; move code to the right functionBjörn Schießle2013-03-082-6/+8
| * | | | remove debug outputBjörn Schießle2013-03-081-2/+1
| * | | | distinguish between touch and writeBjörn Schießle2013-03-072-0/+7
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-081-1/+2
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-063-0/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-051-0/+1
* | | | Merge pull request #2030 from j-ed/masterBernhard Posselt2013-03-041-2/+2
|\ \ \ \
| * | | | Update app.phpj-ed2013-03-021-2/+2
* | | | | fix expire functionBjörn Schießle2013-03-041-5/+5
| |_|_|/ |/| | |
* | | | damn copy&paste, fix wrong var nameBjörn Schießle2013-03-041-1/+1
* | | | fix type in var nameBjörn Schießle2013-03-041-1/+1
* | | | fix quota calculation for trash and versionsBjörn Schießle2013-03-041-4/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-033-3/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-023-3/+11
* | | | Merge masterLukas Reschke2013-03-0120-24/+29
|\ \ \ \
| * | | | fix getVersions() call for the history viewBjörn Schießle2013-03-011-1/+2
| * | | | make sure that the version app always work on the users real home folder and ...Björn Schießle2013-03-011-7/+8
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0117-15/+18
| * | | | Fix window.location mistakes in previous codemaelzx2013-02-281-1/+1
* | | | | Merge masterLukas Reschke2013-02-2829-116/+29
|\| | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2829-116/+29
| |/ / /
* / / / [files_versions] From echo to pLukas Reschke2013-02-271-11/+11
|/ / /
* | | remove admin settings from app.phpBjörn Schießle2013-02-271-2/+0
* | | Merge branch 'master' into versions_cleanupBjörn Schießle2013-02-272-4/+3
|\ \ \
| * | | escape regular expressions; fix typo in variable nameBjörn Schießle2013-02-272-4/+3
* | | | rename History to VersionsBjörn Schießle2013-02-271-2/+2
* | | | remove admin settings for versionsBjörn Schießle2013-02-274-38/+0
|/ / /
* | | fix quota calculationBjörn Schießle2013-02-251-4/+6
* | | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-252-3/+3
|\ \ \
| * \ \ Merge pull request #1827 from owncloud/fix_getVersionsBernhard Posselt2013-02-252-3/+3
| |\ \ \
| | * | | fix getVersions(), we need to get the correct user and filenameBjörn Schießle2013-02-212-3/+3
* | | | | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-258-64/+81
|\| | | |
| * | | | Set required owncloud version to 4.93Robin Appelman2013-02-241-1/+1
| * | | | Whitespace fixesBart Visscher2013-02-224-48/+47