mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
35,318 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

14711 Commits

Author SHA1 Message Date
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
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
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
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