summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9008 from nextcloud/disable-if-no-appinfoMorris Jobke2018-04-032-3/+5
|\ | | | | Do not fail hard if no appinfo is returned during update
| * Do not fail hard if no appinfo is returned during updateJulius Härtl2018-03-282-3/+5
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #8996 from brandonkirsch/fix-onenote-davMorris Jobke2018-04-032-2/+2
|\ \ | | | | | | Fix webdav support for OneNote clients
| * | Fix webdav support for OneNote clientsBrandon Kirsch2018-03-262-2/+2
| | |
* | | Merge pull request #9006 from ↵Morris Jobke2018-04-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/8977/ignore_encrypted_custom_properties Do not treat is-encrypted as custom property
| * | | Do not treat is-encrypted as customer propertyRoeland Jago Douma2018-03-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #8977 Else for all files in a folder we would launch off more queries. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8945 from nextcloud/fix-files-copy-in-recent-favoritesMorris Jobke2018-04-032-6/+9
|\ \ \ \ | | | | | | | | | | Fixed files copy/move when in favorites or recent section
| * | | | Fixed files copy/move when in favorites or recent sectionJohn Molakvoæ (skjnldsv)2018-03-222-6/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #9014 from nextcloud/smb-2.0.5Morris Jobke2018-04-039-25/+45
|\ \ \ \ \ | | | | | | | | | | | | update icewind/smb to 2.0.5
| * | | | | update icewind/smb to 2.0.5Robin Appelman2018-03-289-25/+45
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-0314-16/+150
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-0212-32/+126
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-014-4/+4
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-3132-4/+66
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-302-0/+2
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-2914-4/+46
| | | | |
* | | | | Merge pull request #9009 from nextcloud/appstore-link-externalJulius Härtl2018-03-282-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Open app store links in new tab
| * | | | | Open app store links in new tabJan-Christoph Borchardt2018-03-282-1/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #8999 from nextcloud/css-js-name-based-on-apps-versionsRoeland Jago Douma2018-03-282-17/+44
|\ \ \ \ \ | |/ / / / |/| | | | Use app version to generate scss filename
| * | | | Use app version to generate scss filenameJohn Molakvoæ (skjnldsv)2018-03-282-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #8737 from nextcloud/file_return_put_contentsRoeland Jago Douma2018-03-285-2/+41
|\ \ \ \ \ | | | | | | | | | | | | Pass on the return value of file_put_content
| * | | | | Update autoloaderRoeland Jago Douma2018-03-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Throw an exception if file_put_contents failsRoeland Jago Douma2018-03-273-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This will help with AppData hardening etc * Introduced a GenericFileException for if nothing else is appropiate - Maybe the other File exceptions should base on this? Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #8976 from nextcloud/dep_user_codeRoeland Jago Douma2018-03-286-69/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove deprecated functions from OCP\User
| * | | | | | Remove deprecated \OCP\User::userExistsRoeland Jago Douma2018-03-264-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Remove deprecated OCP\User::getDisplaynameRoeland Jago Douma2018-03-255-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Remove deprecated \OCP\User::getUsersRoeland Jago Douma2018-03-254-39/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #8994 from nextcloud/deprecate-theme-sync-clientsRoeland Jago Douma2018-03-283-38/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Deprecate theme sync clients
| * | | | | | Use customclient_* values by default and do not use them in custom themes ↵Julius Härtl2018-03-263-38/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-28122-116/+366
| | | | | | |
* | | | | | | Merge pull request #8993 from nextcloud/theming-allow-ui-with-themeRoeland Jago Douma2018-03-273-6/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Show UI when using a custom theme
| * | | | | | Show UI when using a custom themeJulius Härtl2018-03-263-6/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not hide the theming app UI when using a custom theme besides it, but warn the users about some settings being overwritten by that. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #8780 from ↵Joas Schilling2018-03-271-32/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/query-builder-database-backends Move the group database backend fully to query builder
| * | | | | | Remove orderBy so the query works correctly on postgresJoas Schilling2018-03-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Make sure DI is doneJoas Schilling2018-03-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Move the group database backend fully to query builderJoas Schilling2018-03-261-32/+54
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #8951 from nextcloud/searchdav-1.0.1Roeland Jago Douma2018-03-271-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | update icewind/searchdav to 1.0.1
| * | | | | update icewind/searchdav to 1.0.1Robin Appelman2018-03-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-274-0/+6
| | | | | |
* | | | | | Merge pull request #8968 from nextcloud/filter_method_not_allowedRoeland Jago Douma2018-03-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | MethodNotAllowed is not a Fatal error
| * | | | | | MethodNotAllowed is not a Fatal errorRoeland Jago Douma2018-03-261-0/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #8983 from nextcloud/fix-8888Roeland Jago Douma2018-03-262-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clear any theming prefixed cache on cache buster increase
| * | | | | | Fix testsJulius Härtl2018-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Clear any theming prefixed cache on cache buster increaseJulius Härtl2018-03-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #8985 from nextcloud/cleanup_ocp_dbRoeland Jago Douma2018-03-2612-122/+113
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup ocp db
| * | | | | | Remove \OCP\DBRoeland Jago Douma2018-03-263-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Do not use \OCP\DB anymoreRoeland Jago Douma2018-03-269-56/+113
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #8981 from nextcloud/strict_2faRoeland Jago Douma2018-03-264-16/+22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Strict 2FA
| * | | | | Make 2FA backupcodes strictRoeland Jago Douma2018-03-261-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * and follow the interface again Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Strict 2FARoeland Jago Douma2018-03-263-8/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make OCP\Authentication\TwoFactorAuth strict * scalar types * return types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>