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
|
18ce53f426
|
Merge commit 'refs/merge-requests/121' of git://gitorious.org/owncloud/owncloud
|
2012-06-16 00:15:02 +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 |
|
Robin Appelman
|
cb833e45c2
|
get rid of php4 style constructors in mdb2
|
2012-06-15 21:59:40 +02:00 |
|
Bart Visscher
|
e11c5a23d5
|
Optimize WebDav access by preloading dav custom properties
|
2012-06-15 21:21:42 +02:00 |
|
Bart Visscher
|
e905b14758
|
Spelling fix
|
2012-06-15 21:21:42 +02:00 |
|
Bart Visscher
|
463a506fcb
|
Fix webdav property name compare
|
2012-06-15 21:21:42 +02:00 |
|
Bart Visscher
|
27efdbd58f
|
Use setter for FileinfoCache
|
2012-06-15 21:21:42 +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
|
a9a424a519
|
also add hasUpdated to oc_filesystem and oc_filesystemview
|
2012-06-15 17:42:39 +02:00 |
|
Robin Appelman
|
449760f665
|
add hasUpdated to oc_filestorage
|
2012-06-15 16:43:24 +02:00 |
Bjoern Schiessle
|
6ca87656be
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-15 16:14:31 +02:00 |
|
Bart Visscher
|
400769ab40
|
Optimize WebDav access using OC_FileCache
|
2012-06-15 16:04:07 +02:00 |
Thomas Tanghus
|
8f6121ffa8
|
Files: Double encode download links. Fix for oc-1016.
|
2012-06-15 15:57:04 +02:00 |
|
Bjoern Schiessle
|
3ddaedee3b
|
fixed xss vulnerability
|
2012-06-15 15:51:06 +02:00 |
|
Georg Ehrke
|
aa7ce480f4
|
create OC_Calendar_Object::generateStartEndDate function
|
2012-06-15 12:11:22 +02:00 |
|
Georg Ehrke
|
4767c70578
|
fix merge conflicts
|
2012-06-15 11:48:26 +02:00 |
|
Georg Ehrke
|
22a33b509f
|
use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod
|
2012-06-15 11:39:19 +02:00 |
|
Georg Ehrke
|
e4529301ff
|
change some function names in OC_Calendar_Repeat
|
2012-06-15 11:34:21 +02:00 |
|
Georg Ehrke
|
5c10683432
|
use easier parseable date to init datetime
|
2012-06-15 11:29:16 +02:00 |
|
Georg Ehrke
|
6f20d51646
|
fix generateEventOutput for calendar hook
|
2012-06-15 11:25:29 +02:00 |
|
Georg Ehrke
|
b6a8de8530
|
don't clean and cache calendar on every update
|
2012-06-15 11:24:40 +02:00 |
|
Bart Visscher
|
2b228fba34
|
Load app before running update script
|
2012-06-15 11:18:44 +02:00 |
|
Bart Visscher
|
0d3f5f736f
|
Disable minizing when DEBUG is true
|
2012-06-15 11:18:44 +02:00 |
|
Georg Ehrke
|
0dd4ea5a4f
|
Merge branch 'master' into calendar_export
|
2012-06-15 10:41:06 +02:00 |
|
Bjoern Schiessle
|
4b7bdd5ace
|
Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
Conflicts:
apps/gallery/templates/index.php
|
2012-06-15 09:51:04 +02:00 |
|
Thomas Tanghus
|
effb6f1309
|
Update stylesheet for type=url.
|
2012-06-15 04:32:01 +02:00 |
|
Thomas Tanghus
|
8a68d09b0f
|
Use type=url for URL field.
|
2012-06-15 04:32:01 +02:00 |
Michael Gapczynski
|
92083aa20c
|
Fix upload for Google Drive; Google Documents List API documentation was misleading
|
2012-06-14 20:57:08 -04:00 |
|
Thomas Tanghus
|
f6aa366857
|
Make sure there is a calendar after delete.
|
2012-06-15 02:10:55 +02:00 |
|
Thomas Tanghus
|
3c75ac5f62
|
Update calendar after delete.
|
2012-06-15 02:07:32 +02:00 |
|
Thomas Tanghus
|
ad8c4ab182
|
Only create new calendar when there are none. Fix oc-1007.
|
2012-06-15 01:55:02 +02:00 |
|
Thomas Tanghus
|
ad32c20300
|
Agree on argument type (cleaned this time).
|
2012-06-15 01:51:26 +02:00 |
|
Thomas Tanghus
|
6d43e6565e
|
Revert "Agree on argument type."
This reverts commit 0f6b1be0e6.
|
2012-06-15 00:53:13 +02:00 |
|
Thomas Tanghus
|
0f6b1be0e6
|
Agree on argument type.
|
2012-06-15 00:50:42 +02:00 |
|
Thomas Tanghus
|
1e76a530ea
|
No need to find calendar twice.
|
2012-06-15 00:28:12 +02:00 |
|
Thomas Tanghus
|
31db583f03
|
Make events show again.
|
2012-06-15 00:26:34 +02:00 |
Brice Maron
|
df83df5263
|
Correct sample config
|
2012-06-14 21:19:11 +00:00 |