summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* use pre_unshare hook, otherwise the share is already removed. Which means tha...Björn Schießle2013-03-081-1/+1
* Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0719-32/+140
|\
| * 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
* | | | | itemSource parameter should be fileSourceMichael Gapczynski2013-03-071-2/+2
* | | | | Update Shared folders ETags of users with resharesMichael Gapczynski2013-03-061-5/+11
* | | | | Move hook connectors from shared storage to app.php, add post_unshare hookMichael Gapczynski2013-03-052-4/+5
* | | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-05172-522/+696
|\| | | |
| * | | | [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
| | * Update app.phpj-ed2013-03-021-6/+6
| | * Update app.phpj-ed2013-03-021-10/+10
| * | Merge pull request #2082 from owncloud/fix-permissions-classBernhard Posselt2013-03-041-1/+1
| |\ \
| | * | Change remove() $user parameter to optionalMichael Gapczynski2013-03-041-1/+1
| * | | Merge pull request #2079 from owncloud/fix_expire_functionBernhard Posselt2013-03-041-5/+5
| |\ \ \
| | * | | fix expire functionBjörn Schießle2013-03-041-5/+5
| | |/ /
| * | | Corrects Files Layout in Trashbinraghunayyar2013-03-041-1/+1
| * | | fix files table CSS specificity issue causing multiselect bar overlap, fix #2075Jan-Christoph Borchardt2013-03-041-1/+1
| |/ /
| * | Merge pull request #2073 from owncloud/trashbin_userHomeblizzz2013-03-041-4/+4
| |\ \
| | * | make trashbin work with different user homesBjörn Schießle2013-03-041-4/+4
| * | | damn copy&paste, fix wrong var nameBjörn Schießle2013-03-041-1/+1
| |/ /
| * | Merge pull request #2069 from owncloud/fix_sanitize_callLukas Reschke2013-03-042-2/+2
| |\ \
| | * | fix p() callBjörn Schießle2013-03-041-1/+1
| | * | use p() for the output and not for the comparisonBjörn Schießle2013-03-041-1/+1