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

1198 commits

Author SHA1 Message Date
Frank Karlitschek
43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek
351740601a port oc_response 2012-05-03 10:46:27 +02:00
Robin Appelman
e5ef3e1340 move archive library to core so we can properly depend on it 2012-05-02 23:48:23 +02:00
Michael Gapczynski
31d623f426 Fix log viewing bug 2012-05-02 15:26:42 -04:00
Frank Karlitschek
10bbbc8cd2 new checkAppEnabled call 2012-05-02 18:54:31 +02:00
Georg Ehrke
da03d05700 create folder 'remote' for the remote services like caldav, carddav and webdav 2012-05-02 16:41:23 +02:00
Frank Karlitschek
82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek
ff66600bc0 port appconfig 2012-05-02 14:11:29 +02:00
Frank Karlitschek
8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek
8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00
Arthur Schiwon
6750998984 files is not internal any more, part II 2012-05-02 11:26:22 +02:00
Arthur Schiwon
d71600213a files is not internal any more 2012-05-02 11:14:11 +02:00
Arthur Schiwon
c9eaffd336 send downloadfile piece by piece. saves RAM and is better suited for large files. 2012-05-02 11:02:13 +02:00
Frank Karlitschek
2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek
e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek
31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek
e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek
d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +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
Arthur Schiwon
d3ce2cacd6 OC_User: handle success properly 2012-05-01 14:40:56 +02:00
Arthur Schiwon
8a69116e94 OC_User: don't say password changed when it is not true 2012-05-01 13:40:01 +02:00
Frank Karlitschek
0195d5b439 some more work on the public API 2012-05-01 09:39:12 +02:00
Frank Karlitschek
04c6582af1 load the files app in a way that doesn´t break oC3 configurations 2012-04-30 13:58:48 +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
Frank Karlitschek
f0701f75a9 tiny typo 2012-04-30 13:08:08 +02:00
Thomas Mueller
07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Frank Karlitschek
c7e7767f58 don´t hardcode files app. we have no a standard info.xml in files 2012-04-29 21:27:02 +02:00
Robin Appelman
4d3ef9a824 improve rescanning folders 2012-04-29 16:11:17 +02:00
Robin Appelman
e3adbcb7d5 remove non existing files from the cache when rescanning a folder 2012-04-29 15:09:47 +02:00
Robin Appelman
09a5c59cca only install shipped apps on setup that should be enabled by default 2012-04-29 14:38:56 +02:00
Georg Ehrke
3aedbc5f95 remove debug message 2012-04-27 22:22:58 +02:00
Georg Ehrke
06e9ac8591 fix parsing of app parameter and fix external app 2012-04-27 22:22:03 +02:00
Georg Ehrke
993d655aad Merge branch 'master' into movable_apps_2 2012-04-27 10:30:50 +02:00
Frank Karlitschek
ee0cb68f5e some csrf fixes. needs testing 2012-04-27 01:18:21 +02:00
Frank Karlitschek
74b5e22a68 some more csrf fixes 2012-04-26 23:17:46 +02:00
Georg Ehrke
5483c1be42 hide fails 2012-04-26 21:58:43 +02:00
Georg Ehrke
5fda0e4b3b make *DAV work with movable apps 2012-04-26 21:56:29 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke
ebcaa46482 fix loading of css files that are core related 2012-04-26 15:19:27 +02:00
Georg Ehrke
3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke
d76552a009 Merge branch 'sabredav_1.6' 2012-04-25 10:39:31 +02:00
Georg Ehrke
476043ecb9 add a proper 404 2012-04-25 10:17:20 +02:00
Robin Appelman
cc2bfd313d minor filecache improvements 2012-04-25 00:12:12 +02:00
Robin Appelman
9015c46e31 emit the correct hooks for file_put_contents and some readfile improvements 2012-04-25 00:12:12 +02:00
Robin Appelman
60b924c954 initial mount configuration work 2012-04-25 00:12:12 +02:00
Georg Ehrke
f17eea506a fix merge conflicts 2012-04-24 21:59:56 +02:00
Georg Ehrke
fb84d0aff8 fix php fail 2012-04-24 21:37:19 +02:00
Georg Ehrke
9b29bc96de remove debug message 2012-04-24 21:36:54 +02:00
Georg Ehrke
0b06eff3a0 another fix for linkto function 2012-04-24 20:17:00 +02:00
Georg Ehrke
29b9e27078 fix linkto function in OC_Helper 2012-04-24 20:14:42 +02:00
Thomas Tanghus
6848b069c9 OC_App::getStorage() failed if app dir didn't exist. 2012-04-24 01:44:07 +02:00
Georg Ehrke
95c220a246 remove debug code in lib base 2012-04-23 20:31:03 +02:00
Georg Ehrke
19109afa79 fix bug in lib base 2012-04-23 20:11:21 +02:00
Georg Ehrke
42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Georg Ehrke
6d92ebca45 use native functions of php to parse the string into the Var 2012-04-23 17:09:28 +02:00
Georg Ehrke
9226cb7a6a rename var file to getfile to prevent fails in files app 2012-04-23 16:36:24 +02:00
Georg Ehrke
aaedb23f05 fix bug in lib/helper.php and fix file upload 2012-04-23 16:28:37 +02:00
Frank Karlitschek
f5c9fe9ece first step to an public api of ownCloud for the apps. In the future they shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon 2012-04-23 15:50:30 +02:00
Georg Ehrke
e888f4d9bc Merge branch 'master' into sabredav_1.6 2012-04-22 13:20:50 +02:00
Georg Ehrke
4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke
0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Frank Karlitschek
a86d89f5ca Add a static code checker for evil patterns in apps. 
Disabled by default for now.
We will check for private api calls here later once the public api is in place
 2012-04-21 22:47:56 +02:00
Frank Karlitschek
6bfe2289be improve the app installer. 
show a label if an app is an internal app or a third party app from the app store.
show a preview image of the app if available
 2012-04-21 15:30:58 +02:00
Georg Ehrke
711aa229b8 Merge branch 'master' into movable_apps 2012-04-20 22:41:39 +02:00
Georg Ehrke
99a473bd62 support file calls with parameter 2012-04-20 22:33:30 +02:00
Frank Karlitschek
0f5864d864 support searching the knowledge base 2012-04-20 21:49:57 +02:00
Frank Karlitschek
2fbc92bd4b new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code 2012-04-20 20:49:35 +02:00
Georg Ehrke
2e85313701 optimize code 2012-04-19 22:26:36 +02:00
Georg Ehrke
909282c81e remove parameters in file var before call require once 2012-04-19 22:25:21 +02:00
Georg Ehrke
85019887df add loading of files 2012-04-19 16:44:49 +02:00
Robin Appelman
bdb3962b8d add function to get mimetype from string 2012-04-18 20:54:28 +02:00
Georg Ehrke
dfc92675e0 make menu work with movable apps 2012-04-18 17:25:44 +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
Robin Appelman
464c751f30 fix creating unique filenames 2012-04-16 10:58:40 +02:00
Robin Appelman
fa97c59f95 fix group backend 2012-04-16 10:36:21 +02:00
Robin Appelman
b61f6438ba return user specific paths from oc_filecache::getpath 2012-04-16 10:06:52 +02:00
Georg Ehrke
77cefdedb8 Merge branch 'master' into sabredav_1.6 2012-04-15 22:28:11 +02:00
Bart Visscher
68b1ae1a36 OC_Group_Backend.php misses function groupexists 
Fix http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-182
 2012-04-15 17:11:03 +02:00
Bart Visscher
ea99e1184d Add well-known redirects to htaccess 
Fixes:
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-232
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-445
 2012-04-15 17:11:03 +02:00
Thomas Müller
a0d917fe98 fixing oc-375 - a number is appended tp the filename 2012-04-15 17:00:49 +02:00
Robin Appelman
dae34edf4f fix filecache rename hook 2012-04-15 16:06:55 +02:00
Jan-Christoph Borchardt
7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Robin Appelman
a6a8e2c553 add public api to get the file id from the cache 2012-04-15 11:44:04 +02:00
Robin Appelman
c5b8a3eb94 fix installing shipped apps 2012-04-15 11:05:55 +02:00
Daniel
fd16784bcc fix bug where users could use wildcards in username to login 
e.g. user Peter could probably login using username Pet%
fixed same problem in the migration script
 2012-04-15 10:30:22 +02:00
Bartek Przybylski
f241615693 fix getAppVersion error 2012-04-15 00:05:28 +02:00
Jan-Christoph Borchardt
ba5e60e2e4 firefighting Robin-breakage 2012-04-14 19:05:01 +02:00
Robin Appelman
4410f15dd8 don't rely on the old version in info.xml anymore 2012-04-14 19:01:59 +02:00
Jan-Christoph Borchardt
fbb314ef4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 18:56:55 +02:00
Jan-Christoph Borchardt
f16cfbab5e improved installation instructions 2012-04-14 18:44:32 +02:00
Jan-Christoph Borchardt
85cb171cb8 improved updater wording 2012-04-14 18:41:09 +02:00
Bart Visscher
402c6da968 Typo fix (breif->brief) 2012-04-14 18:31:42 +02:00
Bart Visscher
4976daca7a Fix default database type string 2012-04-14 18:31:41 +02:00
Robin Appelman
dec139716e cache app types in the db 2012-04-14 17:53:02 +02:00
Robin Appelman
5608867edc use the correct array indexes... 2012-04-14 17:52:49 +02:00
Robin Appelman
b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman
721311c909 some minor optimizations 2012-04-14 16:29:11 +02:00
Robin Appelman
926b2b78fe keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00
Robin Appelman
bfdbdd9b20 remove outdated file 2012-04-14 16:29:11 +02:00
Tom Needham
c069aa62a4 Fix annoying error in log 2012-04-14 12:31:48 +00:00
Robin Appelman
d8864d4f4b show error when installing an app has failed 2012-04-14 12:57:10 +02:00
Robin Appelman
d3bf013761 prevent users with the same name but different casing from being created 2012-04-14 12:57:10 +02:00
Robin Appelman
137dce87fc remove outdated code 2012-04-14 11:42:11 +02:00
Robin Appelman
3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Robin Appelman
d8e54acbf3 test cases for user backends 2012-04-14 10:43:28 +02:00
Arthur Schiwon
9ef34cd831 typo 2012-04-13 23:02:42 +02:00
Arthur Schiwon
74f0bebfc8 don't fail on missing extension 2012-04-13 23:02:42 +02:00
Arthur Schiwon
b9bdad5165 make sure temporary files are being removed, fixes oc-450 2012-04-13 23:02:42 +02:00
Georg Ehrke
77a9e343aa Merge branch 'master' into sabredav_1.6 2012-04-13 16:42:10 -04:00
Arthur Schiwon
b95f561bf2 file settings: let people set no more than upper boundary for file uploads, but they should can really go up to the limit 2012-04-13 11:25:38 +02:00
Arthur Schiwon
1bd27891e2 make upload size settings work probably. do not replace whole .htaccess, only replace what is needed. Consistent, human readable input on admin settings page. 2012-04-13 10:43:44 +02:00
Robin Appelman
1d8fdf52d5 allow multiply group backends 2012-04-13 01:59:05 +02:00
Bart Visscher
69d584331d OC_VCategories: sort categories in natural order using usort 
Use usort to sort, so that the json encoding is an array.
 2012-04-12 23:10:49 +02:00
Bart Visscher
815649dbd7 Implement default categories in OC_VCategories 2012-04-12 23:10:49 +02:00
Florian Preinstorfer
b86f2069ff Fix a session fixation vulnerability 
- regenerate the session for every successful login
- properly destroy a session

Further information can be found on:
https://en.wikipedia.org/wiki/session_fixation
 2012-04-12 19:15:38 +02:00
Grundik
7e7de25710 UTF8 locale by default 2012-04-12 17:54:20 +02:00
Daniele E. Domenichelli
156bdae2fe Use OC_Helper::serverHost() in OC_Helper::linkToAbsolute() 2012-04-12 17:51:17 +02:00
Daniele E. Domenichelli
7b5395675d Add method OC_Helper::serverHost() 
This method returns the server host, even if the website uses one or
more reverse proxies.
 2012-04-12 17:51:17 +02:00
Robin Appelman
0466437fa7 tests for oc_filesystem 2012-04-12 15:55:56 +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
Georg Ehrke
613e15035e Merge branch 'master' into sabredav_1.6 2012-04-10 22:44:13 -04:00
Bart Visscher
17af1ba893 Silence error for missing appinfo info file 2012-04-10 21:04:35 +02:00
Tom Needham
8e188cd96f Copy over all file app data for imported user 2012-04-08 19:16:03 +00:00
Tom Needham
e5ebbacc9e Fix sqlite version detection 2012-04-08 18:52:31 +00:00
Tom Needham
5e314e8eff Emit hooks for user creation 2012-04-07 22:00:32 +00:00
Tom Needham
c0869887cf Return JSON for import and export methods of OC_Migrate 2012-04-07 21:55:16 +00:00
Tom Needham
9edf45a324 Merge branch 'master' into migration 2012-04-07 17:31:30 +00:00
Tom Needham
d2886f2020 Hide instance import as it eats data 2012-04-07 17:27:09 +00:00
Bartek Przybylski
96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +02:00
Florian Hülsmann
8a2c5dda6d Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102 2012-04-04 21:36:50 +02:00
Tom Needham
acdce2b1e0 Check blacklist before saving to filesystem 2012-04-03 22:31:34 +00:00
Michael Gapczynski
ff4b0c4d7f Move writable check into local filestorage so shared files can be renamed 2012-04-01 13:30:41 -04:00
Robin Appelman
cce59df2ae the core apps don't have types 2012-04-01 19:22:23 +02:00
Robin Appelman
39e8981bc2 oc_db is not pdo 
also pgsql does not like double quotes
 2012-04-01 17:32:13 +02:00
Frank Karlitschek
b758725bf7 Try to configure php to enable big file uploads. 
This doesn´t work always depending on the webserver and php configuration.
Let´s try to overwrite some defaults anyways
 2012-04-01 17:02:32 +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
Michael Gapczynski
6bb48b2731 Check file handle exists before trying to read file 2012-04-01 02:38:26 -04:00
Tom Needham
eba6a65908 try to use transactions to replace db 2012-04-01 00:25:47 +00:00
Tom Needham
ffbd72bbcf Fix user app data export 2012-04-01 00:07:39 +00:00
Tom Needham
a248cc73e6 Merge branch 'master' into migration 2012-03-31 23:56:16 +00:00
Tom Needham
daf742c086 Fix owncloud log 2012-03-31 23:55:41 +00:00
Tom Needham
ce89ff15aa Remove db tmp file after export creation 2012-03-31 23:20:08 +00:00
Tom Needham
f7d8a8c571 Merge branch 'master' into migration 2012-03-31 22:44:50 +00:00
Tom Needham
d20eea9761 Use ajax to download file, OC_Dialogs for errors 2012-03-31 22:41:43 +00:00
Robin Appelman
2f68b08491 fix eventsource for ie 2012-03-31 16:40:42 +02:00
Robin Appelman
ebc7a6a0a6 dont send to much when scanning large folders 2012-03-31 16:28:22 +02:00
Robin Appelman
9d2f8aa717 send more progress updates when scanning large folders 2012-03-31 16:24:53 +02:00
Robin Appelman
b72d7f1ab3 make sure output buffering is dissabled when using eventsource 2012-03-31 16:20:32 +02:00
Bart Visscher
20fc23c82b Move logfile determination to init function 2012-03-30 23:41:54 +02:00
Bart Visscher
3300d6ea53 checkUpgrade has to be after template initialization 
The error path of checkUpgrade uses the template
 2012-03-30 23:41:54 +02:00
Bart Visscher
a7438189f3 Move more from base init to separate functions 2012-03-30 23:41:53 +02:00
Bart Visscher
3a4521a012 Add support for logging to syslog 2012-03-30 23:41:53 +02:00
Robin Appelman
65eee1f69d clean pre-path_hash fscache entries 2012-03-30 19:44:49 +02:00
Georg Ehrke
ef1e359c7c Merge branch 'master' into sabredav_1.6 2012-03-30 18:48:30 +02:00
Robin Appelman
7552390031 add path_hash to the filesystem cache 2012-03-30 18:12:33 +02:00
Robin Appelman
523fdda399 add the option to only load apps of a specific type 2012-03-30 14:39:07 +02:00
Robin Appelman
a07c6b1a2e optimizations for loadApps 2012-03-30 14:08:18 +02:00
Robin Appelman
7bc9fa765c optimizations for updateApps 2012-03-30 14:08:18 +02:00
Georg Ehrke
90286353e2 Merge branch 'master' into sabredav_1.6 2012-03-29 23:20:03 +02:00
Tom Needham
73eca66a89 Fix comments 2012-03-29 10:17:08 +00:00
Robin Appelman
60ba5508a4 add support for installing apps from a subfolder in the zip/tgz file 2012-03-29 00:11:29 +02:00
Robin Appelman
d6a9af3138 add support for installing apps from tgz 2012-03-29 00:07:28 +02:00
Robin Appelman
d8e9db207f add tempory folder utility to OC_Helper 2012-03-28 23:47:44 +02:00
Georg Ehrke
e5c009599d remove check for variable which was set one line above - bugfix for oc-324 2012-03-28 16:38:42 +02:00
Tom Needham
ef33219e4f import method returns each apps' import status 2012-03-27 21:21:14 +00:00
Tom Needham
31d268fe92 check for sqlite 2012-03-27 20:55:53 +00:00
Tom Needham
553f4533c0 look for migrate.php in appinfo folder 2012-03-27 20:45:37 +00:00
Tom Needham
b201e51528 Stop error on export 2012-03-27 20:43:44 +00:00
Tom Needham
c8acd4a594 Merge branch 'master' into migration 2012-03-27 20:19:38 +00:00
Georg Ehrke
536a3ecb42 Merge branch 'master' into sabredav_1.6 2012-03-27 20:54:16 +02:00
Arthur Schiwon
c92fc9bf65 return path of tmp file like filestorage/common does. Fixes broken folder-/multifile-download. 2012-03-27 02:24:52 +02:00
Arthur Schiwon
24bc639222 Do not use always the same name for download-zip to avoid collisions. 2012-03-27 01:19:34 +02:00
Arthur Schiwon
bcef775d6b Overwrite Download-ZIP if it already exists. We do not want to show alien content. 2012-03-27 01:18:38 +02:00
Robin Appelman
266699ddf9 fix square images not getting proper thumbnails 2012-03-27 00:42:15 +02:00
Robin Appelman
73c6db5c8e crop and resize in a single step when creating thumbnail 
also so more explicit memory cleanup
 2012-03-26 23:53:48 +02:00
Robin Appelman
0ba9332358 some more memory cleanup in OC_Image 2012-03-26 22:33:37 +02:00
Robin Appelman
0c19e44a61 some more memory cleanup in OC_Image 2012-03-26 22:28:51 +02:00
Georg Ehrke
ac0c5ba6da Merge branch 'master' into sabredav_1.6 2012-03-25 14:02:40 +02:00
Michael Gapczynski
d139e3c3cd Move Google Docs storage backend to files_remote app 2012-03-24 15:28:05 -04:00
Michael Gapczynski
26fcb35a89 Implement fopen() for Google Docs storage backend 2012-03-24 14:50:17 -04:00
Robin Appelman
109d806617 make sure we can load OC_Config when we need it 2012-03-23 18:55:26 +01:00
Frank Karlitschek
7cad6ccce0 don´t show ugly error message 2012-03-23 16:48:16 +01:00
Frank Karlitschek
a191b75c31 make it possible to connect to other ocs appstores and other ocs knowledgebase servers. 
also make it possible to switch the app store and the knowledgebase off completely.
 2012-03-23 15:52:41 +01:00
Nils Jansen
7ed8f39744 as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype. 2012-03-23 13:34:07 +01:00
Georg Ehrke
8e8c4a8edc Merge branch 'master' into sabredav_1.6 2012-03-22 20:40:04 +01:00
Tom Needham
892343c7c1 Fix instance import 2012-03-21 16:30:59 +00:00
Arthur Schiwon
7c815054c7 Config file is more appropriate here 
adjust default value
 2012-03-21 13:05:15 +01:00
Georg Ehrke
8f8d486f35 Merge branch 'master' into sabredav_1.6 2012-03-21 09:42:53 +01:00
Tom Needham
0fa5e196ef Try to use old uid when importing 2012-03-20 20:32:01 +00:00
Tom Needham
514c9ad8e7 Added unified import method. 2012-03-20 20:19:21 +00:00
Georg Ehrke
89c39b47bc add microsoft office mimetypes to the fixlist - bugfix for oc-357 2012-03-20 18:46:56 +01:00
Bart Visscher
632b3cbbbb Cleanup the template code for redundant code 2012-03-19 21:56:55 +01:00
Bart Visscher
3d8a09b147 Split the init function in lib/base.php a bit 2012-03-19 21:56:55 +01:00
Tom Needham
145d6f3566 Add OC_Migration_Content class to help app devs. Restructure OC_Migrate. 2012-03-19 20:44:20 +00:00
Georg Ehrke
fa104fee17 fix mimetype detection 2012-03-19 12:42:33 +01:00
Arthur Schiwon
b13ab2b17e enable admin to turn off ZIP downloads 
user interface offers multi-file/folder downloads only if available

make function name more clear
 2012-03-19 11:56:02 +01:00
Georg Ehrke
33b06c4484 Merge branch 'master' into sabredav_1.6 2012-03-19 08:33:36 +01:00
Tom Needham
77f6872ea4 Shorten export zip names 2012-03-17 17:45:39 +00:00
Tom Needham
bc085c3ff4 Create new user, create new data dir, copy files, import app data 2012-03-17 16:25:14 +00:00
Tom Needham
247b25e7a9 Fix structure of export zip 2012-03-17 15:01:08 +00:00
Tom Needham
5234e66bab Add exportinfo to user exports. 2012-03-17 13:53:00 +00:00
Tom Needham
5332c319a2 Migration info is an object. Other fixes 2012-03-16 22:50:35 +00:00
Tom Needham
c442a06a02 Fix export for admin and users. Added 3 admin export types 2012-03-16 21:09:36 +00:00
Arthur Schiwon
a77edf88c6 check if selected files for zip archive are not too large 
offer config option
 2012-03-16 16:25:15 +01:00
Arthur Schiwon
cfc41942e4 make Files settings work 2012-03-16 16:00:12 +01:00
Tom Needham
50233d075c Improve admin_export ui and move system export cde to OC_Migrate 2012-03-15 20:52:43 +00:00
Bartek Przybylski
0fadbee699 fix adding photo to incorrect gallery 2012-03-15 00:09:06 +01:00
Tom Needham
c9be325af2 Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method. 2012-03-14 16:43:06 +00:00
Tom Needham
a310a81053 move zip creation inside OC_Migrate 2012-03-13 23:09:43 +00:00
Tom Needham
5a50144a16 typo :/ 2012-03-13 21:29:31 +00:00
Tom Needham
fa8b66ca4f Add getApps() method to return apps supporting migration 2012-03-13 21:28:53 +00:00
Tom Needham
cd2f75fdad Use data dir from config.php 2012-03-13 17:27:47 +00:00
Tom Needham
0f3eebbbd9 added cleanUp() method to OC_Migrate 2012-03-13 17:18:42 +00:00
Tom Needham
4d5646a59f Find migrate.php even for disabled apps. Improve ui for user and admin migrations 2012-03-13 16:21:17 +00:00
Tom Needham
d108bdc7c7 Improved import function. Added param to connectDB() to load the db from the import 2012-03-12 21:41:32 +00:00
Tom Needham
1cdb4396a4 Fix copyRows() return value. Generate app info and oc info on return 2012-03-12 18:40:14 +00:00
Thomas Tanghus
d36d317bb2 Contacts: Modifications for using categories. 2012-03-12 14:13:03 +01:00
Tom Needham
a2d7e9c6e8 Merge returns from insertData() 2012-03-11 22:13:50 +00:00
Tom Needham
fa5a5649c6 Fix copyRows() and sqlite connection 2012-03-11 22:09:16 +00:00
Robin Appelman
a85a10b378 oc_db isn't pdo 2012-03-11 21:48:52 +01:00
Bartek Przybylski
f6075cc1fe gallery migration to events system 2012-03-11 16:49:42 +01:00
Tom Needham
d712d7f52c Lots of fixes, improve copyRows() method and update settings page. 2012-03-10 18:18:58 +00:00
Tom Needham
3ca76d24a9 Add OC_Migrate::copyRows() method 2012-03-10 15:52:38 +00:00
Tom Needham
c3dfcc5b21 First basic implementation of migration.db. 2012-03-09 23:33:11 +00:00
Bartek Przybylski
b4ffaa9498 spaces to tabs replacement 2012-03-09 16:47:53 +01:00
Bartek Przybylski
ca9b4e467f filescan by mimetype scan 2012-03-09 16:45:57 +01:00
Bartek Przybylski
84d6c53970 filecache search comparition fix 2012-03-09 16:28:26 +01:00
Thomas Tanghus
57c4d39b1e Fix conflict. 2012-03-07 20:57:05 +01:00
Thomas Tanghus
75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Robin Appelman
9f01533710 fix for webdav when having additional storage backends mounted 2012-03-07 15:44:46 +01:00
Robin Appelman
f06858689f revert an accidental change 2012-03-03 22:12:17 +01:00
Robin Appelman
72947e46d1 small improvement for is_dir 2012-03-03 21:23:35 +01:00
Robin Appelman
bb97cbbb0c fix commong filestorage for files without extention 2012-03-03 21:23:35 +01:00
Robin Appelman
0f54084305 also delete childs of folders from the cache 2012-03-03 21:23:35 +01:00
Robin Appelman
2e365658c8 better handeling of files that can behave like folder (e.g. archives) 2012-03-03 21:23:35 +01:00
Tom Needham
691103acd5 Use json for migration data 2012-03-03 17:30:21 +00:00
Tom Needham
34f05ba180 Udpdate bookmarks migration provider. App version included in export. 2012-03-03 14:35:17 +00:00
Tom Needham
188a304625 Replace db on import. Update user_migration export function. 2012-03-03 13:26:01 +00:00
Robin Appelman
1794ad353d fix file_get_content on empty files for filestorage common 2012-03-03 00:57:52 +01:00
Tom Needham
86fed4c226 Update database.xml locations. Fix dbexport.xml. 2012-03-02 22:19:06 +00:00
Tom Needham
9c79de4aa0 removed duplicate function 2012-03-02 21:47:20 +00:00
Tom Needham
45ef2ecf52 Fix merge conflict 2012-03-02 21:35:48 +00:00
Jakob Sack
90e2962c91 Remove the link between the principals table and the sabre principals connector. 2012-03-02 20:37:49 +01:00
Robin Appelman
48fe85d9bd add streamwrapper that provides a callback on stream close 2012-03-02 18:42:57 +01:00