Georg Ehrke
b75f680b8e
gallery app seems to work now :)
2012-04-25 21:20:30 +02:00
Georg Ehrke
1a913ac282
bookmarks app seems to work now :)
2012-04-25 21:20:06 +02:00
Georg Ehrke
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +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
Georg Ehrke
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +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
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
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +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
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
Jan-Christoph Borchardt
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
Arthur Schiwon
912c87eeda
LDAP: optimize LDAP requests for users and groups. Settings are still to do, though.
2012-04-23 13:04:58 +02:00
Georg Ehrke
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +02:00
Arthur Schiwon
6ee7dc5f59
only retrieve requested attributes
2012-04-23 12:32:17 +02:00
Arthur Schiwon
fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
Thomas Tanghus
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
Thomas Tanghus
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
Robin Appelman
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
Robin Appelman
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
Thomas Tanghus
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
Thomas Tanghus
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
Georg Ehrke
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
Georg Ehrke
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
Thomas Tanghus
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
Thomas Tanghus
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
Thomas Tanghus
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
Thomas Tanghus
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
Thomas Tanghus
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
Thomas Tanghus
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
Thomas Tanghus
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
Thomas Tanghus
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
Thomas Tanghus
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
Frank Karlitschek
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
Frank Karlitschek
260c48c29a
cleanup the admin page layout mess a bit. Still a lot to improve in the future :-)
2012-04-21 23:23:02 +02:00
Frank Karlitschek
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
Frank Karlitschek
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00