Sam Tuke
d96e962fc1
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-26 18:45:59 +01:00
Sam Tuke
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
Frank Karlitschek
6bdefef31e
csrf protection
2012-04-26 19:35:33 +02:00
Georg Ehrke
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
Sam Tuke
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
Georg Ehrke
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
Frank Karlitschek
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
Michael Gapczynski
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
Sam Tuke
6312067ab5
improved styling, called css file in history.php
2012-04-26 14:32:29 +01:00
Georg Ehrke
ebd82ee772
fixes for media app
2012-04-26 15:23:17 +02:00
Georg Ehrke
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02:00
Georg Ehrke
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
Sam Tuke
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
Georg Ehrke
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
Sam Tuke
02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
Thomas Tanghus
4bb1a2c2d6
Contacts: Some js cleanup.
2012-04-26 10:38:39 +02:00
Thomas Tanghus
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
Michael Gapczynski
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
Arthur Schiwon
249e0c1ee2
bring fileactions to the right position again
2012-04-26 01:03:01 +02:00
Michael Gapczynski
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
Arthur Schiwon
de135e3b9b
resolve merge conflicts
2012-04-26 00:14:21 +02:00
Robin Appelman
9d91e53027
fix problem with filescanning
2012-04-25 22:42:00 +02:00
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
Michael Gapczynski
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
Arthur Schiwon
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
Arthur Schiwon
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
Arthur Schiwon
a82d709f87
don't forget new JS file
2012-04-25 20:35:30 +02:00
Arthur Schiwon
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
Sam Tuke
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
Michael Gapczynski
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
Michael Gapczynski
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
Sam Tuke
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
Sam Tuke
02a65f30ec
added history buttons
2012-04-25 14:01:03 +01:00
Sam Tuke
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
Sam Tuke
81f549baee
made code a little more readable
2012-04-25 13:51:08 +01:00
Thomas Tanghus
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
Georg Ehrke
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
Georg Ehrke
03f81fdd88
fix js fail in media player
2012-04-25 10:27:17 +02:00
Georg Ehrke
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +02:00
Georg Ehrke
476043ecb9
add a proper 404
2012-04-25 10:17:20 +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
Robin Appelman
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
Robin Appelman
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
Robin Appelman
cc2bfd313d
minor filecache improvements
2012-04-25 00:12:12 +02:00
Robin Appelman
9015c46e31
emit the correct hooks for file_put_contents and some readfile improvements
2012-04-25 00:12:12 +02:00
Robin Appelman
60b924c954
initial mount configuration work
2012-04-25 00:12:12 +02:00
Robin Appelman
fa502e160d
allow manually scanning of specific directories
2012-04-25 00:12:12 +02:00
