Georg Ehrke
|
e029e8cb14
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:27:55 +02:00 |
|
Georg Ehrke
|
8712754f8c
|
fix style of some doc
|
2012-06-27 22:27:48 +02:00 |
|
Georg Ehrke
|
1f738d8c9f
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:24:12 +02:00 |
|
Brice Maron
|
2706988225
|
Set table prefix if not set in postgresql install
|
2012-06-27 16:08:46 -04:00 |
|
Michael Gapczynski
|
9b605969f1
|
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
|
2012-06-27 15:23:49 -04:00 |
|
Georg Ehrke
|
77c66e8cc4
|
move some documentation to the right place
|
2012-06-27 21:05:46 +02:00 |
|
Georg Ehrke
|
25a50f00bd
|
add merge calendar function and add some documentation to OC_Calendar_Calendar
|
2012-06-27 20:56:58 +02:00 |
|
Michael Gapczynski
|
b7f86cf282
|
Add Samba Share parameter to external storage UI
|
2012-06-27 12:24:21 -04:00 |
|
Michael Gapczynski
|
2c773d549d
|
Don't overwrite fake directory stream for Shared storage
|
2012-06-27 12:07:42 -04:00 |
|
Michael Gapczynski
|
19f94774fb
|
Don't overwrite fake directory stream for Dropbox and Google Drive
|
2012-06-27 12:04:33 -04:00 |
|
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 |
|
Bart Visscher
|
2d8a380a21
|
Fix recursion when running an update script
|
2012-06-27 14:56:34 +02:00 |
|
Georg Ehrke
|
726bec73f0
|
Merge branch 'master' into oc_error
|
2012-06-27 14:06:31 +02:00 |
|
Georg Ehrke
|
90b5cf680f
|
Merge branch 'master' into calendar_export
|
2012-06-27 14:05:11 +02:00 |
|
Robin Appelman
|
12f7cb8767
|
fix running tests from cli
|
2012-06-27 13:21:45 +02:00 |
|
Robin Appelman
|
420d23a875
|
fix webdav errors for empty folders
|
2012-06-27 13:08:16 +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 |
|
Bart Visscher
|
153ee9dcfa
|
Check if app is enabled before loading in remote and public.php
|
2012-06-27 01:05:12 +02:00 |
|
Bart Visscher
|
dab58f3464
|
Cache result of OC_App::getAppVersions
|
2012-06-27 01:05:12 +02:00 |
|
Bart Visscher
|
2f0b4983e9
|
Move app upgrade check to loading of apps
|
2012-06-27 01:05:12 +02:00 |
|
Thomas Tanghus
|
a25ae4b4b6
|
Make Categories a bit quieter.
|
2012-06-27 01:03: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
|
4e53db3d9c
|
Merge branch 'master' into oc_error
|
2012-06-26 14:17:32 +02:00 |
|
Georg Ehrke
|
c7de74c471
|
Merge branch 'master' into calendar_export
|
2012-06-26 14:15:07 +02:00 |
|
Bjoern Schiessle
|
72b365842f
|
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
|
2012-06-26 12:51:32 +02:00 |
|
Bjoern Schiessle
|
18d5420744
|
typo in js statement fixed
|
2012-06-26 10:35:19 +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
|
ac4e19218e
|
All is good ;-)
|
2012-06-26 02:47:59 +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 |
|
Bart Visscher
|
c6b9f613bb
|
Cache: try to set the fast cache in the Broker
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
fe0f281b4f
|
Fix setting ETag header on cache miss
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
531c1c509c
|
Cache: Add APC and XCache to global cache handler
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
4e4a1a4274
|
Cache: Use getUserCache cache in OC_Cache
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
cae089df91
|
Cache: Create global cache in OC_Cache
|
2012-06-25 21:05:10 +02:00 |
|