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

3091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marvin Thomas Rabe
e2d6bf4c63 Bookmarklet Window closes itself after submit. 2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
d9914664f6 Text editor display error fixed. 2012-02-22 16:04:31 +01:00
Marvin Thomas Rabe
b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Robin Appelman
ed0c99ef14 make sure we always have the encryption key unlocked 2012-02-22 15:18:22 +01:00
Robin Appelman
1a9ded981b Merge branch 'master' into enc 2012-02-22 14:26:52 +01:00
Thomas Tanghus
faf6055baa Translate and fix copy/paste error. 2012-02-22 14:19:23 +01:00
Thomas Tanghus
9794e7e427 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Thomas Tanghus
c5c843bfef Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
e0c92662f8 JS fix on address book creation. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
a79f5d40de Remove my FIXME comments when I've fixed it :-P 2012-02-21 23:22:06 +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
6a8364c3ff rework the way file_put_contents is handeled 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
e2b4954176 simple file encryption wip 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
d3e6ea6ac0 Bookmarks: uses the core action icons 2012-02-21 20:28:24 +01:00
Bart Visscher
86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Bart Visscher
987845c312 Move the redirect_url from linkTo function to the checkLoggedIn function 2012-02-21 20:09:24 +01:00
Marvin Thomas Rabe
21f8d0992f Added missing files 2012-02-21 18:29:49 +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
Thomas Tanghus
c691c9d24c Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories 2012-02-20 23:43:59 +01:00
Thomas Tanghus
7a49c8e59c Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 23:42:06 +01:00
Thomas Mueller
6540bda238 some icons for filetypes have been added. 
for licensing information please have look at core/img/filetypes/readme-2.txt
 2012-02-20 22:33:38 +01:00
Bart Visscher
77ab89a7cb Review changes of OC_VCategory 2012-02-20 22:32:57 +01:00
VicDeo
d5f7a39936 Contact list scroll fix 2012-02-20 23:54:23 +03:00
Thomas Tanghus
ffdfe8257b Contacts: Fix adding/updating address book with empty name. 2012-02-20 15:24:54 +01:00
Thomas Tanghus
456ada01fa Contacts: Apply strip_tags on compound values. 2012-02-20 14:36:21 +01:00
Thomas Tanghus
12bcbcdc62 Update ctag in deleteFromDAVData. 2012-02-20 14:24:10 +01:00
Thomas Tanghus
8ed4262393 Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 13:18:22 +01:00
Thomas Tanghus
430ccef09c Added OC_VCategories::rescan() 2012-02-20 13:16:51 +01:00
Arthur Schiwon
30d524b426 load apps before logout so that logout-hook works 2012-02-20 11:21:46 +01:00
Arthur Schiwon
7ff4e40b20 Combing LDAP backend with LDAP extended backend 2012-02-20 10:39:55 +01:00
Alessandro Cosentino
490c9db15d Added bookmarklet for browser. Inspired by Google Bookmarks 2012-02-19 20:18:27 -05:00
Thomas Tanghus
c62673d360 Added public static OC_VCategories object to OC_Contacts_App. 
Parse cards for new categories in add and edit methods.
 2012-02-19 23:32:09 +01:00