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
7fb89c5386
enhance detection of un-initialized database
2011-09-30 14:40:17 +02:00
182333a781
use central method for checking webserver user
2011-09-29 15:54:41 +02:00
6636720d2d
enhance warning
2011-09-29 15:53:58 +02:00
19d4121763
Change json content-type to correct IANA type
2011-09-28 23:17:25 +02:00
1f74e76d83
Implemented ace-edtior as an app. Basic file editing and saving supported.
2011-09-28 15:15:04 +01: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
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
10c5178e31
check for php modules
2011-09-27 19:08:38 +02:00
2d3c1a3f00
Fix space in comment
2011-09-26 21:18:37 +02:00
aae6881494
Move display of login page to function in OC_Util
2011-09-26 21:17:17 +02:00
bcf92badd1
dont set content type to json for Apps
2011-09-26 00:19:34 +02:00
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
6c2b22406c
remove some debug statements
2011-09-25 01:33:53 +02:00
57bffdb46a
fix uploading files using webdav
2011-09-25 01:20:43 +02:00
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
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
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
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +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
6e980d419c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-18 15:06:51 +02:00
94696ea7de
remember changed not to store password in cookie
2011-09-18 15:05:53 +02:00
39fa5d1c7f
always use mdb2 for installation
2011-09-18 14:05:38 +02:00
b86367866e
merge master into database
2011-09-18 13:47:15 +02:00
0714e83a8e
fix creating groups
2011-09-18 13:35:27 +02:00
68e7666293
Changed behaviour of remember checkbox
2011-09-18 09:15:30 +02:00
8c7aa06088
dont use numRows when it's not needed since it can be expensive
2011-09-17 02:49:40 +02:00
5e3ecbbf96
dont use numRows when it's not needed since it can be expensive
2011-09-17 02:36:04 +02:00
0e2b957dac
add pdo backend to oc_db
2011-09-17 02:30:58 +02:00
b1e3961825
removed excess white space inside parentheses
2011-09-12 12:30:57 +02:00
014f4af79c
fixed translation detection thanks to Xuetian Weng
2011-09-12 12:29:43 +02:00
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
252bca5057
removed database table prefix choice, use oc_
2011-09-04 14:56:09 +02:00
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
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
3972774a2e
Removed db4app and test_db
2011-09-01 15:58:47 +02:00
40d9439d4e
Merge branch 'master' of git.kde.org:owncloud
2011-09-01 15:21:27 +02:00
7fa1f8161c
do not user directories when navigating to /data. Needs more security.
2011-08-31 11:41:09 +02:00
e4f70d5bbb
files not viewable from the outside by adresses anymore
2011-08-31 11:28:18 +02:00
efa3085073
fixed picture preview broken for some, thanks to Felix on Shapado
2011-08-29 17:09:22 +02:00
b92603b3fd
Translation for date column
2011-08-28 23:11:45 +02:00
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
74c7890fbb
Fix undefined index license in Apps
2011-08-27 17:56:22 -04:00
52ca447efc
Merge branch 'master' of git.kde.org:owncloud
2011-08-27 18:11:32 +02:00
e8fa2d3442
Added db4app lib, and apps test_db that shows how it works.
...
Also fixed a typo in db.php
2011-08-27 18:09:14 +02:00
11c2aff8c9
fixed installer failing due to htaccess. Thanks to Elias Probst
2011-08-27 10:19:45 +02:00
ee0954b236
fix issue with login being case insensitve
2011-08-25 21:51:13 +02:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
d851bdac90
fix .htaccess file crashing apache+php-cgi
2011-08-22 17:18:54 +02:00
af3080402b
fix installing shipped apps
2011-08-22 14:17:38 +02:00
109302a928
add some todos
2011-08-20 11:53:14 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
683e125042
Merge branch 'sharing'
2011-08-17 13:48:36 +02:00
cb9fc6d901
make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff
2011-08-17 00:24:50 +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
13cbd7f578
some filesystem fixes
2011-08-15 22:55:14 +02:00
6173c0fbc2
a bit of refactoring for oc_filesystem and implement user quota
2011-08-15 21:09:13 +02:00
2cb231d0a4
resolved merge conflict
2011-08-14 19:31:38 +02:00
9648be97fb
better error messages for installation, still need to be inline
2011-08-13 05:37:12 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
122018889a
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
2011-08-12 21:00:41 -04:00
67156f87e3
Add missing parameter to usersInGroup()
2011-08-12 20:53:36 -04:00
ffe9da91af
Add missing parameter to usersInGroup()
2011-08-12 20:51:01 -04:00
c2a5b49834
better error reporting during installation
2011-08-12 19:22:29 +02:00
0b4ed25776
fixed downloading of files with spaces in name for Firefox
2011-08-12 12:03:59 +02:00
6c4d075bd6
added jquery-tipsy for nice title tooltips
2011-08-12 11:26:13 +02:00
4830555cce
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
2011-08-11 17:42:37 -04:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
aa582ec43a
more work on encryption
2011-08-11 17:49:36 +02:00
d75faac09e
Merge branch 'master' of git.kde.org:owncloud
2011-08-11 16:33:53 +02:00
5b9f6b4001
hide the files admin page as long as we don have settings on the page
2011-08-11 16:24:53 +02:00
50c1553c38
automaticaly login after setup
2011-08-11 16:22:25 +02:00
bc5bf18eed
bit of work on app management
2011-08-11 15:11:06 +02:00
b4e89871dd
merged master into sharing
2011-08-11 13:29:22 +02:00
bfd72501a1
add OC_Group::usersInGroup() to get a list of all users in a group
2011-08-11 10:12:17 +02:00
05f3910718
moved search box directly to template
2011-08-10 22:56:55 +02:00
f03874ac49
work on user management
2011-08-10 22:38:28 +02:00
e1bde1a78e
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-08-10 13:40:47 -04:00
613ab41eb3
more work on the encryption library
2011-08-10 17:24:38 +02:00
1f1498ceca
remove Log completely
2011-08-10 14:03:54 +02:00
cdf91b6b3e
work in new app management
2011-08-10 14:03:54 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
c958a44e46
Copying globals to OC::*
2011-08-10 11:18:35 +02:00
7b653dbca6
use sprintf for translations
2011-08-10 11:08:30 +02:00
ec6aed8475
Merge branch 'master' into sharing
2011-08-09 10:42:50 -04:00
97462b018d
Merge MySQL and PostgreSQL input fields
2011-08-09 11:32:22 +02:00
7b38e5d7c7
apps can now add their own forms to the Personal page
2011-08-08 23:46:52 +02:00
962907ee6f
Merge branch 'master' of git://anongit.kde.org/owncloud
...
Conflicts:
lib/template.php
2011-08-08 23:16:30 +02:00
4b967a9414
Minor improvements
2011-08-08 23:14:47 +02:00
d1d47eb5eb
do proper styling for settings pages
2011-08-08 22:38:42 +02:00
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
8bd82b96f3
checking for apache server in setup
2011-08-08 21:41:20 +02:00
1aa89b7cbb
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
lib/base.php
2011-08-07 15:56:26 -04:00
3e8ae8636c
Add postgresql support
...
REVIEW: 102101
2011-08-07 21:06:53 +02:00
acf7916e71
user is a reserved word in postgresql
2011-08-07 19:02:41 +02: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
b2702c4406
fix include path
2011-08-07 17:39:38 +02:00
51caa624bb
first step to file encription
2011-08-07 17:32:48 +02:00
1dc3cb67fa
more improved error reporting
2011-08-06 23:31:38 +02:00
a689fa18df
Merge branch 'master' of git.kde.org:owncloud
2011-08-06 23:19:40 +02:00
b513a60540
nicer error report and streamlined setup
2011-08-06 23:19:00 +02:00
63de1841a6
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-06 23:10:14 +02:00
42a6549729
Database.xml
2011-08-06 23:09:38 +02:00
be9c044b24
descriptions for OC:: variables
2011-08-06 23:04:39 +02:00
d9ccbe96dd
fix template.php ;-)
2011-08-06 17:00:06 +02:00
501b767e6e
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-06 11:38:49 +02:00
5f7c040ec0
Add principals, minor changes in base.php
2011-08-06 11:36:56 +02:00
faf6c0e8e1
fix some forgotten quotes around strings
2011-08-05 11:19:46 +02:00
6d5cb13018
fixed relative time calculation
2011-08-05 08:19:51 +02:00
a2062036d3
selecting a text file from the search results now activates the text viewer
2011-08-03 00:30:21 +02:00
e50abdd355
limit the length of the mysql username during setup
2011-08-02 21:33:35 +02:00
db90b2e44a
prepare replacing global $vars with OC::$vars
2011-08-02 18:48:19 +02:00
c50a83cd8d
Introducing a semiautoload. Enables autoload for classes that are not in lib/
2011-08-02 18:31:42 +02:00
ddfc9fc001
Move registering shared storage out of base
2011-08-01 10:58:15 -04:00
2d19965750
some improvements to collection scanning
2011-08-01 00:07:46 +02:00
14f7daf53c
add transitions to oc_db
2011-07-31 20:24:53 +02:00
17058c9467
Merge branch 'master' into sharing
2011-07-31 12:53:34 -04:00
b93b066a42
fix search results having files from other users
2011-07-31 15:35:37 +02:00
5ef407d1c9
keyboard shortcuts for search results
2011-07-31 04:03:48 +02:00
2c8b4da840
make sure jquery and common javascript is loaded before the javascript of the apps
2011-07-31 02:24:46 +02:00
0bc16683e5
dont show music results twice
2011-07-31 02:20:34 +02:00
0d3ebbfefd
Merge branch 'master' into sharing
2011-07-30 19:57:57 -04: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
1564a40538
dont show the full path for the files in search results
2011-07-31 01:26:13 +02:00
0503c3499e
configure users/groups before loading apps
2011-07-31 00:23:06 +02:00
0dab7f2e53
laod apps ways earlier!
2011-07-31 00:06:17 +02:00
aafd36e2f3
provide json interface for search
2011-07-30 16:42:20 +02:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2ff8d7a8bc
One class per file!
2011-07-29 21:03:53 +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
5fd77084c4
Merge branch 'master' into sharing
...
Conflicts:
core/templates/layout.user.php
2011-07-29 13:58:13 -04:00
d12d08e2f3
some more changes for navigation subentries
2011-07-29 19:43:06 +02:00
fe47d51598
some refactoring for subnavigation code
2011-07-29 19:12:55 +02:00
fcc9f50641
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-07-29 10:23:15 -04:00
6d0c8ea7e4
use proper file icons for image and audio files
2011-07-29 01:37:08 +02:00
f1616b0e62
implemented relative file size and coloring
2011-07-29 00:46:20 +02:00
f1c2b5b304
set installed version in config file
2011-07-28 23:34:39 +02:00
20f5a9f085
bumb version number for upcomming beta
2011-07-28 23:34:39 +02:00
7d15a45e09
use oc_preferences to store ocs privatedata
2011-07-28 20:23:58 +02:00
0d408fe6f5
make use of the command line tools id3info and mp3info for scanning music if they are available
2011-07-28 20:10:58 +02:00
Thomas Schmidt
Bart Visscher
Tom Needham
Frank Karlitschek
Robin Appelman
Florian Pritz
Bart Visscher
Bartek Przybylski
Jan-Christoph Borchardt
Aloisio Almeida Jr
Côme BERNIGAUD
Michael Gapczynski
Jakob Sack
Serge Martin