Brice Maron
5fa14806c8
Add translation for error message
2012-05-24 19:16:00 +00:00
Brice Maron
2c9311cf48
Add error message when uploading folder or null files. ref oc-739
2012-05-24 18:47:34 +00:00
Robin Appelman
a1539dace7
share code between smb and ftp filestorage backends
2012-05-24 19:41:32 +02:00
Brice Maron
f00a50c76a
Add pending line in file list before trying to upload. Correct indentation
2012-05-24 16:56:19 +00:00
Robin Appelman
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
Michael Gapczynski
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
Michael Gapczynski
970124a90b
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:35:29 -04:00
Brice Maron
97d682dc13
Correct small style problem with task app fix #oc-689
2012-05-23 21:02:34 +00:00
Sam Tuke
27f7dae932
removed closing php tag
2012-05-22 13:42:55 +01:00
Frank Karlitschek
8cd7410447
encryption is not yet compatible with ldap
2012-05-22 12:15:51 +02:00
Thomas Tanghus
a896da0d91
Contacts: XSS fix. Still some more to check.
2012-05-21 21:47:15 +02:00
Frank Karlitschek
2f8f7501ef
add warning
2012-05-20 10:58:20 +02:00
Georg Ehrke
ad66bb9c84
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
Michael Gapczynski
5a48ade933
Make sure sharing and versions dropdowns come down in the same location for all files
2012-05-19 11:24:23 -04:00
Georg Ehrke
d4072c82dd
some fixes for contacts, gallery and openid
2012-05-19 15:22:21 +02:00
Georg Ehrke
07fa8da278
fix for calendar
2012-05-19 15:05:58 +02:00
Frank Karlitschek
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
Michael Gapczynski
35bd601215
Fix check for when to store a new version of a file
2012-05-18 22:27:43 -04:00
Michael Gapczynski
f750da1802
Fix revert link on history page of file versions
2012-05-18 22:07:48 -04:00
Michael Gapczynski
89f5701d1a
Fix versioning of shared files
2012-05-18 22:07:48 -04:00
Michael Gapczynski
ea7456a06a
Forgot to actually call remove on the history dropdown
2012-05-18 10:53:58 -04:00
Michael Gapczynski
fcb4d2aaee
Remove the history dropdown before creating a new one
2012-05-18 10:42:49 -04:00
Michael Gapczynski
122d1efecf
Don't show the select form in the history dropdown if a file has no other versions
2012-05-18 10:39:43 -04:00
Arthur Schiwon
c1bb8139a0
LDAP: we're 0.2 now
2012-05-18 18:00:30 +02:00
Arthur Schiwon
bae954a797
LDAP: only check once for name conflicts on update. Set a value on install as well
2012-05-18 18:00:30 +02:00
Thomas Tanghus
7922338050
Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form fields.
2012-05-18 17:39:19 +02:00
Arthur Schiwon
e606213fa0
make upload work with IE again
2012-05-18 17:07:00 +02:00
Arthur Schiwon
0c7efc234b
LDAP: update meta info
2012-05-18 17:07:00 +02:00
Frank Karlitschek
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
Arthur Schiwon
ea33b4aaa1
LDAP: don't make us of global constants (completing, was removed with latest additions to update.php)
2012-05-18 12:55:38 +02:00
Arthur Schiwon
253f101b39
LDAP: check wether applying naming rule would end up in conflicts on update, if so don't do it
2012-05-18 12:55:37 +02:00
Georg Ehrke
73a72054a3
fix call of all versions page
2012-05-18 12:00:35 +02:00
Michael Gapczynski
b7aee58ef9
Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events
2012-05-17 21:26:55 -04:00
Robin Appelman
48505c5626
improve tar archive backend
2012-05-18 01:54:59 +02:00
Michael Gapczynski
5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
Tom Needham
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
Tom Needham
0aac70aaf1
Revert google webfont removal. Sadly this causes havoc with the editor!
2012-05-17 20:23:43 +00:00
Georg Ehrke
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
Michael Gapczynski
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
Georg Ehrke
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
Michael Gapczynski
57d41bb1f8
Merge branch 'merge-requests/115'
2012-05-17 15:39:39 -04:00
Michael Gapczynski
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Michiel de Jong
2cc0515161
no use for double quotes here
2012-05-17 21:03:06 +02:00
Michiel de Jong
f998ed331a
removing dead code
2012-05-17 21:01:42 +02:00
Michiel de Jong
3e454d3459
oops! was hardcoding my test domain inadvertently
2012-05-17 21:00:11 +02:00
Arthur Schiwon
7a7c301d7d
LDAP: follow user- and groupname char limitations for LDAP display names
...
WARNING: may affect existing installations if display names included unallowed characters. Allowed are only a-zA-Z0-9._-@ This fix is however needed, because names with unallowed characters may cause conflicts
2012-05-17 17:17:40 +02:00
Arthur Schiwon
57cf0ae3d1
LDAP: remove unnecessary debug output
2012-05-17 17:17:40 +02:00
Arthur Schiwon
38c56388c1
LDAP: Fix case sensitivity issues with display name attribute
2012-05-17 17:17:40 +02:00
Thomas Tanghus
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
Michael Gapczynski
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00