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
Owen Winkler
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
Thomas Müller
2e5f1142be
return plural form in ajax translations
2013-08-03 23:27:18 +02:00
Georg Ehrke
640253fa31
fix code style of try catch blocks
2013-07-30 13:43:15 +02:00
Georg Ehrke
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
Robin Appelman
58f473d734
split upgrade logic from ajax file
2013-07-06 17:00:00 +02:00
Stephan Arts
3cd7747e7b
Use templates to theme share e-mails ( #3683 )
2013-06-14 17:38:56 +02:00
Michael Gapczynski
4687f50e75
Add undefined verision variables
2013-05-17 11:15:53 -04:00
Bart Visscher
ff64c87adb
Connect watcher failure function to the failure signal
2013-05-04 00:07:30 +02:00
Bart Visscher
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Arthur Schiwon
e25c1f3130
port 22c8194cc8
2013-04-02 21:03:13 +02:00
root
7f74f08808
Add missing backticks.
...
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
Arthur Schiwon
18554059a4
Remove Debug output
2013-03-27 19:12:53 +01:00
Arthur Schiwon
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
Frank Karlitschek
761540e78b
Merge pull request #2320 from ceri/master
...
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
Björn Schießle
8154b4be7d
use display name as sender for private link mails, approved in #2294
2013-03-14 13:26:20 +01:00
Ceri Davies
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
Michael Gapczynski
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
Lukas Reschke
630483c75d
Fix notice
2013-03-02 00:53:53 +01:00
Jan-Christoph Borchardt
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
Robin Appelman
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00