wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
37198 commits 157 branches 562 tags 714 MiB
Commit graph

3659 commits

Author SHA1 Message Date
Morris Jobke
47d7d26bda
remove unused parameters and add viewBox 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-02 15:32:16 +01:00
Nextcloud bot
5c50df72b7
[tx-robot] updated from transifex 2017-01-01 01:07:30 +00:00
Nextcloud bot
02eb0f7fa4
[tx-robot] updated from transifex 2016-12-31 01:08:36 +00:00
Nextcloud bot
fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Nextcloud bot
52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot
bd20139f55
[tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot
3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Michael Jobst
969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603) 
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-23 16:56:55 +01:00
Lukas Reschke
56c016946d Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch 
[downstream] Fix maindetailsview favorite star patch
 2016-12-23 16:36:53 +01:00
Christoph Wurst
cfada468e6
OC.Uploader does not have a 'state' method, therefore the 
dead code can be removed

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-23 15:38:48 +01:00
Thomas Müller
aa8755bd4b
Add navigation via info.xml (#26785) 
* Read navigation information from info.xml

* Load files navigation elements from info.xml

* Add comment about ignoring the exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 12:34:41 +01:00
Thomas Müller
2bf4661e40
Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 10:01:58 +01:00
Nextcloud bot
f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Joas Schilling
e53d0c0d69
Escape the name for the jquery selector 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-20 09:32:47 +01:00
Lukas Reschke
450373fd18
Fix indentation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:34:55 +01:00
Michael Jobst
a7526b9837
Style modifications of favorite star on main detail view (#26658) 
* Style modifications of favorite star on main detail view

* Removed unused opacity change on mouse over

* favorite star title fixed

* favorite star opacity should  always be .7

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:34:09 +01:00
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
Joas Schilling
e1feb72583
Use the display name for files activities again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 16:39:29 +01:00
Morris Jobke
a02d0975dd Merge pull request #2154 from nextcloud/comments-activities-update 
Move comments activities to the new API
 2016-11-22 09:56:22 +01:00
John Molakvoæ (skjnldsv)
b75ef0f8b3
Fix popover layout fix for files and global 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-21 11:29:57 +01:00
Nextcloud bot
ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot
97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Nextcloud bot
b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00:00
Morris Jobke
e8511660f0 Merge pull request #2109 from nextcloud/oc_26533 
Transfer ownership only analyze home storage
 2016-11-18 15:32:28 +01:00
Robin Appelman
8b9ad46ba3 Merge pull request #768 from nextcloud/s3-objectstore 
Add S3 objectstore backend
 2016-11-18 14:55:07 +01:00
Morris Jobke
0e699c4d14 Merge pull request #2116 from nextcloud/downstream-26511 
Display changes in file versions tab view and detailsView
 2016-11-18 11:37:29 +01:00
Nextcloud bot
00fffae47f
[tx-robot] updated from transifex 2016-11-18 01:07:04 +00:00
Jan-Christoph Borchardt
a32c781326 use copy icon for local link rather than link icon to prevent confusion with sharing 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-17 21:46:07 +01:00
Jan-Christoph Borchardt
5eab1cdece fix layout of sharing list 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-17 19:02:33 +01:00
Nextcloud bot
ab18d2f55e
[tx-robot] updated from transifex 2016-11-17 01:07:02 +00:00
Joas Schilling
8f38adaab1 Merge pull request #2123 from nextcloud/downstream-26522 
Skip hidden files when counting visible files in list
 2016-11-16 19:10:35 +01:00
Robin Appelman
d5bfff6f4f
add comment for non empty text file 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:37 +01:00
Robin Appelman
c22776f04a
Dont create 0 byte text files 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:37 +01:00
Joas Schilling
a845f7bc01
Fix wrong copyright headers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 12:20:04 +01:00
Joas Schilling
6b88d56e3a
Update the since version to 11.0.0 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:29:27 +01:00
Joas Schilling
1dc23f2fd6
Remove the old activity extension 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:46 +01:00
Joas Schilling
cf8b91be52
Add back the support for the short translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
27c08167df
Don't even try to combine when the subject is different 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
6ddf43e27a
Provider for the files app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
ca2124a2a1
Register the settings of the files app via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
0d940e581a
Move the favorites filter to IFilter 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
5d71896c8e
Move files filter to IFilter 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Lukas Reschke
bc1008ac38
Use 11.0 instead 9.2 
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 14:45:58 +01:00
Roeland Jago Douma
7e6830729e
Test on storage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 09:53:43 +01:00
Morris Jobke
e5b61527da Merge pull request #2125 from nextcloud/downstream-26546 
Transfer ownership now returns exit code on error
 2016-11-15 00:08:09 +01:00
Roeland Jago Douma
d5afe2f3ca Merge pull request #2119 from nextcloud/downstream-26555 
disabling dropping on dragging objects temporarily
 2016-11-14 17:45:15 +01:00
Roeland Jago Douma
561a4fd989 Merge pull request #2115 from nextcloud/oc_26527 
Skip broken shares when transferring ownership (#26527)
 2016-11-14 17:07:59 +01:00
Roeland Jago Douma
c9b1108e8e Merge pull request #2110 from nextcloud/oc_26526 
First process group shares and then user shares
 2016-11-14 17:06:28 +01:00
Vincent Petry
1355f2039e
Transfer ownership now returns exit code on error (#26546) 2016-11-14 16:57:18 +01:00
Vincent Petry
1141fcc9ac
Skip hidden files when counting visible files in list (#26522) 
The file list UI logic that renders the next page doesn't properly
exclude hidden files when not shown. This fix makes sure that only rows
that are actually visible are counted when rendering a page, this makes
sure that the page will always have enough elements displayed.
 2016-11-14 16:21:57 +01:00
Michael Jobst
03cbc7217c
disabling dropping on dragging objects temporarily 
better solution
 2016-11-14 15:35:25 +01:00