Commit Graph

41358 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) 6ee75e16af
Fixed computation and removed unwanted scripts
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 9616074f58
Fix controls width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) c80b824a46
Fix style and flex width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ 9bb28bab30
Flex to controls
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ 9422e98151
Breadcrumbs hiding calculation
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:37 +01:00
Roeland Jago Douma 497cd7fa4e
Merge pull request #7064 from nextcloud/popover-fix
Fix popover layout
2017-11-08 12:47:58 +01:00
Roeland Jago Douma 448fa4f59e
If for some reason the json can't be decoded it is not cached
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-08 12:37:35 +01:00
Morris Jobke 732c951ae1
Revert "Only allow colons in db host for IPv6 addresses"
This reverts commit 1287d6ddb3.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-08 10:47:35 +01:00
John Molakvoæ (skjnldsv) 15762c103b
Fix acceptance test
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 09:19:33 +01:00
Nextcloud bot 79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Kyle Fazzari 06ba1a8a02
JSResourceLocator: account for symlinks in app path
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 14:54:21 -08:00
Lukas Reschke b754a2e385
Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects
ensure uid for calendar objects is unique
2017-11-07 21:55:09 +01:00
Morris Jobke 0913bc2157
Merge pull request #6552 from nextcloud/notifications-add-highlight-definition
Notifications: Add highlight type definition
2017-11-07 20:34:05 +01:00
John Molakvoæ (skjnldsv) b44581e15d
Fixed sharing popover and removed unused old code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-07 18:20:59 +01:00
Morris Jobke 19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance
Improve performance of UserMountCache with external storage folders
2017-11-07 17:32:06 +01:00
John Molakvoæ (skjnldsv) bce00d8b3d
Reduce spread of css selector for a.action
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-07 16:32:20 +01:00
Roeland Jago Douma 469db9fbb9
Merge pull request #7073 from nextcloud/no-whitepage-of-death
Show proper error page even if the config.php has syntax errors
2017-11-07 16:28:06 +01:00
Roeland Jago Douma f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
Remove unused variables
2017-11-07 16:18:40 +01:00
Roeland Jago Douma 8566f8b8ee
Merge pull request #7094 from nextcloud/theming-capabilities-element
Theming: expose element color though capabilities API
2017-11-07 16:12:51 +01:00
Robin Appelman 8eaf1956bb
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:01:56 +01:00
Robin Appelman 7ea06dacb1
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 14:46:29 +01:00
Morris Jobke aa789989bf
Merge pull request #6926 from nextcloud/license-remove-invalid-mail
Remove invalid mail addresses when updating the license header
2017-11-07 13:49:00 +01:00
Morris Jobke 4866314ce0
Run updated license header updater
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:47:42 +01:00
Paulo moura 37c60c20cc
Properly center login page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:21:25 +01:00
Julius Härtl 00956c00b2
Theming: expose element color though capabilities API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-07 12:31:23 +01:00
Julius Härtl 7006b739b0
Remove brackets for invalid mail addresses when updating the license header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-07 10:50:42 +01:00
Morris Jobke 44f9779f9f
Merge pull request #7059 from kyrofa/bugfix/5532/loading_indicator
core: hide spinner for initial install
2017-11-07 10:47:56 +01:00
Morris Jobke f9e70c2ab6
Merge pull request #7020 from Fiech/master
Extended list of sensitive configuration values (2)
2017-11-07 10:27:53 +01:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke ebe75fb4ba
Merge pull request #7087 from nextcloud/change-email-of-georg
Change georgehrke's email
2017-11-06 21:04:40 +01:00
Morris Jobke 271a2692bd
Merge pull request #7066 from nextcloud/appmenu-fix
Fix header app menu
2017-11-06 21:03:46 +01:00
Morris Jobke 31c5c2a592
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers
Update license headers
2017-11-06 18:48:04 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Morris Jobke 5ed05219d7
Merge pull request #7076 from nextcloud/s3-valid-bucket-name
Better error message for invalid bucket names
2017-11-06 16:16:28 +01:00
Morris Jobke 5411d60b24
Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure
Implement plugins infrastructure in User_LDAP
2017-11-06 16:07:31 +01:00
Marin Treselj f6769e2940 Fixes #4076 - first batch of fixed and re-optimized icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-06 15:51:14 +01:00
Roeland Jago Douma 0256f68c49
Merge pull request #7078 from nextcloud/jenkins-cleanup
Remove Jenkins variables from autotest.sh
2017-11-06 15:25:08 +01:00
Morris Jobke 6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization
Enhance calendar invitation emails
2017-11-06 15:14:49 +01:00
Georg Ehrke 4df08f296b
ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-06 14:25:08 +01:00
Jan-Christoph Borchardt 0abb9755b2
Merge pull request #7054 from nextcloud/timepicker-design
Improve timepicker design, align to datepicker
2017-11-06 12:45:06 +01:00
Jan-Christoph Borchardt 3e538443c5 Fix opacity of minutes in timepicker
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-06 12:44:17 +01:00
Morris Jobke a6666e397d
Merge pull request #7077 from nextcloud/jshint-improvements
Reduce JSHint errors/warnings
2017-11-06 11:37:12 +01:00
Christoph Wurst d4f83d505a
Merge pull request #7074 from nextcloud/use-proper-whitespace
Use proper whitespace
2017-11-06 10:27:09 +01:00
Morris Jobke 37c4534adb
Remove Jenkins varibales from autotest.sh
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 10:08:58 +01:00
Morris Jobke d790c27a19
Reduce JSHint errors/warnings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:57:59 +01:00
Morris Jobke 8b763ea0f7
Better error message for invalid bucket names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:48:41 +01:00
Morris Jobke 5445b1ff17
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
Morris Jobke c9f3b5a311
Use proper whitespace
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:41:25 +01:00
Morris Jobke 68dbf94470
Show proper error page even if the config.php has syntax errors
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:36:19 +01:00