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
John Molakvoæ (skjnldsv)
4e6d828ae7
Bg variable for menu arrow
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-06 05:41:26 +01:00
Nextcloud bot
81ac1ec977
[tx-robot] updated from transifex
2017-11-06 01:09:07 +00:00
John Molakvoæ (skjnldsv)
8fea22314c
Fix template order and animation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-05 18:14:52 +01:00
John Molakvoæ (skjnldsv)
91195b7cf2
Not disabled by default
...
Fixed transition bug of grouptop
Fix password submit and error handling
Fixed multiple form send
Fix submit loading state
fix login form sending state
Replace loader type
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-05 17:38:29 +01:00
John Molakvoæ (skjnldsv)
6347fe86c9
Fix loading state and error message display
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-05 05:47:34 +01:00
Nextcloud bot
2730a57580
[tx-robot] updated from transifex
2017-11-05 01:08:56 +00:00
John Molakvoæ (skjnldsv)
baee457b8f
Radio support too
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 15:47:54 +01:00
John Molakvoæ (skjnldsv)
22458465da
Fix popover icon size
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 15:36:45 +01:00
John Molakvoæ (skjnldsv)
66ef79178a
Fix header app menu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 15:20:03 +01:00
John Molakvoæ (skjnldsv)
c152f80b93
Fix popover layout
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 13:12:18 +01:00
Kyle Fazzari
b0d296639c
CSSResourceLocator: account for symlinks in app path
...
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.
Use realpath when retrieving app path, and these issues go away.
Fix #6028
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-03 23:52:09 -07:00
Nextcloud bot
6fd99b4e47
[tx-robot] updated from transifex
2017-11-04 01:09:00 +00:00
Kyle Fazzari
affdce72cc
core: hide spinner for initial install
...
core/js/setup.js has logic to show the spinner upon form submission, but
ever since v12 was released the spinner was never hidden in the first
place.
Modify core/css/guest.css to hide it, which allows core/js/setup.js to
do its thing.
Fix #5532
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-03 13:54:56 -07:00
korelstar
c7482402b8
Unlock files even if an exception occurs
...
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-03 18:29:04 +01:00
Vincent Petry
cd8d13b9e6
Enable chunking for bigger files in authenticated web upload
...
This commit adds chunked uploads in the Web UI (for authenticated users,
but not for public uploads). To do that the server endpoint used by the
uploader is changed from WebDAV v1 to WebDAV v2. The chunking itself is
done automatically by the jQuery-File-Upload plugin when the
"maxChunkSize" parameter is set; in "fileuploadchunksend" the request is
adjusted to adapt the behaviour of the plugin to the one expected by
"uploads/" in WebDAV v2.
The chunk size to be used by the Web UI can be set in the
"max_chunk_size" parameter of the Files app configuration. By default it
is set to 10MiB.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-03 17:19:23 +01:00
Jan-Christoph Borchardt
153415c54b
Add vertical separator between hours and minutes
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 16:26:13 +01:00
Jan-Christoph Borchardt
494dea2c60
Fix variable name
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 15:17:24 +01:00
Jan-Christoph Borchardt
9a8ecb2607
Merge pull request #6688 from nextcloud/more-variables
...
Add variable for border-radius and box-shadow
2017-11-03 15:10:19 +01:00
Jan-Christoph Borchardt
b01e979d77
Improve timepicker design, align to datepicker
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 15:00:36 +01:00
Vinicius Cubas Brand
fa565750d1
User_LDAP plugins: smaller fixes
...
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:42:59 -02:00