Michael Gapczynski
|
60feaf9abf
|
Merge branch 'master' into share_expiration
Conflicts:
core/js/share.js
lib/util.php
|
2012-09-12 01:06:57 -04:00 |
Michael Gapczynski
|
8f0354bcdd
|
Temporarily disable sharing with contacts and emails, will come in next release
|
2012-09-12 01:02:08 -04:00 |
Michael Gapczynski
|
37f0b85d3f
|
Fix problem with non share collection item types being treated as collections
|
2012-09-11 00:37:31 -04:00 |
Michael Gapczynski
|
6c17a4cb77
|
Don't display actions for children in shared collections, show the parent collection the child is shared in
|
2012-09-09 14:44:08 -04:00 |
Michael Gapczynski
|
13d513c17c
|
Fix shared collection item searching
|
2012-09-09 11:50:12 -04:00 |
Michael Gapczynski
|
3e7951e1e6
|
Normalize the file path for shared children as a precaution
|
2012-09-08 23:42:24 -04:00 |
Michael Gapczynski
|
fe7f095b08
|
Insert id for unique user group share rows
|
2012-09-08 23:09:58 -04:00 |
Michael Gapczynski
|
b163bd514f
|
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
|
2012-09-08 23:09:57 -04:00 |
Michael Gapczynski
|
f23f719d99
|
Fix unsharing from self for group shares and add test for it
|
2012-09-08 20:15:47 -04:00 |
Michael Gapczynski
|
73d726d1b2
|
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
|
2012-09-07 00:02:22 -04:00 |
Michael Gapczynski
|
4c065deb55
|
Listen to post_deleteGroup hook in Share API
|
2012-09-02 20:01:09 -04:00 |
Michael Gapczynski
|
dc569ea300
|
Fix some warnings from Jenkins in the Share API
|
2012-09-02 19:30:01 -04:00 |
Michael Gapczynski
|
db37a454b3
|
Add parameter documentation
|
2012-09-02 18:29:55 -04:00 |
Michael Gapczynski
|
f0f2d93908
|
Restructure generateTarget for the post_addToGroup hook
|
2012-09-02 18:23:19 -04:00 |
Michael Gapczynski
|
a77c16371f
|
Make item targets be based off of the parent item target for reshares
|
2012-09-02 18:23:19 -04:00 |
Michael Gapczynski
|
6c29334b48
|
Add support for share expiration
|
2012-09-01 18:53:48 -04:00 |
Bart Visscher
|
0365f8fd01
|
Remove php close at end of file
|
2012-08-29 20:29:43 +02:00 |
Michael Gapczynski
|
26501a0bc8
|
Delete old link if user sets a password
|
2012-08-29 14:06:55 -04:00 |
Michael Gapczynski
|
9cd55508c3
|
Add Share API settings to admin page
|
2012-08-27 20:39:31 -04:00 |
Michael Gapczynski
|
0ad16e84c5
|
Fix share collection query
|
2012-08-27 20:37:38 -04:00 |
Michael Gapczynski
|
0a9d1ed3a6
|
Initial previewer for public links
|
2012-08-27 20:37:38 -04:00 |
Michael Gapczynski
|
18517f6adb
|
Fix share getItems() limit
|
2012-08-26 21:34:37 -04:00 |
jfd
|
9822cd30c0
|
fix sharing bug introduced with oracle support
|
2012-08-26 14:57:33 +02:00 |
Jörn Friedrich Dreyer
|
fa3497f6ed
|
add backticks to SQL, use limit parameter instead of LIMIT SQL
|
2012-08-25 01:52:27 +02:00 |
Michael Gapczynski
|
36487246ed
|
Switch to using file cache ids instead of paths for file sharing
|
2012-08-24 10:05:37 -04:00 |
Thomas Tanghus
|
c90c358f0d
|
Only load js and css once.
|
2012-08-23 05:02:30 +02:00 |
Michael Gapczynski
|
3debb67458
|
Move share CSS to core, add script and style from inside Share API
|
2012-08-22 11:57:58 -04:00 |
Michael Gapczynski
|
9699ff03bd
|
Revert using item name, no longer allowing the same item source exist for a user
|
2012-08-22 11:57:58 -04:00 |
Michael Gapczynski
|
09e851a9c4
|
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
|
2012-08-20 21:22:22 -04:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
f987e22d85
|
Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions
|
2012-08-19 16:30:38 -04:00 |
Michael Gapczynski
|
df8a2e5361
|
File sharing cleanup, works perfectly I think :)
|
2012-08-16 12:20:14 -04:00 |
Michael Gapczynski
|
9cb3113f42
|
Fix problems exposed by tests
|
2012-08-15 11:59:08 -04:00 |
Michael Gapczynski
|
ddfa760a5e
|
Change to correct function call getItemSharedWithBySource()
|
2012-08-14 17:06:41 -04:00 |
Michael Gapczynski
|
b440dfc67e
|
Remove setTarget() function, changing target names only leads to confusion
|
2012-08-14 17:05:38 -04:00 |
Michael Gapczynski
|
9661a63a72
|
Ensure permissions can't be escalated during a reshare
|
2012-08-14 16:54:38 -04:00 |
Michael Gapczynski
|
028c79fc9d
|
Use if instead of switch for detecting share type and throw exceptions when setting permissions
|
2012-08-14 16:30:13 -04:00 |
Michael Gapczynski
|
937d1b29d8
|
Retrieve all file dependent items when looking for file item type
|
2012-08-14 11:02:29 -04:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
b830b3e24b
|
Start adding permission checks for addressbooks
|
2012-08-08 21:43:02 -04:00 |
Michael Gapczynski
|
2c5744f16c
|
Add back getItemSharedWithBySource(), some situtations require this ability
|
2012-08-08 20:56:55 -04:00 |
Bart Visscher
|
b287b11ff2
|
adjust the query generation in getItems, to use placeholders
|
2012-08-07 21:49:31 +02:00 |
Michael Gapczynski
|
b6bbbb4c47
|
Remove undefined return variable
|
2012-08-07 14:38:02 -04:00 |
Michael Gapczynski
|
a96a75c263
|
Select the correct column when searching for similar targets
|
2012-08-06 16:48:20 -04:00 |
Michael Gapczynski
|
5e95e2a131
|
Set filePath variable
|
2012-08-06 16:46:44 -04:00 |
Michael Gapczynski
|
1b21cde2b3
|
Throw more exceptions
|
2012-08-06 16:37:51 -04:00 |
Michael Gapczynski
|
14d13a740f
|
Load icons for addressbooks, fix statuses for types other than files
|
2012-08-06 15:24:08 -04:00 |
Michael Gapczynski
|
e954de6030
|
Make the file source path relative earlier
|
2012-08-06 14:15:37 -04:00 |
Michael Gapczynski
|
e280e3ecc9
|
Throw more exceptions
|
2012-08-06 14:09:58 -04:00 |
Michael Gapczynski
|
1db1d40414
|
Add additional check for post_deleteUser so we don't delete any non-user shares with the same name
|
2012-08-06 13:58:26 -04:00 |