Thomas Tanghus
|
c90c358f0d
|
Only load js and css once.
|
2012-08-23 05:02:30 +02:00 |
Jenkins for ownCloud
|
082ed4ab71
|
[tx-robot] updated from transifex
|
2012-08-23 02:07:35 +02:00 |
Michael Gapczynski
|
885b8c481b
|
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
|
2012-08-22 12:32:07 -04: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 |
|
Jenkins for ownCloud
|
e6d87b2c4b
|
[tx-robot] updated from transifex
|
2012-08-22 02:08:16 +02:00 |
Frank Karlitschek
|
1d7018158e
|
4.5 alpha 1
|
2012-08-21 18:47:26 +02: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
|
cb0464ca4e
|
Bump version number for Share API
|
2012-08-19 22:36:19 -04:00 |
|
Michael Gapczynski
|
82d81e8d39
|
Merge branch 'share_api'
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
|
2012-08-19 22:29:01 -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 |
Robin Appelman
|
50cc5d5921
|
fix creating nested folders inside tar files
|
2012-08-19 05:54:16 +02:00 |
|
Robin Appelman
|
3da1339cd8
|
fix error when adding string data to an archive
|
2012-08-19 05:04:58 +02:00 |
|
Robin Appelman
|
154ce0f68d
|
also add getLocalFolder to OC_Filsystem and OC_FilesystemView
|
2012-08-19 02:42:15 +02:00 |
|
Robin Appelman
|
9b44d0cb32
|
add OC_FileStorage::getLocalFolder
|
2012-08-19 02:30:33 +02:00 |
|
Robin Appelman
|
5962469892
|
add OC_Archive::addRecursive
|
2012-08-18 22:42:35 +02:00 |
|
Frank Karlitschek
|
850ee93711
|
add impress mimetype
|
2012-08-17 12:39:05 +02:00 |
|
Robin Appelman
|
53a888cc81
|
more path normalization
|
2012-08-17 01:22:54 +02:00 |
|
Michael Gapczynski
|
df8a2e5361
|
File sharing cleanup, works perfectly I think :)
|
2012-08-16 12:20:14 -04:00 |
|
Jenkins for ownCloud
|
1e6dc67517
|
[tx-robot] updated from transifex
|
2012-08-16 02:09:15 +02:00 |
|
Michael Gapczynski
|
9cb3113f42
|
Fix problems exposed by tests
|
2012-08-15 11:59:08 -04:00 |
|
Michael Gapczynski
|
137e4cb342
|
Add tests for Share API, all tests passing :)
|
2012-08-15 11:55:54 -04:00 |
|
Jenkins for ownCloud
|
da3896808a
|
[tx-robot] updated from transifex
|
2012-08-15 02:07:20 +02: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
|
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 |
|
Robin Appelman
|
1522f7f211
|
fix some minor problems with path noramlization
|
2012-08-14 03:07:14 +02:00 |
|
Robin Appelman
|
0c8ce0bb32
|
some basic path normalization
|
2012-08-14 02:44:45 +02:00 |
|
Michael Gapczynski
|
863d3a43b2
|
Catch exceptions and write to log when creating storage object fails
|
2012-08-13 17:10:58 -04:00 |
Lukas Reschke
|
e72a57f595
|
Also check for some other files
|
2012-08-13 00:57:01 +02: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 |
Jakob Sack
|
4d3d4522f9
|
Backgroundjobs: Fix wrong var names
|
2012-08-12 12:14:27 +02:00 |
|
Jakob Sack
|
deef1f73db
|
Backgroundjobs: fix bug in QueuedTask
|
2012-08-12 09:02:20 +02:00 |
|
Michael Gapczynski
|
a1c88a3e39
|
Add search, limit, offset parameters to usersInGroups()
|
2012-08-11 16:25:28 -04:00 |
|
Michael Gapczynski
|
4f1b3631ba
|
Change limit parameter in OC_User as well
|
2012-08-11 16:25:28 -04:00 |
|
Michael Gapczynski
|
874f31b8d7
|
Make getting all users and groups the default
|
2012-08-11 16:25:27 -04:00 |
|
Michael Gapczynski
|
8d1eb674ec
|
Add search, limit, and offset parameters to getUsers() and getGroups()
|
2012-08-11 16:25:27 -04:00 |
|
Jakob Sack
|
1d7e3071e0
|
bump version to reate new tables
|
2012-08-11 17:32:17 +02:00 |
|
Lukas Reschke
|
0d8df3f55c
|
Revert "Combine install checks in lib/base.php"
This reverts commit aa9fbf6639.
|
2012-08-11 17:07:35 +02:00 |
|
Michael Gapczynski
|
465767670b
|
Check blacklist when renaming files
|
2012-08-11 11:04:04 -04:00 |
|
Lukas Reschke
|
8ec45870a3
|
Validate cookie properly and prevent auth bypass
BIG (!) thanks to Julien CAYSSOL
|
2012-08-10 15:28:59 +02:00 |
|
Jakob Sack
|
0ea4fa298c
|
Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed
|
2012-08-10 13:53:40 +02:00 |
|
Jakob Sack
|
81b997b56e
|
Merge branch 'backgroundjobs'
|
2012-08-10 13:00:51 +02:00 |
Bart Visscher
|
82b10954e7
|
Simplify loading app php script files
|
2012-08-10 12:27:37 +02:00 |
|
Bart Visscher
|
5e7086adc9
|
Move login handling to OC class
|
2012-08-10 12:17:13 +02:00 |
|
Bart Visscher
|
83403784d1
|
Always load when the requested file is css
|
2012-08-10 11:43:04 +02:00 |