Georg Ehrke
|
f9d3388854
|
Merge branch 'master' into calendar_import
|
2012-07-21 17:37:10 +02:00 |
|
Georg Ehrke
|
57207ddb82
|
some style fixes for calendar
|
2012-07-21 17:09:10 +02:00 |
|
Georg Ehrke
|
6ccd4e0cfb
|
Merge branch 'master' into subadmin
|
2012-07-21 17:01:45 +02:00 |
|
Georg Ehrke
|
11725efd7e
|
add some hooks for subadmins
|
2012-07-21 16:43:39 +02:00 |
Thomas Tanghus
|
e07cd26571
|
Implemented undelete for contacts.
|
2012-07-21 16:02:12 +02:00 |
|
Thomas Tanghus
|
51bafd32d6
|
Made contactlist optional in insertContact().
|
2012-07-21 14:26:57 +02:00 |
|
Thomas Tanghus
|
00de757169
|
White space.
|
2012-07-21 14:26:26 +02:00 |
|
Thomas Tanghus
|
11aa571751
|
Added option to notify method.
|
2012-07-21 14:24:26 +02:00 |
|
Georg Ehrke
|
5508a95065
|
Merge branch 'master' into subadmin
|
2012-07-21 13:14:52 +02:00 |
|
Thomas Tanghus
|
687c87bc5b
|
DRYed inserting into contacts list.
|
2012-07-21 13:13:41 +02:00 |
|
Georg Ehrke
|
88f66460a3
|
some js improvements for subadmins
|
2012-07-21 13:10:51 +02:00 |
Bart Visscher
|
5381cc7418
|
Fix missing parameter decleration, thanks Jenkins :-)
|
2012-07-21 01:18:51 +02:00 |
|
Bart Visscher
|
ad12e13f14
|
Tasks: Remove unused code
|
2012-07-21 00:52:49 +02:00 |
|
Bart Visscher
|
060b8865a4
|
DRY for getting calendar timezone setting
|
2012-07-21 00:45:30 +02:00 |
|
Bart Visscher
|
1c30a97833
|
Style fixes
|
2012-07-21 00:45:30 +02:00 |
|
Thomas Tanghus
|
06b5e05c86
|
Damn, that Jenkins dude is tough ;)
|
2012-07-21 00:43:01 +02:00 |
Robin Appelman
|
8a19e134df
|
fix ununsed variables
|
2012-07-21 00:20:27 +02:00 |
|
Robin Appelman
|
48ec78299e
|
cleanup some obsolete foldersize code from the shared storage backend
|
2012-07-21 00:20:27 +02:00 |
|
Robin Appelman
|
aa118a4c64
|
remove obsolete oc_filesystem::mountall
|
2012-07-21 00:20:26 +02:00 |
|
Bart Visscher
|
0b338a7a41
|
Add missing public to function definition
|
2012-07-21 00:13:30 +02:00 |
|
Bart Visscher
|
14af503374
|
Fix parameter order in OC_Filestorage_Common->hash
|
2012-07-21 00:13:30 +02:00 |
|
Bart Visscher
|
cdd9ffc8a5
|
Add ETag support to the Sabre file connector.
This is based on the md5 of the file, can be changed later
|
2012-07-21 00:13:30 +02:00 |
Bjoern Schiessle
|
53bdb049cb
|
adapted to new SabreDav version
|
2012-07-20 23:31:08 +02:00 |
|
Thomas Tanghus
|
0af454a23b
|
Trying to get documentation to "Do The Right Thing" (TM)
|
2012-07-20 23:11:06 +02:00 |
|
Thomas Tanghus
|
42fbc111a2
|
Hide progressbar on error.
|
2012-07-20 22:25:09 +02:00 |
|
Thomas Tanghus
|
3103a4cb3f
|
Corrected retry count for uploaded imports.
|
2012-07-20 21:54:24 +02:00 |
Tom Needham
|
29d16f61fa
|
Fix strict standards warnings
|
2012-07-20 19:27:51 +00:00 |
|
Thomas Tanghus
|
de8ed98541
|
Added some more documentation to OCP\JSON.
|
2012-07-20 21:20:51 +02:00 |
|
Thomas Tanghus
|
10337c059c
|
Added some documentation for OCP\JSON::callCheck()
|
2012-07-20 20:15:39 +02:00 |
|
Robin Appelman
|
d393638cc8
|
forgot to make one function abstract
|
2012-07-20 19:03:33 +02:00 |
|
Robin Appelman
|
c9be9ab251
|
remove unused variables
|
2012-07-20 18:56:18 +02:00 |
|
Robin Appelman
|
7152b8b4ee
|
remove unused and depricated getFolderSize
|
2012-07-20 18:32:40 +02:00 |
|
Robin Appelman
|
39086ef63e
|
dont try to create mountpoints automatically
|
2012-07-20 17:58:06 +02:00 |
|
Robin Appelman
|
0e6238c66f
|
fix OC_Cache_File tests if encryption is not enabled
|
2012-07-20 17:58:05 +02:00 |
|
Robin Appelman
|
48306a3c4f
|
fix unused variables
|
2012-07-20 17:58:05 +02:00 |
|
Robin Appelman
|
0e111e1a17
|
fix increasing folder sizes in filecache for custom roots
|
2012-07-20 17:58:05 +02:00 |
|
Robin Appelman
|
57ed83f266
|
fix eventsource fallback when more then one eventsource is active
|
2012-07-20 17:58:05 +02:00 |
|
Georg Ehrke
|
fdb167a046
|
Merge branch 'master' into subadmin
|
2012-07-20 17:20:14 +02:00 |
|
Georg Ehrke
|
bf9b6e9ccc
|
don't show label 'add group' for subadmins and remove some debug code
|
2012-07-20 17:18:40 +02:00 |
|
Thomas Tanghus
|
ecf8e77dab
|
Remove unused file.
|
2012-07-20 17:11:13 +02:00 |
|
Thomas Tanghus
|
7fff386679
|
Code style.
|
2012-07-20 17:11:13 +02:00 |
|
Robin Appelman
|
3c2967074f
|
remove unused variable from dropbox filestorage backend
|
2012-07-20 16:48:28 +02:00 |
|
Robin Appelman
|
1224d7ec01
|
minor fixes for the google filestorage backend
|
2012-07-20 16:47:26 +02:00 |
|
Robin Appelman
|
445f52ef8b
|
dont check for filecache updates when getting quota info over webdav
|
2012-07-20 16:35:51 +02:00 |
|
Robin Appelman
|
23c71b15a0
|
remove unused variables from webdav file backend
|
2012-07-20 16:35:51 +02:00 |
Lukas Reschke
|
c04aa8d6a9
|
Add CSRF checks
|
2012-07-20 15:45:17 +02:00 |
|
Georg Ehrke
|
bd91ee4d22
|
add SabreDav 1.6.3 files
|
2012-07-20 15:25:36 +02:00 |
|
Georg Ehrke
|
e4154e6832
|
remove old files
|
2012-07-20 15:23:56 +02:00 |
|
Georg Ehrke
|
ea79ff191c
|
Merge branch 'master' into subadmin
|
2012-07-20 15:22:12 +02:00 |
|
Georg Ehrke
|
c3bd30cc6b
|
improve default qouta for subadmins
|
2012-07-20 15:20:48 +02:00 |