wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11435 commits 157 branches 562 tags 714 MiB
Commit graph

353 commits

Author SHA1 Message Date
Thomas Tanghus
89464721c7 Added JSON methods for CSRF prevention. Make request token accessible from template and add js var. 2012-06-13 17:33:19 +02:00
Frank Karlitschek
9e9c40eabd fix time call 2012-06-13 17:27:49 +02:00
Thomas Tanghus
2ee809fd86 Allow same host redirects (/somepath). 2012-06-11 15:21:37 +02:00
Frank Karlitschek
cd16c5e479 implement a simple request token session garbage collector 2012-06-11 12:13:08 +02:00
Michael Gapczynski
3c57fb935b Mount personal mount points into filesystem 2012-06-10 16:34:44 -04:00
Thomas Tanghus
b16136642b Bump version to trigger db update. 2012-06-09 16:05:21 +02:00
Frank Karlitschek
344299a074 add two csrf check calls. Review and lot´s of porting needed. 2012-06-09 15:05:14 +02:00
Robin Appelman
dcf1eed816 add unique instance id 2012-06-05 19:32:48 +02:00
Bart Visscher
9d936976a9 Make check for writable apps dir configurable 2012-06-05 17:51:52 +02:00
Bart Visscher
4a5973662c Merge branch 'unstable' 
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
 2012-06-04 23:02:05 +02:00
Frank Karlitschek
4aa96de537 add a check for pdo 2012-06-01 20:00:33 +02:00
Frank Karlitschek
07e1e3a945 check if apps folder is writable 2012-06-01 19:54:07 +02:00
Frank Karlitschek
c0db603d29 this is 5 pre alpha now 2012-05-19 18:21:33 +02:00
Michael Gapczynski
90cbc32c77 Fix redirect after login, prevent open redirects 2012-05-18 16:56:48 -04:00
Frank Karlitschek
2d3c709163 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-18 15:56:15 +02:00
Frank Karlitschek
2e9115efe0 increase to RC2 2012-05-18 15:54:17 +02:00
Michiel de Jong
a6ff909911 this code looks wrong to me but i'm putting it back while we find out what the right code should look like 2012-05-18 15:39:28 +02:00
Michiel de Jong
1a874b4c56 make redirect safe by restricting it to current host 2012-05-18 15:32:41 +02:00
Michiel de Jong
9b5e8a2c63 fix redirect to desired page after login 2012-05-18 15:11:01 +02:00
Bart Visscher
ce1e4425c2 Combine and minimize core and default app js files 2012-05-16 18:53:46 +02:00
Bart Visscher
f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Frank Karlitschek
af77ce9a9b This is RC now 2012-05-13 05:11:10 +02:00
Bart Visscher
b022ccb863 Whitespace fixes 2012-05-10 09:14:26 +02:00
Michael Gapczynski
051442bc76 Sanitize redirect urls 2012-05-08 17:41:50 -04:00
Frank Karlitschek
43978abd80 increase to 4 beta 2012-05-07 22:58:22 +02:00
Frank Karlitschek
e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Marvin Thomas Rabe
7ded9cf520 Checks if config folder is writable on begin of the installation. 2012-05-01 16:35:46 +02:00
Frank Karlitschek
e1268cd5f4 we require php 5.3 now. so please notify the user if an old version is in use 2012-04-30 13:28:31 +02:00
Georg Ehrke
993d655aad Merge branch 'master' into movable_apps_2 2012-04-27 10:30:50 +02:00
Frank Karlitschek
74b5e22a68 some more csrf fixes 2012-04-26 23:17:46 +02:00
Georg Ehrke
eb29c577c2 Merge branch 'master' into movable_apps 2012-04-18 12:20:09 +02:00
Georg Ehrke
3e0e6e35f4 open app thru index.php 2012-04-18 08:20:51 +02:00
Arthur Schiwon
57b8ff890c check if PHP mod GD is installed 2012-04-17 19:09:41 +02:00
Arthur Schiwon
d24abc3b9d check if PHP mod JSON is installed 2012-04-17 19:06:45 +02:00
Robin Appelman
5720bd296d merge log into admin 2012-04-16 12:21:48 +02:00
Jan-Christoph Borchardt
f16cfbab5e improved installation instructions 2012-04-14 18:44:32 +02:00
Frank Karlitschek
637db92e60 increase version to show that we are not the same as stable 2012-04-11 09:20:28 +02:00
Frank Karlitschek
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
Robin Appelman
7552390031 add path_hash to the filesystem cache 2012-03-30 18:12:33 +02:00
Robin Appelman
d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman
dda79a90cf don't limit ourselfs to 32bit integers 2012-02-25 16:51:59 +01:00
Robin Appelman
ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Arthur Schiwon
ca874a3ad7 remove limit from configvalue for long config values 2012-02-24 14:18:09 +01:00
Robin Appelman
6658f51098 provide early file system when using webdav 2012-02-21 20:48:48 +01:00
Robin Appelman
501678f981 always mount the root filesystem, sometimes we need the filesystem when not logged in 2012-02-21 20:48:48 +01:00
Bart Visscher
987845c312 Move the redirect_url from linkTo function to the checkLoggedIn function 2012-02-21 20:09:24 +01:00
Alessandro Cosentino
36b7d819e5 restore redirect after checkLoggedIn 2012-02-21 10:22:17 -05:00
Bart Visscher
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
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher
eb5de4d4f7 Change gallery thumbnail generation to OC_Image 2012-02-08 21:12:30 +01:00
Robin Appelman
30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Robin Appelman
4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Frank Karlitschek
21bf8e99ee increase version number to 3. YeeHaw party!! 2012-01-27 17:39:55 +01:00
Frank Karlitschek
5238a7812c bump version number 2012-01-21 17:33:43 +01:00
Robin Appelman
3552626358 Merge branch 'master' into filesystem 2012-01-20 00:48:03 +01:00
Robin Appelman
11c848b221 initial work on filesystemview 2012-01-20 00:48:00 +01:00
Robin Appelman
941f199caf dont complain about non existing config files 2012-01-16 20:17:45 +01:00
Robin Appelman
96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman
ac188ec74b properly check for write permissions to the config file 2012-01-15 23:58:00 +01:00
Robin Appelman
d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
prcrst
868a3b5364 Fix sqlite detection for Ubuntu 11.10 2012-01-03 15:58:48 +01:00
Daniel Köb
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
Robin Appelman
9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
Robin Appelman
153029a170 increase version to trigger database upgrade 2011-11-26 01:26:01 +01:00
Frank Karlitschek
fab70cb590 removed no longer used function and exec command 
security++
 2011-11-24 13:50:29 +01:00
Robin Appelman
524e3686a0 tell the user when the files are being scanned 2011-11-10 16:40:09 +01:00
Robin Appelman
5a6aba1e11 provide caching for file metadata 2011-11-09 18:41:57 +01:00
Robin Appelman
ec015a2e68 remove the need to register storage providers, pass the classname during mounting instead 2011-11-08 22:21:25 +01:00
Frank Karlitschek
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
Robin Appelman
b975f11514 make sharing work with the new mouting mechanism 2011-10-18 21:19:13 +02:00
Robin Appelman
28ab39073a mount filesystems on demand 2011-10-18 21:01:49 +02:00
Brice Maron
ebd36d56ca Remove unnecessary exec for getting timezone and fix spacings 2011-10-17 21:42:38 +02:00
Joar Wandborg
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
Frank Karlitschek
6163351ea2 master is now on the way to ownCloud 3 2011-10-10 18:48:40 +02:00
Marvin Thomas Rabe
33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Frank Karlitschek
0eddc5cae2 bump version number 2011-10-02 18:15:01 +02:00
Bart Visscher
21a88613a1 Merge branch 'lostpassword' 
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
 2011-09-30 23:48:20 +02:00
Bart Visscher
f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00
Thomas Schmidt
6636720d2d enhance warning 2011-09-29 15:53:58 +02:00
Frank Karlitschek
f14a62c875 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 13:53:51 +02:00
Frank Karlitschek
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
Frank Karlitschek
475dd72ea4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 11:52:13 +02:00
Frank Karlitschek
0fcd765bd5 add check for ctype 2011-09-28 11:47:29 +02:00
Thomas Schmidt
40b47defcb enhance errormessages on setup 2011-09-28 11:46:04 +02:00
Frank Karlitschek
10c5178e31 check for php modules 2011-09-27 19:08:38 +02:00
Bart Visscher
aae6881494 Move display of login page to function in OC_Util 2011-09-26 21:17:17 +02:00
Bart Visscher
e990ef3542 Move some common code to OC_Util 
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
 2011-09-18 21:31:56 +02:00
Bart Visscher
8966ed5a00 Cleanup lib/base.php 2011-09-18 20:57:05 +02:00
Bart Visscher
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
Michael Gapczynski
e4c9871299 This should actually make the 'Shared' directory automatically everytime 2011-08-15 20:45:07 -04:00
Michael Gapczynski
5fbed936bf Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory 2011-08-15 20:33:02 -04:00
Michael Gapczynski
1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Robin Appelman
6173c0fbc2 a bit of refactoring for oc_filesystem and implement user quota 2011-08-15 21:09:13 +02:00
Michael Gapczynski
4830555cce Merge branch 'master' into sharing 
Conflicts:
	.gitignore
 2011-08-11 17:42:37 -04:00
Frank Karlitschek
aa582ec43a more work on encryption 2011-08-11 17:49:36 +02:00
Michael Gapczynski
1aa89b7cbb Merge branch 'master' into sharing 
Conflicts:
	files/css/files.css
	lib/base.php
 2011-08-07 15:56:26 -04:00
Frank Karlitschek
a0b7b85c56 remove debug 2011-08-07 18:00:35 +02:00
Frank Karlitschek
58c2d29f8c report the right webserver user to simplify setup and debug 2011-08-07 17:58:56 +02:00
Frank Karlitschek
b513a60540 nicer error report and streamlined setup 2011-08-06 23:19:00 +02:00
Michael Gapczynski
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
Jakob Sack
bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack
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
Jakob Sack
f5c0dbd947 Use autoload 2011-07-27 19:07:28 +02:00