summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix layout of success message and textMorris Jobke2016-09-072-2/+2
|
* Merge pull request #1289 from ↵Roeland Jago Douma2016-09-073-4/+6
|\ | | | | | | | | nextcloud/backport-1284-allow-status.php-before-install-9 [stable9] Allow to call status.php before the instance is installed
| * Also fix "occ status"Joas Schilling2016-09-061-2/+4
| |
| * Don't throw 500 when not installedJoas Schilling2016-09-061-1/+1
| |
| * Allow to call status.php before the instance is installedJoas Schilling2016-09-061-1/+1
| |
* | Merge pull request #1295 from nextcloud/stable9-backport-1292Morris Jobke2016-09-071-0/+4
|\ \ | |/ |/| [stable9] Add icon for the theming app
| * Add icon for the theming appFelix Epp2016-09-071-0/+4
| |
* | Merge pull request #1281 from ↵Roeland Jago Douma2016-09-064-0/+226
|\ \ | |/ |/| | | | | nextcloud/backport-1272-theming-info-capabilities-9 [stable9] Add theming information to capabilities for the client
| * Fix for Nextcloud9Joas Schilling2016-09-063-18/+9
| |
| * No background and logo in 10Joas Schilling2016-09-062-37/+5
| |
| * php 5.4 and 5.5 compatibilityJoas Schilling2016-09-063-33/+14
| |
| * Add image URLs and testsJoas Schilling2016-09-063-1/+225
| |
| * Add theming information to capabilities for the clientJoas Schilling2016-09-062-0/+62
|/
* Merge pull request #1232 from ↵Roeland Jago Douma2016-09-013-2/+11
|\ | | | | | | | | nextcloud/backport-1224-do-not-allow-linebreak-in-paths-9 [stable9] Do not allow linebreaks and null bytes in paths
| * Add PhantomJS to gitignoreJoas Schilling2016-09-011-0/+1
| |
| * Also prevent null byte characterJoas Schilling2016-09-012-1/+3
| |
| * Filter out %0A from pathsJoas Schilling2016-09-012-2/+8
|/
* Merge pull request #1182 from nextcloud/backport-870-oracle-support-9Joas Schilling2016-08-311-1/+1
|\ | | | | [stable9] Fix oracle support of external storage app
| * Fix oracle support of external storage appJoas Schilling2016-08-301-1/+1
| |
* | Merge pull request #1208 from ↵Roeland Jago Douma2016-08-312-2/+107
|\ \ | |/ |/| | | | | nextcloud/backport-1190-addressbook-correctly-handle-multi-values-9 [stable9] Correctly handle multi-values when converting VCards to array
| * Add a unit test for all the magicJoas Schilling2016-08-311-1/+64
| |
| * Correctly handle multi-values when converting VCards to arrayJoas Schilling2016-08-311-1/+43
|/
* Merge pull request #1175 from nextcloud/backport-1128-stable9Roeland Jago Douma2016-08-307-119/+143
|\ | | | | [stable9] Users page lazy multiselect group dropdowns
| * Backport of Users page lazy multiselect group dropdowns #1128 to stable9Vincent Petry2016-08-297-119/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users page lazy multiselect group dropdowns Instead of pre-rendering all multiselects with lots of group entries, the current groups are now displayed as simple labels. Behind the labels there is a pencil icon like for other fields. When clicking the pencil icon, the dropdown will be spawned and will open itself. Upon closing of the dropdown, the label comes back with the updated selection and the dropdown is destroyed. Extra non-available groups also in list Fix group sorting in user list group selection
* | Merge pull request #1153 from nextcloud/stable9-fix-sharedstorage-hooksLukas Reschke2016-08-301-2/+2
|\ \ | | | | | | Fix paths returned by \OC\Files\Storage\Shared hooks (#25519)
| * | Fix paths returned by \OC\Files\Storage\Shared hooks (#25519)Vincent Petry2016-08-291-2/+2
| |/ | | | | Fixes #23620
* | Merge pull request #1155 from ↵blizzz2016-08-301-1/+4
|\ \ | | | | | | | | | | | | nextcloud/fix-server-side-share-expiration-setting-stable9 In cases where the server dictates the link share expiration the date…
| * | In cases where the server dictates the link share expiration the date is not ↵Thomas Müller2016-08-291-1/+4
| |/ | | | | | | updated on consequitive changes and enable/disable actions
* | Merge pull request #1141 from ↵blizzz2016-08-301-1/+1
|\ \ | | | | | | | | | | | | nextcloud/backport-1132-prevent-parse-error-on-editing-an-html-comment-9 [stable9] Prevent parse error on editing an HTML comment
| * | Prevent parse error on editing an HTML commentJoas Schilling2016-08-291-1/+1
| |/
* | Merge pull request #1152 from nextcloud/butonic-patch-2Roeland Jago Douma2016-08-291-1/+1
|\ \ | | | | | | [stable9] lastInsertId requires the prefix (#25786)
| * | [stable9] lastInsertId requires the prefix (#25786)Jörn Friedrich Dreyer2016-08-291-1/+1
| |/ | | | | backport of https://github.com/owncloud/core/pull/25764
* | Merge pull request #1149 from nextcloud/stable9-database-reconnectRoeland Jago Douma2016-08-291-1/+26
|\ \ | |/ |/| [9.0] Before a user is getting scanned the database connection is re-…
| * [9.0] Before a user is getting scanned the database connection is re-establishedThomas Müller2016-08-291-1/+26
|/
* Merge pull request #1004 from ↵Roeland Jago Douma2016-08-221-1/+3
|\ | | | | | | | | nextcloud/backport-978-add-feedback-for-password-change-9 [stable9] Add feedback for password change
| * 25532_issue_password_update_notification_updated (#25756)Jack Davis2016-08-221-1/+3
|/ | | | | | | | | | | * Password Update Notification Added an IF ELSE statement to ensure that feedback is provided to the user on successfully updating a user password in settings. * Password Update Success Message Updated the password update success message
* Merge pull request #962 from nextcloud/fix-caldavtester-stable9Lukas Reschke2016-08-192-12/+12
|\ | | | | [stable9] Move over to new CalDAVTester repo (#25859)
| * Move over to new CalDAVTester repo (#25859)Thomas Müller2016-08-192-12/+12
|/ | | | | | * Move over to new caldac tester repo * no run.py anymore
* Merge pull request #933 from nextcloud/backport-930-check-isset-require-9Morris Jobke2016-08-181-2/+2
|\ | | | | [stable9] Fix "Undefined index" when the values do not exist
| * Fix "Undefined index" when the values do not existJoas Schilling2016-08-181-2/+2
|/
* Merge pull request #911 from nextcloud/stable9_864Joas Schilling2016-08-181-6/+10
|\ | | | | [Stable9] Ensure the user exists before calling a method on it
| * Backport of #864Roeland Jago Douma2016-08-171-6/+10
|/ | | | | * 26342061b9b9767577a0f5eee16afd36e3b8b0b1 * 264aaf9ffaf71b2fc8a6bd2f5d5c9bf4a6d403de
* Merge pull request #901 from nextcloud/backport-890-quota-unlimited-via-api-9Marius Blüm2016-08-172-1/+2
|\ | | | | [stable9] Allow to retrieve the quota itself via the provisioning api
| * Allow to retrieve the quota itself via the provisioning apiJoas Schilling2016-08-172-1/+2
|/
* Merge pull request #888 from nextcloud/stable9_855Björn Schießle2016-08-162-0/+3
|\ | | | | [Stable9] Add files drop capability for clients
| * Add files drop capability for clientsRoeland Jago Douma2016-08-152-0/+3
|/
* Merge pull request #818 from nextcloud/jail-root-stable9Lukas Reschke2016-08-102-2/+16
|\ | | | | getJailedPath expects to have a trailing /
| * getJailedPath expects to have a trailing /Bjoern Schiessle2016-08-102-2/+16
| |
* | Merge pull request #826 from nextcloud/add-warning-for-php7.1-stable9Lukas Reschke2016-08-101-0/+8
|\ \ | |/ |/| [stable9] Nextcloud is not compatible with PHP 7.1
| * [stable9] Nextcloud is not compatible with PHP 7.1Lukas Reschke2016-08-101-0/+8
|/ | | | Make the code fail hard before people update and then experience some half-broken stuff. See also https://github.com/nextcloud/docker-ci/issues/10