02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
4bb1a2c2d6
Contacts: Some js cleanup.
2012-04-26 10:38:39 +02:00
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
249e0c1ee2
bring fileactions to the right position again
2012-04-26 01:03:01 +02:00
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
de135e3b9b
resolve merge conflicts
2012-04-26 00:14:21 +02:00
9d91e53027
fix problem with filescanning
2012-04-25 22:42:00 +02:00
b75f680b8e
gallery app seems to work now :)
2012-04-25 21:20:30 +02:00
1a913ac282
bookmarks app seems to work now :)
2012-04-25 21:20:06 +02:00
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
cbba469990
LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers.
...
some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible.
thanks for the feedback of Kevin van Kuik
2012-04-25 20:35:30 +02:00
0933b5e7ab
use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things.
2012-04-25 20:35:30 +02:00
a82d709f87
don't forget new JS file
2012-04-25 20:35:30 +02:00
e1cd690a7c
LDPA: group settings into basic and advanced to look less crowded. Still needs some love. Looks different to the other admin settings, though.
2012-04-25 20:35:29 +02:00
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
02a65f30ec
added history buttons
2012-04-25 14:01:03 +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
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +02:00
476043ecb9
add a proper 404
2012-04-25 10:17:20 +02:00
60c0827ba3
Merge branch 'master' into movable_apps
2012-04-25 09:23:01 +02:00
9ee2bb9719
fix js fail in media player
2012-04-25 09:22:19 +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
cc2bfd313d
minor filecache improvements
2012-04-25 00:12:12 +02:00
9015c46e31
emit the correct hooks for file_put_contents and some readfile improvements
2012-04-25 00:12:12 +02:00
60b924c954
initial mount configuration work
2012-04-25 00:12:12 +02:00
fa502e160d
allow manually scanning of specific directories
2012-04-25 00:12:12 +02:00
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
d6346b5b0b
fix OC.filePath in main js
2012-04-24 21:54:09 +02:00
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
fb84d0aff8
fix php fail
2012-04-24 21:37:19 +02:00
9b29bc96de
remove debug message
2012-04-24 21:36:54 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
0b06eff3a0
another fix for linkto function
2012-04-24 20:17:00 +02:00
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
Sam Tuke
Thomas Tanghus
Michael Gapczynski
Arthur Schiwon
Robin Appelman
Georg Ehrke
Frank Karlitschek