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 |