Robin Appelman
88f4f5413a
add OC_Appconfig::hasKey
2011-10-02 14:30:51 +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
Marvin Thomas Rabe
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
Thomas Schmidt
c3b57944ac
Revert "enhance detection of un-initialized database", conflicted with setup step, needs rework
...
This reverts commit 7fb89c5386
.
2011-09-30 17:03:04 +02:00
Thomas Schmidt
7fb89c5386
enhance detection of un-initialized database
2011-09-30 14:40:17 +02:00
Thomas Schmidt
182333a781
use central method for checking webserver user
2011-09-29 15:54:41 +02:00
Thomas Schmidt
6636720d2d
enhance warning
2011-09-29 15:53:58 +02:00
Bart Visscher
19d4121763
Change json content-type to correct IANA type
2011-09-28 23:17:25 +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
Bart Visscher
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
Frank Karlitschek
10c5178e31
check for php modules
2011-09-27 19:08:38 +02:00
Bart Visscher
2d3c1a3f00
Fix space in comment
2011-09-26 21:18:37 +02:00
Bart Visscher
aae6881494
Move display of login page to function in OC_Util
2011-09-26 21:17:17 +02:00
Robin Appelman
bcf92badd1
dont set content type to json for Apps
2011-09-26 00:19:34 +02:00
Bart Visscher
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Robin Appelman
6c2b22406c
remove some debug statements
2011-09-25 01:33:53 +02:00
Robin Appelman
57bffdb46a
fix uploading files using webdav
2011-09-25 01:20:43 +02:00
Florian Pritz
36c31b0e83
fix warning when uploading file using webdav
...
When uploading a file using davfs php warned about a missing argument to
OC_FileProxy_Quota::preFile_put_contents(). Since we get a resource from
OC_Connector_Sabre_File->put(), we have to convert that before running
strlen because it expects a string.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:01 +02:00
Florian Pritz
c7d4e72341
set cookie secure if forcessl is enabled
...
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02:00
Florian Pritz
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
Florian Pritz
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
Bart Visscher
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +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
Bartek Przybylski
6e980d419c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-18 15:06:51 +02:00
Bartek Przybylski
94696ea7de
remember changed not to store password in cookie
2011-09-18 15:05:53 +02:00
Robin Appelman
0714e83a8e
fix creating groups
2011-09-18 13:35:27 +02:00
Bartek Przybylski
68e7666293
Changed behaviour of remember checkbox
2011-09-18 09:15:30 +02:00
Robin Appelman
8c7aa06088
dont use numRows when it's not needed since it can be expensive
2011-09-17 02:49:40 +02:00
Jan-Christoph Borchardt
b1e3961825
removed excess white space inside parentheses
2011-09-12 12:30:57 +02:00
Jan-Christoph Borchardt
014f4af79c
fixed translation detection thanks to Xuetian Weng
2011-09-12 12:29:43 +02:00
Bart Visscher
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
Jan-Christoph Borchardt
252bca5057
removed database table prefix choice, use oc_
2011-09-04 14:56:09 +02:00
Aloisio Almeida Jr
ec87e2eac4
setup.php: Get 'datadirectory' from config file instead of 'datadir'
...
Signed-off-by: Aloisio Almeida Jr <aloisiojr@gmail.com>
2011-09-03 21:22:09 -03:00
Bart Visscher
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
Côme BERNIGAUD
3972774a2e
Removed db4app and test_db
2011-09-01 15:58:47 +02:00
Côme BERNIGAUD
40d9439d4e
Merge branch 'master' of git.kde.org:owncloud
2011-09-01 15:21:27 +02:00
Jan-Christoph Borchardt
7fa1f8161c
do not user directories when navigating to /data. Needs more security.
2011-08-31 11:41:09 +02:00
Jan-Christoph Borchardt
e4f70d5bbb
files not viewable from the outside by adresses anymore
2011-08-31 11:28:18 +02:00
Jan-Christoph Borchardt
efa3085073
fixed picture preview broken for some, thanks to Felix on Shapado
2011-08-29 17:09:22 +02:00
Côme BERNIGAUD
b92603b3fd
Translation for date column
2011-08-28 23:11:45 +02:00
Robin Appelman
5c9178f851
Fixed a bug in appconfig, where an initially empty set value led to endless duplicates of this app/key pair.
...
Path by Elias Probst <mail@eliasprobst.eu>
2011-08-28 19:36:23 +02:00
Michael Gapczynski
74c7890fbb
Fix undefined index license in Apps
2011-08-27 17:56:22 -04:00
Côme BERNIGAUD
52ca447efc
Merge branch 'master' of git.kde.org:owncloud
2011-08-27 18:11:32 +02:00