Michael Gapczynski
1cfa911ce3
Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider
2011-07-20 14:42:48 -04:00
Michael Gapczynski
abf6ba621a
Merge branch 'master' into sharing
2011-07-20 14:30:19 -04:00
Jakob Sack
86cd8063b4
Use SabreDAV authentication Code!
2011-07-20 16:36:36 +02:00
Jakob Sack
bf1ca75710
Integration of SabreDAV
2011-07-20 15:53:34 +02:00
Bartek Przybylski
c5776fdae4
remember login added
2011-07-20 15:04:14 +02:00
Robin Appelman
6935f036a5
move list of mimetypes by extention to a seperate file.
2011-07-17 17:41:46 +02:00
Michael Gapczynski
f09f2d3290
Fix typo in setup, thanks for pointing it out ab0oo
2011-07-13 17:19:13 -04:00
Michael Gapczynski
ecaf66ee97
Add missing argument for fromTmpFile() inside of rename()
2011-07-13 13:47:45 -04:00
Michael Gapczynski
5896e48755
Add missing argument for fromTmpFile() inside of rename()
2011-07-13 13:30:22 -04:00
Michael Gapczynski
a79f2535f8
Merge branch 'master' into sharing
2011-07-12 20:51:07 -04:00
Michael Gapczynski
a861666500
Add missing parameter for fromTmpFile() inside of copy()
2011-07-12 20:50:04 -04:00
Michael Gapczynski
2c4fef91da
Merge branch 'master' into sharing
2011-07-12 18:38:03 -04:00
Michael Gapczynski
f8eced1960
Fix post_create and post_write hooks in copy(), was referencing an undefined variable
2011-07-12 18:26:44 -04:00
Michael Gapczynski
6b303ee64b
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
2011-07-12 13:10:29 -04:00
Michael Gapczynski
5e560e9bd9
Merge branch 'master' into sharing
2011-07-06 20:19:44 -04:00
Jan-Christoph Borchardt
e3fd72dc16
introducing simple file size, only MB as unit, details on hover
2011-07-07 01:27:16 +02:00
Michael Gapczynski
9deab8302f
Fix bugs in getSource() and implement new target path standard
2011-07-05 11:56:02 -04:00
Michael Gapczynski
607f1a2738
Fix conflicts with master in lib/base.php
2011-07-04 16:45:19 -04:00
Michael Gapczynski
05389827fd
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
lib/base.php
2011-07-04 16:36:30 -04:00
Kunal Ghosh
f2845bbea8
Fix to make the Unlock mechanism of WebDAV work. Previously when using unlock in cadaver etc was used the lock entry corresponding to the file was not deleted in the sqlite database table oc_locks. The error was because the delete query in the Unlock function was not getting executed :)
2011-07-02 07:17:05 +05:30
Robin Appelman
f40a1cad8b
not all http server add index.php to $_SERVER[SCRIPT_NAME], do it manually
...
this fixes incorect generated links in some cases
2011-06-26 00:59:31 +02:00
Robin Appelman
155f62bcf6
allow plugins/apps to add custom headers to all pages
2011-06-24 22:09:55 +02:00
Aamir Khan
2098cbd822
redirect_url to be respected in linkTo function
2011-06-25 01:14:28 +05:30
Robin Appelman
4d11e920be
provide an option to add custom elements to the header of templates
2011-06-24 18:02:19 +02:00
Michael Gapczynski
467778d66f
Merge branch 'master' into sharing
2011-06-23 17:54:49 -04:00
Kamil Domanski
2073d3b08e
fix 404
2011-06-23 23:47:46 +02:00
Kamil Domanski
0bf67298d1
no indexing in generated htaccess
2011-06-23 23:41:53 +02:00
Robin Appelman
8b76590f5d
fix creating users
2011-06-23 18:23:47 +02:00
Dominik Schmidt
3b2fcd356f
Use new user backend API
2011-06-23 15:24:09 +02:00
Dominik Schmidt
96657f8b62
Detect backend features dynamically instead of trial-and-error usage
...
Move documented functions for reference into OC_USER_EXAMPLE class.
2011-06-23 14:45:28 +02:00
Michael Gapczynski
18e776fa2f
Changed mount point to 'Share', fixed is_dir()
2011-06-22 11:40:09 -04:00
Robin Appelman
83958ebd4b
add oc_user::getUser to get the user id of the loggedin user
2011-06-22 12:50:57 +02:00
Robin Appelman
36dbb8edab
prefix the mysql user name to avoid collissions
2011-06-21 23:58:02 +02:00
Kamil Domanski
e047feb2ad
install shipped apps also in "installed apps" page
2011-06-21 22:17:53 +02:00
Robin Appelman
ee0f1490e1
Multiply changes to user system
...
keeping tracked of the logged in user is no longer done by the active backend but by oc_user directly instead
multiply backends can be active at the same time, allowing alternative authentication procedures like openid or tokens to be used next to the regular user system
2011-06-21 19:28:46 +02:00
Jakob Sack
3e74cca739
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-20 22:09:21 +02:00
Jakob Sack
61993419ec
New i18n-structure
2011-06-20 21:54:21 +02:00
Kamil Domanski
0603391405
fixed page reload after logout
2011-06-20 21:09:34 +02:00
Jakob Sack
eb1ce7819a
Fix linkTo()
2011-06-20 21:01:34 +02:00
Jakob Sack
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00
Jakob Sack
272fc252fb
Activate "active" for subentries
2011-06-20 19:50:25 +02:00
Robin Appelman
0563741652
fix sqlite3 driver for php<5.3
2011-06-20 19:04:31 +02:00
Robin Appelman
76b12c4ae0
add settings option for language
2011-06-20 14:33:31 +02:00
Jakob Sack
99ae7cd477
Autodetection of language is working now
2011-06-19 23:46:59 +02:00
Jakob Sack
ad893f2bea
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-19 23:34:03 +02:00
Jakob Sack
b31a8ac985
More l10n-stuff
2011-06-19 23:33:34 +02:00
Kamil Domanski
38545d5ee4
and even more properly now ;P
2011-06-19 23:29:09 +02:00
Kamil Domanski
51c0a8e3ce
index now properly reloaded after setup
2011-06-19 23:12:07 +02:00
Kamil Domanski
ee247a21a4
shipped apps are no longer hardcoded
2011-06-19 22:46:05 +02:00
Robin Appelman
37f9e03772
improved check in oc_preferences if a key already exists
2011-06-19 22:34:36 +02:00
Robin Appelman
11dc3bb0e1
only load apps if they exist
2011-06-19 22:34:36 +02:00
Robin Appelman
07f2fcf7ec
add post_* hooks to filesystem for write, create, delete, rename and copy
2011-06-19 22:34:36 +02:00
Jakob Sack
c26719a10d
Fixed documentation of OC_L10N
2011-06-19 19:38:51 +02:00
Jakob Sack
e8e483d079
L10N is here ;-)
2011-06-19 18:53:02 +02:00
Jakob Sack
86406c6cfe
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-19 16:06:52 +02:00
Jakob Sack
a688e5a5b1
Load preferences only if user is registered
2011-06-19 16:06:05 +02:00
Kamil Domanski
6b2ec22104
allow disabling apps, install apps as disabled
2011-06-19 15:18:52 +02:00
Jakob Sack
d5b550395a
Removed debug messages
2011-06-19 15:08:28 +02:00
Jakob Sack
baa00a589f
l10n added
2011-06-19 14:27:52 +02:00
Jakob Sack
6a19a7d226
added preferences to base.php, will be needed for i18n stuff
2011-06-19 14:24:26 +02:00
Kamil Domanski
1cab3ca92c
move installation of shipped apps to setup
2011-06-19 00:55:19 +02:00
Kamil Domanski
be3ee03189
handle app repo connection failure
2011-06-18 22:02:45 +02:00
Michael Gapczynski
4e7d1c376f
OC_FILESTOAGE_SHARED now works with hard coded values for files
2011-06-18 13:49:52 -04:00
Robin Appelman
51420a7522
only create one connection to a sqlite3 database, fixes 'Database locked' errors with webdav
2011-06-17 16:09:43 +02:00
Robin Appelman
561c3a15f0
prevent some possible warnings if there are files in /apps
2011-06-17 14:17:08 +02:00
Robin Appelman
300b8c06cf
allow plugins to cancel filesystem operations using the provided hooks
2011-06-16 22:44:36 +02:00
Michael Gapczynski
bf66563cda
First version of shared storage provider - not functional
2011-06-16 14:40:21 -04:00
Robin Appelman
3062723c34
default to sqlite3 over sqlite2 for new installations
2011-06-16 14:56:56 +02:00
Robin Appelman
7d3ae7ae9b
fix settings page for non-admin users
2011-06-14 16:03:57 +02:00
Robin Appelman
f6eb7c1205
make use of native sqlite3 prepared statements
2011-06-14 01:20:41 +02:00
Robin Appelman
00858efbe2
store numbers as strings to prevent errors with numeric passwords
2011-06-14 01:20:41 +02:00
Robin Appelman
f863002e95
use sqlite3 if sqlite2 isn't available
2011-06-14 01:20:41 +02:00
Robin Appelman
1e0fe05bef
fix error with empty config file
2011-06-14 01:20:41 +02:00
Robin Appelman
1ea43dd7f9
make OC_DB work with the sqlite3 driver
2011-06-13 04:06:43 +02:00
Robin Appelman
600219c8c0
sqlite3 driver for mdb2
...
the only problem that I found with it so far is that it gives a database locked error on login,
the rest seems to work fine but more testing is required.
2011-06-13 04:05:41 +02:00
Robin Appelman
964b51879e
add option to remove tables install from database structure
2011-06-12 17:51:31 +02:00
Robin Appelman
bb5a2a917b
test case library and start of filesystem test
2011-06-12 01:06:27 +02:00
Robin Appelman
2a5ee9512e
allow tear down of filesystem.
...
also fix a bug when chrooting to '/'
2011-06-12 00:57:43 +02:00
Robin Appelman
5425c3d1e9
fix delTree
2011-06-12 00:50:13 +02:00
Alessandro Cosentino
86dd023448
Adding clear logs functions
2011-06-07 15:48:21 -04:00
Robin Appelman
d65f8bba73
try to adjust times to the clients timezone
2011-06-05 15:13:03 +02:00
Robin Appelman
d8ba312679
fix incorrect variable name in libfilestorage
2011-06-04 18:34:15 +02:00
Robin Appelman
016a892a78
merge refactoring in master
2011-06-02 20:35:14 +02:00
Robin Appelman
5d3cf06c73
delete old plugin stuff
2011-06-02 20:21:31 +02:00
Robin Appelman
7f987b84a5
fix OC_HELPER::linkTo again
2011-06-02 20:21:02 +02:00
Robin Appelman
2b45a28bd4
fix OC_HELPER::linkto() when the link is not a valid file.
...
(e.g. a php script with ?foo=bar appended)
2011-06-02 02:58:42 +02:00
Robin Appelman
09458aa639
add dateOnly option to formatDate
2011-06-02 02:29:16 +02:00
Robin Appelman
c1d02fd166
install apps that are shipped with owncloud the first time they are loaded
2011-06-01 15:05:48 +02:00
Robin Appelman
6b34ba8a8e
Make max upload filesize configurable for apache hosts
2011-05-29 17:43:13 +02:00
Robin Appelman
f48344df30
recursive deletion is now in OC_HELPER
2011-05-29 17:01:34 +02:00
Robin Appelman
85cae2cc32
recursive copy is now in OC_HELPER
2011-05-29 17:00:34 +02:00
Robin Appelman
f4e4617be7
App installer backend.
...
Not yet attached to the gui
2011-05-28 17:33:25 +02:00
Robin Appelman
d23ecd0538
fix a strict error in webdav
2011-05-28 15:52:35 +02:00
Robin Appelman
5ccce7e45f
fix a potential infinite loop when installing with sqlite
2011-05-28 15:52:35 +02:00
Alessandro Cosentino
1ec304227e
changed the path in imagePath again
2011-05-17 23:29:09 -04:00
François Kubler
13ddf8100f
New installer.
...
* Forms have been revamped (CSS + javascript),
* Process has been improved : errors are displayed on the form page,
* Some changes in the index.php page so that everything related to installation is in lib/setup.php
* Also added a small function in OC_HELPER class to set input values.
All these should improve the installation process in terms of ergonomics.
Well, I do hope so.
2011-05-17 22:34:31 +02:00
Jakob Sack
e314a83a7b
Fixing the image link for apps
2011-05-17 17:19:21 +02:00
Robin Appelman
915073f8ea
use simplexml instead of dom for OC_APP::getAppInfo()
2011-05-16 16:20:56 +02:00
Robin Appelman
d10840ab18
moved app install/remove/update functions to lib/installer.php
...
added OC_APP::getAppInfo() for reading app metadata
2011-05-15 16:32:22 +02:00
Jakob Sack
d70dfbdebb
Renamed a few columns in order t ohave both sqlite and mysql up and running
2011-05-15 15:03:12 +02:00
Jakob Sack
6b83e5ccfe
renamed installer.php to setup.php
2011-05-06 22:50:18 +02:00
Robin Appelman
e8e0608991
no hooks for OC_FILESTORAGE the one from OC_FILESYSTEM should be enough
2011-04-29 12:22:37 +02:00
Robin Appelman
5d358bb63f
merge
2011-04-28 23:59:02 +02:00
Robin Appelman
96cb5a3d2e
fix oc_appconfig for sqlite
2011-04-28 17:45:41 +02:00
Robin Appelman
3e99aefb7e
make logs work with sqlite
2011-04-28 17:40:51 +02:00
Robin Appelman
1850bddb67
move sqlite database into the data folder, makes it easier to set the correct permissions
2011-04-28 16:54:10 +02:00
Robin Appelman
8a6edd4654
Show currect filename when downloading files
2011-04-26 15:01:16 +02:00
Robin Appelman
b7aba15f17
add search functionality, for now only searches files but plugins/apps can extend that
2011-04-24 16:09:27 +02:00
Robin Appelman
8d52fdb7fa
fix chmodr
2011-04-24 15:23:18 +02:00
Robin Appelman
08cfe4b6ff
stylesheets have .css as extention, not .js
2011-04-23 02:30:34 +02:00
Robin Appelman
4c0d6dc9e7
make OC_HOOKS actually work
2011-04-23 02:30:12 +02:00
Robin Appelman
3e47ce3cef
properly load css and js files for apps
2011-04-23 02:28:12 +02:00
Robin Appelman
cf76cad931
change printPageNavi() to getPageNavi() to allow some more flexibility
2011-04-21 23:04:16 +02:00
Robin Appelman
741519fa79
loging system
2011-04-21 23:03:45 +02:00
Marco Michelino
4e2ef271bc
bugfixes on GET requests via WebDAV
2011-04-20 13:28:35 +02:00
Marco Michelino
d1b4f74bc2
Avoid // in URIs
2011-04-19 12:32:37 +02:00
Jan-Christoph Borchardt
8080a1a5a7
now my uppercase Wikileaks folder is correctly sorted below pr0n, like it should be
2011-04-18 23:52:55 +02:00
Jan-Christoph Borchardt
660e2c8102
renamed application-octet-stream.png to file.png
2011-04-18 22:16:32 +02:00
Robin Appelman
235b647fe1
send proper headers
2011-04-18 15:39:29 +02:00
Robin Appelman
0f49d57d27
dissable loggin for now
2011-04-18 15:36:56 +02:00
Robin Appelman
70bf44401d
correct them the right way this time
2011-04-18 15:31:40 +02:00
Robin Appelman
2673b6c054
typo's ...
2011-04-18 15:30:27 +02:00
Robin Appelman
14777ba444
clarify OC_FILES::get() documentation
2011-04-18 15:30:27 +02:00
Jakob Sack
6f07cf2651
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-18 15:07:51 +02:00
Jakob Sack
b57823baa5
Made the "change password" thingie in settings working
2011-04-18 15:07:14 +02:00
Robin Appelman
a977ba31ce
create .htaccess files during installation for apache users
2011-04-18 14:12:53 +02:00
Robin Appelman
7684585f49
404 error page
2011-04-18 13:16:49 +02:00
Jakob Sack
f1e78be4f4
Even more fixes on user management. Any designers here that want to make it good looking?
2011-04-18 13:12:30 +02:00
Jakob Sack
da30671ec4
More error checking in user management
2011-04-18 12:39:28 +02:00
Robin Appelman
fe90bf4bdc
disable the backup system for now
2011-04-18 12:18:45 +02:00
Robin Appelman
67ba9b320e
seperate hooks for OC_FILESYSTEM and OC_FILESTORAGE
2011-04-18 12:16:56 +02:00
Jakob Sack
761a517888
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-18 12:03:06 +02:00
Robin Appelman
b8e1788ed0
replace filesystem observer with the more general OC_HOOK
2011-04-18 12:02:53 +02:00
Jakob Sack
329d804032
Hotfix: deleting users is working again
2011-04-18 12:02:03 +02:00
Jakob Sack
a1ff99126a
prevent users from deleting admin group
2011-04-18 11:53:38 +02:00
Jakob Sack
dd0eb9dd8d
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-18 11:49:23 +02:00
Jakob Sack
f22c05deab
Check for existance of group- and usernames, don't mix OC_USER and OC_GROUP!
2011-04-18 11:48:52 +02:00
Jakob Sack
b37fb9142f
Added tons of Hooks to OC_USER and OC_GROUP
2011-04-18 11:39:29 +02:00
Robin Appelman
900ece18e7
seperate view and logic for pagenavi
2011-04-18 11:31:01 +02:00
Jakob Sack
1fe5f5a2df
Better documentation for OC_USER
2011-04-18 10:41:01 +02:00
Jakob Sack
a70330e9be
Improved documentation for group management
2011-04-18 10:00:45 +02:00
Frank Karlitschek
91b5d8575a
add pager function to the base lib and remove the default table width
2011-04-17 19:46:09 +02:00
Jakob Sack
47223ae2d9
Working subnavigation
2011-04-17 19:38:04 +02:00
Robin Appelman
7b02151639
make the file permissions hint more clear
2011-04-17 18:19:50 +02:00
Robin Appelman
871a4b3d4a
more improvements for foldersize
2011-04-17 18:19:50 +02:00
Jakob Sack
d59b0df401
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-17 18:06:17 +02:00
Jakob Sack
79d8aa871a
User management works good enough for now. Need to do something else ...
2011-04-17 18:05:49 +02:00
Frank Karlitschek
60b6825612
show only ownCloud related knowledgebase entries. and make the page pretty
2011-04-17 17:38:35 +02:00
Robin Appelman
225ad85e90
add free_space to OC_FILESYSTEM
2011-04-17 16:40:44 +02:00
Frank Karlitschek
5759802091
now we have our own ocs server
2011-04-17 16:04:46 +02:00
Robin Appelman
86356e888e
save the correct config entry
2011-04-17 15:25:59 +02:00
Robin Appelman
e984a3b47a
fix keeping track of foldersize
2011-04-17 13:47:22 +02:00
Robin Appelman
6affa3281a
small fixes in webdav
2011-04-17 13:33:30 +02:00
Robin Appelman
58cb46c4e8
make sql queries work in sqlite
2011-04-17 12:36:14 +02:00
Robin Appelman
243d6566dd
fix login when using sqlite
2011-04-17 12:36:14 +02:00
Arthur Schiwon
a14f8243e8
get max upload file size for upload form from php settings
2011-04-17 12:03:23 +02:00
Robin Appelman
ab155de14f
improve error handeling for first run dialog
2011-04-17 11:59:15 +02:00
Arthur Schiwon
5a03ce696c
debug output should not be there
2011-04-17 11:20:28 +02:00
Robin Appelman
fde08b2389
installer now works when using mysql
2011-04-17 11:10:03 +02:00
Arthur Schiwon
8a5d1ffebe
fix that might solve strange uploading issues
2011-04-17 01:17:34 +02:00
Frank Karlitschek
85a6097c03
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
2011-04-17 01:13:07 +02:00
Frank Karlitschek
0820cb8f17
owncloud now with even more buzzwords. we outsourced the doccumentation and use an online knowledgebase
2011-04-17 01:11:44 +02:00
Jakob Sack
d314c33715
do not redeclare methods
2011-04-17 01:06:48 +02:00
Jakob Sack
cb2d8db9ce
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-17 01:04:43 +02:00
Jakob Sack
c4287162c4
Some work on the fancy user management
2011-04-17 01:04:23 +02:00
Frank Karlitschek
ca04b33abe
first step on online ocs knowledgebase integration
2011-04-17 00:53:10 +02:00
Robin Appelman
3263b80ea9
first-run wizzard wip
2011-04-17 00:45:05 +02:00
Robin Appelman
25d687f35a
add OC_GROUP::createGroup();
2011-04-17 00:28:44 +02:00
Frank Karlitschek
af40d872ce
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
2011-04-16 23:09:02 +02:00
Frank Karlitschek
fc63882fe2
more layout fixes
2011-04-16 23:07:18 +02:00
Jakob Sack
7035c0417c
Get Hot New Fixes (TM)
2011-04-16 23:02:54 +02:00
Robin Appelman
a16c6fb804
don't use items in an array that aren't there
2011-04-16 20:36:43 +02:00
Frank Karlitschek
fb74de326d
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
2011-04-16 20:35:15 +02:00
Frank Karlitschek
1372d8339d
add a date format function for more eyecandy
2011-04-16 20:34:18 +02:00
Robin Appelman
bf45dcb959
only check for permissions for folders that exists
2011-04-16 20:27:08 +02:00
Robin Appelman
d002ed0b94
set strict error reporting
2011-04-16 20:08:13 +02:00
Frank Karlitschek
cf50c497b9
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
2011-04-16 19:58:07 +02:00
Robin Appelman
101877351b
use the correct variable name
2011-04-16 19:46:47 +02:00
Robin Appelman
e71bc75a9d
use the correct signature for OC_FILEOBSERVER->notify()
2011-04-16 19:45:47 +02:00
Robin Appelman
7b00f99a57
static functions shouldn't be abstract
2011-04-16 19:45:07 +02:00
Frank Karlitschek
219c4a2c78
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
2011-04-16 19:43:26 +02:00
Frank Karlitschek
85df699746
application listing works more or less now
2011-04-16 19:42:58 +02:00
Robin Appelman
5ccdea8e5b
save installation state of databases in appconfig instead of plugin.xml
2011-04-16 19:06:45 +02:00
Frank Karlitschek
150631849f
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
...
Conflicts:
admin/apps.php
2011-04-16 18:50:49 +02:00
Robin Appelman
f0e59b9043
better display for server configuration errors
2011-04-16 18:27:58 +02:00
Jakob Sack
964a55033a
never ever call a function you just removed
2011-04-16 18:08:40 +02:00
Jakob Sack
f2e37e0018
Completely removing personalMenu
2011-04-16 18:06:23 +02:00
Jakob Sack
5d23b60c8a
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-16 17:50:18 +02:00
Jakob Sack
af1e48df80
Changes in the user experience
2011-04-16 17:49:57 +02:00
Robin Appelman
318d024cc1
show size of folders in filebrowser
2011-04-16 17:07:44 +02:00
Robin Appelman
1495ec0f31
show server configuration errors on seperate page
2011-04-16 15:49:55 +02:00
Jakob Sack
b5f913a3fc
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-16 14:59:27 +02:00
Jakob Sack
4c74029489
First sketch of a user administration
2011-04-16 14:59:10 +02:00
Frank Karlitschek
5112295723
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
2011-04-16 14:37:51 +02:00
Frank Karlitschek
d6d848184b
new cool ocs client, but still empty
2011-04-16 14:36:32 +02:00
Arthur Schiwon
1c3703477b
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-16 14:00:05 +02:00
Robin Appelman
9a575d1ded
port OC_OCS to prepared statements
2011-04-16 13:55:33 +02:00
Arthur Schiwon
627dc95d19
don't manifold slashes in case empty $app is forwarded to linkTo()
2011-04-16 12:43:37 +02:00
Jakob Sack
8465f76e7e
Use OC_CONFIG where possible
2011-04-16 12:18:42 +02:00
Jakob Sack
77fe7240f0
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
2011-04-16 11:46:09 +02:00