summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #807 from nextcloud/ocs_dataresponseRoeland Jago Douma2016-08-106-122/+67
|\ | | | | OCSController requires DataResponse
| * Fix Core's OCSController responseRoeland Jago Douma2016-08-101-2/+2
| |
| * Move the Share20OCS code over to use the proper DataResponseRoeland Jago Douma2016-08-103-57/+56
| |
| * OCSController requires DataResponseRoeland Jago Douma2016-08-102-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-cachethepropagatorinstanceLukas Reschke2016-08-102-5/+12
|\ \ | | | | | | Store the shared propagator instance
| * | Store the shared propagator instanceVincent Petry2016-08-102-5/+12
| | | | | | | | | | | | This instead of recreating it for every call.
* | | Merge pull request #808 from ↵Lukas Reschke2016-08-102-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 inJörn Friedrich Dreyer2016-08-102-2/+2
| |/ /
* | | Merge pull request #819 from nextcloud/theming-support-for-appsLukas Reschke2016-08-104-0/+126
|\ \ \ | | | | | | | | Theming support for apps
| * | | Theming: Add OCA.Theming Js for app interactionJulius Haertl2016-08-104-0/+107
| | | |
| * | | Add css classes to allow app developers using the theming colorsJulius Haertl2016-08-092-0/+19
| | | |
* | | | Merge pull request #824 from nextcloud/add-warning-for-php7.1Lukas Reschke2016-08-101-0/+8
|\ \ \ \ | | | | | | | | | | Nextcloud is not compatible with PHP 7.1
| * | | | 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
* | | | | Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-idBjörn Schießle2016-08-104-5/+29
|\ \ \ \ \ | |/ / / / |/| | | | get shared storage storage id without setting up the storage
| * | | | get shared storage storage id without setting up the storageRobin Appelman2016-08-094-5/+29
| | | | |
* | | | | Merge pull request #814 from nextcloud/fix-undefined-offset-in-login-controllerBjörn Schießle2016-08-101-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix undefined offset in login controller
| * | | | Add missing array element - fixes #25714Thomas Müller2016-08-101-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #806 from nextcloud/token_polishRoeland Jago Douma2016-08-103-3/+63
|\ \ \ \ | |/ / / |/| | | Token polish
| * | | add more margin to right of the iconMorris Jobke2016-08-101-0/+1
| | | |
| * | | Add sliding animationRoeland Jago Douma2016-08-101-2/+7
| | | |
| * | | Add clipboardjs for tokenRoeland Jago Douma2016-08-103-0/+42
| | | |
| * | | Always show delete icon for new tokensRoeland Jago Douma2016-08-101-0/+9
| | | | | | | | | | | | | | | | | | | | * Always show delete icon * Hide form if the new icon is deleted
| * | | Add note password is only shown onceRoeland Jago Douma2016-08-101-1/+4
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2016-08-1064-56/+182
| | |
* | | Merge pull request #777 from nextcloud/ocs_capabilitiesMorris Jobke2016-08-107-98/+100
|\ \ \ | | | | | | | | Move /cloud/capabilities and /cloud/user to Core
| * | | Remove OC_OCS_Cloud and OC\OCS\CloudRoeland Jago Douma2016-08-092-67/+0
| | | |
| * | | Move /cloud/user to Core appRoeland Jago Douma2016-08-093-9/+23
| | | |
| * | | Move getCapabilities over to CoreRoeland Jago Douma2016-08-095-25/+31
| | | |
| * | | Allow OCS routes in Core and SettingsRoeland Jago Douma2016-08-092-0/+49
| | |/ | |/|
* | | Merge pull request #677 from nextcloud/app-menu-fixLukas Reschke2016-08-101-0/+4
|\ \ \ | | | | | | | | Fix closing app menu on mobile
| * | | Fix closing app menu on mobileJulius Haertl2016-07-311-0/+4
| | | |
* | | | Merge pull request #529 from nextcloud/vendor-maintenance-downgradeLukas Reschke2016-08-104-3/+43
|\ \ \ \ | | | | | | | | | | Allow downgrades of maintenance accross vendors
| * | | | Allow downgrades of maintenance accross vendorsJoas Schilling2016-07-224-3/+43
| | | | |
* | | | | Merge pull request #783 from nextcloud/app-disable-yellowLukas Reschke2016-08-101-2/+2
|\ \ \ \ \ | | | | | | | | | | | | make disabled apps more clear during upgrade
| * | | | | make disabled apps more clear during upgradeRobin Appelman2016-08-091-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #784 from nextcloud/admin_php_smtp_casingLukas Reschke2016-08-091-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Admin setting PHP and SMTP casing
| * | | | | Admin setting PHP and SMTP casingRoeland Jago Douma2016-08-091-6/+6
| | | | | |
* | | | | | Merge pull request #799 from nextcloud/open_date_picker_on_toggleMorris Jobke2016-08-091-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Open exiration date picker directly on toggle
| * | | | | Open exiration date picker directly on toggleRoeland Jago Douma2016-08-091-0/+2
| | | | | |
* | | | | | Merge pull request #691 from nextcloud/ocs_allow_all_old_routesLukas Reschke2016-08-093-9/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow ocs/v2.php/cloud/... routes
| * | | | | Allow ocs/v2.php/cloud/... routesRoeland Jago Douma2016-08-083-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_titleBjörn Schießle2016-08-091-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove AGPL title
| * | | | | | Remove AGPL titleRoeland Jago Douma2016-08-091-2/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #780 from nextcloud/copy_fed_cloud_idRoeland Jago Douma2016-08-093-1/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add clipboard action to Personal Settings Fed Cloud Id
| * | | | | | Add clipboard action to Personal Settings Fed Cloud IdRoeland Jago Douma2016-08-093-1/+41
| |/ / / / /
* | | | | | Merge pull request #789 from nextcloud/padding_federationMarius Blüm2016-08-091-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Padding of federated servers
| * | | | | | Padding of federated serverRoeland Jago Douma2016-08-091-1/+0
| | | | | | |
* | | | | | | Merge pull request #786 from nextcloud/fix-backgroundjob-logsRoeland Jago Douma2016-08-091-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | log class name, ID only is hard to debug
| * | | | | | | log class name, ID only is hard to debugJörn Friedrich Dreyer2016-08-091-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #767 from nextcloud/federation-error-messagesMarius Blüm2016-08-094-15/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | improve federation error messages