Vincent Petry
6252c248c2
Merge pull request #7557 from owncloud/issue/7297
...
Do not allow setting an expiration date in the past
2014-03-19 15:53:08 +01:00
Thomas Müller
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
Thomas Müller
f1ecc758f5
send an individual email to each recipient
2014-03-10 21:54:23 +01:00
Joas Schilling
80393d9c0f
Do not allow setting an expiration date in the past
...
Fix #7297
2014-03-05 13:12:58 +01:00
Robin Appelman
7c4f81bd78
rename url parameter
2014-02-24 13:24:10 +01:00
Robin Appelman
4715fb12c8
Add url parameter to control whether previews should return 404 when the mimetype is unsupported
2014-02-21 14:06:15 +01:00
Robin Appelman
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
Björn Schießle
16eb43c033
Merge pull request #7247 from owncloud/sharing_cleanup_step1
...
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
Bjoern Schiessle
2fd75d8f1c
clean up the sharing ajax calls, add mail notification class
2014-02-19 19:33:00 +01:00
Robin Appelman
609a91a9b1
Show svg mime icons when no preview is available
2014-02-19 14:47:29 +01:00
Lukas Reschke
c19cacb29f
Check whether the app is set
2014-02-18 14:12:49 +01:00
Lukas Reschke
1352c63dca
Check whether the Key is set
2014-02-18 12:47:05 +01:00
Lukas Reschke
dc6f1d875d
An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
...
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
2014-02-18 12:32:57 +01:00
Vincent Petry
d7f4547717
Merge pull request #6726 from owncloud/fix_6630
...
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00
Arthur Schiwon
af781bdea7
fix DI
2014-02-11 10:50:03 +01:00
Arthur Schiwon
41e8d44cf7
move sorter into a class
2014-02-11 10:49:34 +01:00
Arthur Schiwon
1d0a236563
respect coding guidelines
2014-02-11 10:49:27 +01:00
Arthur Schiwon
71e4d965a1
on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430
2014-02-11 10:49:22 +01:00
Georg Ehrke
f7c291e276
remove empty line
2014-01-30 16:32:45 +01:00
Georg Ehrke
c5742520e1
don't urldecode get var, php does this automatically
2014-01-30 16:32:45 +01:00
Bjoern Schiessle
2bb13a8db9
use localised date in notification mails
2014-01-27 12:47:54 +01:00
Bjoern Schiessle
77de47858b
add expire date to link share if possible
2014-01-24 10:46:08 +01:00
Thomas Müller
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
Frank Karlitschek
6915367622
Merge pull request #5446 from frisco82/fixNotifyUser
...
Fix notify user checkbox
2013-10-21 14:07:33 -07:00
Ramiro Aparicio
b27595888a
fix notify user, and made js more resiliant to changes
2013-10-21 16:14:23 +02:00
Ramiro Aparicio
85edbb08c1
fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used
2013-10-21 15:31:31 +02:00
Thomas Tanghus
31714f8871
Merge pull request #5133 from owncloud/js_vcategories_to_tags
...
Js vcategories to tags
2013-10-11 04:17:59 -07:00
Bjoern Schiessle
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
Thomas Tanghus
f19a236c8e
Remove obsolete files.
2013-10-04 17:24:28 +02:00
Vincent Petry
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
Bjoern Schiessle
304803d102
fix array_diff call
2013-10-04 12:23:40 +02:00
Bjoern Schiessle
17aa49a890
fix mail subject; don't show time for expire date
2013-09-30 13:33:02 +02:00
Bjoern Schiessle
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
Bjoern Schiessle
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
Bjoern Schiessle
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
Georg Ehrke
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
Bjoern Schiessle
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
Bjoern Schiessle
e7959f4fd2
don't send mail to the user who shared the file
2013-08-30 16:52:06 +02:00
Bjoern Schiessle
65ddefc89d
set sendMail status back to false
2013-08-30 16:29:22 +02:00
Bjoern Schiessle
36574241f8
some clean-up
2013-08-30 16:21:52 +02:00
Bjoern Schiessle
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
Arthur Schiwon
22e1f73d5e
Use Group methods for searching, fixes #4201
2013-08-30 12:37:46 +02:00
Georg Ehrke
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
Morris Jobke
ea6e74ca95
Merge pull request #4552 from dampfklon/fix4552
...
Make group suffix in share dialog translatable
2013-08-28 15:46:51 -07:00
Thomas Müller
9909b8b726
adding translations to update events
2013-08-27 00:26:44 +02:00
dampfklon
87c3f34a93
Make group suffix in share dialog translatable
2013-08-22 19:52:08 +02:00
Georg Ehrke
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Georg Ehrke
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00