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
52f10c436e
Scale logo only for custom ones
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 16:18:09 +02:00
edb4956290
Fix username and avatar for external users
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 15:45:14 +02:00
770f37a01c
Merge pull request #4951 from nextcloud/transifex-oauth2
...
Add oauth2 to transifex
2017-05-18 19:11:28 -05:00
f53c6b146c
Add oauth2 to transifex
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-18 19:10:55 -05:00
e24105feba
[tx-robot] updated from transifex
2017-05-19 00:08:26 +00:00
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
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
c605472950
Merge pull request #4888 from nextcloud/theming-fallback-icons
...
Fallback to default favicon
2017-05-18 23:30:02 +02:00
258c8720dd
Fix backup codes activity type
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
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
1632bb4557
Move activities test code
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
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
f4189699e7
Function accepts only integers
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:59:22 +02:00
639ba526d0
Adjust realm from SabreDAV to Nextcloud
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:38:55 +02:00
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
ba7b6bd973
Delete token after usage in test
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:05 +02:00
fa6ec47a5c
Add indexes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:04 +02:00
df3909a7c3
Use Bearer backend for SabreDAV
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
691646bdae
Add tests for OAuth2 app
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
d90eba3f85
Fix style issues pointed out in review
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
b07a0f51ba
Add OAuth state to session
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
88afd8b224
Cleanup code
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
9d91ebf8e0
Add XSD definitions
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:07 +02:00
1eb7f4956b
delete auth token when client gets deleted
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
bb19b37097
hide client secret by default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
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
4b4d3bb1c2
It's a bearer
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
1470ec95ca
Fetch signle row
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
4d96cd3df7
Change to POST
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
c5ad3c9213
Increase length of encrypted token in database
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
0a2b57c93f
Get a single row
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
a5ddd65c10
Use query builder
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
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
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
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
489131333a
Inject FileAccessHelper for proper testing
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-18 10:45:42 +02:00
d41fd7471c
[tx-robot] updated from transifex
2017-05-18 00:07:48 +00:00
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
11e04e394d
[tx-robot] updated from transifex
2017-05-17 15:56:32 +00:00
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
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
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
639168ede4
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:16:59 +02:00
d3865b6096
Use appdata logo when generating icons
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:14:37 +02:00
edb5502b9d
Add proper Content-Type to icons
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
1157f413c9
Fallback to default favicon
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
443cbdc739
[tx-robot] updated from transifex
2017-05-17 00:08:09 +00:00
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
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
c180ad1caa
Remove primary class from public link download button
2017-05-16 20:47:52 +02:00
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
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
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
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
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
e920e20284
Merge pull request #4425 from nextcloud/oci
...
Primary key is too long for oracle
2017-05-15 23:55:50 -05:00
7d1f362aa0
[tx-robot] updated from transifex
2017-05-16 00:08:08 +00:00
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
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
2dc79efb32
Rename the table to a valid name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
91dfff5db4
Revert "fix permissions of mountpoints - take 2"
2017-05-15 12:43:25 -05:00
ad0d0b0916
Merge pull request #4685 from nextcloud/fix_4683
...
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
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
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
9b750c08ac
update comment to code
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
cef2110263
Revert "fix objectstore rename"
...
This reverts commit 5334a3dc33
2017-05-15 13:59:18 +02:00
cd79eb1b2c
Remove 2FA backup codes on user deletion
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 13:31:30 +02:00
9ad57cabc8
[tx-robot] updated from transifex
2017-05-15 00:08:14 +00:00
b1bd9ff0b9
[tx-robot] updated from transifex
2017-05-14 00:07:54 +00:00
6e3a914f4a
[tx-robot] updated from transifex
2017-05-13 00:08:00 +00:00
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
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
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
643b4a4ec4
Move the file sharing app to migration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
c2350f237e
Clicking on theming preview triggers fileupload dialog
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:49:36 -05:00
645f0aa96f
[tx-robot] updated from transifex
2017-05-12 00:07:46 +00:00
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
167013dbf9
Merge pull request #4783 from nextcloud/lite-application-classes
...
Use automatic injection for appdata folders
2017-05-10 17:31:05 -05:00
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
93994b1320
Eval script elemtents in HTML body response
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-10 13:03:15 +02:00
5c20d2ca8c
Use the configured lookup server
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
266a1e88fa
Define method shouldRun
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
a8bb4a1898
Use automatic DI injection for UpdateLookupServer
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:44:02 +02:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
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
b2c96d0c23
Stop if user folder is not available
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 11:26:08 -05:00
fb204de7f6
Fix theming preview for background image
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-09 18:21:41 +02:00
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
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
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
37b847ec48
[tx-robot] updated from transifex
2017-05-09 05:08:07 +00:00
43275b1000
[tx-robot] updated from transifex
2017-05-09 04:32:51 +00:00
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
f6a4028fad
[tx-robot] updated from transifex
2017-05-09 00:07:51 +00:00
9d8e9b1efb
[tx-robot] updated from transifex
2017-05-08 20:49:06 +00:00
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
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
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
2d707fdfb5
Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch
...
fix PROPPATCH requests to read-only shared calendars
2017-05-08 12:42:30 -05:00
Lukas Reschke
Julius Härtl
Joas Schilling
Morris Jobke
Nextcloud bot
Christoph Wurst
Bjoern Schiessle
Jan-Christoph Borchardt
Christoph Wurst
Roeland Jago Douma
Robin Appelman
Roeland Jago Douma
Daniel Calviño Sánchez