Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #807 from nextcloud/ocs_dataresponse | Roeland Jago Douma | 2016-08-10 | 6 | -122/+67 |
|\ | | | | | OCSController requires DataResponse | ||||
| * | Fix Core's OCSController response | Roeland Jago Douma | 2016-08-10 | 1 | -2/+2 |
| | | |||||
| * | Move the Share20OCS code over to use the proper DataResponse | Roeland Jago Douma | 2016-08-10 | 3 | -57/+56 |
| | | |||||
| * | OCSController requires DataResponse | Roeland Jago Douma | 2016-08-10 | 2 | -63/+9 |
| | | | | | | | | | | | | The OCS Controller requires a DataResponse object to be returned. This means that all error handling will have to be done via exceptions thrown and handling in the middleware. | ||||
* | | Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance | Lukas Reschke | 2016-08-10 | 2 | -5/+12 |
|\ \ | | | | | | | Store the shared propagator instance | ||||
| * | | Store the shared propagator instance | Vincent Petry | 2016-08-10 | 2 | -5/+12 |
| | | | | | | | | | | | | This instead of recreating it for every call. | ||||
* | | | Merge pull request #808 from ↵ | Lukas Reschke | 2016-08-10 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/skip_expiry_for_users_that_never_logged_in Skip version and trash expiry for users that never logged in | ||||
| * | | | Skip version and trash expiry for users that never logged in | Jörn Friedrich Dreyer | 2016-08-10 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #819 from nextcloud/theming-support-for-apps | Lukas Reschke | 2016-08-10 | 4 | -0/+126 |
|\ \ \ | | | | | | | | | Theming support for apps | ||||
| * | | | Theming: Add OCA.Theming Js for app interaction | Julius Haertl | 2016-08-10 | 4 | -0/+107 |
| | | | | |||||
| * | | | Add css classes to allow app developers using the theming colors | Julius Haertl | 2016-08-09 | 2 | -0/+19 |
| | | | | |||||
* | | | | Merge pull request #824 from nextcloud/add-warning-for-php7.1 | Lukas Reschke | 2016-08-10 | 1 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | Nextcloud is not compatible with PHP 7.1 | ||||
| * | | | | Nextcloud is not compatible with PHP 7.1 | Lukas Reschke | 2016-08-10 | 1 | -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 | ||||
* | | | | | Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id | Björn Schießle | 2016-08-10 | 4 | -5/+29 |
|\ \ \ \ \ | |/ / / / |/| | | | | get shared storage storage id without setting up the storage | ||||
| * | | | | get shared storage storage id without setting up the storage | Robin Appelman | 2016-08-09 | 4 | -5/+29 |
| | | | | | |||||
* | | | | | Merge pull request #814 from nextcloud/fix-undefined-offset-in-login-controller | Björn Schießle | 2016-08-10 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix undefined offset in login controller | ||||
| * | | | | Add missing array element - fixes #25714 | Thomas Müller | 2016-08-10 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #806 from nextcloud/token_polish | Roeland Jago Douma | 2016-08-10 | 3 | -3/+63 |
|\ \ \ \ | |/ / / |/| | | | Token polish | ||||
| * | | | add more margin to right of the icon | Morris Jobke | 2016-08-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add sliding animation | Roeland Jago Douma | 2016-08-10 | 1 | -2/+7 |
| | | | | |||||
| * | | | Add clipboardjs for token | Roeland Jago Douma | 2016-08-10 | 3 | -0/+42 |
| | | | | |||||
| * | | | Always show delete icon for new tokens | Roeland Jago Douma | 2016-08-10 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | * Always show delete icon * Hide form if the new icon is deleted | ||||
| * | | | Add note password is only shown once | Roeland Jago Douma | 2016-08-10 | 1 | -1/+4 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-10 | 64 | -56/+182 |
| | | | |||||
* | | | Merge pull request #777 from nextcloud/ocs_capabilities | Morris Jobke | 2016-08-10 | 7 | -98/+100 |
|\ \ \ | | | | | | | | | Move /cloud/capabilities and /cloud/user to Core | ||||
| * | | | Remove OC_OCS_Cloud and OC\OCS\Cloud | Roeland Jago Douma | 2016-08-09 | 2 | -67/+0 |
| | | | | |||||
| * | | | Move /cloud/user to Core app | Roeland Jago Douma | 2016-08-09 | 3 | -9/+23 |
| | | | | |||||
| * | | | Move getCapabilities over to Core | Roeland Jago Douma | 2016-08-09 | 5 | -25/+31 |
| | | | | |||||
| * | | | Allow OCS routes in Core and Settings | Roeland Jago Douma | 2016-08-09 | 2 | -0/+49 |
| | |/ | |/| | |||||
* | | | Merge pull request #677 from nextcloud/app-menu-fix | Lukas Reschke | 2016-08-10 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Fix closing app menu on mobile | ||||
| * | | | Fix closing app menu on mobile | Julius Haertl | 2016-07-31 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #529 from nextcloud/vendor-maintenance-downgrade | Lukas Reschke | 2016-08-10 | 4 | -3/+43 |
|\ \ \ \ | | | | | | | | | | | Allow downgrades of maintenance accross vendors | ||||
| * | | | | Allow downgrades of maintenance accross vendors | Joas Schilling | 2016-07-22 | 4 | -3/+43 |
| | | | | | |||||
* | | | | | Merge pull request #783 from nextcloud/app-disable-yellow | Lukas Reschke | 2016-08-10 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | make disabled apps more clear during upgrade | ||||
| * | | | | | make disabled apps more clear during upgrade | Robin Appelman | 2016-08-09 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #784 from nextcloud/admin_php_smtp_casing | Lukas Reschke | 2016-08-09 | 1 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Admin setting PHP and SMTP casing | ||||
| * | | | | | Admin setting PHP and SMTP casing | Roeland Jago Douma | 2016-08-09 | 1 | -6/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #799 from nextcloud/open_date_picker_on_toggle | Morris Jobke | 2016-08-09 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Open exiration date picker directly on toggle | ||||
| * | | | | | Open exiration date picker directly on toggle | Roeland Jago Douma | 2016-08-09 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #691 from nextcloud/ocs_allow_all_old_routes | Lukas Reschke | 2016-08-09 | 3 | -9/+15 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Allow ocs/v2.php/cloud/... routes | ||||
| * | | | | | Allow ocs/v2.php/cloud/... routes | Roeland Jago Douma | 2016-08-08 | 3 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the possibilities of the old OCS API is that you can define the url yourself. This PR makes this possible again by adding an optional root elemenet to the route. Routes are thus: .../ocs/v2.php/<root>/<url> By default <root> = apps/<app> This will allow for example the provisioning API etc to be in ../ovs/v2/php/cloud/users | ||||
* | | | | | | Merge pull request #781 from nextcloud/personal_licence_title | Björn Schießle | 2016-08-09 | 1 | -2/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove AGPL title | ||||
| * | | | | | | Remove AGPL title | Roeland Jago Douma | 2016-08-09 | 1 | -2/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #780 from nextcloud/copy_fed_cloud_id | Roeland Jago Douma | 2016-08-09 | 3 | -1/+41 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add clipboard action to Personal Settings Fed Cloud Id | ||||
| * | | | | | | Add clipboard action to Personal Settings Fed Cloud Id | Roeland Jago Douma | 2016-08-09 | 3 | -1/+41 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #789 from nextcloud/padding_federation | Marius Blüm | 2016-08-09 | 1 | -1/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Padding of federated servers | ||||
| * | | | | | | Padding of federated server | Roeland Jago Douma | 2016-08-09 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #786 from nextcloud/fix-backgroundjob-logs | Roeland Jago Douma | 2016-08-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | log class name, ID only is hard to debug | ||||
| * | | | | | | | log class name, ID only is hard to debug | Jörn Friedrich Dreyer | 2016-08-09 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #767 from nextcloud/federation-error-messages | Marius Blüm | 2016-08-09 | 4 | -15/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | improve federation error messages |