Commit Graph

37028 Commits

Author SHA1 Message Date
Morris Jobke 2a6006b927
Fix config.sample.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-30 16:52:30 -06:00
Joas Schilling 0a837ac64e
Revert unintentional log timestamp format change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-30 15:06:23 +01:00
blizzz 64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
Christoph Wurst 9a036a2ae3 Merge pull request #3260 from nextcloud/various-scss-fixes
Various scss fixes
2017-01-30 11:34:39 +01:00
Nextcloud bot bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot f4de328695
[tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Morris Jobke 8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
Add navigation via info.xml (#26785)
2017-01-27 11:25:26 -06:00
Joas Schilling 05884bcd7c Merge pull request #3178 from nextcloud/default-value-logdateformat
fix default value for logdateformat
2017-01-27 12:08:57 +01:00
Lukas Reschke b5990b740d Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive
Make sure different webroots use different cached paths
2017-01-27 10:14:22 +01:00
Joas Schilling 27f8a832e4
Force to specify the name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-27 09:44:11 +01:00
Morris Jobke 98dc58356f Merge pull request #3284 from nextcloud/remove-avatar-fixup
remote now unneeded AvatarPermissions repair step
2017-01-26 20:14:24 -06:00
Nextcloud bot a5aeddc810
[tx-robot] updated from transifex 2017-01-27 01:07:18 +00:00
Morris Jobke 426c8e3be1 Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug
fix shared-as-busy events for owner
2017-01-26 17:30:51 -06:00
Morris Jobke 382e20f573 Merge pull request #3249 from nextcloud/add-clear-search-button
Add clear search button
2017-01-26 15:42:52 -06:00
Morris Jobke e21170bd1a Merge pull request #3246 from nextcloud/fix-sqlite-dependency
Remove useless dependency on SQLite (non-PDO)
2017-01-26 15:41:11 -06:00
John Molakvoæ (skjnldsv) 07cbdbff52
Blue shadow fix 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 20:35:22 +01:00
John Molakvoæ (skjnldsv) 9513e7a14b
Blue left shadow fix #3288
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 20:26:15 +01:00
Robin Appelman c76fe2b4f5
remote now unneeded AvatarPermissions repair step
Avatars are now stored in appdata

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 19:24:55 +01:00
Lukas Reschke 43315e27f4 Merge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-nonce-browser
Use correct theming when returning the defaults
2017-01-26 18:44:48 +01:00
Lukas Reschke 29f5ab1758 Merge pull request #3238 from nextcloud/dav-test
Make DAV external storage test more reliable
2017-01-26 18:43:36 +01:00
Lukas Reschke dd0d469833 Merge pull request #3272 from nextcloud/fix_user_controller
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
2017-01-26 18:37:36 +01:00
John Molakvoæ (skjnldsv) 7b4b45306b
Js magic to reset search
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 15:33:05 +01:00
Roeland Jago Douma ce240a45e6 Merge pull request #3160 from nextcloud/streams52
update icewind/streams to 0.5.2
2017-01-26 14:55:37 +01:00
Robin Appelman c9ecd64d36
update icewind/streams to 0.5.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 12:19:32 +01:00
Georg Ehrke 97d3020027
fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-01-26 12:06:07 +01:00
Lukas Reschke 3afd3c3a3d Merge pull request #3265 from nextcloud/brute-force-protection-public-link-auth
add brute force protection for public link authentication
2017-01-26 12:05:16 +01:00
Bjoern Schiessle 3e6c40eeb4
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:31:08 +01:00
Morris Jobke 3a603ab8b4 Merge pull request #3264 from nextcloud/ldap-deny-long-dns
Gracefully deny users or groups with too long DNs
2017-01-26 01:15:43 -06:00
Morris Jobke e7523b07bd Merge pull request #3197 from nextcloud/enable-scss-for-all-apps
Enable every app to generate their scss file
2017-01-25 22:53:23 -06:00
Morris Jobke feab1e5b94 Merge pull request #3162 from nextcloud/ldap-ocs
Part 1 of LDAP Backend OCS Api
2017-01-25 22:45:34 -06:00
Morris Jobke 4536ead454
Remove useless dependency on SQLite (non-PDO)
* we only require the PDO driver
* fixes #481

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-25 22:23:05 -06:00
Morris Jobke 3be746d660 Merge pull request #3208 from nextcloud/issue-3125-bring-user-management-endpoints-in-line
Error out when subadmin doesn't select any group
2017-01-25 22:16:25 -06:00
Morris Jobke 659d4b8d32 Merge pull request #3252 from nextcloud/remove-activity-icon-hacking
Remove the icon since it's defined by the app itself
2017-01-25 19:19:44 -06:00
Morris Jobke 694fa879fb Merge pull request #3255 from nextcloud/fix-password-form
fix personal page password form layout
2017-01-25 19:19:26 -06:00
Nextcloud bot 05e3aa491a
[tx-robot] updated from transifex 2017-01-26 01:07:15 +00:00
Morris Jobke d319d6f9d4 Merge pull request #3258 from nextcloud/you-get-a-copyright-you-get-a-copyright-everybody-gets-a-copyright
Copyright of scss files
2017-01-25 19:00:55 -06:00
Morris Jobke 6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
John Molakvoæ (skjnldsv) 4f78c06391
Removed invalid authors
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 18:27:41 +01:00
Bjoern Schiessle ed55b87b65
add brute force protection for public link authentication
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 18:17:08 +01:00
Arthur Schiwon 03ae7b654f
Gracefully deny users or groups with too long DNs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-25 17:10:51 +01:00
Björn Schießle ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api
add data from the users profile to the provisioning api
2017-01-25 15:44:36 +01:00
John Molakvoæ (skjnldsv) 4e91759825
No more height css calc for app-navigation children
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 15:39:54 +01:00
Björn Schießle 5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links
allow editing single files shared as public link
2017-01-25 15:35:57 +01:00
John Molakvoæ (skjnldsv) 87fd41dba2
Fix popover conflicts with app-navigation li (color & opacity)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 15:22:51 +01:00
John Molakvoæ (skjnldsv) 179bd5824f
Border radius fix on popover
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 15:13:38 +01:00
John Molakvoæ (skjnldsv) bf6505f30c
Everyone gets a copyright!
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 14:13:28 +01:00
Jan-Christoph Borchardt 3384b2f53c fix personal page password form layout
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-25 12:05:43 +01:00
Björn Schießle f469b3e958 Merge pull request #3223 from nextcloud/fix-public-page-style
Fix public page style
2017-01-25 11:45:36 +01:00
Jan-Christoph Borchardt 8c732e376b properly compress close-white.svg 2017-01-25 11:28:43 +01:00