Commit Graph

16267 Commits

Author SHA1 Message Date
Morris Jobke 529d8122bb Merge pull request #4791 from nextcloud/permalink_copy_on_click
Copy permalink directly on click
2017-06-04 12:18:53 -05:00
Nextcloud bot f03d6f225e
[tx-robot] updated from transifex 2017-06-04 00:08:29 +00:00
Nextcloud bot 5d39f700e4
[tx-robot] updated from transifex 2017-06-03 00:09:00 +00:00
Björn Schießle 74fccf20c8 Merge pull request #5084 from nextcloud/useful-gs-settings
add new config switched for the global scale architecture
2017-06-02 10:58:43 +02:00
Joas Schilling 0e26ba4c2a
Don't allow the user to set fields they can't see
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 10:09:42 +02:00
Nextcloud bot c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Nextcloud bot 8801b68d45
[tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Arthur Schiwon 2bbd5147e7
remove check, user_webdavauth is not an app anymore for long
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 01:33:04 +02:00
blizzz 8318b2a137 Merge pull request #5104 from nextcloud/ldap-attempt-reconnect
Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection
2017-06-01 01:20:57 +02:00
Morris Jobke a0f16c69ac Merge pull request #5160 from nextcloud/comradekingu-patch-1
no "mail" or mid sentence "E-mail"
2017-05-31 11:16:51 +02:00
Joas Schilling 97e41015b3
Don't try to generate logs for chunking paths
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-31 11:10:42 +02:00
Nextcloud bot 5f9cc5a2d5
[tx-robot] updated from transifex 2017-05-31 00:08:48 +00:00
Nextcloud bot b9b7f8bede
[tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
Bjoern Schiessle 7c2d473d76
add new config switched for the global scale architecture
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-29 18:19:28 +02:00
comradekingu 864b21dd46 no "mail" or mid sentence "E-mail" 2017-05-29 18:16:09 +02:00
Nextcloud bot 4be17dff0f
[tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Nextcloud bot 4f2b26d246
[tx-robot] updated from transifex 2017-05-28 00:08:14 +00:00
Nextcloud bot e3e3e8edf2
[tx-robot] updated from transifex 2017-05-27 00:08:32 +00:00
Joas Schilling d0c614a322
Allow dir-listing also when one child is blocked by access control
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 15:54:39 +02:00
Arthur Schiwon b79f9cadc2
fix paging
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 13:44:43 +02:00
Arthur Schiwon a619d349bf
add convenience script to run all tests at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:31:26 +02:00
Arthur Schiwon f11d998371
Make IDE happy
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:30:43 +02:00
Arthur Schiwon 10ef98a3b1
add missing INotificationManager when creating User backend, LDAP
UserManager

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:25:54 +02:00
Nextcloud bot c1925ddfd0
[tx-robot] updated from transifex 2017-05-26 00:08:16 +00:00
Nextcloud bot a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Arthur Schiwon bd5d12528f
make sure used ldap connection resource is always up to date
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:45:48 +02:00
bline 8c89bf7c59
moved to something a little less invasive. back to passing CR around.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:36:51 +02:00
bline 8829d84949
special case for controlPagedResultResponse. It would be nice if there was a generic way to pass by reference with call_user_func_array..
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:34:52 +02:00
Robin Appelman ed89034047
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-24 13:56:09 +02:00
Nextcloud bot 6cc26efbc5
[tx-robot] updated from transifex 2017-05-24 00:08:22 +00:00
Roeland Jago Douma 91315f63cf
Copy permalink directly on click
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-23 13:44:42 +02:00
Roeland Jago Douma 30ac7ec2bf Merge pull request #5004 from nextcloud/bugfix/fix_replacing_4mbunicode_for_calendar_properties_table
fix replacing of 4MB Unicode Chars in cal props table
2017-05-23 13:26:10 +02:00
Roeland Jago Douma 250db249b5 Merge pull request #5042 from nextcloud/external-get-for-group-sql-type
use the correct param type when getting external storages for groups
2017-05-23 11:36:20 +02:00
Roeland Jago Douma 3aee260737 Merge pull request #4969 from nextcloud/fix-broken-activity-avatars-with-external-users
Fix username and avatar for external users
2017-05-23 08:33:49 +02:00
Nextcloud bot 9c8a838624
[tx-robot] updated from transifex 2017-05-23 00:08:29 +00:00
Robin Appelman 0baeec170e
use the correct param type when getting external storages for groups
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-22 17:39:56 +02:00
Joas Schilling 1efd961476 Merge pull request #5010 from nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app
Fix starting lower case letter in tooltip of Theming app
2017-05-22 15:03:18 +02:00
Joas Schilling ecd299e8de Merge pull request #5023 from nextcloud/version_bump
We are working on 13 now!
2017-05-22 12:20:05 +02:00
Joas Schilling 3ec9d91bd0
Split multi-author entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
Joas Schilling bc8fbc1a67
Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15
Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Joas Schilling 02275e60c6
Add missing version requirement to OAuth2 app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 09:56:49 +02:00
Morris Jobke e102923a97 Merge pull request #5000 from nextcloud/phil-davis-filename-input-tooltip
Make rename file tooltip error text change
2017-05-22 01:51:42 -05:00
Nextcloud bot 462f12611c
[tx-robot] updated from transifex 2017-05-22 00:08:23 +00:00
Georg Ehrke 4b5379309e
fix replacing of 4MB Unicode Chars in cal props table
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-21 13:26:46 +02:00
Phil Davis 2b2f27486a
Make new file file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-21 08:23:17 +05:45
Phil Davis ca1d41e077
Make rename file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-21 08:22:40 +05:45
Nextcloud bot c677f49469
[tx-robot] updated from transifex 2017-05-21 00:08:26 +00:00
Daniel Calviño Sánchez 8a05494964 Fix starting lower case letter in tooltip of Theming app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-20 17:10:26 +02:00
Daniel Hansson 119e8474b6 fix for sharing
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 16:23:04 +02:00
Nextcloud bot a442c86a84
[tx-robot] updated from transifex 2017-05-20 00:08:27 +00:00
Lukas Reschke c1c676f602 Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream
Fix logo being too big on log in page, fix #4585
2017-05-19 20:50:09 +02:00
Julius Härtl 52f10c436e
Scale logo only for custom ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 16:18:09 +02:00
Joas Schilling edb4956290
Fix username and avatar for external users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 15:45:14 +02:00
Morris Jobke 770f37a01c Merge pull request #4951 from nextcloud/transifex-oauth2
Add oauth2 to transifex
2017-05-18 19:11:28 -05:00
Morris Jobke f53c6b146c Add oauth2 to transifex
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-18 19:10:55 -05:00
Nextcloud bot e24105feba
[tx-robot] updated from transifex 2017-05-19 00:08:26 +00:00
Lukas Reschke 7976927628 Merge pull request #4894 from nextcloud/generic-security-activities
Change 2FA activities to more generic security activities
2017-05-19 00:50:44 +02:00
Lukas Reschke 0eb4970ec8 Merge pull request #4704 from nextcloud/add-oauth-code-flow-support
Add oauth code flow support
2017-05-18 23:30:44 +02:00
Lukas Reschke c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons
Fallback to default favicon
2017-05-18 23:30:02 +02:00
Christoph Wurst 258c8720dd
Fix backup codes activity type
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 58683f11ac
Publish 2fa backup codes activities to the right stream
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 1632bb4557
Move activities test code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 0928b5f621
Change 2FA activities to more generic security activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Lukas Reschke f4189699e7
Function accepts only integers
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:59:22 +02:00
Lukas Reschke 639ba526d0
Adjust realm from SabreDAV to Nextcloud
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:38:55 +02:00
Lukas Reschke f93db724d7
Make legacy DAV backend use the BearerAuth backend as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:19:39 +02:00
Lukas Reschke ba7b6bd973
Delete token after usage in test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:05 +02:00
Lukas Reschke fa6ec47a5c
Add indexes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:04 +02:00
Lukas Reschke df3909a7c3
Use Bearer backend for SabreDAV
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke 691646bdae
Add tests for OAuth2 app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke d90eba3f85
Fix style issues pointed out in review
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke b07a0f51ba
Add OAuth state to session
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke 88afd8b224
Cleanup code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke 9d91ebf8e0
Add XSD definitions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle 1eb7f4956b
delete auth token when client gets deleted
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle bb19b37097
hide client secret by default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle 1a8965b488
handle case if no valid client identifier is given
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:06 +02:00
Lukas Reschke 4b4d3bb1c2
It's a bearer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 1470ec95ca
Fetch signle row
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 4d96cd3df7
Change to POST
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke c5ad3c9213
Increase length of encrypted token in database
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke 0a2b57c93f
Get a single row
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke a5ddd65c10
Use query builder
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Lukas Reschke 5f71805c35
Add basic implementation for OAuth 2.0 Authorization Code Flow
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Björn Schießle 879e11e7d1 Merge pull request #4812 from nextcloud/move-sharing-to-migration
Move the file sharing app to migration
2017-05-18 18:24:43 +02:00
Joas Schilling fad02fe00c
Add the column so we keep the value from before the update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 14:45:26 +02:00
Julius Härtl 489131333a
Inject FileAccessHelper for proper testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-18 10:45:42 +02:00
Nextcloud bot d41fd7471c
[tx-robot] updated from transifex 2017-05-18 00:07:48 +00:00
Lukas Reschke aa9b465af7 Merge pull request #4921 from nextcloud/filerow-clickability
Increase width of clickable area in file row to open file/folder
2017-05-17 22:15:46 +02:00
Nextcloud bot 11e04e394d
[tx-robot] updated from transifex 2017-05-17 15:56:32 +00:00
Morris Jobke c2d8fe6336 Merge pull request #4922 from nextcloud/verbose-uploadmenu-text
Use more verbose text for upload menu
2017-05-17 10:48:52 -05:00
Morris Jobke 2ec616323b Merge pull request #4918 from nextcloud/theming-capabilities-plain-background
OCS Return color when theming uses no background image
2017-05-17 10:42:41 -05:00
Julius Härtl 81847c01b0
Return color when theming uses no background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 13:16:44 +02:00
Julius Härtl 639168ede4
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:16:59 +02:00
Julius Härtl d3865b6096
Use appdata logo when generating icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:14:37 +02:00
Julius Härtl edb5502b9d
Add proper Content-Type to icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
Julius Härtl 1157f413c9
Fallback to default favicon
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
Nextcloud bot 443cbdc739
[tx-robot] updated from transifex 2017-05-17 00:08:09 +00:00
Jan-Christoph Borchardt b7a9ec0002 Use more verbose text for upload menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:06:05 +02:00
Jan-Christoph Borchardt ecf3deb01c Increase width of clickable area in file row to open file/folder
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:04:43 +02:00
Jan-Christoph Borchardt c180ad1caa Remove primary class from public link download button 2017-05-16 20:47:52 +02:00
Christoph Wurst 1161139ebb Merge pull request #4900 from nextcloud/fix-search-mime-icons
Use proper mime icons for search results
2017-05-16 20:04:33 +02:00
Lukas Reschke 15f7fe022b Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user
Make it clear that you can now click on usernames
2017-05-16 16:29:09 +02:00
Jan-Christoph Borchardt 70c750dacc Fix logo being too big on log in page, fix #4585
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 15:53:54 +02:00
Julius Härtl da281822b6
Use proper mime icons for search results
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-16 14:30:49 +02:00
Roeland Jago Douma fd74428cdb Merge pull request #4865 from nextcloud/improve-two-factor-buttons
Improve layout of buttons for two factor auth
2017-05-16 13:11:55 +02:00
Morris Jobke e920e20284 Merge pull request #4425 from nextcloud/oci
Primary key is too long for oracle
2017-05-15 23:55:50 -05:00
Nextcloud bot 7d1f362aa0
[tx-robot] updated from transifex 2017-05-16 00:08:08 +00:00
Joas Schilling d89d96203a Rename the index so the name is unique until the old table is deleted
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Joas Schilling 74a6a6c839 Add a update step that copies all the backup codes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Joas Schilling 2dc79efb32 Rename the table to a valid name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Morris Jobke 91dfff5db4 Revert "fix permissions of mountpoints - take 2" 2017-05-15 12:43:25 -05:00
Morris Jobke ad0d0b0916 Merge pull request #4685 from nextcloud/fix_4683
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
Morris Jobke 30443ac177 Improve layout of buttons for two factor auth
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 11:45:15 -05:00
Morris Jobke 3f201ec7f3 Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion
Remove more personal info on user deletion
2017-05-15 11:03:33 -05:00
Robin Appelman 9b750c08ac
update comment to code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
Roeland Jago Douma cef2110263
Revert "fix objectstore rename"
This reverts commit 5334a3dc33.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-15 13:59:18 +02:00
Joas Schilling cd79eb1b2c
Remove 2FA backup codes on user deletion
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 13:31:30 +02:00
Nextcloud bot 9ad57cabc8
[tx-robot] updated from transifex 2017-05-15 00:08:14 +00:00
Nextcloud bot b1bd9ff0b9
[tx-robot] updated from transifex 2017-05-14 00:07:54 +00:00
Nextcloud bot 6e3a914f4a
[tx-robot] updated from transifex 2017-05-13 00:08:00 +00:00
Morris Jobke 2289ccd0ec Merge pull request #4829 from nextcloud/theming-preview-click
Clicking on theming preview triggers fileupload dialog
2017-05-12 10:22:20 -05:00
Joas Schilling 37d333c3b5
Don't open the dialog for logo and background
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:48:51 +02:00
Joas Schilling 51757716ec
Fix the share type of guest shares when migrating from ownCloud
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Joas Schilling 643b4a4ec4
Move the file sharing app to migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Morris Jobke c2350f237e Clicking on theming preview triggers fileupload dialog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:49:36 -05:00
Nextcloud bot 645f0aa96f
[tx-robot] updated from transifex 2017-05-12 00:07:46 +00:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Morris Jobke 167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes
Use automatic injection for appdata folders
2017-05-10 17:31:05 -05:00
Morris Jobke affa8d07ca Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn
Add fallback to jQuery.fn.globalEval
2017-05-10 11:37:06 -05:00
Lukas Reschke 93994b1320
Eval script elemtents in HTML body response
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-10 13:03:15 +02:00
Joas Schilling 5c20d2ca8c
Use the configured lookup server
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
Joas Schilling 266a1e88fa
Define method shouldRun
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
Joas Schilling a8bb4a1898
Use automatic DI injection for UpdateLookupServer
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:44:02 +02:00
Nextcloud bot fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Lukas Reschke ec69980154 Merge pull request #4772 from nextcloud/fix-theming-background-preview
Fix theming preview for background image
2017-05-10 00:31:55 +02:00
Morris Jobke b2c96d0c23 Stop if user folder is not available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 11:26:08 -05:00
Julius Härtl fb204de7f6
Fix theming preview for background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-09 18:21:41 +02:00
Roeland Jago Douma 04a5c34cac Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment
Fix mentioned user not clickable after posting or editing a comment
2017-05-09 14:23:29 +02:00
Roeland Jago Douma 07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload
Proper exception for upload of .htaccess file via WebDAV
2017-05-09 10:35:38 +02:00
Christoph Wurst 56a9084dd2
Do not list system users in contacts menu if sharing autocompletion is disabled
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-09 08:45:36 +02:00
Nextcloud bot 37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot 43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke f8044cbbce Proper exception for upload of .htaccess file via WebDAV
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 20:03:41 -05:00
Nextcloud bot f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Nextcloud bot 9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Daniel Calviño Sánchez 0db3a413b3 Fix mentioned user not clickable after posting or editing a comment
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.

Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).

Fixes #4555

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
Daniel Calviño Sánchez 002018d8ad Add missing unit tests for comments with mentions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
Morris Jobke fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages
don't mention the owner of a file in case of a re-share by mail.
2017-05-08 13:32:04 -05:00