Michael Gapczynski
|
b369adbd94
|
Allow admin to disable resharing of files
|
2012-04-25 11:51:30 -04:00 |
Sam Tuke
|
a3dff248a1
|
fixed path to history script
|
2012-04-25 14:27:55 +01:00 |
|
Sam Tuke
|
02a65f30ec
|
added history buttons
|
2012-04-25 14:01:03 +01:00 |
|
Sam Tuke
|
8ae1430090
|
added script and loaded it for adding history button
|
2012-04-25 13:56:43 +01:00 |
|
Sam Tuke
|
81f549baee
|
made code a little more readable
|
2012-04-25 13:51:08 +01:00 |
Thomas Tanghus
|
4795295fb1
|
Contacts: Fixed some file paths.
|
2012-04-25 10:44:27 +02:00 |
Georg Ehrke
|
d76552a009
|
Merge branch 'sabredav_1.6'
|
2012-04-25 10:39:31 +02:00 |
|
Georg Ehrke
|
03f81fdd88
|
fix js fail in media player
|
2012-04-25 10:27:17 +02:00 |
|
Georg Ehrke
|
323b19a4a0
|
some fixes in contacts javascript files
|
2012-04-25 10:17:54 +02:00 |
|
Georg Ehrke
|
476043ecb9
|
add a proper 404
|
2012-04-25 10:17:20 +02:00 |
|
Georg Ehrke
|
60c0827ba3
|
Merge branch 'master' into movable_apps
|
2012-04-25 09:23:01 +02:00 |
|
Georg Ehrke
|
9ee2bb9719
|
fix js fail in media player
|
2012-04-25 09:22:19 +02:00 |
Robin Appelman
|
5b70e2fb25
|
some performance improvements to the openstack swift backend
|
2012-04-25 00:12:12 +02:00 |
|
Robin Appelman
|
5c3ea14819
|
fix mimetypes of encrypted files
|
2012-04-25 00:12:12 +02:00 |
|
Robin Appelman
|
cc2bfd313d
|
minor filecache improvements
|
2012-04-25 00:12:12 +02:00 |
|
Robin Appelman
|
9015c46e31
|
emit the correct hooks for file_put_contents and some readfile improvements
|
2012-04-25 00:12:12 +02:00 |
|
Robin Appelman
|
60b924c954
|
initial mount configuration work
|
2012-04-25 00:12:12 +02:00 |
|
Robin Appelman
|
fa502e160d
|
allow manually scanning of specific directories
|
2012-04-25 00:12:12 +02:00 |
|
Georg Ehrke
|
f17eea506a
|
fix merge conflicts
|
2012-04-24 21:59:56 +02:00 |
|
Georg Ehrke
|
d6346b5b0b
|
fix OC.filePath in main js
|
2012-04-24 21:54:09 +02:00 |
|
Georg Ehrke
|
a85d49833b
|
fix position of Semicolon
|
2012-04-24 21:52:44 +02:00 |
|
Georg Ehrke
|
fb84d0aff8
|
fix php fail
|
2012-04-24 21:37:19 +02:00 |
|
Georg Ehrke
|
9b29bc96de
|
remove debug message
|
2012-04-24 21:36:54 +02:00 |
|
Georg Ehrke
|
684007bbae
|
fix pathes in contacts
|
2012-04-24 21:33:34 +02:00 |
|
Georg Ehrke
|
0b06eff3a0
|
another fix for linkto function
|
2012-04-24 20:17:00 +02:00 |
|
Georg Ehrke
|
29b9e27078
|
fix linkto function in OC_Helper
|
2012-04-24 20:14:42 +02:00 |
Frank Karlitschek
|
9b134b0636
|
move granite also to apps-playground because it´s not stable yet and is no longer used
|
2012-04-24 15:41:54 +02:00 |
|
Frank Karlitschek
|
a3d0a74d03
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-04-24 15:38:36 +02:00 |
|
Frank Karlitschek
|
69a2173fdb
|
non working app. moved to the apps-playground repository
|
2012-04-24 14:00:44 +02:00 |
|
Thomas Tanghus
|
b824425186
|
Added loading indicator.
|
2012-04-24 11:38:11 +02:00 |
|
Thomas Tanghus
|
988f98fc6f
|
Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-)
|
2012-04-24 11:35:56 +02:00 |
|
Thomas Tanghus
|
22f4acadc0
|
Contacts: In app import (for Chrome and Firefox only)
|
2012-04-24 01:44:07 +02:00 |
|
Thomas Tanghus
|
b8da5c5262
|
Contacts: Tried to format NOTE field a bit. Needs to be improved more though.
|
2012-04-24 01:44:07 +02:00 |
|
Thomas Tanghus
|
6848b069c9
|
OC_App::getStorage() failed if app dir didn't exist.
|
2012-04-24 01:44:07 +02:00 |
|
Thomas Tanghus
|
dfc94cbe84
|
Contacts: In app import. Cleanup still needed.
|
2012-04-24 01:44:07 +02:00 |
|
Thomas Tanghus
|
0cd9570277
|
Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
|
2012-04-24 01:44:07 +02:00 |
|
Frank Karlitschek
|
4ea927a798
|
wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing.
|
2012-04-23 23:54:49 +02:00 |
|
Georg Ehrke
|
fd47fbe176
|
fix contacts app a bit
|
2012-04-23 20:42:52 +02:00 |
|
Georg Ehrke
|
9092692b8e
|
make calendar work with movable apps
|
2012-04-23 20:32:55 +02:00 |
|
Georg Ehrke
|
95c220a246
|
remove debug code in lib base
|
2012-04-23 20:31:03 +02:00 |
|
Georg Ehrke
|
10eea3f464
|
fix pathes of shared calendars
|
2012-04-23 20:13:55 +02:00 |
|
Georg Ehrke
|
19109afa79
|
fix bug in lib base
|
2012-04-23 20:11:21 +02:00 |
|
Georg Ehrke
|
d1110c62ef
|
fix file path in apps/media/ajax/api.php
|
2012-04-23 20:01:48 +02:00 |
|
Georg Ehrke
|
42a570788b
|
Merge branch 'master' into movable_apps
|
2012-04-23 19:56:07 +02:00 |
|
Georg Ehrke
|
6d92ebca45
|
use native functions of php to parse the string into the Var
|
2012-04-23 17:09:28 +02:00 |
|
Georg Ehrke
|
9226cb7a6a
|
rename var file to getfile to prevent fails in files app
|
2012-04-23 16:36:24 +02:00 |
|
Georg Ehrke
|
aaedb23f05
|
fix bug in lib/helper.php and fix file upload
|
2012-04-23 16:28:37 +02:00 |
|
Georg Ehrke
|
3b9d283245
|
fix path in apps/files/templats/index.php
|
2012-04-23 16:25:07 +02:00 |
|
Georg Ehrke
|
c0df15367f
|
fix style.css of the files app
|
2012-04-23 16:18:15 +02:00 |
|
Georg Ehrke
|
08fe6bdb27
|
fix path in /apps/files/js/timezone.php
|
2012-04-23 16:17:35 +02:00 |