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
Robin Appelman
8f8985c3e5
Merge branch 'database'
2012-01-08 01:45:18 +01:00
Frank Karlitschek
0d81014fa6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-06 19:15:29 +01:00
Frank Karlitschek
d485a70e7d
finish the application store feature so that users can download and install ownCloud apps from our website. there is still a small problem with write permissions. will look into this later
2012-01-06 19:08:35 +01:00
Tom Needham
47a275f389
Use parameter
2012-01-06 18:04:24 +00:00
Frank Karlitschek
f9db4249a3
add a formfactor session variable which is autodetected but can also manually overwritten via a get variable.
...
currently we have:
* default -> the normal desktop browser interface
* mobile -> interface for smartphones
* tablet -> interface for tablets
* standalone -> the default interface but without header, footer and sidebar. just the application. useful to use just a specific app on the desktop in a standalone window.
In the future we should adapt the userinterface to the specific formfactor.
2012-01-06 17:21:24 +01:00
Thomas Tanghus
2f86a6203a
Added fixOrientation method which rotates the image based on EXIF data.
2012-01-05 17:42:40 +01:00
Thomas Tanghus
d80b477ab5
Wrong permission checking on file save.
2012-01-04 23:31:32 +01:00
Thomas Tanghus
48a8f2a793
Content type header was sent when saving image to disk.
2012-01-04 22:57:42 +01:00
Michael Gapczynski
b6d66c4727
Remove the keys in preferences when a user is deleted - Thanks rogerc
2012-01-04 15:19:16 -05:00
Tom Needham
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
prcrst
868a3b5364
Fix sqlite detection for Ubuntu 11.10
2012-01-03 15:58:48 +01:00
Robin Appelman
9e9bc1430b
don't check if the target path is writable for operations that can create a new file
...
fixes file upload
2012-01-03 15:55:38 +01:00
Robin Appelman
4c8f17ad47
don't try to use mod_rewrite when it isn't enabled
...
having a broken web/card/caldav is much better as having no ownCloud at all :)
2012-01-03 04:55:57 +01:00
Thomas Tanghus
b8cffbc0ee
OC_Image::__invoke didn't return anything thus causing contacts/thumbnail.php to spit out lots of error messages.
2012-01-02 23:17:15 +01:00
Thomas Tanghus
2a184631d1
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 19:38:10 +01:00
Robin Appelman
cc55f00481
fix is_readable and is_writable
2012-01-02 16:38:10 +01:00
Thomas Tanghus
6a7fbf9d13
Added more error checking and debug on missing image support.
2012-01-02 13:40:23 +01:00
Thomas Tanghus
c62c55fb81
Added save() to OC_Image.
2012-01-02 12:09:45 +01:00
Georg Ehrke
534b6f3a09
Fix whitespace username
2012-01-02 11:49:53 +01:00
Thomas Tanghus
29048bf4bd
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 11:47:02 +01:00
Michael Gapczynski
4374d55e5e
Correct local permissions checks
2012-01-01 19:59:24 -05:00
Thomas Tanghus
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
Thomas Tanghus
a8789ebe29
Removed static declaration from loadFrom* methods.
2012-01-02 00:43:27 +01:00
Michael Gapczynski
a9bab168f5
Replace canRead()/canWrite() with is_readable()/is_writeable() for proper permission checks
2012-01-01 18:41:00 -05:00
Thomas Tanghus
db6738478b
Mixed up two lines :-P
2012-01-01 23:34:26 +01:00
Thomas Tanghus
312e7993bb
Added image type specific loading and displaying.
...
Added method 'valid()' to tell if image contains a valid resource.
Renamed imageResource() to resource().
2012-01-01 23:26:24 +01:00
Michael Gapczynski
a22b5feda6
Initial commit of common filestorage
2012-01-01 17:05:22 -05:00
Michael Gapczynski
7250dc4e98
Fix updateApp() and add extra check to updateApps()
2012-01-01 16:58:51 -05:00
Michael Gapczynski
782d201191
Move to branch
2012-01-01 16:25:43 -05:00
Michael Gapczynski
19328fd8b2
Initial commit of common filestorage
2012-01-01 15:56:33 -05:00
Thomas Tanghus
929ce2b566
Small fixes
2012-01-01 20:06:35 +01:00
Thomas Tanghus
c500c1e930
Removed some denug statements and an exception thrown.
2012-01-01 18:07:46 +01:00
Thomas Tanghus
6207c0444b
Added class OC_Image
2012-01-01 17:57:26 +01:00
Tom Needham
cbb2db8622
Fix merge conflicts
2012-01-01 01:18:02 +00:00
Tom Needham
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
Daniel Köb
eb4cd86910
Include PostgreSQL when checking for available database drivers.
...
Signed-off-by: Brice Maron <brice@bmaron.net>
2011-12-30 21:09:29 +01:00
Robin Appelman
3844fb0e4c
also use fscache when getting used space for webdav
2011-12-14 01:19:23 +01:00
Robin Appelman
835d6a9b6e
save quota in human readable format (42 MB), should prevent some of the overflow related problems
2011-12-14 01:16:14 +01:00
Robin Appelman
c67c933d3f
Merge branch 'database' into filesystem
2011-12-11 23:57:53 +01:00
Robin Appelman
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
Robin Appelman
5e711f37ca
make filesize parsing case insensitive
2011-12-11 23:34:27 +01:00
Robin Appelman
efecb694ef
make filesize parsing case insensitive
2011-12-11 23:33:24 +01:00
Robin Appelman
a8148fa94a
update apps when their version number increases
2011-12-11 22:08:01 +01:00
Robin Appelman
7f1bb5fd78
Merge branch 'master' into database
2011-12-11 22:00:17 +01:00
Bart Visscher
1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
Bart Visscher
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
Bart Visscher
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
Bart Visscher
0342b5fc43
Fix filename of log icon
2011-12-07 20:41:00 +01:00
Bart Visscher
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
Robin Appelman
153029a170
increase version to trigger database upgrade
2011-11-26 01:26:01 +01:00
Robin Appelman
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
Bart Visscher
43911d9a6f
Template: output better html for select options
2011-11-24 21:36:34 +01:00
Frank Karlitschek
fab70cb590
removed no longer used function and exec command
...
security++
2011-11-24 13:50:29 +01:00
Hendrik Langer
76bfc3b547
set http auth headers for apache+php-cgi work around if variable gets renamed by apache
2011-11-24 02:59:22 +01:00
Georg Ehrke
6c4692380f
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-11-20 11:41:58 +01:00
Frank Karlitschek
7df9d934ca
second half of the updating stuff
2011-11-19 12:02:34 +01:00
Frank Karlitschek
949bd2c47a
first small step to an automatic updating system.
...
At the moment we only have a hint that a new version is avaiable and a link to a not yet existing page if updating information. This has to be improved.
2011-11-19 11:56:40 +01:00
Robin Appelman
98dc0882cb
fix errors during database migration
2011-11-15 16:08:08 +01:00
Robin Appelman
916c72b40b
set the installed version after updating the database
2011-11-15 15:59:01 +01:00
Robin Appelman
9686c5b6aa
fixes in the sqlite manager driver
2011-11-15 15:58:12 +01:00
Robin Appelman
b2f1429b75
automatically upgrade the main database on version number increase (doesnt work with sqlite for now)
2011-11-13 16:16:21 +01:00
Robin Appelman
aa7c5a971c
small fix in sqlite3 driver
2011-11-13 16:08:47 +01:00
Robin Appelman
486a31bfa3
minor changes to mysql setup
2011-11-13 16:06:29 +01:00
Robin Appelman
bf40691ace
some fixes in the sqlite3 driver
2011-11-12 18:06:07 +01:00
Georg Ehrke
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
Robin Appelman
024f4375b6
keep encrypted and versioned flag in fscache
2011-11-12 01:00:04 +01:00
Robin Appelman
b2f2a87745
use cache for searching files
2011-11-10 23:50:43 +01:00
Robin Appelman
7543ffa3b1
always load the filecache
2011-11-10 16:53:08 +01:00
Robin Appelman
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
Bart Visscher
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
Robin Appelman
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
Jakob Sack
b3a73c78e8
Fix comments/documentation
2011-11-09 11:35:50 +01:00
Robin Appelman
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
Robin Appelman
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
Robin Appelman
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
Robin Appelman
878fc1d197
remove outdated remote storage prototype
2011-11-08 22:18:41 +01:00
Florian Vichot
452a463764
Make OC_Connector_Sabre_File::get() return a PHP stream instead of the file content, as is recommended by SabreDAV to handle large files.
2011-11-06 22:39:24 +01:00
Brice Maron
3940ca3df1
Display correctly the error message when nothing is retrieved from OCS servers
2011-11-06 16:48:26 +01:00
Brice Maron
7de591f5cc
Avoid Huge error message when unable to read log file
2011-11-06 14:37:22 +01:00
Robin Appelman
7b3ae2edd4
use database table prefix from installer, not the old configured value
2011-11-03 13:09:51 +01:00
Brice Maron
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Brice Maron
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
Bart Visscher
7b01858c57
Enable php display_errors setting
2011-10-27 22:48:50 +02:00
Bart Visscher
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
Robin Appelman
f073041b0b
provide function for updating the database scheme
2011-10-23 15:25:38 +02:00
Robin Appelman
6592fbb948
improve detection of database backend
2011-10-23 12:32:33 +02:00
Robin Appelman
122fa190c6
improve mimetype detection
2011-10-23 11:35:29 +02:00
Robin Appelman
38bb503ff6
fix fopen
2011-10-23 11:35:29 +02:00
Frank Karlitschek
3acea2f574
change the error hint from suggesting to change the owner of a directory to changing the permissions. changing the owner of a director is not possible via ftp.
2011-10-22 19:39:05 +02:00
Georg Ehrke
0011c42669
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 13:12:13 +02:00
Robin Appelman
7761765a4b
change licencing headers for sqlite3 driver
2011-10-22 12:31:07 +02:00
Robin Appelman
af1f0305eb
fix log level check
2011-10-22 12:22:57 +02:00
Bart Visscher
4fe48a50f0
Translation of calendar interface
2011-10-20 23:49:27 +02:00
Robin Appelman
3a937f79f7
escape filenames for getMimeType
2011-10-20 22:55:27 +02:00
Robin Appelman
8f77179d29
Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud
2011-10-20 01:24:23 +02:00
Robin Appelman
273972b75a
prevent sql error while initializing apps on sqlite2
2011-10-20 01:17:02 +02:00
Hendrik Langer
466b41c36b
Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments
2011-10-19 23:38:35 +02:00
Robin Appelman
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
Robin Appelman
28ab39073a
mount filesystems on demand
2011-10-18 21:01:49 +02:00
Brice Maron
ebd36d56ca
Remove unnecessary exec for getting timezone and fix spacings
2011-10-17 21:42:38 +02:00
Robin Appelman
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
Robin Appelman
77378fa189
fix now() function for sqlite3
2011-10-17 00:25:13 +02:00
Brice Maron
1f6be85719
Fix bookmarks app to work with postgresql.
...
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
Robin Appelman
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
Robin Appelman
d9372ac766
make log level configurable
2011-10-16 21:11:03 +02:00
Robin Appelman
820cd0fb75
provide a logging mechanism
2011-10-16 21:11:03 +02:00
Robin Appelman
d11a8f4103
some minor tweaks to oc_db
2011-10-16 21:11:03 +02:00
Brice Maron
90c54ade67
Fix typo in getting var from config
2011-10-16 21:08:07 +02:00
Brice Maron
c105268a1d
Fetch prefix from config at installation instead of a hardcoded value
2011-10-16 21:06:48 +02:00
Brice Maron
543537ef29
Fix installer for postgresql : correct table detection query
2011-10-16 20:23:43 +02:00
Georg Ehrke
9ce15667d5
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
2011-10-16 15:41:00 +02:00
Robin Appelman
512d226d43
merge database into master
2011-10-16 13:54:21 +02:00
Georg Ehrke
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
Robin Appelman
db2fb38746
prevent error involving webdav workaround
2011-10-13 21:55:02 +02:00
Robin Appelman
f1fd374a6f
webdav workaround for apache+php-cgi
2011-10-13 16:33:39 +02:00
Robin Appelman
d7fa2a0f77
mimetype icon improvements
2011-10-13 16:33:39 +02:00
Robin Appelman
ffb9a0475e
webdav workaround for apache+php-cgi
2011-10-13 16:31:01 +02:00
Joar Wandborg
9d3c7badb5
Fixed a bug in checkWebserverUser
...
checkWebserverUser would return the owner of the document
root instead of the owner of the web server process.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-11 21:46:14 +02:00
Georg Ehrke
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
Robin Appelman
9ba384b9a4
merge master into database
2011-10-10 21:05:39 +02:00
Robin Appelman
8b3c4e9a52
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-10 20:57:15 +02:00
Frank Karlitschek
6163351ea2
master is now on the way to ownCloud 3
2011-10-10 18:48:40 +02:00
Robin Appelman
949494ccfd
mimetype icon improvements
2011-10-08 21:18:47 +02:00
Tom Needham
538abb99f1
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:10:50 +01:00
Robin Appelman
1f562a2e83
fixes for the mimetype icons
2011-10-07 18:09:49 +02:00
Tom Needham
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
Borjan Tchakaloff
3388381deb
Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
...
The OC_App::navigation array contains by default only the help menu.
2011-10-05 14:31:33 +04:00
Tom Needham
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
Marvin Thomas Rabe
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
Tom Needham
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00