Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix correctFolders and retrieve the correct storage cache | Michael Gapczynski | 2013-03-08 | 2 | -17/+17 |
| | |||||
* | not only files can be reshared but also folders | Björn Schießle | 2013-03-08 | 1 | -1/+1 |
| | |||||
* | Fix share hook for updater | Michael Gapczynski | 2013-03-08 | 1 | -2/+14 |
| | |||||
* | use pre_unshare hook, otherwise the share is already removed. Which means ↵ | Björn Schießle | 2013-03-08 | 2 | -1/+2 |
| | | | | that we have no chance to determine which folder has to be updated | ||||
* | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-07 | 61 | -456/+632 |
|\ | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php | ||||
| * | fixed header content padding | Florian Hülsmann | 2013-03-07 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2173 from owncloud/fix-shared-storage | Bernhard Posselt | 2013-03-07 | 6 | -20/+63 |
| |\ | | | | | | | Fix fetching source path of shared files | ||||
| | * | Change findById to findByStorageId in mount test | Michael Gapczynski | 2013-03-07 | 1 | -1/+1 |
| | | | |||||
| | * | Fix fetching source path of shared files | Michael Gapczynski | 2013-03-07 | 6 | -19/+62 |
| | | | |||||
| * | | Merge pull request #2174 from owncloud/fix_printed_brs | blizzz | 2013-03-07 | 1 | -15/+15 |
| |\ \ | | | | | | | | | Remove <br> from error messages, because they will be escaped and the us... | ||||
| | * | | Remove <br> from error messages, because they will be escaped and the used ↵ | Arthur Schiwon | 2013-03-07 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | template has it's own <br> already | ||||
| * | | | Merge pull request #2167 from owncloud/input-type-fix | Frank Karlitschek | 2013-03-07 | 2 | -6/+15 |
| |\ \ \ | | | | | | | | | | | Input type fix | ||||
| | * | | | add type=text to ZIP size field, fix second part of #2097 | Jan-Christoph Borchardt | 2013-03-06 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | add email input type to styled inputs, fix #2097 | Jan-Christoph Borchardt | 2013-03-06 | 1 | -5/+14 |
| | | | | | |||||
| * | | | | Merge pull request #2162 from owncloud/trash_bin_home | Jan-Christoph Borchardt | 2013-03-07 | 2 | -1/+23 |
| |\ \ \ \ | | | | | | | | | | | | | let the home icon link to the files view in the trash bin | ||||
| | * | | | | 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 |
| | | | | | | |||||
| * | | | | | Merge pull request #2163 from owncloud/fix_file_download | Björn Schießle | 2013-03-07 | 3 | -6/+20 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | json encode list of files | ||||
| | * | | | | create a meanigful file name if files are from the root folder | Björn Schießle | 2013-03-07 | 1 | -1/+7 |
| | | | | | | |||||
| | * | | | | 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 | 3 | -5/+14 |
| |/ / / / | |||||
| * | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-07 | 35 | -383/+429 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #2134 from owncloud/fix_2127 | blizzz | 2013-03-06 | 1 | -1/+3 |
| |\ \ \ | | |_|/ | |/| | | return 403 when mkdir failed on webDAV, fixes #2127 | ||||
| | * | | return 403 when mkdir failed on webDAV, fixes #2127 | Arthur Schiwon | 2013-03-06 | 1 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #2130 from owncloud/fix_2128 | Thomas Müller | 2013-03-06 | 1 | -1/+1 |
| |\ \ | | | | | | | | | fix #2128 | ||||
| | * | | fix #2128 | Georg Ehrke | 2013-03-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2129 from owncloud/don't-sanitize-error-message | Bernhard Posselt | 2013-03-06 | 2 | -3/+4 |
| |\ \ \ | | |/ / | |/| | | Don't sanitize error message hint | ||||
| | * | | Add warning about sanitization | Lukas Reschke | 2013-03-06 | 1 | -2/+3 |
| | | | | |||||
| | * | | Don't sanitize error message hint | Lukas Reschke | 2013-03-06 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2120 from owncloud/clear-caches | Bernhard Posselt | 2013-03-06 | 2 | -4/+4 |
| |\ \ | | | | | | | | | Clear the CSS and JS cache earlier to make sure update goes smoothly | ||||
| | * | | Clear the CSS and JS cache earlier to make sure update goes smoothly | Michael Gapczynski | 2013-03-05 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge pull request #2119 from owncloud/fix_ldap_settings | Bernhard Posselt | 2013-03-06 | 2 | -12/+15 |
| |\ \ \ | | | | | | | | | | | LDAP: fix settings output thus make settings work again | ||||
| | * | | | 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 | 4 | -4/+39 |
| |\ \ \ \ | | |_|/ / | |/| | | | properly implement displayNamesInGroup in Core and LDAP, fixes #1689 | ||||
| | * | | | whitespace | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | LDAP: implementation of displayNamesInGroup | Arthur Schiwon | 2013-03-05 | 2 | -3/+30 |
| | | | | | |||||
| | * | | | make getDisplayNames optional feature for Group Backends, fall back to ↵ | Arthur Schiwon | 2013-03-05 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | internal names | ||||
* | | | | | 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 | 540 | -7851/+9785 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-06 | 61 | -238/+306 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #2112 from owncloud/fix_1673 | Frank Karlitschek | 2013-03-05 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | LDAP: escape some more chars for proper search filter, fixes #1673 | ||||
| | * | | | LDAP: escape some more chars for proper search filter, fixes #1673 | Arthur Schiwon | 2013-03-05 | 1 | -0/+3 |
| | |/ / | |||||
| * | / | Merge pull request #2108 from owncloud/fix_ldap_errorcheck | Björn Schießle | 2013-03-05 | 1 | -1/+1 |
| |\| | | | |/ | |/| | LDAP: error codes can be negative, too | ||||
| | * | LDAP: error codes can be negative, too | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 |
| |/ | |||||
| * | ownCloud 5 RC2v5.0.0RC2 | Frank Karlitschek | 2013-03-02 | 1 | -2/+2 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-05 | 33 | -100/+161 |
| | |