Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use pre_unshare hook, otherwise the share is already removed. Which means tha... | Björn Schießle | 2013-03-08 | 1 | -1/+1 |
* | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-07 | 19 | -32/+140 |
|\ | |||||
| * | Merge pull request #2173 from owncloud/fix-shared-storage | Bernhard Posselt | 2013-03-07 | 2 | -11/+32 |
| |\ | |||||
| | * | Fix fetching source path of shared files | Michael Gapczynski | 2013-03-07 | 2 | -11/+32 |
| * | | Merge pull request #2167 from owncloud/input-type-fix | Frank Karlitschek | 2013-03-07 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | add type=text to ZIP size field, fix second part of #2097 | Jan-Christoph Borchardt | 2013-03-06 | 1 | -1/+1 |
| * | | | Merge pull request #2162 from owncloud/trash_bin_home | Jan-Christoph Borchardt | 2013-03-07 | 2 | -1/+23 |
| |\ \ \ | |||||
| | * | | | add dirlisting var to file list | Björn Schießle | 2013-03-07 | 1 | -0/+1 |
| | * | | | no dir parameter needed | Björn Schießle | 2013-03-07 | 1 | -1/+1 |
| | * | | | let the home icon link to the files view in the trash bin | Björn Schießle | 2013-03-07 | 2 | -1/+22 |
| * | | | | remove debug output | Björn Schießle | 2013-03-07 | 1 | -2/+1 |
| * | | | | json encode list of files | Björn Schießle | 2013-03-07 | 2 | -3/+11 |
| |/ / / | |||||
| * | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-07 | 8 | -2/+29 |
| | |/ | |/| | |||||
| * | | Merge pull request #2119 from owncloud/fix_ldap_settings | Bernhard Posselt | 2013-03-06 | 2 | -12/+15 |
| |\ \ | |||||
| | * | | LDAP: move more settings stuff to template file | Arthur Schiwon | 2013-03-06 | 2 | -12/+15 |
| | * | | LDAP: fix settings output thus make settings work again | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 |
| * | | | Merge pull request #2118 from owncloud/fix_1689 | Björn Schießle | 2013-03-06 | 2 | -3/+30 |
| |\ \ \ | |||||
| | * | | | whitespace | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 |
| | * | | | LDAP: implementation of displayNamesInGroup | Arthur Schiwon | 2013-03-05 | 2 | -3/+30 |
* | | | | | itemSource parameter should be fileSource | Michael Gapczynski | 2013-03-07 | 1 | -2/+2 |
* | | | | | Update Shared folders ETags of users with reshares | Michael Gapczynski | 2013-03-06 | 1 | -5/+11 |
* | | | | | Move hook connectors from shared storage to app.php, add post_unshare hook | Michael Gapczynski | 2013-03-05 | 2 | -4/+5 |
* | | | | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-05 | 172 | -522/+696 |
|\| | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-06 | 15 | -4/+41 |
| | |/ / | |/| | | |||||
| * | | | LDAP: escape some more chars for proper search filter, fixes #1673 | Arthur Schiwon | 2013-03-05 | 1 | -0/+3 |
| |/ / | |||||
| * / | LDAP: error codes can be negative, too | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-05 | 7 | -1/+15 |
| * | Merge pull request #2092 from owncloud/infieldlabels-placeholder | Lukas Reschke | 2013-03-04 | 1 | -2/+2 |
| |\ | |||||
| | * | explicitly add empty placeholder to inputs which use infield labels, fix #2049 | Jan-Christoph Borchardt | 2013-03-04 | 1 | -2/+2 |
| * | | Merge pull request #2090 from owncloud/fixing-2089-master | Frank Karlitschek | 2013-03-04 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | fixes #2089 | Thomas Mueller | 2013-03-04 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #2030 from j-ed/master | Bernhard Posselt | 2013-03-04 | 6 | -28/+28 |
| |\ \ | | |/ | |/| | |||||
| | * | Update app.php | j-ed | 2013-03-02 | 1 | -1/+1 |
| | * | Update app.php | j-ed | 2013-03-02 | 1 | -2/+2 |
| | * | Update app.php | j-ed | 2013-03-02 | 1 | -2/+2 |
| | * | Update app.php | j-ed | 2013-03-02 | 1 | -7/+7 |
| | * | Update app.php | j-ed | 2013-03-02 | 1 | -6/+6 |
| | * | Update app.php | j-ed | 2013-03-02 | 1 | -10/+10 |
| * | | Merge pull request #2082 from owncloud/fix-permissions-class | Bernhard Posselt | 2013-03-04 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Change remove() $user parameter to optional | Michael Gapczynski | 2013-03-04 | 1 | -1/+1 |
| * | | | Merge pull request #2079 from owncloud/fix_expire_function | Bernhard Posselt | 2013-03-04 | 1 | -5/+5 |
| |\ \ \ | |||||
| | * | | | fix expire function | Björn Schießle | 2013-03-04 | 1 | -5/+5 |
| | |/ / | |||||
| * | | | Corrects Files Layout in Trashbin | raghunayyar | 2013-03-04 | 1 | -1/+1 |
| * | | | fix files table CSS specificity issue causing multiselect bar overlap, fix #2075 | Jan-Christoph Borchardt | 2013-03-04 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2073 from owncloud/trashbin_userHome | blizzz | 2013-03-04 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | make trashbin work with different user homes | Björn Schießle | 2013-03-04 | 1 | -4/+4 |
| * | | | damn copy&paste, fix wrong var name | Björn Schießle | 2013-03-04 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2069 from owncloud/fix_sanitize_call | Lukas Reschke | 2013-03-04 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | fix p() call | Björn Schießle | 2013-03-04 | 1 | -1/+1 |
| | * | | use p() for the output and not for the comparison | Björn Schießle | 2013-03-04 | 1 | -1/+1 |