e257c3f27c
Fixed array syntax to work with PHP 5.3
...
It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.
2013-10-04 14:28:11 +02:00
304803d102
fix array_diff call
2013-10-04 12:23:40 +02:00
17aa49a890
fix mail subject; don't show time for expire date
2013-09-30 13:33:02 +02:00
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
e7959f4fd2
don't send mail to the user who shared the file
2013-08-30 16:52:06 +02:00
65ddefc89d
set sendMail status back to false
2013-08-30 16:29:22 +02:00
36574241f8
some clean-up
2013-08-30 16:21:52 +02:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
22e1f73d5e
Use Group methods for searching, fixes #4201
2013-08-30 12:37:46 +02:00
87c3f34a93
Make group suffix in share dialog translatable
2013-08-22 19:52:08 +02:00
3cd7747e7b
Use templates to theme share e-mails ( #3683 )
2013-06-14 17:38:56 +02:00
761540e78b
Merge pull request #2320 from ceri/master
...
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
8154b4be7d
use display name as sender for private link mails, approved in #2294
2013-03-14 13:26:20 +01:00
17cb47fbf6
Correct emails when folders are shared.
...
itemType is never "dir"; it's either "file" or "folder".
2013-03-14 10:04:58 +00:00
fbb989f548
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
2013-02-28 12:07:56 +01:00
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
e9a57e28fc
show display name instead of uid
2013-01-25 13:57:08 +01:00
8daefd00fb
Sanitize the exception
2013-01-19 19:57:17 +01:00
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
fefc4e1707
Load all apps in core share ajax file for apps to register their share backends
2012-10-27 17:25:10 -04:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
b475164e95
Fix autocomplete search for users for groups only share policy
2012-10-09 08:35:07 -04:00
003241e847
fix for bug #1942 : Allow user to share with every group if "allow users to share with anyone" is set
2012-10-09 10:36:24 +02:00
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
ac79fe649c
Added a missing CSRF check
2012-09-22 11:02:03 +02:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
6e76c59007
Remove closing php tag
2012-09-04 13:18:11 +03:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
fedb3641f9
Determine if reshare needs to be checked
2012-08-24 15:12:16 -04:00
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
49229da0e1
Remove setTarget from ajax
2012-08-20 21:22:22 -04:00
5eca531f99
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
2012-08-19 22:14:38 -04:00
64ef1e2181
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
2012-08-12 14:49:41 -04:00
d4882df8cb
Fix warnings and better styling
2012-08-07 23:29:56 +02:00
1b5c8ff471
Don't return error when just no sharing found
2012-08-07 23:29:01 +02:00
0ddfc94cf5
Try to fix last commit
2012-08-07 14:34:29 -04:00
5e2ef1e918
Check if itemShares share type is an array instead of set, javascript likes to set indexes to 'undefined'
2012-08-07 14:11:48 -04:00
b6b713eb76
Only show the user's groups in the share with autocomplete
2012-08-06 20:43:08 -04:00
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
2201074e1f
Basic setup for sharing with contacts
2012-08-01 17:17:28 -04:00
Vincent Petry
Bjoern Schiessle
Arthur Schiwon
dampfklon
Stephan Arts
Frank Karlitschek
Ceri Davies
Jan-Christoph Borchardt
Bart Visscher
Lukas Reschke
Randolph Carter
Thomas Mueller
Jörn Friedrich Dreyer
Michael Gapczynski