0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02:00
80c850d018
added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts
2012-04-27 13:19:16 +01:00
768041b6cb
Contacts: Added convinience method for notifications.
2012-04-27 10:35:31 +02:00
18c11ec81b
jquery.combobox: Added 'editable' option and cleaned up a bit.
2012-04-27 10:35:31 +02:00
1384fdfe01
Contacts: Updated first run page.
2012-04-27 10:35:31 +02:00
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
1b935a22ce
add old webdav file
2012-04-27 10:23:29 +02:00
ee0cb68f5e
some csrf fixes. needs testing
2012-04-27 01:18:21 +02:00
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
f7fb4a54c9
ampache should work now
2012-04-26 22:00:37 +02:00
5483c1be42
hide fails
2012-04-26 21:58:43 +02:00
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
78b2da583d
move files to the correct place
2012-04-26 21:24:41 +02:00
6039dd0fe8
remove merge conflicts fail
2012-04-26 21:23:38 +02:00
d96e962fc1
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-26 18:45:59 +01:00
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
6bdefef31e
csrf protection
2012-04-26 19:35:33 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
1277962183
a lot of users have problems with big files. So add an explicit button to the documentation
2012-04-26 16:53:18 +02:00
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
6312067ab5
improved styling, called css file in history.php
2012-04-26 14:32:29 +01:00
ebd82ee772
fixes for media app
2012-04-26 15:23:17 +02:00
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
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
Georg Ehrke
Sam Tuke
Thomas Tanghus
Frank Karlitschek
Sam Tuke
Michael Gapczynski
Arthur Schiwon
Robin Appelman