c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
260729fd7d
Verify whether the URL is valid
...
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017
@karlitschek Backport for stable6 and stable7 requested.
2014-07-27 16:46:32 +02:00
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
2fec6cbd5b
Remove forgotten debug log
2014-07-03 12:26:17 +02:00
3e78f41d00
Use getAbsoluteUrl for redirection URL
...
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
2014-07-01 16:02:38 +02:00
c005515ebd
Support for multiple default apps
...
If a default app isn't visible for the user, try the next one.
Else fallback to the "files" app.
2014-07-01 15:42:26 +02:00
894d69184a
Add bak defaultapp setting
2014-07-01 14:28:45 +02:00
ae68a773c0
more strings to translate in utils also some fixes in defaults
2014-06-28 13:29:24 +02:00
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
4e65889f54
only use one config option 'objectstore' for root and home storage configuration
2014-06-18 12:53:20 +02:00
7493ff0624
fix unit test by always initializing the root of the storage in the constructor
2014-06-18 12:53:20 +02:00
10de4a7b90
move creation of / and users 'files' from storage constructor to setupFS / mount initialization
2014-06-18 12:53:20 +02:00
85ccfad37c
change 'object_storage' config param to 'root_storage'
...
copy skeleton only for local filesystems
2014-06-18 12:53:19 +02:00
2bf7e5c02f
make objectstore setup more robust, don't pass user to object store mounted as root
2014-06-18 12:53:19 +02:00
3c66a8c8ed
allow configuring objectstore as home and root storage
2014-06-18 12:53:19 +02:00
799205488c
Prevent loadApps on upgrade
...
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
ac7fb1b23e
Remove legacy routing code
...
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.
This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.
Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
f1bf06f8cf
Merge pull request #8884 from owncloud/move-flock-to-app
...
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
ab6680e9ab
name the storage wrapper to make sure that we don't apply the wrapper multiple times
2014-06-04 07:55:46 +02:00
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
555b9cc245
Merge pull request #7614 from owncloud/test_annotations_working
...
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
06af8e09da
adding annotation check to checkServer()
2014-05-19 21:51:35 +02:00
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
f7e777f7d2
Fix various code errors detected by Scrutinizer
...
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
5cfc9d973d
Fix PHP Doc and use readable variable name
2014-05-04 13:02:58 +02:00
d091cca636
Fix typo
2014-05-04 12:53:06 +02:00
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
d98ae4f9b2
Fix a wrong WebDAV Warning with self-signed-certs
...
Occuring in the admin interface
2014-04-13 05:24:29 +02:00
77ecfdd1a4
Only encode dangerous dangerous characters
...
There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded.
This may fix issues like https://github.com/owncloud/calendar/pull/394
2014-04-11 19:42:15 +02:00
7278f2f567
Sub-dir was prepended twice
2014-03-29 20:40:49 +01:00
c14107550d
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-28 18:05:48 +01:00
2d592ddc8f
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
...
Squashed commit of the following:
commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge: 1e9c5behttps://github.com/kev300/core into kev300-master
commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:11:42 2013 +0100
Update util.php
commit 3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:09:15 2013 +0100
Update util.php
commit 512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:02:04 2013 +0100
Update util.php
commit 6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date: Mon Dec 16 16:44:46 2013 +0100
Update util.php
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
2014-03-28 12:09:29 +01:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
743ca4581d
Merge pull request #7748 from owncloud/postgresversionwarning
...
Added PostgreSQL version warning on upgrade
2014-03-25 23:17:18 +01:00
6bfeb342db
fixing code style
2014-03-25 23:17:00 +01:00
a25b86a30e
Log exception when PostgreSQL version check failed
2014-03-24 11:54:44 +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
6de9033d86
Added warning for Mac OS on setup page
2014-03-20 12:57:55 +01:00
36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Björn Schießle
Lukas Reschke
Vincent Petry
Volkan Gezer
Jörn Friedrich Dreyer
Lukas Reschke
Thomas Müller
ringmaster
Robin Appelman
Morris Jobke
Robin McCorkell
Thomas Tanghus
kondou