aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check if image files for theming are emptyJulius Haertl2016-12-092-1/+4
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Merge pull request #2561 from nextcloud/save-timezone-on-loginblizzz2016-12-094-4/+24
|\ | | | | Save the timezone on login again
| * Save the timezone on login againJoas Schilling2016-12-084-4/+24
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2016-12-0914-28/+174
| |
* | Merge pull request #2571 from ↵Morris Jobke2016-12-082-2/+3
|\ \ | | | | | | | | | | | | nextcloud/issue-2568-allow-non-subadmins-to-change-language Allow non subadmins to change language
| * | Allow non-subadmins to change their languageJoas Schilling2016-12-081-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to overwrite the message which we already do in SubadminMiddlewareJoas Schilling2016-12-081-2/+2
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2565 from nextcloud/direct-desktop-clientsRoeland Jago Douma2016-12-083-3/+3
|\ \ | | | | | | Change URL for desktop clients directly to pop-up
| * | Cahnge URL for desktop clients directly to pop-upFelix A. Epp2016-12-083-3/+3
| |/ | | | | | | | | | | by adding `/#install-clients` to the URL Signed-off-by: Felix A. Epp <work@felixepp.de>
* | Merge pull request #2515 from nextcloud/tag-rename-stylingJoas Schilling2016-12-082-3/+11
|\ \ | | | | | | fix styling of renaming system tags
| * | fix rename input positioning in ffRobin Appelman2016-12-061-0/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | float tooltip over select2 dropdownRobin Appelman2016-12-051-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | fix styling of renaming system tagsRobin Appelman2016-12-051-2/+8
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2545 from nextcloud/fix-popover-widthRoeland Jago Douma2016-12-083-10/+3
|\ \ \ | | | | | | | | Fix popover width
| * | | Fix popover federationScopeMenuJohn Molakvoæ (skjnldsv)2016-12-071-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix popover margin and widthJohn Molakvoæ (skjnldsv)2016-12-072-10/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2556 from Lartza/fix-setup-pgsql-quotesRobin Appelman2016-12-081-4/+4
|\ \ \ \ | | | | | | | | | | Quote database and role in queries
| * | | | Quote database and role in queriesLari Tikkanen2016-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1793 Signed-off-by: Lari Tikkanen <lartza@outlook.com>
* | | | | Merge pull request #2534 from nextcloud/fix-avatar-upload-buttonsRoeland Jago Douma2016-12-081-26/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix avatar delete button
| * | | | Fix #2473John Molakvoæ (skjnldsv)2016-12-061-26/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2016-12-0826-6/+88
| |/ / / |/| | |
* | | | Increase version string to 11,0,0,6Lukas Reschke2016-12-071-1/+1
| | | |
* | | | Merge pull request #2549 from nextcloud/increase-version-to-rcLukas Reschke2016-12-071-1/+1
|\ \ \ \ | | | | | | | | | | Increase versionto 11 RC1
| * | | | Increase versionto 11 RC1Lukas Reschke2016-12-071-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2542 from nextcloud/followup-2516-undefined-providerLukas Reschke2016-12-071-10/+12
|\ \ \ \ | | | | | | | | | | Make sure $provider is defined when we use it
| * | | | Make sure $provider is defined when we use itJoas Schilling2016-12-071-10/+12
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2016-12-078-80/+216
| | | |
* | | | Merge pull request #2530 from ↵blizzz2016-12-062-1/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/fix-change-permissions-mail-shares-on-folder fix change permission on mail shares of folders
| * | | fix type in jsdocArthur Schiwon2016-12-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | set different permissions if file or folderArthur Schiwon2016-12-061-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | set full edit permissionsArthur Schiwon2016-12-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fix change permission on mail shares of foldersArthur Schiwon2016-12-061-4/+3
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #2532 from nextcloud/token-dropdownBjörn Schießle2016-12-062-0/+15
|\ \ \ \ | |_|/ / |/| | | Fix apppassword dropdown issues
| * | | hide token configure menu when clicking outside itRobin Appelman2016-12-061-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | hide all other token dropdowns when showing oneRobin Appelman2016-12-061-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | center arrow for token dropdownRobin Appelman2016-12-061-0/+5
|/ / / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2524 from nextcloud/fix-db-selectionRoeland Jago Douma2016-12-062-14/+29
|\ \ \ | | | | | | | | Fix db selection design and fix #2511
| * | | Fix db selection design and fix #2511John Molakvoæ (skjnldsv)2016-12-062-14/+29
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #2519 from nextcloud/404-versions-downloadRoeland Jago Douma2016-12-061-1/+9
|\ \ \ | |/ / |/| | Show nice error page for not available versions
| * | Show nice error page for not available versionsMorris Jobke2016-12-051-1/+9
| | | | | | | | | | | | | | | | | | * fixes #1464 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2513 from nextcloud/fix-htaccess-checksRoeland Jago Douma2016-12-063-3/+6
|\ \ \ | | | | | | | | Properly check the data dir
| * | | Properly check the data dirMorris Jobke2016-12-053-3/+6
| |/ / | | | | | | | | | | | | | | | * fixes #1364 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2521 from nextcloud/config-switchesRoeland Jago Douma2016-12-063-1/+15
|\ \ \ | | | | | | | | Document updater channel & check for correct PHP version in updater
| * | | Document updater channel & check for correct PHP version in updaterMorris Jobke2016-12-063-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | * see https://github.com/nextcloud/updater/issues/53 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2016-12-06100-426/+396
|/ / /
* | | Merge pull request #2520 from nextcloud/replace-stringMorris Jobke2016-12-052-3/+9
|\ \ \ | | | | | | | | Check for nextcloud version as well
| * | | Check for nextcloud version as wellLukas Reschke2016-12-052-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #497 from nextcloud/postgres-setup-no-adminMorris Jobke2016-12-052-39/+50
|\ \ \ \ | | | | | | | | | | handle postgres setup when we cant connect as admin
| * | | | handle postgres setup when we cant connect as adminRobin Appelman2016-12-052-39/+50
| | | | |
* | | | | Merge pull request #2505 from nextcloud/sudo-mode-provisioning-apiMorris Jobke2016-12-055-7/+130
|\ \ \ \ \ | | | | | | | | | | | | Require sudo mode on the provisioning API