Commit graph

4540 commits

Author SHA1 Message Date
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
Frank Karlitschek
24318354f2 changed the default from Berlin to UTC.
Greetings form Berlin by the way ;-)
2012-05-24 00:49:21 +02:00
Brice Maron
97d682dc13 Correct small style problem with task app fix #oc-689 2012-05-23 21:02:34 +00:00
Robin Appelman
60fdc13ae6 enable running unit tests from cli 2012-05-22 20:22:53 +02: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
Florian Hülsmann
d2e2a2b2c0 prevent apps from printing output from app.php 2012-05-22 13:10:42 +02: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
Thomas Mueller
ede89ee405 oc-657: icons for M$ office file types 2012-05-21 09:35:31 +02:00
Robin Appelman
cb23bae8d9 dont throw errors when apps dont have types configured 2012-05-20 18:52:03 +02:00
Robin Appelman
f00b57f8be files app is always enabled 2012-05-20 18:52:03 +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
Frank Karlitschek
c0db603d29 this is 5 pre alpha now 2012-05-19 18:21:33 +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
Frank Karlitschek
08f7d4c552 document the public classes a bit more 2012-05-19 10:36:57 +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
Robin Appelman
a2cc772aa5 dont run update scripts for apps that arent enabled 2012-05-19 02:00:46 +02:00
Robin Appelman
b096fd9ed8 log upgrades 2012-05-19 01:55:20 +02:00
Robin Appelman
df64b9b0e9 strict standards fixes for sqlite3 2012-05-19 01:39:41 +02:00
Michael Gapczynski
90cbc32c77 Fix redirect after login, prevent open redirects 2012-05-18 16:56:48 -04:00
Frank Karlitschek
e03b5ff665 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-18 21:16:03 +02:00
Frank Karlitschek
fdbe0c9734 don´t claim that already downloaded 3rd party apps are internal apps 2012-05-18 21:14:07 +02:00
Frank Karlitschek
0df376d472 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-18 18:25:31 +02:00
Frank Karlitschek
16224e5e8b "fopen(" interferes with our own classes.
remove it for now and let´s fix this later
2012-05-18 18:22:37 +02: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
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
Michiel de Jong
fc536c3491 add htmlentities() call into login form 2012-05-18 16:12:49 +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
Frank Karlitschek
2d3c709163 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-18 15:56:15 +02:00
Frank Karlitschek
db77dc91bc only try to install apps that are compatible with oC4 2012-05-18 15:54:36 +02:00
Frank Karlitschek
2e9115efe0 increase to RC2 2012-05-18 15:54:17 +02:00