Lukas Reschke
|
34fb313466
|
Merge pull request #2689 from andreas-p/fix-remote-conflict
Fix showConflict
|
2016-12-19 14:34:56 +01:00 |
pflug
|
c7fc010215
|
Fix showConflict
use getFullFileName to show conflicting file
add original.directory to make fileExists happy
Signed-off-by: Andreas Pflug <dev@admin4.org>
|
2016-12-19 08:11:04 +01:00 |
Joas Schilling
|
6de0eb0b74
|
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-12-15 15:53:48 +01:00 |
|
Joas Schilling
|
edec1fafe7
|
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-12-13 20:41:55 +01:00 |
Nextcloud bot
|
0c6c85bafb
|
[tx-robot] updated from transifex
|
2016-12-12 01:07:18 +00:00 |
|
Nextcloud bot
|
7cb99e74db
|
[tx-robot] updated from transifex
|
2016-12-10 01:07:15 +00:00 |
|
Nextcloud bot
|
88d90066ba
|
[tx-robot] updated from transifex
|
2016-12-09 01:07:18 +00:00 |
Roeland Jago Douma
|
158cc9c261
|
Merge pull request #2545 from nextcloud/fix-popover-width
Fix popover width
|
2016-12-08 13:49:56 +01:00 |
|
Nextcloud bot
|
74d1b0bada
|
[tx-robot] updated from transifex
|
2016-12-08 01:07:26 +00:00 |
John Molakvoæ (skjnldsv)
|
2eca4e65b3
|
Fix popover margin and width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2016-12-07 10:50:54 +01:00 |
|
Nextcloud bot
|
ea801d7d7c
|
[tx-robot] updated from transifex
|
2016-12-07 01:07:46 +00:00 |
Arthur Schiwon
|
7e2b866fd7
|
fix type in jsdoc
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2016-12-06 18:08:13 +01:00 |
Morris Jobke
|
7ce5303374
|
Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemet
Add an activity when managing favorites
|
2016-12-05 15:44:24 +01:00 |
Robin Appelman
|
af9b3e3889
|
fix conflict dialog styling in firefox
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2016-12-05 14:20:54 +01:00 |
|
Joas Schilling
|
1a802d3383
|
Add tests for favorite action
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-12-04 12:54:34 +01:00 |
|
Joas Schilling
|
7c1b288b57
|
Add some generic tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-12-04 12:41:14 +01:00 |
|
Joas Schilling
|
8baf986d3b
|
Add an activity when managing favorites
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-12-04 12:16:49 +01:00 |
|
Nextcloud bot
|
3bea7ac6ac
|
[tx-robot] updated from transifex
|
2016-12-04 01:07:30 +00:00 |
|
Nextcloud bot
|
181cf9c7f3
|
[tx-robot] updated from transifex
|
2016-12-03 01:07:26 +00:00 |
|
Morris Jobke
|
717f1d380c
|
Merge pull request #2475 from nextcloud/fix-filename-local-link
fix width of filename in sidebar to accommodate local link
|
2016-12-02 18:04:57 +01:00 |
|
Morris Jobke
|
48dddf82eb
|
properly calculate the width of the name in the sidebar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2016-12-02 16:08:41 +01:00 |
Jan-Christoph Borchardt
|
ac527769c5
|
fix width of filename in sidebar to accommodate local link
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
|
2016-12-02 14:49:19 +01:00 |
|
Morris Jobke
|
b6184b0bc2
|
Increase width of new menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2016-12-02 14:29:15 +01:00 |
|
Jan-Christoph Borchardt
|
40a11f12c0
|
fix vertical sizing change of popover in new folder flow
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
|
2016-12-02 13:22:48 +01:00 |
|
Morris Jobke
|
4bb1154f50
|
Fix input field for new folder - fixes #2245
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2016-12-02 12:53:24 +01:00 |
|
Morris Jobke
|
ac1bf3c2b7
|
Merge pull request #2432 from nextcloud/activity-mail-language
Make sure the activity emails can be sent in the users language
|
2016-12-01 23:01:00 +01:00 |
Christoph Wurst
|
ea45b22053
|
Merge pull request #2444 from nextcloud/detect-also-a-400-status
Catch status code 400
|
2016-12-01 21:25:54 +01:00 |
|
Roeland Jago Douma
|
61d61e794c
|
Merge pull request #2435 from nextcloud/sidebar-preview-non-preview
allow registering sidebar preview handlers for mimetypes that dont co…
|
2016-12-01 21:14:10 +01:00 |
|
Lukas Reschke
|
9704b4df52
|
Catch status code 400
In case the server returns a statuscode 400 we should also gracefully return to the home directory.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2016-12-01 19:13:28 +01:00 |
|
Robin Appelman
|
a4900bf23f
|
allow registering sidebar preview handlers for mimetypes that dont come with server side previews
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2016-12-01 15:43:17 +01:00 |
Roeland Jago Douma
|
b89aafc241
|
We should always show permanent actions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2016-12-01 15:16:06 +01:00 |
|
Joas Schilling
|
b2f46bfa04
|
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-12-01 11:35:23 +01:00 |
|
Nextcloud bot
|
4ca7f9c896
|
[tx-robot] updated from transifex
|
2016-12-01 01:07:17 +00:00 |
|
Robin Appelman
|
d7dd399bbd
|
Merge pull request #2422 from nextcloud/text-preview-debug
remove js debug statements in sidebar text preview generator
|
2016-11-30 15:39:59 +01:00 |
|
Nextcloud bot
|
f075c22c72
|
[tx-robot] updated from transifex
|
2016-11-30 14:18:08 +00:00 |
|
Robin Appelman
|
7fc118e8ea
|
remove js debug statements in sidebar text preview generator
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2016-11-30 14:54:54 +01:00 |
|
Nextcloud bot
|
41dcceeb35
|
[tx-robot] updated from transifex
|
2016-11-30 01:07:16 +00:00 |
|
Nextcloud bot
|
a84dacc16f
|
[tx-robot] updated from transifex
|
2016-11-29 17:03:24 +00:00 |
|
John Molakvoæ (skjnldsv)
|
bd18349f46
|
Fix mobile view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2016-11-29 13:47:37 +01:00 |
|
Nextcloud bot
|
e8ea9a5d27
|
[tx-robot] updated from transifex
|
2016-11-29 01:06:47 +00:00 |
|
Morris Jobke
|
a12d2e67e7
|
Merge pull request #2335 from nextcloud/grouping-for-activities
Bring back grouping for activities
|
2016-11-28 16:18:02 +01:00 |
Bjoern Schiessle
|
e5c31b72e1
|
bring back permissions for mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
|
2016-11-28 11:24:05 +01:00 |
|
Nextcloud bot
|
ca7b9e5490
|
[tx-robot] updated from transifex
|
2016-11-28 09:51:57 +00:00 |
|
Nextcloud bot
|
4e682d4113
|
[tx-robot] updated from transifex
|
2016-11-28 01:06:56 +00:00 |
|
Nextcloud bot
|
8f4ec8583d
|
[tx-robot] updated from transifex
|
2016-11-26 01:06:57 +00:00 |
|
Joas Schilling
|
da9468522b
|
Add an event merger and use it for the files activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-11-25 15:36:11 +01:00 |
|
Joas Schilling
|
5ba2b1c193
|
Working towards groups
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2016-11-25 15:19:55 +01:00 |
|
Morris Jobke
|
6281607d7a
|
improved style of shared entry
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2016-11-23 15:25:48 +01:00 |
|
Robin Appelman
|
3bb3296c53
|
make the share icon in the filelist visible again
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2016-11-23 14:44:53 +01:00 |
|
Morris Jobke
|
f6e7269628
|
document new variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2016-11-22 16:55:28 +01:00 |