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

46631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Härtl
2a17811caf
Use property to check if a share entry is shared with the current user 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:10:48 +01:00
Julius Härtl
2804f3a761
Add uid_owner to enable permission settings on the views 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:09:29 +01:00
Julius Härtl
59377dbd50
Remove reshare owner entry from the share list 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:09:29 +01:00
Julius Härtl
b73e03724c
Show share settings for owner and reshare owners only 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:09:29 +01:00
Maxence Lange
275cea5d9c
limit to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
72ad2d60b5
display shares to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
68c44bb642
shares are displayed to users with resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:26 +01:00
Morris Jobke
f13c7dda1c
Merge pull request #12207 from nextcloud/item-list-popover-fix 
Fix popover menu alignment in list
 2018-11-02 10:58:30 +01:00
Morris Jobke
248d95339d
Cleanup some unused sharing methods from the old sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-02 10:49:42 +01:00
John Molakvoæ (skjnldsv)
6200ee78f9
Fix popover menu alignment in list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-02 09:57:11 +01:00
Morris Jobke
0f08f3cd41
Merge pull request #12177 from nextcloud/fix/apptoken_login_flow_proper_host 
Use the proper server for the apptoken flow login
 2018-11-02 09:39:40 +01:00
Roeland Jago Douma
d836b853ea
Merge pull request #12195 from nextcloud/fulltextsearch-info-xsd 
add the tag fulltextsearch
 2018-11-02 09:07:08 +01:00
Maxence Lange
cd729b696b
Merge pull request #12193 from nextcloud/interface-fulltxtsearch-issue-00002 
+infoBool / +infoInt
 2018-11-02 08:38:02 +01:00
Roeland Jago Douma
2cae91904c
Merge pull request #12194 from nextcloud/fix-path-as-dashboard-is-already-imported 
fix path to DashboardManager, as the class is already imported (minor)
 2018-11-02 08:22:05 +01:00
Nextcloud bot
3b5e031e6b
[tx-robot] updated from transifex 2018-11-02 01:13:34 +00:00
Daniel Calviño Sánchez
adf80aa8b3 Add sending the password by Talk for a link share to ShareAPIController 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez
fe8a67f517 Store "sendPasswordByTalk" property of link shares in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez
52cada951b Check "note", "label" and "hide download" too in update share tests 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:56:07 +01:00
Daniel Calviño Sánchez
00e4c8aee4 Fix update share tests 
The update share tests only checked that the share returned by
"update()" had the expected values. However, as "update()" returns the
same share that was given as a parameter the tests were not really
verifying that the values were updated in the database.

In a similar way, the test that checked that a password was removed did
not set a password first, so even if the database returned null it could
be simply returning the default value for the share; a password must be
set first to ensure that it is removed.

Besides that, a typo was fixed too that made the checks on the original
share instead of on the one returned by "update()"; right now it is the
same share, so the change makes no difference, but it is how the check
should be done anyway.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:09:01 +01:00
Morris Jobke
8bfbefa117
Merge pull request #11053 from nextcloud/occ-app-update-command 
occ app update command
 2018-11-02 00:41:59 +01:00
Jan-Christoph Borchardt
6702576dfc
Merge pull request #12192 from nextcloud/development-setup 
Development setup in readme, and some adjustments
 2018-11-02 00:23:46 +01:00
Morris Jobke
f28691c26e
Merge pull request #11844 from nextcloud/multiple-link-shares 
allow to create multiple link shares via share api
 2018-11-01 22:36:09 +01:00
Morris Jobke
affdb0e4d1
Log the previous exception during hard failure 
* otherwise the exception that was caused by the template is logged

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-01 22:27:56 +01:00
Morris Jobke
35e3d40e80
Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cron 
Revert "Wait for cron to finish before running upgrade command"
 2018-11-01 21:52:20 +01:00
Morris Jobke
d96e2ce111
Merge pull request #12196 from nextcloud/revert-12138-and-12138 
Revert important rule for hidden class and inline button style
 2018-11-01 21:48:52 +01:00
Maxence Lange
70b8c5672b init some var 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-01 21:37:59 +01:00
John Molakvoæ (skjnldsv)
876d6ec8e6 Fixed jsunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:33:11 +01:00
John Molakvoæ (skjnldsv)
0a70544cd9 Password policy fix and menu open on first share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:33:11 +01:00
Jan-Christoph Borchardt
9dea41f8fe Fix wording, sort 'Add another link' to bottom so it does not confuse 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 21:33:10 +01:00
Daniel Calviño Sánchez
b23289da1a Adjust acceptance tests to changes in link shares 
Although now it is possible to create several link shares the acceptance
tests currently handles only the first link share; this first link share
is now created by clicking an "Add new share" button instead of a
checkbox.

Besides that, the "Copy link" button has been moved from the menu to the
row, next to the menu trigger.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-01 21:33:10 +01:00
Jan-Christoph Borchardt
7bfb32230a Use primary color for share link icon background instead of bland grey 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 21:33:10 +01:00
John Molakvoæ (skjnldsv)
a7ea3d29fa Fix password enforcement 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:33:05 +01:00
John Molakvoæ (skjnldsv)
260290ec41 Fix enforce date 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:30:46 +01:00
John Molakvoæ (skjnldsv)
206d6126b6 Fix note display 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:30:45 +01:00
John Molakvoæ (skjnldsv)
106ed07d6a Copy link outside menu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:30:45 +01:00
John Molakvoæ (skjnldsv)
1bd6d39b39 Migrate link shares to array 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:29:40 +01:00
Julius Härtl
9387294993
Revert "Fix .hidden class specificity, should not be overridable, ref #12138" 
This reverts commit 25e70e1eb7.
 2018-11-01 21:00:44 +01:00
Julius Härtl
927bdebd65
Revert "make .button inline-block" 
This reverts commit 87c3f79399.
 2018-11-01 21:00:22 +01:00
Maxence Lange
1169d2b102 add the tag fulltextsearch 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-01 19:33:46 +01:00
Maxence Lange
1e2d19ae0d fix path 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-01 19:14:58 +01:00
Maxence Lange
45285eca6a +infoBool / +infoInt 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-01 17:38:43 +01:00
John Molakvoæ (skjnldsv)
98f30c2dab
Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server into addressbook-uid-check-migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 17:33:58 +01:00
John Molakvoæ (skjnldsv)
abed75e5cb
Fix phpunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 17:32:21 +01:00
Morris Jobke
290ede1292
Log exception in case an app update fails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-01 17:13:42 +01:00
Michael Gerber
020a9add07
Add occ app:update command 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-01 17:13:12 +01:00
Jan-Christoph Borchardt
713534da2c
Readme: Simply use emojis instead of images for tools section 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 16:38:40 +01:00
Morris Jobke
35a7ea869e
Merge pull request #12152 from brad2014/bugfix/12151/fix-emailtemplate-list-formatting 
Fix issue #12151: fix list formatting by correcting malformed html
 2018-11-01 16:30:22 +01:00
Jan-Christoph Borchardt
4986ca85c9
Readme: Reduce size of Tools logos, use HTML for part 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 16:27:56 +01:00
Jan-Christoph Borchardt
f946ad71f7
Readme: Add line breaks between tool images 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 16:17:43 +01:00
Jan-Christoph Borchardt
2e23404ee9
Readme: Replace Github emoji codes with real emoji 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 16:06:05 +01:00