Commit graph

35530 commits

Author SHA1 Message Date
Christoph Wurst
0ebffa4a5f do not double encode the redirect url
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-09 16:14:46 +01:00
Morris Jobke
742c215946 Merge pull request #2058 from nextcloud/better-error-message-for-installation-error
Use a better error message and point the users to the support channels
2016-11-09 13:59:33 +01:00
Morris Jobke
eadccc239a Merge pull request #2052 from nextcloud/ros-definitions-as-php-class
Use a php class for the definitions to avoid loading problems
2016-11-09 13:53:54 +01:00
Roeland Jago Douma
6a75296ccb Merge pull request #1792 from nextcloud/bump_sabre
Bump sabre
2016-11-09 13:06:52 +01:00
Lukas Reschke
da55dd1d1f
Adjust third-party ref
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 11:53:36 +01:00
Lukas Reschke
58ca624b62
Add tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 11:52:40 +01:00
Lukas Reschke
72f45bbfc7 Merge pull request #2055 from nextcloud/js-codecov
Javascript code coverage
2016-11-09 10:54:57 +01:00
Lukas Reschke
9305094b8b
Add test and adjust PHP function arguments
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 10:49:57 +01:00
Joas Schilling
2f7e291101
Correctly catch the "soft errors" now
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 10:30:19 +01:00
Joas Schilling
92e5fb4053
Add tests for validity of the definitions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 10:08:29 +01:00
Joas Schilling
224dfaf1e6
Use a better error message and point the users to the support channels
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 09:10:32 +01:00
Joas Schilling
706b5c3fb6
Use a php class for the definitions to avoid loading problems
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 08:52:07 +01:00
Roeland Jago Douma
b6562cb386
Generate js codecov coverage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-09 08:03:29 +01:00
Morris Jobke
05cf1dab4c Merge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-bus
Make sure the database is not replaced while we make a backup of the …
2016-11-08 20:37:22 +01:00
Roeland Jago Douma
100cec59a7 Merge pull request #2037 from nextcloud/fix-preview-urls
Fix preview URLs
2016-11-08 18:29:57 +01:00
Björn Schießle
1ad3043e4f Merge pull request #1998 from nextcloud/share-by-mail-notification
add share by mail activity
2016-11-08 17:37:46 +01:00
Joas Schilling
1c97d1b4ed
Fix some typos
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 17:05:29 +01:00
Joas Schilling
9296038d78
Fix preview URLs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 16:39:13 +01:00
Joas Schilling
4393e8003b
Make sure the database is not replaced while we make a backup of the service
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 16:32:41 +01:00
Morris Jobke
5f15020b9b Merge pull request #1618 from nextcloud/show-folder-shared-status
make it possible to share the current folder
2016-11-08 16:23:47 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Bjoern Schiessle
3bc643ec23
add new definition
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
Bjoern Schiessle
087dab85b4
add activity for share by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
Christoph Wurst
c591e29eb3 Merge pull request #2047 from nextcloud/update-containers
Update containers to latest version
2016-11-08 15:37:50 +01:00
Morris Jobke
9f29b6fa30 Merge pull request #2038 from nextcloud/js_tests
Bump jstests deps
2016-11-08 15:33:24 +01:00
Morris Jobke
d94f6f4664
Update containers to latest version
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-08 12:30:06 +01:00
Roeland Jago Douma
a8329947b4
Bump jstests deps
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-08 12:13:32 +01:00
Morris Jobke
8d4745154a Merge pull request #2040 from nextcloud/firefox-svg-workaround-fix
Apply firefox workaroud to svg filters
2016-11-08 12:08:28 +01:00
Morris Jobke
742ece8b7a
Fix styling of the breadcrumbs icon
* properly center share icon
* also apply styles for public share icon

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-08 11:14:36 +01:00
Christoph Wurst
6c323496ab
fix share icon position and remove debug log 2016-11-08 10:36:39 +01:00
Julius Haertl
d3d49c1e98
Apply firefox workaroud to svg filters
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-08 09:55:29 +01:00
Nextcloud bot
8d7df51a0e
[tx-robot] updated from transifex 2016-11-08 01:06:57 +00:00
Roeland Jago Douma
0c1fd16d54
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 21:02:23 +01:00
Roeland Jago Douma
07d027feeb
Show link icon when shared by link
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 15:38:56 +01:00
Roeland Jago Douma
b39a17e499
Actually update the state
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 14:58:45 +01:00
Jan-Christoph Borchardt
8de4d4f76e
detail fixes for share current folder
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-07 14:58:45 +01:00
Roeland Jago Douma
1190ce1dd5
Listen to sharetab changes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 14:58:45 +01:00
Christoph Wurst
c55718ae5e
update breadcrumb view whenever the share information on the directory info model changes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst
36cf779140
the root folder must not be shared
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst
5bf7e5533d
visually reflect sharing state of current folder
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst
9e5e120ef9
refactor share permission logic into own method to reuse it for the share tab
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst
bc1cb8a6d0
let users share the curren folder
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst
c5597baf88
show whether the current folder was shared or not
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Roeland Jago Douma
1857e50259 Merge pull request #2036 from nextcloud/try-fixing-firefox-push-state
Fix the push state
2016-11-07 13:48:18 +01:00
Roeland Jago Douma
689567ec6d Merge pull request #2034 from nextcloud/product-typo
Fix translation string
2016-11-07 13:47:35 +01:00
Joas Schilling
6c27b74e75
Fix the push state
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-07 12:51:32 +01:00
Joas Schilling
6573debb0a
Fix translation string
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-07 11:25:53 +01:00
Morris Jobke
1c8f9d6655 Merge pull request #2026 from nextcloud/setting_lang
Move setlanguage to controller
2016-11-07 09:26:50 +01:00
Roeland Jago Douma
25a8d9f543 Merge pull request #2032 from nextcloud/noodlesegg-refactor
refactoring code to reduce cyclomatic complexit
2016-11-07 09:06:09 +01:00
Donquixote
537d588726
refactoring code to reduce cyclomatic complexit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 08:18:16 +01:00