a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
81f549baee
made code a little more readable
2012-04-25 13:51:08 +01:00
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
03f81fdd88
fix js fail in media player
2012-04-25 10:27:17 +02:00
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +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
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
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
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
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
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
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
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
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
3aeea0c196
Merge branch 'merge-requests/105'
2012-04-19 20:31:24 +02:00
3706bbec1b
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
2012-04-19 20:30:58 +02:00
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
Sam Tuke
Thomas Tanghus
Georg Ehrke
Robin Appelman
Frank Karlitschek
Jan-Christoph Borchardt
Arthur Schiwon