Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Log forbidden in debug level | Vincent Petry | 2015-03-24 | 1 | -0/+3 |
| | |||||
* | Merge pull request #15151 from owncloud/use-local-time | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
|\ | | | | | Don't use hardcoded date and time | ||||
| * | Don't use hardcoded date and time | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
| | | | | | | Use local time instead. http://momentjs.com/ | ||||
* | | Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption | Vincent Petry | 2015-03-24 | 1 | -14/+0 |
|\ \ | | | | | | | Remove range header exception for encryption | ||||
| * | | Remove range header exception for encryption | jknockaert | 2015-03-24 | 1 | -14/+0 |
| | | | | | | | | | | | | revert #10422 | ||||
* | | | Merge pull request #15127 from owncloud/admin-tips-jenkins | Morris Jobke | 2015-03-24 | 2 | -2/+21 |
|\ \ \ | | | | | | | | | add Tips & tricks section to admin settings | ||||
| * | | | add Tips & tricks section to admin settings | Jan-Christoph Borchardt | 2015-03-23 | 2 | -2/+21 |
| | | | | |||||
* | | | | Merge pull request #15126 from owncloud/sabre-storagenotavailable | Morris Jobke | 2015-03-24 | 2 | -1/+15 |
|\ \ \ \ | | | | | | | | | | | Soft fail in CustomPropertiesBackend whenever storage not available | ||||
| * | | | | Soft fail in CustomPropertiesBackend whenever storage not available | Vincent Petry | 2015-03-23 | 2 | -1/+15 |
| |/ / / | | | | | | | | | | | | | | | | | When a storage is not available, it will not fail the whole call any more but still return a usable file list. | ||||
* | | | | Merge pull request #15149 from owncloud/fix-enable-for-group | Joas Schilling | 2015-03-24 | 2 | -2/+10 |
|\ \ \ \ | |_|_|/ |/| | | | Correctly get array of groups and send OCP\IGroup objects to enable meth... | ||||
| * | | | Correctly get array of groups and send OCP\IGroup objects to enable method | Joas Schilling | 2015-03-24 | 2 | -2/+10 |
| | | | | |||||
* | | | | Merge pull request #15145 from owncloud/fix-15097-master | Vincent Petry | 2015-03-24 | 5 | -23/+130 |
|\ \ \ \ | | | | | | | | | | | Properly catch whether a share is `null` | ||||
| * | | | | when the path doesnt exist show a proper error page | Robin Appelman | 2015-03-24 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Properly catch whether a share is `null` | Lukas Reschke | 2015-03-24 | 5 | -23/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory. To test this perform the following steps: * Share file in owncloud 7 (7.0.4.2) * Delete the parent folder of the shared file * The share stays is in the DB and the share via the sharelink is inaccessible. (which is good) * Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones) * Optional Step: Logout, Reset Browser Session, etc. * Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL. * Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file) * No exception is thrown and no error is logged. This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8. Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so. Fixes https://github.com/owncloud/core/issues/15097 | ||||
* | | | | | Merge pull request #15143 from owncloud/24h-time-format | Jan-Christoph Borchardt | 2015-03-24 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use 24h format instead of 12h format | ||||
| * | | | | | Use 24h format instead of 12h format | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | Use correct time format in WebUI | ||||
* | | | | | Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list | Vincent Petry | 2015-03-24 | 2 | -16/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not walk over the users directory, but over the list of tagged objects | ||||
| * | | | | | Do not walk over the users directory, but over the list of tagged objects | Joas Schilling | 2015-03-23 | 2 | -16/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Way quicker | ||||
* | | | | | | Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list | Morris Jobke | 2015-03-24 | 7 | -37/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Issue/15138 feedback for empty apps list | ||||
| * | | | | | | Use the same style when no search result was found | Joas Schilling | 2015-03-24 | 2 | -6/+11 |
| | | | | | | | |||||
| * | | | | | | Do not duplicate the empty content css | Joas Schilling | 2015-03-24 | 2 | -24/+1 |
| | | | | | | | |||||
| * | | | | | | Display a message when no apps can be found for this oc version | Joas Schilling | 2015-03-24 | 3 | -7/+22 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #15012 from Volker-E/master | Morris Jobke | 2015-03-24 | 11 | -53/+40 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | fixing #15011 by adding ARIA roles where distinct | ||||
| * | | | | | fixing #15023, getting comments out of HTML output | Volker E | 2015-03-21 | 3 | -6/+7 |
| | | | | | | |||||
| * | | | | | fixing #15027, cleaning up obsolete IE5-7 workaround code | Volker E | 2015-03-19 | 9 | -40/+26 |
| | | | | | | |||||
| * | | | | | fixing #15011 by adding ARIA roles where distinct | Volker E | 2015-03-18 | 2 | -7/+7 |
| | | | | | | |||||
* | | | | | | Revert "Change to 24H format instead of 12H format" | Vincent Petry | 2015-03-24 | 1 | -1/+1 |
| |/ / / / |/| | | | | | | | | | | | | | | This reverts commit 8279dde97a8f93b74eb733d243d6a5bb41aa15e3. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-24 | 130 | -278/+164 |
| | | | | | |||||
* | | | | | Change to 24H format instead of 12H format | Daniel Hansson | 2015-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Update how the time shows in WebUI. My first PR to core, woha. :) | ||||
* | | | | | Merge pull request #15121 from owncloud/email-sent-unbold | Morris Jobke | 2015-03-23 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | unbold share email sent notification | ||||
| * | | | | | unbold share email sent notification | Jan-Christoph Borchardt | 2015-03-23 | 1 | -4/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #15075 from owncloud/fix-15056-master | Thomas Müller | 2015-03-23 | 1 | -1/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | remove unneeded status element from json response on /categories | ||||
| * | | | | | remove unneeded status element from json response on /categories - fixes 15056 | Thomas Müller | 2015-03-23 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #15123 from owncloud/fix_14098 | blizzz | 2015-03-23 | 2 | -1/+15 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | offset needs to be considered in computed limit | ||||
| * | | | | | offset needs to be considered in computed limit | Arthur Schiwon | 2015-03-23 | 2 | -1/+15 |
| |/ / / / | |||||
* | | | | | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox | Lukas Reschke | 2015-03-23 | 1 | -0/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Show message if upload of folder isn't allowed | ||||
| * | | | | | Show message if upload of folder isn't allowed | Morris Jobke | 2015-02-06 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * current firefox doesn't throw an exception anymore * it just reads 0 bytes -> folder or empty file * upload of folder or empty file isn't supported in every browser except Chrome * fixes #13940 | ||||
* | | | | | | Merge pull request #14862 from owncloud/introduce-shipped.json-master | Morris Jobke | 2015-03-23 | 3 | -6/+68 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | shipped apps are now defined in core/shipped.json - the shipped tag in i... | ||||
| * | | | | | | adding enterprise apps to shipped.json | Thomas Müller | 2015-03-23 | 1 | -11/+20 |
| | | | | | | | |||||
| * | | | | | | Update shipped.json | Thomas Müller | 2015-03-16 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Add spaces | Morris Jobke | 2015-03-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | [WIP] upgrade app store apps during console upgrade | Thomas Müller | 2015-03-13 | 1 | -1/+21 |
| | | | | | | | |||||
| * | | | | | | shipped apps are now defined in core/shipped.json - the shipped tag in ↵ | Thomas Müller | 2015-03-13 | 2 | -5/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | info.xml is ignored from now on - never trust an app :speak_no_evil: | ||||
* | | | | | | | Merge pull request #15114 from owncloud/sharing-labels | Jan-Christoph Borchardt | 2015-03-23 | 2 | -6/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | combine labels with inputs in sharing dialog, fix #14796 | ||||
| * | | | | | | | combine labels with inputs in sharing dialog, fix #14796 | Jan-Christoph Borchardt | 2015-03-23 | 2 | -6/+5 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #15120 from owncloud/ldap-occ-fix-warnings | Morris Jobke | 2015-03-23 | 4 | -10/+37 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix PHP warnings when using occ with some LDAP commands | ||||
| * | | | | | | | fix PHP warnings when using occ with some LDAP commands | Arthur Schiwon | 2015-03-23 | 4 | -10/+37 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #15118 from owncloud/user-mgmt-groups | Jan-Christoph Borchardt | 2015-03-23 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | fix long group names overlapping in the sidebar, fix #12649 | ||||
| * | | | | | | fix long group names overlapping in the sidebar, fix #12649 | Jan-Christoph Borchardt | 2015-03-23 | 1 | -0/+10 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #14383 from jknockaert/newbranch | Clark Tomlinson | 2015-03-23 | 1 | -130/+160 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make encryption stream wrapper seekable |