57d41bb1f8
Merge branch 'merge-requests/115'
2012-05-17 15:39:39 -04:00
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
2cc0515161
no use for double quotes here
2012-05-17 21:03:06 +02:00
f998ed331a
removing dead code
2012-05-17 21:01:42 +02:00
3e454d3459
oops! was hardcoding my test domain inadvertently
2012-05-17 21:00:11 +02:00
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
57cf0ae3d1
LDAP: remove unnecessary debug output
2012-05-17 17:17:40 +02:00
38c56388c1
LDAP: Fix case sensitivity issues with display name attribute
2012-05-17 17:17:40 +02:00
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
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
2f1e601809
Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though...
2012-05-17 14:31:04 +02:00
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
9e83c3f823
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
2012-05-16 21:05:15 +02:00
ab18a0bfe8
ldap: unique index names for the database, fixes non-creating of indexes for the second table and potential issues in the app
2012-05-16 18:11:42 +02:00
eceed497b1
fix paths in apps/remoteStorage/ajax/revokeToken.php
2012-05-16 18:08:50 +02:00
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
35effbcd3f
LDAP: convert all DNs to lowercase so to make comparisons and everything work
2012-05-15 11:12:29 +02:00
568b6a7f56
Make only writable files draggable
2012-05-14 20:41:06 -04:00
a3b06e9658
Check if a private link points to a folder or file and change text accordingly
2012-05-14 20:21:31 -04:00
cda9dcc7aa
Fix private link emailing and clean up file name displayed in email
2012-05-14 20:21:31 -04:00
5cf42b88af
Replace all %2F with a / in private link
2012-05-14 20:21:31 -04:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
d4271ed9df
Use original source when resharing a file, fixes bug oc-210
2012-05-14 17:31:03 -04:00
954d4e5200
No need to keep the 'source files' in here, because the latest 'git master' release can be pulled
...
from http://mozilla.github.com/pdf.js/build/pdf.js
README added to document the fact stated above
update.sh added for easy update of pdfjs
CAUTION:
Don't update before OC4! API has been changed and we need to adopt files_pdfviewer
2012-05-14 23:21:29 +02:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
e03c5f39a8
Call is_writable explicitly on folders for readonly check
2012-05-14 16:31:00 -04:00
e74f4b406f
Remove logging.
2012-05-14 17:50:24 +02:00
9b3d8660eb
Contacts: Had forgotten to call local function.
2012-05-14 17:49:33 +02:00
de850dfa52
Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P
2012-05-14 17:49:33 +02:00
4c6d11e223
move auth.css and remoteStorage-big.png to assets folders From where they can be included
2012-05-14 17:05:35 +02:00
18c8896b3c
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
84827ff992
some fixes for calendar's export.php
2012-05-14 15:52:24 +02:00
9c8eb104b6
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
55eb318265
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00
0c8740c1d5
LDAP: and don't forget the else part
2012-05-14 13:13:08 +02:00
82cfb3e0f5
LDAP: don't store agent password in plain text
2012-05-14 12:58:58 +02:00
2e34673989
LDAP: no whitespaces after the , in the DNs, resolves conflicts with some servers
2012-05-14 12:25:33 +02:00
1f2b37c08b
Contacts: Photo upload handlers wern't being loaded for new contacts.
...
Name conflict with two FileUploads :-P
2012-05-14 11:08:00 +02:00
3514ec5947
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-14 10:52:25 +02:00
1fc74ea174
Add ctmp extension to blacklist to make sync test files not versioned.
2012-05-14 10:51:41 +02:00
40f91d9f7c
Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated.
2012-05-14 10:13:45 +02:00
6d37f9b951
Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways
2012-05-13 21:10:27 -04:00
Michael Gapczynski
Michiel de Jong
Arthur Schiwon
Thomas Tanghus
Robin Appelman
Georg Ehrke
Thomas Mueller
Klaas Freitag