Jan-Christoph Borchardt
03514e485c
Change feed to website planet link, fix wording
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 21:22:08 +02:00
Roeland Jago Douma
646db7f88d
Merge pull request #4518 from nextcloud/downstream-25838
...
Fix share indicator handling
2017-04-26 19:23:27 +02:00
Lukas Reschke
d89c76049f
Merge pull request #4374 from nextcloud/contactsmenu_popover
...
add contacts popover
2017-04-26 18:31:17 +02:00
Roeland Jago Douma
edd9444209
Merge pull request #4503 from nextcloud/downstream-27281
...
fix objectstore rename
2017-04-26 17:17:24 +02:00
Roeland Jago Douma
94a4d47b22
Merge pull request #4516 from nextcloud/downstream-27527
...
OCC scanner commit in batches
2017-04-26 16:59:03 +02:00
Morris Jobke
ba43a09380
Merge pull request #4512 from nextcloud/fix-translations-2
...
Fix translations
2017-04-26 08:57:08 -03:00
Vincent Petry
17a31a51c6
Fix share indicator handling
...
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
Vincent Petry
0721a7d5cc
Fix scanner after review
2017-04-26 13:26:47 +02:00
Vincent Petry
e3218ddffd
OCC scanner commit in batches
2017-04-26 13:26:27 +02:00
Roeland Jago Douma
5b5c3a1773
Merge pull request #4430 from nextcloud/refactor-auth
...
Improve readability of login logic
2017-04-26 10:41:53 +02:00
Joas Schilling
bec9f18a0f
Merge pull request #4478 from nextcloud/improve_settings_help
...
adding some documentation hints and some smaller cleanup
2017-04-26 09:45:01 +02:00
Joas Schilling
ec323cb687
Fix email vs mail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
Joas Schilling
6c28c4ac8b
Use correct plural form and add special strings for tomorrow and today
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
Georg Ehrke
6bbc682c4b
handle 404 separately
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:30:21 +02:00
Georg Ehrke
99b201a188
unit test jquery.contactsmenu
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
6d7714f182
fix CommentsTabsView js test
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
f32fc97533
fix ContactsStoreTest
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
897bd5cfef
add contactsmenu popover to comments
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
e61cf83faf
better detection whether or not contactsmenu target was clicked
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
399f08bd33
add contactsmenu popover to resharer infobox
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
4d60aff6ec
Contactsmenu popover: show proper message when server throws error
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
8f404c1f56
don't toggle sharing popover together with contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Joas Schilling
f43e7a9405
Fix past tense
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:27:41 +02:00
Georg Ehrke
c844b2931e
close menu again when clicking on avatar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:56 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
Roeland Jago Douma
7386bea23f
Merge pull request #4467 from nextcloud/lists-for-html-mails
...
Add lists to HTML emails
2017-04-26 08:30:30 +02:00
Roeland Jago Douma
752b219970
Merge pull request #4061 from nextcloud/downstream-26407
...
Redis cluster support
2017-04-26 08:27:30 +02:00
Morris Jobke
527369be9c
Merge pull request #4500 from nextcloud/downstream-27118
...
Restrict proppatch to the proper nodes
2017-04-26 01:28:16 -03:00
Morris Jobke
4c2c08f376
Merge pull request #4416 from gvmura/avoid-duplicate-files-google
...
Avoid duplicate files in google with the same name
2017-04-26 01:26:04 -03:00
Morris Jobke
d4329f3355
Merge pull request #4449 from stweil/mimetypes
...
Add mimetypes for jp2 and webp
2017-04-26 01:22:49 -03:00
Jörn Friedrich Dreyer
fff6d6e3e8
Refactor auth methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-26 01:08:53 -03:00
Morris Jobke
215573fe3c
Merge pull request #4486 from nextcloud/fix-js-unit
...
Remove DOMPurify from srcFiles
2017-04-25 22:39:55 -03:00
Morris Jobke
8a004ac41f
Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo
...
user_ldap: Add support for gidNumber
2017-04-25 22:34:30 -03:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
6db6911a13
Merge pull request #3233 from nextcloud/contactsmenu
...
Contacts menu
2017-04-26 01:31:11 +02:00
Jan-Christoph Borchardt
241e397326
Merge branch 'master' into contactsmenu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
Jan-Christoph Borchardt
0f0b04b7d9
Fix test
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:06:56 +02:00
Morris Jobke
255c7df3bd
Merge pull request #4499 from nextcloud/downstream-26984
...
Trigger change when a user is enabled/disabled
2017-04-25 18:27:38 -03:00
Morris Jobke
417bc606e4
Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging
...
Remove js debug logging
2017-04-25 18:26:53 -03:00
Morris Jobke
859bc245b1
Merge pull request #4479 from nextcloud/auth-flow
...
Add new auth flow basics
2017-04-25 18:26:15 -03:00
Roeland Jago Douma
c59652dbc3
Merge pull request #4495 from nextcloud/downstream-27638
...
Catch session already closed exception in destructor
2017-04-25 22:24:50 +02:00
Christoph Wurst
fd74ad452a
Remove js debug logging
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 21:42:38 +02:00
Jan-Christoph Borchardt
2ccaae8968
Fix emptycontent HTML and wording
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
Jan-Christoph Borchardt
4ae5340814
Fix spinner position of Contacts menu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
Christoph Wurst
945420baaf
Use HTTP POST to retrieve the list of contacts
...
We do not want to have sensitive information in the URL and
therefore also not in the access log. Thus the GET request is
replaced by a POST request.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst
5c29fb16c0
Update composer autoloader
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst
98f02fad60
Adjust entry unit test to newly added avatar property
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst
5c61852c25
Fix failing contacts menu js test data
...
When we test wheter action menus in the contacts menu close
when clicking other ones, we have to provide test data
that actually causes the view to render the menu.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst
ecd408d524
Fix icon of second action
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
2c2e1f7988
Use absolute URI for action icons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00