Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use pre_unshare hook, otherwise the share is already removed. Which means ↵ | Björn Schießle | 2013-03-08 | 1 | -0/+1 |
| | | | | 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 | 10 | -26/+70 |
|\ | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php | ||||
| * | Merge pull request #2173 from owncloud/fix-shared-storage | Bernhard Posselt | 2013-03-07 | 3 | -4/+26 |
| |\ | | | | | | | Fix fetching source path of shared files | ||||
| | * | Fix fetching source path of shared files | Michael Gapczynski | 2013-03-07 | 3 | -4/+26 |
| | | | |||||
| * | | 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 | ||||
| * | | | create a meanigful file name if files are from the root folder | Björn Schießle | 2013-03-07 | 1 | -1/+7 |
| | | | | |||||
| * | | | json encode list of files | Björn Schießle | 2013-03-07 | 1 | -2/+3 |
| | |/ | |/| | |||||
| * | | return 403 when mkdir failed on webDAV, fixes #2127 | Arthur Schiwon | 2013-03-06 | 1 | -1/+3 |
| |/ | |||||
| * | Add warning about sanitization | Lukas Reschke | 2013-03-06 | 1 | -2/+3 |
| | | |||||
| * | Merge pull request #2120 from owncloud/clear-caches | Bernhard Posselt | 2013-03-06 | 1 | -0/+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 | 1 | -0/+4 |
| | | | |||||
| * | | Merge pull request #2118 from owncloud/fix_1689 | Björn Schießle | 2013-03-06 | 2 | -1/+9 |
| |\ \ | | |/ | |/| | properly implement displayNamesInGroup in Core and LDAP, fixes #1689 | ||||
| | * | make getDisplayNames optional feature for Group Backends, fall back to ↵ | Arthur Schiwon | 2013-03-05 | 2 | -1/+9 |
| | | | | | | | | | | | | internal names | ||||
* | | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-05 | 36 | -61/+150 |
|\| | | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php | ||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-06 | 4 | -1/+4 |
| |/ | |||||
| * | ownCloud 5 RC2v5.0.0RC2 | Frank Karlitschek | 2013-03-02 | 1 | -2/+2 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-05 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #2096 from owncloud/cache-upgrade-id | Michael Gapczynski | 2013-03-04 | 1 | -4/+5 |
| |\ | | | | | | | Cache: also check if the file id is already in the cache during upgrade | ||||
| | * | Cache: more efficient detection for existing entries during upgrade | Robin Appelman | 2013-03-04 | 1 | -9/+3 |
| | | | |||||
| | * | Cache: also check if the file id is already in the cache during upgrade | Robin Appelman | 2013-03-04 | 1 | -3/+10 |
| | | | | | | | | | | | | Should solve upgrade issues if only some of the configured storages were migrated previously | ||||
| * | | Merge pull request #2088 from owncloud/fixing-1844-again-master | Bernhard Posselt | 2013-03-04 | 2 | -2/+10 |
| |\ \ | | | | | | | | | adding test case for getDefaultEmailAddress() + fixing #1844 again | ||||
| | * | | adding test case for getDefaultEmailAddress() + fixing #1844 again | Thomas Mueller | 2013-03-04 | 2 | -2/+10 |
| | | | | |||||
| * | | | Merge pull request #2078 from owncloud/save_category_relations | Thomas Müller | 2013-03-04 | 1 | -5/+4 |
| |\ \ \ | | | | | | | | | | | VCategories: Don't forget to save category relations if category exists. | ||||
| | * | | | VCategories: Don't forget to save category relations if category exists. | Thomas Tanghus | 2013-03-04 | 1 | -5/+4 |
| | | | | | |||||
| * | | | | Only send the standard headers | Lukas Reschke | 2013-03-04 | 1 | -1/+0 |
| | |/ / | |/| | | | | | | Fixes https://github.com/owncloud/apps/issues/675 | ||||
| * | | | Fix #2074 by initializing as an array | Michael Gapczynski | 2013-03-04 | 2 | -7/+7 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-04 | 1 | -0/+12 |
| | | | |||||
| * | | Disable loading of backgroundjobs js when upgrade is needed | Bart Visscher | 2013-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Check maintenance mode before loading apps in route matcher | Bart Visscher | 2013-03-03 | 1 | -1/+3 |
| | | | |||||
| * | | Chunk size comment should say kB, not MB | Michael Gapczynski | 2013-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-03 | 3 | -0/+3 |
| | | | |||||
| * | | Merge pull request #2036 from owncloud/escape-only-in-template | Frank Karlitschek | 2013-03-02 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Escape the data only in the template | ||||
| | * | | Escape the data only in the template | Lukas Reschke | 2013-03-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Avoid to display empty DisplayNames for menu and title | Brice Maron | 2013-03-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #2026 from j-ed/master | Lukas Reschke | 2013-03-02 | 1 | -2/+9 |
| |\ \ \ | | | | | | | | | | | do not try to extract image infos from 0- or better less than 12-byte length files. | ||||
| | * | | | Update image.php | j-ed | 2013-03-02 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at `http://php.net/manual/de/function.exif-imagetype.php`. | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-02 | 3 | -0/+6 |
| | |/ / | |/| | | |||||
| * | | | Merge master | Lukas Reschke | 2013-03-01 | 12 | -14/+55 |
| |\ \ \ | |||||
| | * | | | validate the generated email address and fall back to localhost.localdomain ↵ | Thomas Mueller | 2013-03-01 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case it is not valid fixes #1844 | ||||
| | * | | | for this self test we don't care if the ssl certificate is self signed and ↵ | Thomas Mueller | 2013-03-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | the peer cannot be verified. | ||||
| | * | | | Merge pull request #2008 from owncloud/1999-requesttoken | Frank Karlitschek | 2013-03-01 | 1 | -3/+7 |
| | |\ \ \ | | | | | | | | | | | | | Check if requesttoken exists in session | ||||
| | | * | | | Check if requesttoken exists in session | Lukas Reschke | 2013-03-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Ref #1999 | ||||
| | | * | | | Style fixes | Lukas Reschke | 2013-03-01 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | 5.0 RC 1v5.0.0RC1 | Frank Karlitschek | 2013-03-01 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-01 | 9 | -3/+12 |
| | | |_|/ | | |/| | | |||||
| | * | | | Merge pull request #1937 from owncloud/check-resharing | Bart Visscher | 2013-02-28 | 1 | -2/+24 |
| | |\ \ \ | | | |/ / | | |/| | | Check resharing setting | ||||
| | | * | | Check resharing setting | Michael Gapczynski | 2013-02-26 | 1 | -2/+24 |
| | | | | | |||||
| * | | | | Merge master | Lukas Reschke | 2013-02-28 | 7 | -12/+32 |
| |\| | | | |||||
| | * | | | Merge pull request #1988 from owncloud/permissionscache_clean | icewind1991 | 2013-02-28 | 2 | -10/+18 |
| | |\ \ \ | | | | | | | | | | | | | Clean permissions cache when deleting file |