993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
3e0e6e35f4
open app thru index.php
2012-04-18 08:20:51 +02:00
57b8ff890c
check if PHP mod GD is installed
2012-04-17 19:09:41 +02:00
d24abc3b9d
check if PHP mod JSON is installed
2012-04-17 19:06:45 +02:00
5720bd296d
merge log into admin
2012-04-16 12:21:48 +02:00
f16cfbab5e
improved installation instructions
2012-04-14 18:44:32 +02:00
637db92e60
increase version to show that we are not the same as stable
2012-04-11 09:20:28 +02:00
6545e48787
Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition.
2012-04-01 11:20:12 +02:00
7552390031
add path_hash to the filesystem cache
2012-03-30 18:12:33 +02:00
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
dda79a90cf
don't limit ourselfs to 32bit integers
2012-02-25 16:51:59 +01:00
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
ca874a3ad7
remove limit from configvalue for long config values
2012-02-24 14:18:09 +01:00
6658f51098
provide early file system when using webdav
2012-02-21 20:48:48 +01:00
501678f981
always mount the root filesystem, sometimes we need the filesystem when not logged in
2012-02-21 20:48:48 +01:00
987845c312
Move the redirect_url from linkTo function to the checkLoggedIn function
2012-02-21 20:09:24 +01:00
36b7d819e5
restore redirect after checkLoggedIn
2012-02-21 10:22:17 -05:00
1fa05894d5
Move config.php writable test to update path
...
This should make it possible to use owncloud with a read-only config.php
2012-02-17 22:10:03 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
eb5de4d4f7
Change gallery thumbnail generation to OC_Image
2012-02-08 21:12:30 +01:00
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
21bf8e99ee
increase version number to 3. YeeHaw party!!
2012-01-27 17:39:55 +01:00
5238a7812c
bump version number
2012-01-21 17:33:43 +01:00
3552626358
Merge branch 'master' into filesystem
2012-01-20 00:48:03 +01:00
11c848b221
initial work on filesystemview
2012-01-20 00:48:00 +01:00
941f199caf
dont complain about non existing config files
2012-01-16 20:17:45 +01:00
96e2f15d8a
merge master into filesystem
2012-01-16 03:06:11 +01:00
ac188ec74b
properly check for write permissions to the config file
2012-01-15 23:58:00 +01:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
868a3b5364
Fix sqlite detection for Ubuntu 11.10
2012-01-03 15:58:48 +01:00
eb4cd86910
Include PostgreSQL when checking for available database drivers.
...
Signed-off-by: Brice Maron <brice@bmaron.net>
2011-12-30 21:09:29 +01:00
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
153029a170
increase version to trigger database upgrade
2011-11-26 01:26:01 +01:00
fab70cb590
removed no longer used function and exec command
...
security++
2011-11-24 13:50:29 +01:00
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
3acea2f574
change the error hint from suggesting to change the owner of a directory to changing the permissions. changing the owner of a director is not possible via ftp.
2011-10-22 19:39:05 +02:00
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
28ab39073a
mount filesystems on demand
2011-10-18 21:01:49 +02:00
ebd36d56ca
Remove unnecessary exec for getting timezone and fix spacings
2011-10-17 21:42:38 +02:00
9d3c7badb5
Fixed a bug in checkWebserverUser
...
checkWebserverUser would return the owner of the document
root instead of the owner of the web server process.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-11 21:46:14 +02:00
6163351ea2
master is now on the way to ownCloud 3
2011-10-10 18:48:40 +02:00
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
0eddc5cae2
bump version number
2011-10-02 18:15:01 +02:00
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
6636720d2d
enhance warning
2011-09-29 15:53:58 +02:00
f14a62c875
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 13:53:51 +02:00
f2a7f230f1
add status file. useful for external administration. show the ownClopud version at least in the config dialog.
2011-09-28 13:52:26 +02:00
475dd72ea4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 11:52:13 +02:00
0fcd765bd5
add check for ctype
2011-09-28 11:47:29 +02:00
40b47defcb
enhance errormessages on setup
2011-09-28 11:46:04 +02:00
10c5178e31
check for php modules
2011-09-27 19:08:38 +02:00
aae6881494
Move display of login page to function in OC_Util
2011-09-26 21:17:17 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
8966ed5a00
Cleanup lib/base.php
2011-09-18 20:57:05 +02:00
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
1ec75330ec
Merge branch 'master' into sharing
2011-08-15 17:49:36 -04:00
6173c0fbc2
a bit of refactoring for oc_filesystem and implement user quota
2011-08-15 21:09:13 +02:00
4830555cce
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
2011-08-11 17:42:37 -04:00
aa582ec43a
more work on encryption
2011-08-11 17:49:36 +02:00
1aa89b7cbb
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
lib/base.php
2011-08-07 15:56:26 -04:00
a0b7b85c56
remove debug
2011-08-07 18:00:35 +02:00
58c2d29f8c
report the right webserver user to simplify setup and debug
2011-08-07 17:58:56 +02:00
b513a60540
nicer error report and streamlined setup
2011-08-06 23:19:00 +02:00
11d1627513
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
...
Conflicts:
lib/base.php
2011-07-30 19:40:19 -04:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2bfad189e7
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
...
Conflicts:
lib/base.php
lib/filestorage.php
2011-07-29 20:42:24 +02:00
f5c0dbd947
Use autoload
2011-07-27 19:07:28 +02:00
Georg Ehrke
Frank Karlitschek
Arthur Schiwon
Robin Appelman
Jan-Christoph Borchardt
Bart Visscher
Alessandro Cosentino
Robin Appelman
prcrst
Daniel Köb
Brice Maron
Joar Wandborg
Marvin Thomas Rabe
Thomas Schmidt
Bart Visscher
Michael Gapczynski
Jakob Sack