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
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
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
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
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
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
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
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
c3d78cf77a
remove require once lib base in files scan.php
2012-04-20 22:34:13 +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
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
b39c3d4c4e
make use of the fact that stream_read will always read 8192 bytes for encryption stream
...
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
b44bc9f4b2
remove require once lib base in some more files
2012-04-18 17:42:11 +02:00
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
Georg Ehrke
Jan-Christoph Borchardt
Arthur Schiwon
Thomas Tanghus
Robin Appelman
Frank Karlitschek