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

14907 commits

Author SHA1 Message Date
Morris Jobke
b35812fce6
Show specific empty message for tag input fields 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-14 11:46:21 +01:00
Morris Jobke
16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages 
only query substorages to calculate the final mtime/size/etag when we need it
 2016-11-14 11:39:02 +01:00
Nextcloud bot
8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Roeland Jago Douma
965981486f
Fixes not allowed increasing of link share permissions 
Fixes the following:

1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share

before this increased the permissions of the link share. Which should
not happen.

now: API reponds with an error that the permissions can't be increased.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-13 20:29:34 +01:00
Roeland Jago Douma
1056692fff
Fixes files_drop when avatars are disabled 
Fixes: #2080

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-13 14:39:38 +01:00
Nextcloud bot
150b86a7db
[tx-robot] updated from transifex 2016-11-13 01:07:09 +00:00
Nextcloud bot
1d65d31e0f
[tx-robot] updated from transifex 2016-11-12 01:07:11 +00:00
Joas Schilling
d61c8d74bb Merge pull request #2082 from nextcloud/files_drop_sabre32 
Fixes files_drop for sabre 3.2
 2016-11-11 15:09:50 +01:00
Nextcloud bot
d969fc4ac6
[tx-robot] updated from transifex 2016-11-11 01:07:18 +00:00
Roeland Jago Douma
4b3b562c4f
Fixes files_drop for sabre 3.2 
In the new sabre (3.2) the order of beforeMethod is switched. it used to
be that beforeMethod:METHOD was called after beforeMethod. But now it is
called before. Since we need the view this was broken.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-10 20:44:41 +01:00
Joas Schilling
cbc6118f51
Only check the sharing backends for file/folder items 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-10 16:46:01 +01:00
Robin Appelman
ec2235e14b
fix tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-10 15:06:24 +01:00
Robin Appelman
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-10 13:59:22 +01:00
Nextcloud bot
cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Robin Appelman
d1291f7aee
remove unneeded getDirectoryContent when getting share types for a folder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-09 17:04:44 +01:00
Felix Heidecke
d4afccfeb0
Add submit button to validate the federated server, 
fixes issue #25364
 2016-11-09 14:27:05 +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
58ca624b62
Add tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-09 11:52:40 +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
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
087dab85b4
add activity for share by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:42:07 +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
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
Joas Schilling
6573debb0a
Fix translation string 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-07 11:25:53 +01:00
Nextcloud bot
8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Nextcloud bot
e217040402
[tx-robot] updated from transifex 2016-11-06 01:07:48 +00:00
Nextcloud bot
ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Roeland Jago Douma
fb562e93cc Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tad 
Cleanup OC_Group usage a bit
 2016-11-04 22:40:34 +01:00
Roeland Jago Douma
04ece69a33
Cleanup OC_Group usage a bit 
This is deprecated internal stuff. Should not be used anymore.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 20:55:47 +01:00
Roeland Jago Douma
1e6175dfcb
Fix CalendarTest 
* Made sure delete from self works again (and is tested)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 15:40:59 +01:00
Roeland Jago Douma
c016d947e2
Fix plugin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 15:10:38 +01:00
Roeland Jago Douma
6d1c0be47d
Minor fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 15:10:15 +01:00
Roeland Jago Douma
9fa3a22ddd
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 13:37:00 +01:00
Thomas Müller
c778b1bade
Update sabre dav to 3.2 (#26115) 
* Update sabre/dav to 3.2.0

* Adjust code to work with sabre/dav 3.2.0 and it's dependencies

* Adding own CalDAV plugin to fix calendar home property

* Test if there is a user logged in when listing files home

* Update sabre version used by integration tests

* Disable unauthenticated DAV access

This is needed to make Sabre 3.2 behave like we did before.
Eventually we should integrate better with the ACL plugin which itself
should implement an auth failure when appropriate.

=====

* Fixed so cherry-pick was succesfull

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 13:35:10 +01:00
Michael Jobst
bf9376a7f6
Fixed disappearing of share info in file view 2016-11-04 10:37:30 +01:00
Nextcloud bot
479d76d426
[tx-robot] updated from transifex 2016-11-04 01:07:04 +00:00
Lukas Reschke
c0bbae28f0 Merge pull request #1741 from nextcloud/new_preview 
Improve previews
 2016-11-03 21:07:16 +01:00
Roeland Jago Douma
f6ff624e3d Merge pull request #1733 from nextcloud/dav-events 
Activities for calendars, events and todos
 2016-11-03 19:31:20 +01:00
Björn Schießle
1c52d87821 Merge pull request #2000 from nextcloud/sharebymail-icon 
add share by mail icon, fix #1979
 2016-11-03 15:33:58 +01:00
Joas Schilling
7a0e003ade
Add more tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 15:24:18 +01:00
Joas Schilling
36b656e207
Add tests for triggerCalendarActivity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 14:30:02 +01:00
Morris Jobke
ae5eb79593 Merge pull request #1908 from nextcloud/downstream-26078 
Upload autorename on client side
 2016-11-03 14:21:35 +01:00
Jan-Christoph Borchardt
219b536f70 add share by mail icon, fix #1979 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-03 14:05:43 +01:00
Roeland Jago Douma
55af6b45f7
More tests 
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
87855aa97b
Added genertor helper & tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
3d6ee7ffc9
Update thumbnail endpoint to new generato 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
5d11085190
Move over files_trashbin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d720a2fb57
Moved over files_versions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
3822bceea2
Move publicpreview over 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Joas Schilling
c4775a5bce
Start unit tests for the activity listener 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:57:40 +01:00
Joas Schilling
e8f82c6b61
Add tests for dispatching of the events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:28:12 +01:00
Lukas Reschke
b33ceb6fdd Merge pull request #1915 from nextcloud/downstream-26398 
Add using casing check/fix for initMountPoints
 2016-11-03 12:14:28 +01:00
Joas Schilling
52dd27892b
Use the event dispatcher 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:59 +01:00
Joas Schilling
d3e8463de2
Use a different type for events and todos 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:59 +01:00
Joas Schilling
43b46bcc6a
Activities for events and todos 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
07f6747305
Move the methods into a new class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
776622f3de
Add activities for shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
35ce4c772c
Fix unshare actions for author != owner 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
9a7c522cc6
Add activity for unshare from group 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
83d51afab1
Unshare user activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:57 +01:00
Joas Schilling
90578327d5
Start working on calendar activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:57 +01:00
Morris Jobke
9ebbb3c654 Merge pull request #1991 from nextcloud/code-check-more-shipped-apps 
Run code checker on more shipped apps
 2016-11-03 09:16:20 +01:00
Nextcloud bot
8471219b7c
[tx-robot] updated from transifex 2016-11-03 01:07:06 +00:00
Lukas Reschke
ffba8297df
Run code checker on more shipped apps 
Adds:
- sharebymail
- systemtags
- theming
- workflowengine

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-03 00:11:28 +01:00
Morris Jobke
39573e602d Merge pull request #1978 from nextcloud/remove-send-mail-option 
Remove send mail option
 2016-11-02 22:36:05 +01:00
Vincent Petry
f737426eca
Add using casing check/fix for initMountPoints 2016-11-02 22:21:46 +01:00
Vincent Petry
6a4ea2c15a
Upload autorename on client side 
Removes the need for POST to collection which would hit against upload
limits.

The client tries to auto rename the file by adding a suffix "(2)".
It tries to use the file list on the client side to guess a
suitable name. In case a file still cannot be uploaded and creates a
conflict, which can happen when the file was concurrently uploaded, the
logic will continue increasing the suffix.
 2016-11-02 22:15:03 +01:00
Roeland Jago Douma
a8d9bf48ff Merge pull request #1511 from nextcloud/master-kill-upload-limit 
Remove upload_limit in files app as it is not needed with PUT upload
 2016-11-02 21:24:10 +01:00
Bjoern Schiessle
d235c4833f
remove the 'shareapi_allow_mail_notification' setting 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 21:17:05 +01:00
Vincent Petry
7e701504be
Remove upload_limit in files app as it is not needed with PUT upload (#26069) 
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-02 20:43:35 +01:00
Lukas Reschke
50cb3a5e5a Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing 
improved error messages in case federated sharing fails
 2016-11-02 20:19:44 +01:00
Roeland Jago Douma
3bdec28dad Merge pull request #1971 from nextcloud/fix-checkbox-glitch 
Fix checkbox left margin glitch
 2016-11-02 20:02:36 +01:00
Bjoern Schiessle
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 18:30:38 +01:00
Bjoern Schiessle
4623b70cc9
catch all exception and return a user friendly exception message 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 18:05:14 +01:00
Michael Grosser
e81d04cd8d Merge pull request #1940 from nextcloud/new-appstore 
Use new appstore API
 2016-11-02 17:00:24 +00:00
John Molakvoæ
bc5268bdc8
Fix #1782 
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-02 15:07:24 +01:00
Morris Jobke
ffebc050d0 Merge pull request #1887 from nextcloud/downstream-26370 
Added functions to check etag of elements - integration tests
 2016-11-02 14:57:45 +01:00
Roeland Jago Douma
acf01b7f06 Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default 
use https by default if no protocol is given.
 2016-11-02 12:09:11 +01:00
Joas Schilling
7da3ba3f91 Merge pull request #657 from nextcloud/share-by-mail 
New share provider: Share by mail
 2016-11-02 11:04:33 +01:00
Bjoern Schiessle
76b1dee499
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 10:44:55 +01:00
Roeland Jago Douma
e5bc45c349
Fix OCS API to be able to remove group shares from self as recipient 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-02 08:49:58 +01:00
Nextcloud bot
122fbf0092
[tx-robot] updated from transifex 2016-11-02 01:07:09 +00:00
Bjoern Schiessle
f2b2b8d894
import exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:12:01 +01:00
Bjoern Schiessle
6e52091c8e
remove unused variable 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:11:30 +01:00
Bjoern Schiessle
32dbf32bc5
add new method getSharesInFolder(), see #339 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:05:09 +01:00
Bjoern Schiessle
16ec0f2177
add tests for the share-by-mail provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
ce08682c2f
enabled by default and add to shipped.json 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
6d7520b1e2
unit tests updated and new added 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
1e930df91f
find and show share-by mail links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
31c8c38bd6
send mail for share-by-mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
7436e45c91
if we have a exact match, either for the federated cloud id or for the 
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
392c8a115f
unified way to display remote shares and mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
8c8a019b7e
show correct display name if we have the user in one of our address books 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
60a3893ca8
improve search for federated cloud ids and email adresses 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
77f74b9780
handle case if no share-by-mail share provider is loaded 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
96c40d14a1
update permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle
a17c6a485d
add share by mail share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle
0a6f02801f
introduce share by mail, ui part 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Lukas Reschke
ef467c3195 Merge pull request #339 from nextcloud/share-types-by-folder 
Add getShareTypesInFolder to optimize folder listening
 2016-11-01 18:44:00 +01:00
Roeland Jago Douma
7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 13:52:37 +01:00
Roeland Jago Douma
fc4d0a86ef
Fix merging backend results 
* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 12:16:05 +01:00
Nextcloud bot
20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Roeland Jago Douma
ce7eb02685
Add remoteprovider getsharesinfolder function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 20:26:11 +01:00
Lukas Reschke
8acb54aa0b
Add update support 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:47 +01:00
Lukas Reschke
8d83e239f3
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Lukas Reschke
32cf661215
Use new appstore API 
This change introduces the new appstore API in Nextcloud.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:44 +01:00
Robin Appelman
3692769b0a
Add getShareTypesInFolder to optimize folder listening 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-10-31 15:55:40 +01:00
Lukas Reschke
85016977f4 Merge pull request #1935 from nextcloud/downstream-ldap-26 
Add prefix to the connection
 2016-10-31 09:27:09 +01:00
Lukas Reschke
230dca0065 Merge pull request #1903 from nextcloud/fix-log-in-button 
remove slight transparency of primary action button, ref #1615
 2016-10-31 08:51:09 +01:00
Nextcloud bot
6d2d069c17
[tx-robot] updated from transifex 2016-10-31 01:06:55 +00:00
Marius Blüm
a08a4b5981 Merge pull request #1955 from nextcloud/issue_#1776 
Issue-1776: Add unshare function to 3-dot menu.
 2016-10-30 11:27:57 +01:00
Nextcloud bot
1187a8c183
[tx-robot] updated from transifex 2016-10-30 00:06:56 +00:00
Julia Bode
2d91831b50 Issue-1776: Add unshare function to 3-dot menu. 
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
 2016-10-29 17:07:06 +02:00
Lukas Reschke
e48fa1c337 Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n 
Move away from legacy OC_L10N
 2016-10-29 09:39:22 +02:00
Nextcloud bot
035890aeb1
[tx-robot] updated from transifex 2016-10-29 00:07:14 +00:00
Morris Jobke
a78f6e9586
Use OCP\\IL10N in tests too 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-28 23:04:36 +02:00
Morris Jobke
48ce0ef19c Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities 
Fix comment mentions in activities
 2016-10-28 22:47:15 +02:00
Roeland Jago Douma
83e7cfd13a
Fix more tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 22:16:28 +02:00
Roeland Jago Douma
740659a04c
Move away from OC_L10N 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 21:46:28 +02:00
Joas Schilling
286482656b
Fix comment mentions in activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-28 12:32:10 +02:00
Jörn Friedrich Dreyer
f8352fcb8d
introduce callForSeenUsers and countSeenUsers (#26361) 
* introduce callForSeenUsers and countSeenUsers

* add tests

* oracle should support not null on clob

* since 9.2.0
 2016-10-28 08:44:05 +02:00
Nextcloud bot
ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00:00
Morris Jobke
d4969abc9d Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings 
Nextcloud rich object strings
 2016-10-27 15:30:58 +02:00
Juan Pablo Villafáñez
1937e58ec0
Add prefix to the connection 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-27 13:08:09 +02:00
Nextcloud bot
9984eba727
[tx-robot] updated from transifex 2016-10-27 00:07:01 +00:00
Morris Jobke
cde7f535bd Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions 
comment mentions: show displayname not uid
 2016-10-26 14:02:49 +02:00
Morris Jobke
ffb0e91b60 Merge pull request #1907 from nextcloud/downstream-26164 
Highlight files and update storage stats at end of upload (#26164)
 2016-10-26 13:17:35 +02:00
Nextcloud bot
a973c1bfb9
[tx-robot] updated from transifex 2016-10-26 00:07:12 +00:00
Roeland Jago Douma
1b6ba5ad32 Merge pull request #1911 from nextcloud/downstream-26477 
Fix malformed attribute in files app
 2016-10-25 22:04:43 +02:00
Roeland Jago Douma
d89c1a49c1 Merge pull request #1913 from nextcloud/downstream-26441 
Require to use at least desktop client 2.0 by default
 2016-10-25 22:04:15 +02:00
Arthur Schiwon
b12b52b73b
fix JS test and introduce tests for rendering mentions to displaynames 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-25 18:33:59 +02:00
Thomas Müller
9df3869bfc
Fix unit tests for BlockLegacyClientPlugin 2016-10-25 18:03:10 +02:00
Thomas Müller
1c39b30d50
Require to use at least desktop client 2.0 by default 2016-10-25 18:01:25 +02:00
Morris Jobke
fa4bf7b0b0 Merge pull request #1906 from nextcloud/downstream-26460 
Remove any detailed information about the exception in the browser er…
 2016-10-25 17:58:19 +02:00