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
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
Robin Appelman
e8afe4f158 add search implementation to filestorage common 2012-03-02 18:42:57 +01:00
Robin Appelman
b621431c11 don't try to seach apps in hidden folders 2012-03-02 18:42:57 +01:00
Bart Visscher
d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Bart Visscher
8c7b13db70 Files: Fix wrong attribute name in OC_Search_Provider_File 2012-03-01 22:59:35 +01:00
Bart Visscher
3d3190309f Simplify stripping the last part off WEBROOT and SERVERROOT for 3rdparty and app dir 2012-03-01 22:59:35 +01:00
Bart Visscher
5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Tom Needham
33c5b3a2ef Added replaceDB method in lib/db.php 2012-03-01 19:41:14 +00:00
Robin Appelman
6ecbaf0041 load streamwrappers earlier 2012-03-01 18:44:33 +01:00
Frank Karlitschek
0b4607321f Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-03-01 15:21:12 +01:00
Frank Karlitschek
d29a02a65a undo the change of the webroot detection. seams to be buggy 2012-03-01 15:19:44 +01:00
Robin Appelman
e76e4e7540 add touch() to all storage backands, and make parameter optional 2012-02-29 23:44:05 +01:00
Robin Appelman
b23b5aae7f remove debug output 2012-02-29 23:17:49 +01:00
Michael Gapczynski
baffa03fa5 Fix opendir for folders aka Google Docs collections 2012-02-29 13:18:33 -05:00
Michael Gapczynski
02f15e9a03 More work on Google Docs storage backend 2012-02-28 19:16:52 -05:00
Bartek Przybylski
2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00
Frank Karlitschek
0a9b0ee382 change the detection of the webroot. it is simpler now and also works for app directories outside the owncloud folder. works for me and hopefully for everybody else too 2012-02-28 18:21:23 +01:00
Robin Appelman
a829ce69c5 make sure the streamwrappers are registered early 2012-02-28 17:25:15 +01:00
Frank Karlitschek
5e9d268c21 never try to load an non existing template,css,img. 
do propper checking, error reporting and motivate the developerto fix it ;-)
 2012-02-28 16:14:12 +01:00
Robin Appelman
d1c3aa3112 add test case for getLocalFile 2012-02-28 12:06:34 +01:00
Robin Appelman
de37bafa5c use in-memory files for the datase scheme during installation 2012-02-28 11:39:39 +01:00
Robin Appelman
3e0bb3e7c4 use temporary file managment 2012-02-28 11:33:59 +01:00
Robin Appelman
a76ff563d6 fix temporary file creation 2012-02-28 11:32:45 +01:00
Robin Appelman
273d7fb4fd fix copy/paste error in common filestorage 2012-02-28 11:16:41 +01:00
Robin Appelman
77b51f03e3 add temporary file managment 2012-02-28 11:16:19 +01:00
Michael Gapczynski
d190ebee48 Initial work on Google Docs storage backend 2012-02-27 15:00:17 -05:00
Frank Karlitschek
5943af17e7 spaces -> tabs 
Thanks to Jakob for reminding me
 2012-02-27 18:01:43 +01:00
Robin Appelman
d8d4420f22 some cleanup in filestorage 2012-02-27 12:20:37 +01:00
Robin Appelman
cef230c141 extend filestorage common and provide test implementation 2012-02-27 12:04:42 +01:00
Robin Appelman
e2721fc93c make OC_FileStorage abstract 2012-02-27 11:28:11 +01:00
Frank Karlitschek
ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Robin Appelman
857535403c add more valid fopen modes 2012-02-26 15:32:58 +01:00
Robin Appelman
d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman
62cd89da14 improved password hashing based one phpass 
old passwords are automatically upgraded on login
 2012-02-26 14:12:50 +01:00
Georg Ehrke
92c7b2717d add OC_Geo class 2012-02-26 13:45:20 +01:00
Robin Appelman
6c501f90bb hopefully a fix for webroot detection 2012-02-26 04:09:48 +01:00
Robin Appelman
c8c3b8a63e chunked implementation for readfile 
prevents memory issues when downloading large files
 2012-02-26 03:54:21 +01:00
Robin Appelman
fe0832746b intval() of a number seems unnecessary 
and it could cause 32bit integer overflow issues
 2012-02-26 03:31:04 +01:00
Robin Appelman
797e921b9a improve log browsing 2012-02-26 03:10:29 +01:00
Robin Appelman
4f627c428e some more error reporting during filesystem scan 2012-02-25 20:27:16 +01:00
Robin Appelman
dda79a90cf don't limit ourselfs to 32bit integers 2012-02-25 16:51:59 +01:00
Robin Appelman
ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Robin Appelman
8b93a9a237 add javascript bindings for OC_AppConfig 2012-02-25 16:35:40 +01:00
Georg Ehrke
097ce76fc4 Merge branch 'master' into sabredav_1.6 2012-02-25 16:29:32 +01:00
Georg Ehrke
0d2f1688e4 add empty methods updatePrincipal and searchPrincipals and change method getPrincipalByPath to work with sabredav 1.6 2012-02-25 16:26:47 +01:00
Georg Ehrke
cc15852386 replace Sabre_DAV_Exception_FileNotFound with Sabre_DAV_Exception_NotFound 2012-02-25 09:35:35 +01:00
Robin Appelman
9dcf29ff51 fix bug in group mangement 2012-02-24 23:54:38 +01:00
Robin Appelman
9f5bce81b0 add a default user quota 2012-02-24 23:54:38 +01:00
Robin Appelman
e039015ca1 prevent errors when a user backends gives an invalid result 2012-02-24 23:54:38 +01:00
Georg Ehrke
1d1dfcbc1a replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime 2012-02-24 22:20:40 +01:00
Georg Ehrke
e082d473bb Merge branch 'master' into sabredav_1.6 2012-02-24 18:51:38 +01:00
Arthur Schiwon
ca874a3ad7 remove limit from configvalue for long config values 2012-02-24 14:18:09 +01:00
Georg Ehrke
eae32e05c9 Merge branch 'master' into sabredav_1.6 2012-02-23 22:12:00 +01:00
Bartek Przybylski
a02d5d1a3d log typo fix 2012-02-23 19:29:11 +01:00
Georg Ehrke
3e756407a0 check if the tempfile was created successfully 2012-02-23 18:23:09 +01:00
Georg Ehrke
95fe159914 make lib/vobject.php work with sabredav 1.6 2012-02-23 17:20:03 +01:00
Frank Karlitschek
a62e109e8c make the location of the 3rdparty folder flexible. 
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
 2012-02-23 15:37:38 +01:00
Robin Appelman
2e05bd69f5 add javascript bindings for OC_AppConfig 2012-02-22 22:20:11 +01:00
Thomas Tanghus
9794e7e427 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Robin Appelman
c20319d377 fix incorrect information in the filecache when using encryption 2012-02-21 20:48:49 +01:00
Robin Appelman
d9c7e4c333 proper mimetypes for encrypted files 2012-02-21 20:48:48 +01:00
Robin Appelman
325858e9e2 add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper 2012-02-21 20:48:48 +01:00
Robin Appelman
c121a1a1e7 implement file_put_contents with stream data using fopen 2012-02-21 20:48:48 +01:00
Robin Appelman
95459d068e non existing files can never be updated 2012-02-21 20:48:48 +01:00
Robin Appelman
1cffeefa06 move implementation of from/toTmpFile from the file storage to the filesystem 2012-02-21 20:48:48 +01:00
Robin Appelman
6658f51098 provide early file system when using webdav 2012-02-21 20:48:48 +01:00
Robin Appelman
b3a974d8bb only trigger hooks for the default filesystem view 2012-02-21 20:48:48 +01:00
Robin Appelman
501678f981 always mount the root filesystem, sometimes we need the filesystem when not logged in 2012-02-21 20:48:48 +01:00
Robin Appelman
f1cbb9effc initial integration of encryption 2012-02-21 20:48:48 +01:00
Robin Appelman
e53e7990c4 improve get_temp_dir() implementation 2012-02-21 20:48:48 +01:00
Robin Appelman
fd4b30ac6f no post hooks for fopen 2012-02-21 20:48:48 +01:00
Robin Appelman
e9af218562 use streams instead of temporary files for cross-storage copy and rename 2012-02-21 20:48:48 +01:00
Robin Appelman
82394f9527 add option to dissable fileproxies 2012-02-21 20:48:47 +01:00
Robin Appelman
3d67cd51c2 encryption proxy wip 2012-02-21 20:48:47 +01:00
Robin Appelman
abc749feeb make documentation reflect reality a bit better 2012-02-21 20:48:47 +01:00
Robin Appelman
b6ed61eab2 pass paramters to file proxies by reference so they can be modified 2012-02-21 20:48:47 +01:00
Bart Visscher
987845c312 Move the redirect_url from linkTo function to the checkLoggedIn function 2012-02-21 20:09:24 +01:00
Alessandro Cosentino
36b7d819e5 restore redirect after checkLoggedIn 2012-02-21 10:22:17 -05:00
Thomas Tanghus
be948a9baa Check for empty value in ctor and being conservative about configvalue name ;-) 2012-02-21 09:53:03 +01:00
Thomas Tanghus
7c7031df44 Forgot to assign param. 2012-02-21 00:02:27 +01:00
Bart Visscher
77ab89a7cb Review changes of OC_VCategory 2012-02-20 22:32:57 +01:00
Thomas Tanghus
430ccef09c Added OC_VCategories::rescan() 2012-02-20 13:16:51 +01:00
Thomas Tanghus
8a1b671fdd Switch from using separate db table to use OC_Preferences. 
There is a limitation in that the the configvalue field in the preferences table is a varchar(255).
 2012-02-19 17:00:07 +01:00
Thomas Tanghus
adec09b075 Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-19 13:11:13 +01:00
Thomas Tanghus
71aa36c3f1 ETags must be quoted. 2012-02-18 11:49:31 +01:00
Thomas Tanghus
0203f55fbf Added first draft of OC_VCategories. 2012-02-18 11:45:36 +01:00
Michael Gapczynski
6f1ed85f0b Temporary fix for sharing files 2012-02-17 21:56:20 -05:00
Bart Visscher
1fa05894d5 Move config.php writable test to update path 
This should make it possible to use owncloud with a read-only config.php
 2012-02-17 22:10:03 +01:00
Bart Visscher
45cff7b737 Move storing "last updated at" time to the app config 
This way the config.php file is not changed every time you go to the
personal page. Step to make it possible to have a read-only config.php
most of the time
 2012-02-17 22:10:03 +01:00
Bart Visscher
bd7227bb93 Spelling fix hint text 2012-02-17 22:10:02 +01:00
Bart Visscher
e8b69d45a3 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher
f54c767d72 Fix parameter of OC_Response::sendFile 2012-02-17 22:07:13 +01:00
Bart Visscher
bcbebe390b Document OC_Response 2012-02-17 22:07:13 +01:00
Thomas Tanghus
496c1581d7 ETags must be quoted. 2012-02-16 23:24:23 +01:00
Thomas Tanghus
0e2531ba57 Added method for loading from file handle. 2012-02-16 10:38:00 +01:00
Robin Appelman
c2fb5fed02 use cached size for getting the size of a moved file 2012-02-15 14:43:06 +01:00
Frank Karlitschek
127c0c7033 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-14 16:34:33 +01:00
Frank Karlitschek
d53ed4b40b make it possible to override every image and logo with a new version from within a theme. I think we have a very cool theming here. *self-praise* 2012-02-14 16:32:38 +01:00
Klaas Freitag
064f87680b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-14 10:01:20 +01:00
Klaas Freitag
60a03580ff allow to set a files mtime through a PROPPATCH request on resource 
'lastmodified'. Needed for syncing algorithms.
 2012-02-14 09:59:54 +01:00
Robin Appelman
3c52ac7af3 make local filestorage comply with test cases 2012-02-14 01:00:41 +01:00
Bart Visscher
525306c1e2 Replace Expires and caching headers by OC_Response functions 2012-02-13 23:48:05 +01:00
Bart Visscher
29fc82c364 Send gallery album thumbnail with OC_Response::sendFile 2012-02-13 23:35:37 +01:00
Bart Visscher
594dcf13f2 Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader 2012-02-13 22:47:31 +01:00
Bart Visscher
0fd5252cfc OC_Image: Move Content-Type header to show function 2012-02-13 22:41:05 +01:00
Bart Visscher
363fdc40b8 OC_Response: Set Expire and Cache-Control headers in enableCaching 2012-02-13 22:37:27 +01:00
Bart Visscher
7208abf618 OC_Response: fix var name bugs 2012-02-13 22:35:48 +01:00
Bart Visscher
a25bda8e41 Add application name to title 2012-02-12 21:56:01 +01:00
Bart Visscher
125cf79a37 OC_Response: add setExpiresHeader function 2012-02-12 20:40:52 +01:00
Bart Visscher
45bb6f5fd4 OC_Response: add redirect function 2012-02-12 20:40:52 +01:00
Robin Appelman
3579446930 use SimpleTest for unit testing 
includes some tests for storage providers, more to come
 2012-02-12 18:07:58 +01:00
Bart Visscher
0917bdecdd Contacts: Move response caching to OC_Response 2012-02-12 17:21:33 +01:00
Bart Visscher
3eff161bbf OC_Image: Use valid function instead of checking the resource 2012-02-12 15:14:24 +01:00
Bart Visscher
192b8906a3 Add copyright to OC_Connector_Sabre_Principal 2012-02-12 15:14:23 +01:00
Michael Gapczynski
6929652e14 Redirect to installer if not installed 2012-02-11 17:37:47 -05:00
Frank Karlitschek
26a5c13906 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-11 23:26:42 +01:00
Frank Karlitschek
340b6bf3ad add themeing support and support for autoselection of mobile/tablet and standalone css/jss files and templates 2012-02-11 23:25:35 +01:00
Bart Visscher
b5418173e5 Derive the user principles from the owncloud users 
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
 2012-02-11 21:09:51 +01:00
Tom Needham
2f80df1f9e Merge branch 'master' of gitorious.org:owncloud/owncloud into migration 2012-02-10 15:24:26 +00:00
Klaas Freitag
85853f9ec2 - Added the ability to change a files mtime via webdavs propset. 
- Added some minor debug help to fscache
 2012-02-10 11:30:38 +01:00
Bart Visscher
8684e847b0 OC_Image: change static vars to object vars 2012-02-09 22:44:26 +01:00
Robin Appelman
b4d84bd9bb dont try to remove buffers, can cause trouble with strict warnings 2012-02-09 19:53:02 +01:00
Robin Appelman
c4864b4a54 don't use PDO::inTransaction 2012-02-09 19:53:02 +01:00
Robin Appelman
25381ac5b1 fix filecache with MDB2 2012-02-08 21:39:09 +01:00
Robin Appelman
398fbe7b82 use fetchRow instead of fetch 2012-02-08 21:26:45 +01:00
Bart Visscher
eb5de4d4f7 Change gallery thumbnail generation to OC_Image 2012-02-08 21:12:30 +01:00
Robin Appelman
24748ee10f add convinience function to get filesystem view for app storage 2012-02-08 21:01:09 +01:00
Robin Appelman
bcebfbfbe2 bugfix in searching files by mimetype 2012-02-08 17:29:54 +01:00
Robin Appelman
e50dfbc228 fix filecache when creating a new folder 2012-02-06 19:33:37 +01:00
Robin Appelman
9f3388ecbc store writable flag for files 2012-02-05 14:04:10 +01:00
Robin Appelman
30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Robin Appelman
25e777ef5e watch for changes outside owncloud to the files 2012-02-05 03:06:33 +01:00
Robin Appelman
0bb48d814b fix bug in transactions with PDO 2012-02-05 01:23:41 +01:00
Tom Needham
1133eaa679 load bookmarks provider class 2012-02-03 21:28:58 +00:00
Tom Needham
ee88ded463 more commenting out for debugging, added logging commands 2012-02-03 21:00:12 +00:00
Tom Needham
0bbc9ade7d fix syntax, add logging, debug xml output instead of zip 2012-02-03 20:48:32 +00:00
Tom Needham
5507db9b15 Initial migration code, and basic export for bookmarks 2012-02-03 20:32:06 +00:00
Robin Appelman
05d76dcd67 allow the usage of the filecache outside of the users home folder 2012-02-02 19:04:13 +01:00
Robin Appelman
a69d3c3346 only show what folder we are scanning to save bandwith 2012-02-01 15:25:00 +01:00
Robin Appelman
371b4642bb proper file sorting 2012-01-31 16:33:47 +01:00
Robin Appelman
f1c5dce75c dont try to use something that isn't there 2012-01-31 16:33:36 +01:00
Robin Appelman
c46f701771 use filesystem cache for searching 2012-01-31 16:12:49 +01:00
Robin Appelman
7ff86cfebe provide live feedback while scanning files 2012-01-31 13:56:58 +01:00
Robin Appelman
803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Robin Appelman
ffecc3e434 start of proper feedback during filessytem scan 2012-01-30 23:32:55 +01:00
Robin Appelman
1191b57b34 Merge branch 'master' into filesystem 2012-01-30 23:20:47 +01:00
Robin Appelman
6a1121ab2e provide server side close option for EventStream 2012-01-30 23:19:58 +01:00
Robin Appelman
4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Robin Appelman
45038af948 provide small wrapper around server side events and provide a fallback for IE 2012-01-30 20:21:16 +01:00
Frank Karlitschek
21bf8e99ee increase version number to 3. YeeHaw party!! 2012-01-27 17:39:55 +01:00
Frank Karlitschek
05f1fffddc fix appstore download. 2012-01-27 17:34:47 +01:00
Robin Appelman
500407dbe9 change https detection a bit, hopefully fixing an edge case 2012-01-27 00:37:11 +01:00
Robin Appelman
2f4a289782 fix non-absolute symbolic links 2012-01-27 00:21:15 +01:00
Robin Appelman
935b828427 initialize all storage backends when searching for a file, fixed searching in the Shared folder 2012-01-26 17:56:13 +01:00
Frank Karlitschek
5238a7812c bump version number 2012-01-21 17:33:43 +01:00
Robin Appelman
6866165a37 make oc_image work when php_exif isn't enabled 2012-01-20 17:13:49 +01:00
Robin Appelman
3552626358 Merge branch 'master' into filesystem 2012-01-20 00:48:03 +01:00
Robin Appelman
11c848b221 initial work on filesystemview 2012-01-20 00:48:00 +01:00
Robin Appelman
941f199caf dont complain about non existing config files 2012-01-16 20:17:45 +01:00
Robin Appelman
d7ed456f96 forgot to merge something 2012-01-16 14:36:11 +01:00
Robin Appelman
96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman
ebe10870cf fix database upgrading for pgsql 2012-01-16 02:06:19 +01:00
Robin Appelman
907dd4d24d some aditional feedback during database upgrade 2012-01-16 01:15:43 +01:00
Robin Appelman
ac188ec74b properly check for write permissions to the config file 2012-01-15 23:58:00 +01:00
Georg Ehrke
9c04858631 added vcards to the mimetype fix list and renamed the icon for vcards 2012-01-15 11:02:08 +01:00
Georg Ehrke
0c76884f98 add icon for log app 2012-01-14 23:39:05 +01:00
Bartek Przybylski
ef69abd4dc constans for signals handling 2012-01-14 23:13:01 +01:00
Robin Appelman
36a2649e37 use admin icon for log menu enty untill we have a proper icon 2012-01-14 22:02:26 +01:00
Robin Appelman
f4ce399162 fix issue with moving music files 2012-01-14 21:13:46 +01:00
Robin Appelman
7d53b6f106 remove temporary files after updating 2012-01-13 20:05:44 +01:00
Robin Appelman
6e0ea7aaae use absolute path for db_structure.xml when updating 2012-01-13 20:05:24 +01:00
Daniel Köb
37dbf48434 Connect to the newly created database when checking if it needs to be filled. 2012-01-13 04:38:59 +01:00
Thomas Tanghus
e60860148c Don't chunk_split encoded image string. 
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
 2012-01-12 22:50:12 +01:00
Georg Ehrke
0fb73ec49d fix previous change 2012-01-12 21:54:58 +01:00
Georg Ehrke
a1429085ee Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-12 21:43:32 +01:00
Georg Ehrke
a0ff21a232 added a file to fix wrong recognised mime-types 2012-01-12 18:26:13 +01:00
Tom Needham
fd4b63810d default table prefix to oc_ if not set 2012-01-10 14:41:08 +00:00
Thomas Tanghus
5f04b41ea6 Just a comment ;-) 2012-01-09 20:40:24 +01:00
Tom Needham
5e40653713 Missing line return 2012-01-08 21:18:21 +00:00
Robin Appelman
fbb126cdd9 save updated version number of apps after updating 2012-01-08 19:58:20 +01:00
Tom Needham
de3032fd00 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-08 17:02:07 +00:00
Robin Appelman
ccc43f0ea0 merge master into filesystem 2012-01-08 18:01:33 +01:00
Robin Appelman
37f5a8cdb4 improve pgsql database detection 2012-01-08 17:49:53 +01:00
Tom Needham
e5d3666280 Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui 2012-01-08 16:45:28 +00:00
Robin Appelman
49337e0ad1 dont create a new user when it already exists 2012-01-08 14:25:38 +01:00
Robin Appelman
ae711168c3 improve detection for mysql databases 2012-01-08 14:07:12 +01:00
Robin Appelman
a4e14b49b1 load reverse driver when updating database 2012-01-08 13:16:11 +01:00
Robin Appelman
76b193c698 don't try to upgrade what isn't installed 2012-01-08 13:01:59 +01:00
Robin Appelman
034cf19159 allow changing database backends between PDO and MDB2 2012-01-08 02:57:52 +01:00
Michael Gapczynski
010bfa11e3 Fix updateApp() and add extra check to updateApps() 2012-01-08 02:12:52 +01:00
Robin Appelman
fea68e08b4 update apps when their version number increases 2012-01-08 01:57:53 +01:00
Robin Appelman
001d06f2ff fix errors during database migration 2012-01-08 01:57:53 +01:00
Robin Appelman
c6aa0f9854 set the installed version after updating the database 2012-01-08 01:57:53 +01:00
Robin Appelman
09a53170a3 fixes in the sqlite manager driver 2012-01-08 01:57:53 +01:00
Robin Appelman
ecf6f2ca2f automatically upgrade the main database on version number increase (doesnt work with sqlite for now) 2012-01-08 01:57:53 +01:00
Robin Appelman
9a4e37483b small fix in sqlite3 driver 2012-01-08 01:57:53 +01:00
Robin Appelman
91a9688d07 minor changes to mysql setup 2012-01-08 01:57:53 +01:00
Robin Appelman
6c09d9e0f8 some fixes in the sqlite3 driver 2012-01-08 01:57:53 +01:00
Robin Appelman
799a7db638 Merge branch 'filesystem' of gitorious.org:owncloud/owncloud into filesystem 2012-01-08 01:57:14 +01:00
Robin Appelman
d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00