Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15153 from owncloud/uniquename-node | Lukas Reschke | 2015-03-24 | 3 | -0/+57 |
|\ | |||||
| * | Add `getNonExistingName()` to the node api | Robin Appelman | 2015-03-24 | 3 | -0/+57 |
* | | Merge pull request #15112 from owncloud/security-warning-section | Morris Jobke | 2015-03-24 | 3 | -97/+39 |
|\ \ | |||||
| * | | consolidate all admin warnings and notices into one section | Jan-Christoph Borchardt | 2015-03-24 | 3 | -97/+39 |
* | | | Merge pull request #15156 from owncloud/file-summary-align | Morris Jobke | 2015-03-24 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | correctly align file list summary when the list has the favorite feature | Jan-Christoph Borchardt | 2015-03-24 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #15048 from owncloud/avatar-crop-square | Morris Jobke | 2015-03-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | round width and height when cropping avatar | Robin Appelman | 2015-03-20 | 1 | -1/+1 |
* | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share | Morris Jobke | 2015-03-24 | 4 | -26/+209 |
|\ \ \ | |||||
| * | | | Add a unit test for the naming conflict on the mountpoint name | Joas Schilling | 2015-03-17 | 2 | -6/+155 |
| * | | | Use insertIfNotExists() instead of manual logic | Joas Schilling | 2015-03-17 | 1 | -24/+31 |
| * | | | Correctly get the unique mountpoint name when mounting the share | Joas Schilling | 2015-03-17 | 3 | -10/+37 |
* | | | | Merge pull request #15151 from owncloud/use-local-time | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Don't use hardcoded date and time | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
* | | | | | Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption | Vincent Petry | 2015-03-24 | 1 | -14/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove range header exception for encryption | jknockaert | 2015-03-24 | 1 | -14/+0 |
* | | | | | | Merge pull request #15127 from owncloud/admin-tips-jenkins | Morris Jobke | 2015-03-24 | 2 | -2/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | Vincent Petry | 2015-03-23 | 2 | -1/+15 |
| |/ / / / / / | |||||
* | | | | | | | 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 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
* | | | | | | | | 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 | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | 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 | Joas Schilling | 2015-03-23 | 2 | -16/+14 |
* | | | | | | | | | Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list | Morris Jobke | 2015-03-24 | 7 | -37/+34 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | 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 #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 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | [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 |
* | | | | | | | Merge pull request #15121 from owncloud/email-sent-unbold | Morris Jobke | 2015-03-23 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 - 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 | 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 | Morris Jobke | 2015-02-06 | 1 | -0/+9 |
* | | | | | | | | Merge pull request #14862 from owncloud/introduce-shipped.json-master | Morris Jobke | 2015-03-23 | 3 | -6/+68 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | adding enterprise apps to shipped.json | Thomas Müller | 2015-03-23 | 1 | -11/+20 |