aa5bba2bcc
'ID' => 'id' and check existence of EMAIL
2014-03-25 14:22:39 +01:00
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
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
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
f1ecc758f5
send an individual email to each recipient
2014-03-10 21:54:23 +01:00
80393d9c0f
Do not allow setting an expiration date in the past
...
Fix #7297
2014-03-05 13:12:58 +01:00
7c4f81bd78
rename url parameter
2014-02-24 13:24:10 +01:00
4715fb12c8
Add url parameter to control whether previews should return 404 when the mimetype is unsupported
2014-02-21 14:06:15 +01:00
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
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
2fd75d8f1c
clean up the sharing ajax calls, add mail notification class
2014-02-19 19:33:00 +01:00
609a91a9b1
Show svg mime icons when no preview is available
2014-02-19 14:47:29 +01:00
c19cacb29f
Check whether the app is set
2014-02-18 14:12:49 +01:00
1352c63dca
Check whether the Key is set
2014-02-18 12:47:05 +01:00
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
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
af781bdea7
fix DI
2014-02-11 10:50:03 +01:00
41e8d44cf7
move sorter into a class
2014-02-11 10:49:34 +01:00
1d0a236563
respect coding guidelines
2014-02-11 10:49:27 +01:00
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
0db5fead8e
remove some more global variable $RUNTIME_NOAPPS
2014-02-06 10:04:18 +01:00
f7c291e276
remove empty line
2014-01-30 16:32:45 +01:00
c5742520e1
don't urldecode get var, php does this automatically
2014-01-30 16:32:45 +01:00
2bb13a8db9
use localised date in notification mails
2014-01-27 12:47:54 +01:00
77de47858b
add expire date to link share if possible
2014-01-24 10:46:08 +01:00
d4c0ac7790
introduce auto completion on share email - integrated with the contactsmanager api
2013-11-14 09:38:55 +01:00
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
6915367622
Merge pull request #5446 from frisco82/fixNotifyUser
...
Fix notify user checkbox
2013-10-21 14:07:33 -07:00
b27595888a
fix notify user, and made js more resiliant to changes
2013-10-21 16:14:23 +02:00
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
31714f8871
Merge pull request #5133 from owncloud/js_vcategories_to_tags
...
Js vcategories to tags
2013-10-11 04:17:59 -07:00
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
f19a236c8e
Remove obsolete files.
2013-10-04 17:24:28 +02:00
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
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +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
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
ea6e74ca95
Merge pull request #4552 from dampfklon/fix4552
...
Make group suffix in share dialog translatable
2013-08-28 15:46:51 -07:00
9909b8b726
adding translations to update events
2013-08-27 00:26:44 +02:00
87c3f34a93
Make group suffix in share dialog translatable
2013-08-22 19:52:08 +02:00
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
2e5f1142be
return plural form in ajax translations
2013-08-03 23:27:18 +02:00
640253fa31
fix code style of try catch blocks
2013-07-30 13:43:15 +02:00
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
58f473d734
split upgrade logic from ajax file
2013-07-06 17:00:00 +02:00
3cd7747e7b
Use templates to theme share e-mails ( #3683 )
2013-06-14 17:38:56 +02:00
4687f50e75
Add undefined verision variables
2013-05-17 11:15:53 -04:00
ff64c87adb
Connect watcher failure function to the failure signal
2013-05-04 00:07:30 +02:00
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
e25c1f3130
port 22c8194cc8
2013-04-02 21:03:13 +02:00
7f74f08808
Add missing backticks.
...
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
18554059a4
Remove Debug output
2013-03-27 19:12:53 +01:00
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01: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
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
630483c75d
Fix notice
2013-03-02 00:53:53 +01: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
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
5f92d269dc
l10n support enhanced in core
2013-02-07 16:49:36 +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
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
6b2216f0d6
Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
2013-01-05 11:09:48 -05:00
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05: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
e06513d76b
Fixing syntax error - closes #406
2012-11-14 11:17:21 +01:00
99af3433d1
Fixing syntax error - closes #406
2012-11-14 11:10:31 +01:00
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +01:00
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +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
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +02:00
26719005a4
Added ajax files for favorite category handling.
2012-10-19 00:07:41 +02:00
f4fd4a5a52
Updated category ajax files to use type instead of app and add callCheck.
2012-10-19 00:06:18 +02: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
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +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
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
5868f834c8
Respect coding style
2012-09-04 13:21:36 +03:00
ae67841461
Respect coding style
2012-09-04 13:21:00 +03:00
ff8b8909c1
Respect coding style
2012-09-04 13:19:44 +03:00
f4cace6cc1
Respect coding style
2012-09-04 13:19:04 +03:00
6e76c59007
Remove closing php tag
2012-09-04 13:18:11 +03:00
5bd4d6b051
Respect coding style
2012-09-04 13:17:14 +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
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -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
334296b027
Removed unused file
2012-08-10 00:09:00 +02:00
ab97c04894
Added XSRF check
2012-08-10 00:09:00 +02: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
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04:00
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
8d01e1a355
Don't show self or already shared with users and groups in the share with search
2012-07-31 13:06:32 -04:00
d66f071d3e
Use search and limit parameters for share with search in sharing dropdown
2012-07-30 20:21:48 -04:00
ed71343df8
Autocomplete for share with search in sharing dropdown
2012-07-30 15:30:21 -04:00
d24326ecce
Updated style
2012-07-26 01:38:20 +02:00
d425740dc2
Remove unused files
2012-07-26 01:19:46 +02:00
1554d7a2c0
Check for admin user
2012-07-26 01:16:32 +02:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
88f4845ca3
Sanitization isn't required here
2012-07-11 20:04:18 -04:00
b148256233
Get rid of sneaky error_log() that got left behind
2012-07-10 21:30:52 -04:00
c0e1b8e7e7
Sanitize POST and GET in ajax/share
2012-07-10 19:54:03 -04:00
Thomas Tanghus
Thomas Müller
Vincent Petry
Joas Schilling
Robin Appelman
Björn Schießle
Lukas Reschke
Arthur Schiwon
Georg Ehrke
Frank Karlitschek
Ramiro Aparicio
Morris Jobke
dampfklon
Owen Winkler
Stephan Arts
Michael Gapczynski
Bart Visscher
root
Ceri Davies
Jan-Christoph Borchardt
Randolph Carter
Jörn Friedrich Dreyer
Felix Moeller
Christian Reiner