9788cf04ee
[tx-robot] updated from transifex
2016-11-27 01:07:08 +00:00
8f4ec8583d
[tx-robot] updated from transifex
2016-11-26 01:06:57 +00:00
64fb0fb3dd
Merge pull request #2276 from nextcloud/update-email-address
...
Update email address
2016-11-25 11:40:20 +01:00
0de685c562
bring back setEmailAddress for the user management
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-25 10:26:48 +01:00
dc4ceb7338
Loading icon fix #2198
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-24 17:28:21 +01:00
cb69accdc5
Merge pull request #2307 from nextcloud/better-filter-on-appstore
...
Loop for newest version in appstore response
2016-11-24 16:57:14 +01:00
cbf943301f
Merge pull request #2224 from nextcloud/fix-visibility-switcher
...
Fix visibility switcher for avatar
2016-11-24 15:47:55 +01:00
7162166bae
Also show updates on the "enabled" page
...
The enabled page doesn't pass through "getAppsForCategory" thus it also needs to have that special logic applied.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-24 15:04:23 +01:00
546989959c
update email address correctly
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 20:19:31 +01:00
f0670aadbe
Merge pull request #2239 from nextcloud/cleanup-settings-application-again
...
Cleanup settings application again
2016-11-23 11:07:10 +01:00
7b0b7e801f
Merge pull request #2250 from nextcloud/check-if-data-is-defined
...
Check if data is defined
2016-11-22 20:31:32 +01:00
623c02fe6e
Remove superfluous email input field
...
That field is already there and looking at the code this seems to have been missed on a rebase.
Fixes https://github.com/nextcloud/server/issues/2222
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 18:29:09 +01:00
e827be759d
Check if data is defined
...
Otherwise when adding a user as subadmin this would throw the following JS error:
```
users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605
```
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 18:23:48 +01:00
7f1bf10044
Clean up the Application class again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 15:04:03 +01:00
54f80ce6d9
Add SubAdminMiddleware back
...
Removed by mistake in #1946
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 13:33:23 +01:00
9c52f16dbb
Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element
...
Use app ID instead of object
2016-11-22 10:06:33 +01:00
b0cf78aa1e
[tx-robot] updated from transifex
2016-11-22 01:06:54 +00:00
8ee11956da
Use app ID instead of object
...
Fixes several error messages when installing an app from the appstore, including:
```
Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661
Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81
trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628
```
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 00:24:23 +01:00
91f735acf3
Make Christoph happier
...
Apparently this failed for him as per https://github.com/nextcloud/server/pull/2224#issuecomment-262085537
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 23:21:53 +01:00
1e06d0bb47
Merge pull request #2221 from nextcloud/from-is-featured-to-featured
...
Error log spam: Cast "isFeatured" to "featured"
2016-11-21 23:11:29 +01:00
267ecab405
Fix visibility switcher for avatar
...
Fixes #2223
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 21:50:57 +01:00
e2bfce0d26
Cast "isFeatured" to "featured"
...
The appstore returns a "isFeatured" in the current API revision. We need to cast this thus.
Fixes the following error log message when opening the tab "Customization":
> Undefined index: featured at /media/psf/stable9/settings/Controller/AppSettingsController.php#233
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 21:34:37 +01:00
2a712abdfd
use date as device name if no name was given
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 20:28:21 +01:00
cd24010fa4
Merge pull request #2214 from nextcloud/remove-logging
...
remove old logging section
2016-11-21 17:17:02 +01:00
c694bd3455
remove old logging section
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-21 13:46:31 +01:00
a1ca54a0ae
center checkmark to indicate that the setting was stored
2016-11-21 11:30:03 +01:00
4a05aa8a02
don't try to verify email address if no email address is set
2016-11-21 11:30:03 +01:00
5aed91c321
small fixes
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:30:03 +01:00
16181c5463
Ask for password when scope is changed
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
e87933bc3d
Fix mail scope
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
5acc3d3c5e
Highlight current entry
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
a0c64044b2
Make JS aware of password verification
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
6e783f8345
make icons a bit smaller
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
f062c6daee
fix menu positioning hack
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
e53e585e91
put explanatory text directly in popup
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
8bf4111368
Fix changing display names for subadmins
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
662dff046d
Adjust permission checks
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
fb91bf6a5b
Add a signer class for signing
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
a32d6e481f
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:30:00 +01:00
056ce5125e
Fix password display issue
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:59 +01:00
061ef0cc7c
rearrange input fields
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
fa87b2fbf2
limit max-width to have never more than two input fields next to each other
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
845f0bd401
Fix position of menu
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:58 +01:00
a15809ceed
Fix location of menu
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:58 +01:00
f489fd99c3
change scope to 'local' for display name and avatar
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:58 +01:00
3f8bfbdb11
change order of email and phone number
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:58 +01:00
f7a4db5040
fix avatar cropper
2016-11-21 11:29:58 +01:00
8f33d9d1c0
update system address book if the user change the personal settings
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:57 +01:00
987995ac92
Fix popup arrow positioning
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
b75ef0f8b3
Fix popover layout fix for files and global
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
77c034fc69
remove double import
2016-11-21 11:29:57 +01:00
9c7533ff6b
fix profile picture fed sharing scope menu
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-21 11:29:57 +01:00
de1f3f05fd
allow to change display names in the user settings again
...
keep display name and email address in sync with the accounts table
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:54 +01:00
1700e3dccc
allow multiple values for phone, website, address and email
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:50 +01:00
445a254c1e
display stored user data
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:43 +01:00
40b99734d3
introduce accounts table and keep it up-to-date with the data added to the personal settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:41 +01:00
d1233b47b0
use PUT to update user settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:38 +01:00
78f6e29954
Add federation scope to the user avatar
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:33 +01:00
20739c93a6
Persist settings on the server
...
Persist personal settings federated sharing scopes
Show new settings fields in read-only mode too
Insert values on page load
Return updated values; show inline success feedback
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:24 +01:00
c42d977185
Add more personal information fields to the settings page for enhanced federated sharing
...
fix layout
Add generic way of handling input change events
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:10 +01:00
ba9b17c906
[tx-robot] updated from transifex
2016-11-21 01:06:58 +00:00
97af4f762d
[tx-robot] updated from transifex
2016-11-20 01:06:44 +00:00
b1ee9862f8
[tx-robot] updated from transifex
2016-11-19 01:06:44 +00:00
332eaec4c0
Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions
...
Password confirmation for some actions
2016-11-18 15:42:30 +01:00
3ffd9a755f
Fix user management callbacks
...
* properly handle user management actions like display name, email or password field change
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 14:19:07 +01:00
8ef356a86d
fix displayname
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 13:50:18 +01:00
c241539a21
Merge pull request #2108 from nextcloud/properly-parse-ie-useragent
...
Properly parse IE 11 user agent
2016-11-18 13:39:47 +01:00
02ea134152
Fix error displaying on email and add confirmation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
a53c313878
Require password confirmation to change the Quota
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
309b21f5a0
Require confirmation to change the displayname
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
a7feb91282
Confirm on create/delete group
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
3dc3887dee
More fixes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
47f9574302
Hide and show after updating
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
2fd2e45e42
Require password confirmation for user management
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
62855c08ff
Require confirmation when changing the email settings
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
6c3f0fd431
Fix error message displaying
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
68fa1e5dd8
Require password confirmation for app password
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
28ddf3abdb
Require password confirmation for changing the email
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 11:57:16 +01:00
00fffae47f
[tx-robot] updated from transifex
2016-11-18 01:07:04 +00:00
82141faea1
Merge pull request #2188 from nextcloud/remove-settings-pane-in-apps-management
...
Remove settings pane in app management
2016-11-17 21:39:30 +01:00
6d5cc6edc0
Remove settings pane in app management
...
* experimental apps where removed with 32cf661215#1940 )
* fixes #2183
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 18:09:40 +01:00
bba32cf4b7
Merge pull request #2163 from nextcloud/app-password-scope-warngings
...
fix warnings when updating app password
2016-11-17 17:52:23 +01:00
ab18d2f55e
[tx-robot] updated from transifex
2016-11-17 01:07:02 +00:00
ff44adbcb4
Merge pull request #2131 from nextcloud/fix-tabs-in-translation
...
convert text to single line so tabs in translation issue is fixed
2016-11-16 23:25:07 +01:00
d2dee32756
fix warnings when updating app password
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 19:14:36 +01:00
7100a1b347
Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard
...
Adds copy tooltip to clipboards
2016-11-16 17:57:35 +01:00
61453f5fd5
Merge pull request #719 from nextcloud/lockdown
...
Allow restricting of app password permissions
2016-11-16 16:17:28 +01:00
b7e6e9f83c
Fix tooltips - they now properly change on click
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 15:43:26 +01:00
9157f807cc
dropdown ui
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:32 +01:00
da63af8b02
enable deleting/configuring new tokens
...
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:28 +01:00
1afccde16a
allow configuring filesystem access
...
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:27 +01:00
b4e27d35f5
app password scope wip
...
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:27 +01:00
0c89beb639
left-align social media buttons correctly on Personal page too
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 12:06:43 +01:00
0200f34dd1
Move social buttons to bottom on admin page
...
For #2134
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 10:48:31 +01:00
06d8801328
No HTML in string
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 10:23:30 +01:00
317b132d31
convert text to single line so tabs in translation issue is fixed
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 10:07:39 +01:00
f7c637071a
Adds copy tooltip to clipboards
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-15 19:30:59 +01:00
5fd428413b
Adjust previous fallbacks
...
11.0 is 11 and not 9.2 anymore
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 15:07:58 +01:00
9a613078f6
Properly parse IE 11 user agent
...
* fixes #2101
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-14 12:35:23 +01:00
4c6e9dccfe
Merge pull request #2093 from nextcloud/fix-single-author-with-details
...
Fix single author with details
2016-11-14 09:50:57 +01:00
8c1cd07de3
[tx-robot] updated from transifex
2016-11-14 01:07:06 +00:00
896be27e72
Fixes javascript tests for apps.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 14:28:32 +01:00
150b86a7db
[tx-robot] updated from transifex
2016-11-13 01:07:09 +00:00
ac2135560f
Fix single author with details
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-11 14:11:19 +01:00
cfda17d8f3
[tx-robot] updated from transifex
2016-11-10 01:07:14 +00:00
8d7df51a0e
[tx-robot] updated from transifex
2016-11-08 01:06:57 +00:00
1c8f9d6655
Merge pull request #2026 from nextcloud/setting_lang
...
Move setlanguage to controller
2016-11-07 09:26:50 +01:00
8d954c0ece
[tx-robot] updated from transifex
2016-11-07 01:07:03 +00:00
78efb1972e
Fix route and js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-06 14:05:53 +01:00
95a8964cc8
Add settings PersonalController
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-06 14:05:49 +01:00
e217040402
[tx-robot] updated from transifex
2016-11-06 01:07:48 +00:00
bfd2596381
Merge pull request #2021 from henrymohn/bug-1875_Password-Hint
...
Removed else statement preventing Success message from displaying cau…
2016-11-05 16:54:37 +01:00
ca3616cb58
[tx-robot] updated from transifex
2016-11-05 01:07:14 +00:00
fe544d807a
Removed else statement preventing Success message from displaying causing bug #1875
...
Signed-off-by: Henry Mohn <hmohniii@gmail.com>
2016-11-04 20:40:42 +00:00
479d76d426
[tx-robot] updated from transifex
2016-11-04 01:07:04 +00:00
e8d614b59e
Hide "Add group" for subadmins
2016-11-03 20:41:10 +01:00
0741346385
Show a hint for system based cron user name
...
* makes it easier to setup cron job
* gives hints for PHP documentation
* disables the cron setting if requirements not met
* fixes #1989
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-03 10:38:00 +01:00
8471219b7c
[tx-robot] updated from transifex
2016-11-03 01:07:06 +00:00
39573e602d
Merge pull request #1978 from nextcloud/remove-send-mail-option
...
Remove send mail option
2016-11-02 22:36:05 +01:00
c901c851ca
Merge pull request #1960 from nextcloud/adjust-link-to-contributing.md
...
Adjust link to contributing.md
2016-11-02 20:04:45 +01:00
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
d6f156feb4
Adjust link to contributing.md
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 10:32:30 +01:00
42b0a0d2af
Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin
...
Color the trusted domain to alert the admin a bit more
2016-11-02 10:06:35 +01:00
122fbf0092
[tx-robot] updated from transifex
2016-11-02 01:07:09 +00:00
20f45e6fe4
[tx-robot] updated from transifex
2016-11-01 01:06:57 +00:00
a68595742b
Proxy images through usercontent.apps.nextcloud.com
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:47 +01:00
8acb54aa0b
Add update support
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:47 +01:00
df7fd2b57c
Query the timefactory instead of creating it
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:46 +01:00
32cf661215
Use new appstore API
...
This change introduces the new appstore API in Nextcloud.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:44 +01:00
247b7f37ce
Color the trusted domain to alert the admin a bit more
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 12:22:21 +01:00
6d2d069c17
[tx-robot] updated from transifex
2016-10-31 01:06:55 +00:00
1187a8c183
[tx-robot] updated from transifex
2016-10-30 00:06:56 +00:00
740659a04c
Move away from OC_L10N
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 21:46:28 +02:00
ad597d498d
[tx-robot] updated from transifex
2016-10-28 00:07:11 +00:00
0a2e2f70f6
Merge pull request #1929 from nextcloud/share_email_to_OCS
...
Remove notify recipient function
2016-10-27 09:03:29 +02:00
9984eba727
[tx-robot] updated from transifex
2016-10-27 00:07:01 +00:00
57e61250ac
Remove notify recipient option
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-26 20:52:36 +02:00
8b15669677
Allow users to change their passwords again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-26 14:04:38 +02:00
363618249d
Merge pull request #1355 from nextcloud/apps_flexbox
...
Use flexbox on app page
2016-10-26 10:28:02 +02:00
a973c1bfb9
[tx-robot] updated from transifex
2016-10-26 00:07:12 +00:00
e169bb0636
Limit to apps list, add proper flex attributes
...
Let app-name headline break, increase padding on the right for more visual clearance.
Make experimental header full width
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-10-25 18:04:20 +02:00
e23a298a81
[tx-robot] updated from transifex
2016-10-25 09:36:09 +00:00
890f752a6b
Merge pull request #1452 from nextcloud/appconfig-endpoint
...
Appconfig endpoint
2016-10-25 10:57:48 +02:00
cfae91ab64
Merge pull request #1828 from nextcloud/avatar-picker-improvements
...
Avatar picker improvements
2016-10-24 16:33:18 +02:00
0aec8647c2
use smaller cropper on small screens
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-24 13:56:21 +02:00
ad902d6bea
center cropper vertically
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-24 13:54:56 +02:00
d0d7767366
Fix misleading SSL/TLS SMTP email configuration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-24 11:34:30 +02:00
f19d4ec29b
Modified the SQLite warning of server/settings/templates/admin/tiptricks.php to be more understandable and legible
...
Signed-off-by: Sam Cater <sam@samcater.com>
Added sign off of commit
2016-10-24 09:02:56 +01:00
1be6213ba4
Merge pull request #1832 from nextcloud/select2-into-core
...
Select2 into core
2016-10-22 14:35:07 +02:00
Nextcloud bot
Morris Jobke
Bjoern Schiessle
John Molakvoæ (skjnldsv)
blizzz
Lukas Reschke
Joas Schilling
Roeland Jago Douma
Robin Appelman
Jan-Christoph Borchardt
Roeland Jago Douma
Christoph Wurst
Björn Schießle
Christoph Wurst
Robin Appelman
Henry Mohn
Vincent Petry
Michael Grosser
Felix Epp
Sam Cater