29b9e27078
fix linkto function in OC_Helper
2012-04-24 20:14:42 +02:00
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
a3d0a74d03
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-24 15:38:36 +02:00
69a2173fdb
non working app. moved to the apps-playground repository
2012-04-24 14:00:44 +02:00
b824425186
Added loading indicator.
2012-04-24 11:38:11 +02:00
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
22f4acadc0
Contacts: In app import (for Chrome and Firefox only)
2012-04-24 01:44:07 +02:00
b8da5c5262
Contacts: Tried to format NOTE field a bit. Needs to be improved more though.
2012-04-24 01:44:07 +02:00
6848b069c9
OC_App::getStorage() failed if app dir didn't exist.
2012-04-24 01:44:07 +02:00
dfc94cbe84
Contacts: In app import. Cleanup still needed.
2012-04-24 01:44:07 +02:00
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
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
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +02:00
9092692b8e
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
95c220a246
remove debug code in lib base
2012-04-23 20:31:03 +02:00
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +02:00
19109afa79
fix bug in lib base
2012-04-23 20:11:21 +02:00
d1110c62ef
fix file path in apps/media/ajax/api.php
2012-04-23 20:01:48 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
6d92ebca45
use native functions of php to parse the string into the Var
2012-04-23 17:09:28 +02:00
9226cb7a6a
rename var file to getfile to prevent fails in files app
2012-04-23 16:36:24 +02:00
aaedb23f05
fix bug in lib/helper.php and fix file upload
2012-04-23 16:28:37 +02:00
3b9d283245
fix path in apps/files/templats/index.php
2012-04-23 16:25:07 +02:00
c0df15367f
fix style.css of the files app
2012-04-23 16:18:15 +02:00
08fe6bdb27
fix path in /apps/files/js/timezone.php
2012-04-23 16:17:35 +02:00
f5c9fe9ece
first step to an public api of ownCloud for the apps. In the future they shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon
2012-04-23 15:50:30 +02:00
1b29fc3fb2
fixing multiselect overflow, issue 341
2012-04-23 14:29:11 +02:00
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
912c87eeda
LDAP: optimize LDAP requests for users and groups. Settings are still to do, though.
2012-04-23 13:04:58 +02:00
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +02:00
6ee7dc5f59
only retrieve requested attributes
2012-04-23 12:32:17 +02:00
fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
44fa4433bc
move files of fullcalendar 1.5.3
2012-04-22 21:18:40 +02:00
c77fa42143
add new files of fullcalendar 1.5.3
2012-04-22 21:18:40 +02:00
43ee5cf224
remove old fullcalendar files
2012-04-22 21:18:40 +02:00
e8f062dc93
Contacts:
...
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
2012-04-22 20:47:24 +02:00
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
Georg Ehrke
Frank Karlitschek
Thomas Tanghus
Jan-Christoph Borchardt
Arthur Schiwon
Robin Appelman