Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Arthur Schiwon
d2369b6e96
LDAP: support for 'member' as group-member-association
2012-05-26 16:38:37 +02:00
Georg Ehrke
a1c9191006
fix share for users with a point within their name
2012-05-26 15:23:46 +02:00
Brice Maron
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
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
3fee3a4633
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-22 14:44:40 +01: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
Thomas Tanghus
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
Michael Gapczynski
9b3847f49b
Initial support for Amazon S3 storage backend
2012-05-16 21:52:05 -04:00
Robin Appelman
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
Robin Appelman
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
Robin Appelman
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
Thomas Tanghus
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
Georg Ehrke
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
Sam Tuke
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
Arthur Schiwon
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
Michiel de Jong
eceed497b1
fix paths in apps/remoteStorage/ajax/revokeToken.php
2012-05-16 18:08:50 +02:00
Sam Tuke
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
Sam Tuke
c0df40084a
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 15:00:36 +01:00
Arthur Schiwon
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
Michael Gapczynski
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
Sam Tuke
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
Thomas Tanghus
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
Michael Gapczynski
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
Michael Gapczynski
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
Michael Gapczynski
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
Sam Tuke
2ad6b5048e
fixed 'delete' label so it doesn't break translations
2012-05-15 16:24:06 +01:00
Arthur Schiwon
35effbcd3f
LDAP: convert all DNs to lowercase so to make comparisons and everything work
2012-05-15 11:12:29 +02:00
Michael Gapczynski
568b6a7f56
Make only writable files draggable
2012-05-14 20:41:06 -04:00
Michael Gapczynski
a3b06e9658
Check if a private link points to a folder or file and change text accordingly
2012-05-14 20:21:31 -04:00
Michael Gapczynski
cda9dcc7aa
Fix private link emailing and clean up file name displayed in email
2012-05-14 20:21:31 -04:00
Michael Gapczynski
5cf42b88af
Replace all %2F with a / in private link
2012-05-14 20:21:31 -04:00
Thomas Mueller
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
Michael Gapczynski
d4271ed9df
Use original source when resharing a file, fixes bug oc-210
2012-05-14 17:31:03 -04:00
Thomas Mueller
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
Robin Appelman
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
Michael Gapczynski
e03c5f39a8
Call is_writable explicitly on folders for readonly check
2012-05-14 16:31:00 -04:00
Thomas Tanghus
e74f4b406f
Remove logging.
2012-05-14 17:50:24 +02:00
Thomas Tanghus
9b3d8660eb
Contacts: Had forgotten to call local function.
2012-05-14 17:49:33 +02:00
Thomas Tanghus
de850dfa52
Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P
2012-05-14 17:49:33 +02:00
Michiel de Jong
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
Georg Ehrke
18c8896b3c
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
Georg Ehrke
84827ff992
some fixes for calendar's export.php
2012-05-14 15:52:24 +02:00
Georg Ehrke
9c8eb104b6
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
Georg Ehrke
55eb318265
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00
Arthur Schiwon
0c8740c1d5
LDAP: and don't forget the else part
2012-05-14 13:13:08 +02:00
Arthur Schiwon
82cfb3e0f5
LDAP: don't store agent password in plain text
2012-05-14 12:58:58 +02:00
Arthur Schiwon
2e34673989
LDAP: no whitespaces after the , in the DNs, resolves conflicts with some servers
2012-05-14 12:25:33 +02:00
Thomas Tanghus
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
Klaas Freitag
3514ec5947
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-14 10:52:25 +02:00
Klaas Freitag
1fc74ea174
Add ctmp extension to blacklist to make sync test files not versioned.
2012-05-14 10:51:41 +02:00
Thomas Tanghus
40f91d9f7c
Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated.
2012-05-14 10:13:45 +02:00
Michael Gapczynski
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
Robin Appelman
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
Robin Appelman
0fb90fa875
set public handeler in info,xml for sharing
2012-05-14 00:28:27 +02:00
Thomas Tanghus
4e1e978b89
Contacts: Forgot one file for the import fix.
2012-05-13 23:27:14 +02:00
Thomas Tanghus
9295f49553
Contacts: Add error checking and reporting to import from files app.
2012-05-13 23:27:14 +02:00
Michael Gapczynski
1629c77eb5
Validate bookmark inputs, fixes bug oc-636
2012-05-13 16:58:47 -04:00
Tom Needham
90518e8d2a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-13 20:50:19 +00:00
Tom Needham
b80b8656eb
Third time lucky fixing google font include
2012-05-13 20:49:54 +00:00
Michael Gapczynski
8a42d159f7
Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2.
2012-05-13 16:45:03 -04:00
Tom Needham
ddb8d1460b
Revert "Remove google webfont include"
...
This reverts commit 30d31fecd9
.
2012-05-13 20:43:20 +00:00
Tom Needham
21dfe9dc5e
Fixed keyboard shortcut for saving files. Thanks adlr in #ace!
2012-05-13 20:19:20 +00:00
Tom Needham
30d31fecd9
Remove google webfont include
2012-05-13 19:41:41 +00:00
Tom Needham
78ecfc89a7
Fix breadcrumb path
2012-05-13 19:33:42 +00:00
Georg Ehrke
ddf0903ace
add post user delete hook for calendar sharing
2012-05-13 20:03:52 +02:00
Robin Appelman
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
Georg Ehrke
0892abd050
some little js fixes for drop import
2012-05-13 15:08:27 +02:00
Georg Ehrke
62a86748b5
Merge branch 'master' into calendar_dropimport
2012-05-13 15:06:02 +02:00
Georg Ehrke
63a1b066bc
add first version of drop import
2012-05-13 15:05:57 +02:00
Georg Ehrke
5ac10a9c0e
hide share tab for new events, because you can't share an event that haven't got an id yet
2012-05-13 12:28:28 +02:00
Georg Ehrke
f45411f79d
fix another php notice
2012-05-13 12:25:26 +02:00
Georg Ehrke
85cc34fd05
fix another php notice
2012-05-13 12:14:08 +02:00
Georg Ehrke
f6dc158d51
fix php notice and displaying of events
2012-05-13 12:02:36 +02:00
Thomas Tanghus
56bd3f1220
Revert "Edited combobox to adhere to coding standards and added a dblclick handler."
...
This reverts commit 19b55d3fce
.
2012-05-13 06:22:15 +02:00
Thomas Tanghus
996020d82b
Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
...
This reverts commit a36a8faad4
.
Moved it to unstable branch for now.
2012-05-13 06:22:15 +02:00
Thomas Mueller
546ae30421
non-minified version added
2012-05-12 20:56:29 +02:00
Thomas Mueller
51cb1c9ffa
fixing file headers with copyright
2012-05-12 20:46:07 +02:00
Thomas Tanghus
19b55d3fce
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-05-12 13:43:34 +02:00
Thomas Tanghus
a36a8faad4
Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)
2012-05-12 13:43:33 +02:00
Bartek Przybylski
ab9927d5fc
oc-627, calling base function instead of loading too much useless functions
2012-05-12 13:25:04 +02:00
Michael Gapczynski
b4e7c05959
Encoded slashes (%2F) don't look pretty in our private link urls
2012-05-11 20:58:21 -04:00
Michael Gapczynski
faebee5f25
Turn async off when fetching users to make sure the users get removed from the select form
2012-05-11 20:39:48 -04:00
Robin Appelman
d07512c82d
fix gallery previous not showing
2012-05-12 00:37:19 +02:00
Robin Appelman
736739bbbd
load remote and public paths from info.xml during upgrade instead of setting them every time
2012-05-11 20:33:56 +02:00
Arthur Schiwon
3c2af95108
LDAP: offer only ownCloud-enabled users for sharing
2012-05-11 19:21:13 +02:00
Thomas Tanghus
8e5240d579
Contacts: Make the structured name dialog modal to avoid confusion.
2012-05-11 18:21:55 +02:00
Thomas Tanghus
646a4bd635
Contacts: Clone event handlers as well.
2012-05-11 18:21:55 +02:00
Thomas Tanghus
08e0b6cf5e
Contacts: Also strip parameters.
2012-05-11 18:21:55 +02:00
Sam Tuke
d98d72aa99
improved url generation - made use of OC.linkTo() for linking to versions history page
2012-05-11 17:13:58 +01:00
Michiel de Jong
f0362dbf58
register public.php?service=host-meta
2012-05-11 17:25:32 +02:00
Michiel de Jong
9469c9947f
fix warning 'unknown var appsDir'
2012-05-11 16:59:44 +02:00
Arthur Schiwon
7efa7171e3
LDAP: wrong assumptions for case (in)sensitivity, implement far better solution
2012-05-11 15:42:57 +02:00
Michiel de Jong
3fd2e0d2ce
correct host-meta mime type
2012-05-11 15:27:11 +02:00
Michiel de Jong
4c02a82f6c
move lrdd to jrd
2012-05-11 15:26:45 +02:00
Michiel de Jong
b133f22d7f
move host-meta to JRD because I can't work out how to deal with ampersands in XRD
2012-05-11 15:21:45 +02:00
Michiel de Jong
a95c1b8082
fix auth dialog includes
2012-05-11 15:21:45 +02:00
Sam Tuke
03fad97764
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-11 13:17:37 +01:00
Michiel de Jong
61d535984d
clean up auth dialog
2012-05-11 11:05:44 +02:00
Michiel de Jong
2e309aae97
announce OAuth2 implicit grant end-point the new way
2012-05-11 10:52:37 +02:00
Michiel de Jong
02cee2c562
trying to fix /.well-known/host-meta
2012-05-11 10:47:42 +02:00
Michiel de Jong
0c7f0aa3fa
attempt to align the webfinger app with new public.php routing
2012-05-11 10:26:30 +02:00