summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #2217 from owncloud/mountconfig-locationLukas Reschke2013-03-101-2/+4
|\ \ \ \ \
| * | | | | Store the global mount configuration file in the datadirRobin Appelman2013-03-101-2/+4
* | | | | | Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-099-1/+96
|\ \ \ \ \ \
| * \ \ \ \ \ Merge in masterTom Needham2013-03-0959-102/+343
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Rebase to current masterTom Needham2013-03-05413-3146/+30490
| |\ \ \ \ \ \ \
| * | | | | | | | Add further capabilities to /cloud/capabilitites api callTom Needham2013-02-106-1/+63
| * | | | | | | | 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-09200-841/+1475
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add capabilities exposure to the versioning appTom Needham2013-02-093-0/+32
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-107-21/+57
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0934-33/+89
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2165 from owncloud/fix_2155Lukas Reschke2013-03-081-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Offer download of whole shared dir only if it does not exceed zip input limitArthur Schiwon2013-03-071-1/+5
* | | | | | | | | 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-087-22/+90
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #2173 from owncloud/fix-shared-storageBernhard Posselt2013-03-072-11/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix fetching source path of shared filesMichael Gapczynski2013-03-072-11/+32
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2167 from owncloud/input-type-fixFrank Karlitschek2013-03-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | add type=text to ZIP size field, fix second part of #2097Jan-Christoph Borchardt2013-03-061-1/+1
* | | | | | | | | Merge pull request #2162 from owncloud/trash_bin_homeJan-Christoph Borchardt2013-03-072-1/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add dirlisting var to file listBjörn Schießle2013-03-071-0/+1
| * | | | | | | | | no dir parameter neededBjörn Schießle2013-03-071-1/+1
| * | | | | | | | | let the home icon link to the files view in the trash binBjörn Schießle2013-03-072-1/+22
* | | | | | | | | | remove debug outputBjörn Schießle2013-03-071-2/+1
* | | | | | | | | | json encode list of filesBjörn Schießle2013-03-072-3/+11
|/ / / / / / / / /
* | / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-03-078-2/+29
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2119 from owncloud/fix_ldap_settingsBernhard Posselt2013-03-062-12/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | LDAP: move more settings stuff to template fileArthur Schiwon2013-03-062-12/+15
| * | | | | | | | LDAP: fix settings output thus make settings work againArthur Schiwon2013-03-051-1/+1
* | | | | | | | | Merge pull request #2118 from owncloud/fix_1689Björn Schießle2013-03-062-3/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | whitespaceArthur Schiwon2013-03-051-1/+1
| * | | | | | | | LDAP: implementation of displayNamesInGroupArthur Schiwon2013-03-052-3/+30
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0615-4/+41
| |/ / / / / / / |/| | | | | | |
* | | | | | | | LDAP: escape some more chars for proper search filter, fixes #1673Arthur Schiwon2013-03-051-0/+3
|/ / / / / / /
* / / / / / / LDAP: error codes can be negative, tooArthur Schiwon2013-03-051-1/+1
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-057-1/+15
* | | | | | Merge pull request #2092 from owncloud/infieldlabels-placeholderLukas Reschke2013-03-041-2/+2
|\ \ \ \ \ \
| * | | | | | explicitly add empty placeholder to inputs which use infield labels, fix #2049Jan-Christoph Borchardt2013-03-041-2/+2
* | | | | | | Merge pull request #2090 from owncloud/fixing-2089-masterFrank Karlitschek2013-03-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fixes #2089Thomas Mueller2013-03-041-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #2030 from j-ed/masterBernhard Posselt2013-03-046-28/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update app.phpj-ed2013-03-021-1/+1
| * | | | | | Update app.phpj-ed2013-03-021-2/+2
| * | | | | | Update app.phpj-ed2013-03-021-2/+2
| * | | | | | Update app.phpj-ed2013-03-021-7/+7