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

2822 commits

Author SHA1 Message Date
Bjoern Schiessle
c67ae2e7f1 no reason to strip tags at this point 2012-06-27 15:56:14 +02:00
Bjoern Schiessle
d5237c42bc Util::formatDate() expect $timestamp as double 2012-06-27 15:05:40 +02:00
Georg Ehrke
90b5cf680f Merge branch 'master' into calendar_export 2012-06-27 14:05:11 +02:00
Bjoern Schiessle
060a297260 enable highlighting of address in OSM. 2012-06-27 11:46:42 +02:00
Michael Gapczynski
79da782892 Improve error handling of Dropbox storage backend 2012-06-26 20:37:50 -04:00
Thomas Tanghus
3edc40a68a Load default categories if there are none, 2012-06-27 02:12:53 +02:00
Thomas Tanghus
823bef3a09 Ensure event handlers are being set when adding first contact. 2012-06-27 02:12:53 +02:00
Thomas Tanghus
afd9705283 Add check for return value. 2012-06-27 02:12:53 +02:00
Michael Gapczynski
f55f13eebc Don't call getLocalFile() until you know it actually is music 2012-06-26 14:51:31 -04:00
Thomas Tanghus
cad282b73f Added some error checking. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
1b2d09f9ca Added missing requesttoken. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
d8b181cd84 Added error checking on all db queries. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
db115429f7 Added createUser hook. 2012-06-26 18:15:24 +02:00
Bjoern Schiessle
de4a540ce6 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-26 16:30:34 +02:00
Thomas Tanghus
46e93168cd Fix variable name. 2012-06-26 16:06:52 +02:00
Bjoern Schiessle
7dc72a48cc Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-26 15:48:21 +02:00
Georg Ehrke
b9ce4e1f40 add OC_Calendar_Object::createUID() 2012-06-26 15:20:29 +02:00
Bjoern Schiessle
9cb01bd093 xss fix 2012-06-26 14:27:50 +02:00
Georg Ehrke
c7de74c471 Merge branch 'master' into calendar_export 2012-06-26 14:15:07 +02:00
Thomas Tanghus
bf756293c6 Added signals. 2012-06-26 05:26:50 +02:00
Thomas Tanghus
8df59852a4 Adjust pic width a bit. 2012-06-26 04:09:45 +02:00
Thomas Tanghus
b384d79bf8 Remove x-scrollbar from contacts list. 2012-06-25 23:32:03 +02:00
Bart Visscher
103ae6faa4 Media: Change includes in app.php to use the autoloader 2012-06-25 21:05:10 +02:00
Arthur Schiwon
fb53708d10 LDAP: compare base trees case insensitively 2012-06-25 20:53:45 +02:00
Thomas Tanghus
2250fb1159 Emit Completed. 2012-06-25 20:30:21 +02:00
Thomas Tanghus
dc4b891327 Better visual feedback and prevent drop on self. 2012-06-25 18:24:15 +02:00
Thomas Tanghus
b8d6ad0431 Improve styling on draggables. 2012-06-25 18:24:15 +02:00
Sam Tuke
380f41136c Added placeholder msg to share with menu to clarify user list restricted to security context 2012-06-25 16:57:41 +01:00
Arthur Schiwon
9bb409d881 fix syntax error after merge 2012-06-25 17:34:28 +02:00
Thomas Tanghus
ef93bf223a Try to conserve some memory. Should fix oc-1106 for master. 2012-06-25 17:26:44 +02:00
Arthur Schiwon
3f6a7859c9 LDAP: cheaper userExists() implementation, fixes oc-1012 2012-06-25 13:22:00 +02:00
Arthur Schiwon
d64a7716f1 LDAP: always sanitize DN and DN-containing attributes 2012-06-25 13:22:00 +02:00
Bjoern Schiessle
a09a01a49f sanitizeHTML() has to be called later to keep the path unchanged 2012-06-25 12:44:54 +02:00
Bjoern Schiessle
9ee528bc74 Only delete existing thumbnails (bug #1100) 2012-06-25 10:15:20 +02:00
Thomas Tanghus
052bd8efbb Drag'n'Drop contacts between addressbook. Still needs some css magic. 2012-06-25 03:42:27 +02:00
Brice Maron
51d33768b8 Prevent errors and mini enhancement of saved window in bookmarks 2012-06-24 21:30:14 +00:00
Brice Maron
0fb9d0bf29 Correct bookmark app : add through interface and remove missing css 2012-06-24 21:24:43 +00:00
Thomas Tanghus
e845e56749 Remove excessive debugging. 2012-06-24 22:25:32 +02:00
Thomas Tanghus
3afbc3d2dc Add some DRYness to logging. 2012-06-24 22:25:32 +02:00
Thomas Tanghus
f10c51193b Fixed function name. 2012-06-24 22:25:32 +02:00
Thomas Tanghus
df1eca4fa2 Also load categories from VJOURNAL. 2012-06-24 22:25:32 +02:00
Brice Maron
61adae1e49 Use intervals for sessions deletion with postgres fix oc-492 2012-06-24 19:41:23 +00:00
Brice Maron
f56b3df0bc Resolve scanning issue case comparison of songs 2012-06-24 16:03:25 +00:00
Brice Maron
c53a8fa541 Correct seq name in media songs fix oc-589 2012-06-24 16:02:41 +00:00
Thomas Tanghus
0f9b9fa111 Remove unneeded parameter. 2012-06-24 16:07:18 +02:00
Thomas Tanghus
5393c0cfed Click to select which address book to add to. 2012-06-24 16:03:10 +02:00
Thomas Tanghus
9e6d2f2f82 Improve prev/next selection on delete. 2012-06-24 15:07:44 +02:00
Georg Ehrke
ca5de26bac another fix for oc-1044 2012-06-24 09:41:37 +02:00
Georg Ehrke
17e289aef2 Merge branch 'master' into calendar_export 2012-06-23 19:54:12 +02:00
Tom Needham
6e5573acb5 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-23 14:42:54 +00:00
Tom Needham
5323983fc7 Text editor: Waste less space for line numbers 2012-06-23 14:42:37 +00:00
Brice Maron
d39d7fb9ff Remove references to /apps/ and correct inclusion of settings 2012-06-22 22:05:39 +00:00
Brice Maron
b5e3e150eb Correction of path looking for apps and css 2012-06-22 20:58:52 +00:00
Bart Visscher
ded9ea5ad3 Spelling fixes 2012-06-22 22:57:35 +02:00
Bart Visscher
ea3a6d9fcf Merge resource error-suppressing fix 2012-06-22 22:54:25 +02:00
Bart Visscher
2e6e154475 Gallery: Fix opening folders with a ' in the name 2012-06-22 22:46:12 +02:00
Georg Ehrke
0939b1b0ab Merge branch 'master' into calendar_export 2012-06-22 21:36:51 +02:00
Michael Gapczynski
618a3c1d94 Fix removing personal mounts 2012-06-22 12:22:42 -04:00
Michael Gapczynski
b650f46698 Fix variable checks for mounting Google Drive 2012-06-22 12:22:42 -04:00
Tom Needham
41cfd55f55 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-22 16:17:23 +00:00
Bart Visscher
96ec7a66bb More session_write_close 2012-06-22 17:21:56 +02:00
Tom Needham
0aafc717ec Text Editor: fix editor positioning 2012-06-22 15:02:03 +00:00
Thomas Mueller
aade44471d pdf viewer no longer 'eats' keyboard input 2012-06-22 16:10:25 +02:00
Thomas Tanghus
1f06cdf81f Small js fix. 2012-06-22 14:27:46 +02:00
Thomas Tanghus
07124ee38d Cast translation to string. 2012-06-22 14:27:46 +02:00
Bjoern Schiessle
e1fa9c282b xss vulnerabilities fixed 2012-06-22 14:11:57 +02:00
Bjoern Schiessle
5b46734a40 xss vulnerability fixed 2012-06-22 13:58:15 +02:00
Brice Maron
8c2803a7c1 Correct image path and apps path replacement 2012-06-22 13:12:03 +02:00
Arthur Schiwon
19931e2008 remove unnecessary closing PHP tag 2012-06-22 12:49:56 +02:00
Arthur Schiwon
bef9b671ee LDAP: cheaper userExists() implementation 2012-06-22 12:42:07 +02:00
Bjoern Schiessle
8c28aec664 date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:30:40 +02:00
Bart Visscher
82f39d3292 Contacts: Fix name and carddav-url encoding 2012-06-21 23:30:04 +02:00
Bart Visscher
fd23c286ef Calendar: Fix caldav url encoding 2012-06-21 23:30:04 +02:00
Bart Visscher
4a22f4ca78 Calendar: convert choosecalendar.rowfields template from plain php to html+php 2012-06-21 23:30:04 +02:00
Bart Visscher
1d07b9e291 Calendar: Missing userid in allCalendars call 2012-06-21 23:30:04 +02:00
Bart Visscher
c047fdafdb Calendar: Fix missing template parameter 'shared' for new and update calendar 2012-06-21 23:30:04 +02:00
Brice Maron
95b5202893 Correct usage of approot 2012-06-21 21:13:12 +00:00
Michael Gapczynski
bf6abdde2d Add missing ')' 2012-06-21 12:26:06 -04:00
Brice Maron
a5938e4e37 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Thomas Tanghus
37d12144c2 Fix URL delimiter. 2012-06-21 22:03:57 +02:00
Thomas Tanghus
ad7154b344 Fix being able to link directly to contact, that I broke in other commit. 2012-06-21 22:02:17 +02:00
Thomas Tanghus
b17bf59ced Only search for VEVENTs. 2012-06-21 20:51:23 +02:00
Bart Visscher
b17e682609 Tasks: Add delete action 2012-06-21 19:49:28 +02:00
Bart Visscher
10351550cd Tasks: Use list label for ordering by list 2012-06-21 19:49:28 +02:00
Bart Visscher
b9e3b0ddf9 Tasks: Fix position of the summary input 2012-06-21 19:49:28 +02:00
Brice Maron
e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Sam Tuke
a9a913c273 Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic) 
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
 2012-06-21 18:15:22 +01:00
Robin Appelman
49033ff8e0 dont change the encryption key during the test case 2012-06-21 18:53:10 +02:00
Robin Appelman
6707e4187e only use 1 fsview when initializing encryption 2012-06-21 18:35:12 +02:00
Robin Appelman
56de98ed8c fix saved file size for uploaded files 2012-06-21 18:22:18 +02:00
Robin Appelman
d0455c5819 truncate decrypted files based on filelength 2012-06-21 17:38:00 +02:00
Bjoern Schiessle
1338279ca0 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 16:42:16 +02:00
Georg Ehrke
49d9eb7acf fix calendar 2012-06-21 16:24:05 +02:00
Sam Tuke
7c3f6f61db Fixed missing jQuery event object - expire interface now works with Firefox 2012-06-21 14:54:24 +01:00
Georg Ehrke
f5740a6f92 fix a PHP Notice 2012-06-21 15:20:15 +02:00
Bjoern Schiessle
34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Bjoern Schiessle
09d2f76727 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 11:51:50 +02:00
Bjoern Schiessle
2f9763d216 check if user is allowed to edit bookmarks 2012-06-21 11:50:51 +02:00
Georg Ehrke
1db2539223 make edit event form work with DateTime Property UTC 2012-06-21 11:35:20 +02:00
Bjoern Schiessle
cd005e6c62 use new sanitizeHTML() function 2012-06-21 10:28:43 +02:00
Bjoern Schiessle
f8ec280b6e correct presentation of HTML encoded characters 2012-06-21 09:44:20 +02:00
Georg Ehrke
82e8cb23fe Merge branch 'master' into calendar_export 2012-06-21 09:08:26 +02:00
Bart Visscher
fedfa4c98e DateTime objects are directly comparable 2012-06-20 21:38:56 +02:00
Bart Visscher
a6dc7345d0 Gallery: Move code/js/css from main template to the right place 2012-06-20 21:28:37 +02:00
Thomas Tanghus
10a0d5a46c More changes for updating the contacts list. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
dc8c188ffe Better error checking. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
426ed27be2 Make sure address books are shown even if empty. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
0f1fe0b505 Log error as ERROR. 2012-06-20 21:00:49 +02:00
Georg Ehrke
40e7b56783 Merge branch 'master' into calendar_export 2012-06-20 20:15:07 +02:00
Georg Ehrke
0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Georg Ehrke
c1d205cbf5 Merge branch 'master' into calendar_export 2012-06-20 20:14:03 +02:00
Arthur Schiwon
f255ac8b3a make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:03:25 +02:00
Arthur Schiwon
4b231c15d5 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 19:43:02 +02:00
Sam Tuke
72215a818d added new user settings interface for deleting old file versions 
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
 2012-06-20 18:25:12 +01:00
Sam Tuke
d6bf62ea4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 16:26:02 +01:00
Sam Tuke
c244daac89 removed readdir to fix bug oc-1054 2012-06-20 16:24:49 +01:00
Bart Visscher
6308ca6b8a Merge branch 'shared_log' 2012-06-20 17:20:46 +02:00
Bart Visscher
0086639891 Merge branch 'audit' 2012-06-20 17:20:39 +02:00
Bart Visscher
6404476bec Delay setup of FS until OC_Filesystem is used 2012-06-20 17:10:49 +02:00
Bart Visscher
cd934d5d89 Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible 2012-06-20 17:10:49 +02:00
Bjoern Schiessle
5a2c93ec2d use sanitizeHTML() function 2012-06-20 15:11:14 +02:00
Georg Ehrke
572dd9fbad Merge branch 'master' into calendar_repeat 2012-06-20 13:29:12 +02:00
Georg Ehrke
27c995230c Merge branch 'master' into calendar_export 2012-06-20 13:28:30 +02:00
Bjoern Schiessle
1ecbf459c9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 13:01:55 +02:00
Arthur Schiwon
5b02217906 forgotten $, incorrect subtract 2012-06-20 12:47:31 +02:00
Arthur Schiwon
7c6b8475eb LDAP: only map users within the User Base Tree 2012-06-20 12:47:24 +02:00
Bjoern Schiessle
8d89bba07c use new sanitizeHTML() function 2012-06-20 12:23:26 +02:00
Sam Tuke
28a72e0e3c Fixed deleteAll function for deleting all old versions of files (expireAll) 
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
 2012-06-19 19:42:40 +01:00
Thomas Tanghus
0b9a48b4b6 Re-add missing loadhandlers() call. 2012-06-19 14:56:21 +02:00
Thomas Tanghus
33aec973df Loading of contacts was placed outside of $(document).ready() function. 2012-06-19 14:55:14 +02:00
Georg Ehrke
5ce0097b6f Calendar: only run ->expand if the event is repeating 2012-06-19 13:30:45 +02:00
Georg Ehrke
2b2da6fe35 Calendar: js fix 2012-06-19 13:26:55 +02:00
Georg Ehrke
c8c105df33 Calendar: fix modifying of end DateTime object 2012-06-19 13:04:11 +02:00
Georg Ehrke
a38463d41a Merge branch 'master' into calendar_repeat 2012-06-19 11:30:12 +02:00
Georg Ehrke
8c8a0cca75 Merge branch 'master' into calendar_export 2012-06-18 23:10:01 +02:00
Thomas Mueller
a1364c9726 fixes oc-1026 2012-06-18 22:48:52 +02:00
Robin Appelman
debd9c8dfb fix problem with encryption flag not being saved correctly in the filecache 2012-06-18 18:18:10 +02:00
Georg Ehrke
16560fe5c1 Merge branch 'master' into calendar_repeat 2012-06-18 15:59:26 +02:00
Georg Ehrke
6e405513ab Merge branch 'master' into calendar_export 2012-06-18 15:59:21 +02:00
Georg Ehrke
13aad8f06d some little fixes for repeating events caching 2012-06-18 15:58:01 +02:00
Bart Visscher
79f9d61ec8 Allow apps to load before login, needed for user_openid 2012-06-18 15:40:48 +02:00
Georg Ehrke
beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" 
This reverts commit e3b58f6783.
 2012-06-18 14:47:58 +02:00
Georg Ehrke
e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function" 
This reverts commit aa7ce480f4.
 2012-06-18 14:47:09 +02:00
Georg Ehrke
6b6d3d68d4 Merge branch 'master' into calendar_repeat 2012-06-18 14:34:43 +02:00
Georg Ehrke
c2b7d05188 Merge branch 'master' into calendar_export 2012-06-18 14:34:38 +02:00
Thomas Tanghus
e5feb4e1aa Remove obsolete js. 2012-06-18 02:22:22 +02:00
Thomas Tanghus
73fd4c979a Update js after contactlist change. 2012-06-18 02:21:29 +02:00
Thomas Tanghus
a4f53922c2 Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:36:25 +02:00
Thomas Tanghus
cab4a634df Save addressbook id to be able to rearrange contacts properly. 2012-06-17 23:14:02 +02:00
Thomas Tanghus
3efec3fde9 Make contact list fit in viewport. 2012-06-17 23:12:48 +02:00
Thomas Tanghus
ea4d8ccf70 Rearrange markup. 2012-06-17 23:12:11 +02:00
Thomas Tanghus
8337b30e43 Add thumbnail links so they are loaded when addressbook is expanded. 2012-06-17 23:09:25 +02:00
Thomas Tanghus
7d84c4741c Use uasort instead of usort. 2012-06-17 21:50:49 +02:00
Thomas Tanghus
46a771d2e6 Sort addressbooks. 2012-06-17 21:47:15 +02:00
Thomas Tanghus
fb700de4a4 Add effect on addressbook show/hide. 2012-06-17 21:37:13 +02:00
Thomas Tanghus
9e4a41e9cb Add effect on addressbook show/hide. 2012-06-17 21:34:56 +02:00
Thomas Tanghus
5a8f4b8783 Adjustments for inview handler etc. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
b6b6d69158 Moved parsing to the controller and js to contacts.js. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
2875901fc7 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
91f5a1de39 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
b1cfc99f63 Styled address book entries. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
56d25d4d1b Make the parsing in the controller, not in the template. Assign only relevant entries to the template. 2012-06-17 20:25:32 +02:00
Stephan Bergemann
92e35bd843 now a little less in template - more in ajax controller 2012-06-17 20:25:32 +02:00
Stephan Bergemann
7f485d1b20 contacts app now lists contacts sorted by expandable/collapsable addressbooks 2012-06-17 20:25:32 +02:00
Georg Ehrke
b8daae30b6 Merge branch 'master' into calendar_repeat 2012-06-17 16:41:49 +02:00
Georg Ehrke
4b872d10fc Merge branch 'master' into calendar_export 2012-06-17 16:41:44 +02:00
Tom Needham
b064fc6968 user_migrate: remove old code 2012-06-17 12:06:40 +00:00
Georg Ehrke
229587a31e Merge branch 'master' into calendar_repeat 2012-06-17 08:36:26 +02:00
Georg Ehrke
a8da950819 Merge branch 'master' into calendar_export 2012-06-17 08:36:20 +02:00
Robin Appelman
ad4f066bac suppress error when using is_dir on non directory in smb backend 2012-06-17 03:09:49 +02:00
Robin Appelman
ed66c63c29 improve caching smb results a bit 2012-06-17 02:59:38 +02:00
Robin Appelman
769cbe9a4c improve filecache support for smb 2012-06-17 02:54:23 +02:00
Thomas Tanghus
9c6d82d00d PDF Viewer: Double encode link. 2012-06-16 19:48:33 +02:00
Georg Ehrke
7f1e0287a9 Merge branch 'master' into calendar_repeat 2012-06-16 19:04:50 +02:00
Georg Ehrke
56f8fc0f70 Merge branch 'master' into calendar_export 2012-06-16 19:04:45 +02:00
Thomas Tanghus
1118498050 files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:54:55 +02:00
Thomas Tanghus
4cbdd59859 Fix char encoding. 2012-06-16 18:38:20 +02:00
Thomas Tanghus
6642ef6a50 Fix string encoding probs. 2012-06-16 18:06:47 +02:00
Georg Ehrke
fd9a4f8d51 Merge branch 'master' into calendar_repeat 2012-06-16 09:48:43 +02:00
Georg Ehrke
be4820bbca Merge branch 'master' into calendar_export 2012-06-16 09:48:32 +02:00
Georg Ehrke
31ec93bd00 remove a lot of closing php tags and empty lines at a file's end in calendar app 2012-06-16 09:45:17 +02:00
Georg Ehrke
05c1afd0d1 Merge branch 'master' into calendar_repeat 2012-06-16 09:41:31 +02:00
Georg Ehrke
4d392801cc Merge branch 'master' into calendar_export 2012-06-16 09:41:24 +02:00
Georg Ehrke
b6375e7a8c remove a closing php tag in calendar 2012-06-16 09:40:03 +02:00
Georg Ehrke
a6531d0311 Merge branch 'master' into calendar_repeat 2012-06-16 09:35:53 +02:00
Georg Ehrke
81e8ffc4ba Merge branch 'master' into calendar_export 2012-06-16 09:35:48 +02:00
Robin Appelman
bf2062b09d write_close the session when scanning files or music 2012-06-16 01:35:39 +02:00
Robin Appelman
195c37f88a fix for encryption binary files 2012-06-16 01:31:03 +02:00
Tom Needham
8484e16516 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-15 23:14:48 +00:00
Tom Needham
e37ef6dd47 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:14:40 +00:00
Bart Visscher
4268fe61ba Calendar: Write-close session to enable parallel events.php requests 2012-06-16 00:44:23 +02:00
Bart Visscher
6d3ae575b6 Remove $DOCUMENTROOT, not used 2012-06-16 00:11:36 +02:00
Robin Appelman
03951ccc6b fix encryption proxy for updated filecache 2012-06-15 23:11:55 +02:00
Robin Appelman
19bfe21401 add binary test case for encryption 2012-06-15 23:11:33 +02:00
Georg Ehrke
fbd45a939f Merge branch 'master' into calendar_repeat 2012-06-15 20:48:32 +02:00
Georg Ehrke
4d2894f390 Merge branch 'master' into calendar_export 2012-06-15 20:48:26 +02:00
Robin Appelman
f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Robin Appelman
449760f665 add hasUpdated to oc_filestorage 2012-06-15 16:43:24 +02:00
Thomas Tanghus
8f6121ffa8 Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:57:04 +02:00
Georg Ehrke
aa7ce480f4 create OC_Calendar_Object::generateStartEndDate function 2012-06-15 12:11:22 +02:00