Commit graph

2726 commits

Author SHA1 Message Date
Georg Ehrke
9fd07ee10d Merge branch 'master' into calendar 2012-02-08 17:13:50 +01:00
Robin Appelman
36d696c30d dont load pdfview for ie 2012-02-08 16:28:59 +01:00
Robin Appelman
5f7727629a Merge branch 'filesystem' 2012-02-08 15:50:58 +01:00
Georg Ehrke
cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00
Robin Appelman
e50dfbc228 fix filecache when creating a new folder 2012-02-06 19:33:37 +01:00
Thomas Tanghus
89616d81f0 Modification for adding photos. 2012-02-06 07:24:39 +01:00
Robin Appelman
9f3388ecbc store writable flag for files 2012-02-05 14:04:10 +01:00
Robin Appelman
30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Georg Ehrke
89073970d3 change comments in import.php 2012-02-05 12:13:53 +01:00
Georg Ehrke
8337eaa1ec add import function for contacts 2012-02-05 12:13:53 +01:00
Robin Appelman
25e777ef5e watch for changes outside owncloud to the files 2012-02-05 03:06:33 +01:00
Robin Appelman
90c4666b12 fix bug in transactions with PDO 2012-02-05 01:24:06 +01:00
Robin Appelman
0bb48d814b fix bug in transactions with PDO 2012-02-05 01:23:41 +01:00
Robin Appelman
7c00aedc37 some improvements in file scanning 2012-02-05 01:23:04 +01:00
Robin Appelman
36bc1a2102 Merge branch 'master' into filesystem 2012-02-05 01:22:29 +01:00
Tom Needham
493ba20734 Updated readme url for install instructions 2012-02-04 23:40:47 +00:00
Georg Ehrke
55be59e738 Merge branch 'master' into calendar 2012-02-04 21:34:38 +01:00
Georg Ehrke
5e08d1bb40 Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar 2012-02-04 21:27:18 +01:00
Georg Ehrke
b810380d56 add sharing management for calendars 2012-02-04 21:23:31 +01:00
Bartek Przybylski
cfc710e768 preferences store fix 2012-02-04 20:15:55 +01:00
Bartek Przybylski
f6a27dfa28 stripping root from gallery name 2012-02-04 15:35:58 +01:00
Bartek Przybylski
f1672d7d10 handling special chars in dirnames 2012-02-04 11:02:13 +01:00
Bartek Przybylski
5a106d1036 gallery: fix FS hooks 2012-02-04 10:30:32 +01:00
Bartek Przybylski
8df0650658 gallery settings, defining scan root and shor order 2012-02-03 21:38:44 +01:00
Bartek Przybylski
ee01d1a81d removing console error in safari for bookmarks 2012-02-03 21:37:09 +01:00
Georg Ehrke
ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +01:00
Robin Appelman
05d76dcd67 allow the usage of the filecache outside of the users home folder 2012-02-02 19:04:13 +01:00
Georg Ehrke
bfa69c3e59 add a label calendar to the settings page - bugfix for oc-157 2012-02-02 18:37:06 +01:00
Thomas Tanghus
6225b5ec86 More in-/output sanitation, 2012-02-02 17:54:30 +01:00
Thomas Tanghus
66b96e4440 Sanitize in- and output. 2012-02-02 17:54:30 +01:00
Georg Ehrke
f81ac81550 fix merge conflicts 2012-02-02 17:48:29 +01:00
Robin Appelman
7b9fb84fe9 Merge branch 'master' into filesystem 2012-02-02 17:30:54 +01:00
Georg Ehrke
92b8f32386 Calendar: Bugfix: better input validation 2012-02-02 15:01:05 +01:00
Georg Ehrke
91b705cc4f remove debug file 2012-02-02 12:37:58 +01:00
Georg Ehrke
f870f9efcf validate parameters in changeview.php 2012-02-02 12:18:29 +01:00
Georg Ehrke
9e5172f75c Merge branch 'master' into calendar 2012-02-02 12:12:48 +01:00
Bartek Przybylski
f198296576 gallery works in safari now 2012-02-01 22:15:46 +01:00
Marvin Thomas Rabe
f999fbf81a Bookmark layout updated 2012-02-01 22:02:06 +01:00
Marvin Thomas Rabe
bbd10a3c94 Bookmark layout updated 2012-02-01 21:19:31 +01:00
Marvin Thomas Rabe
e4faea8f90 Fixed upload button display error 2012-02-01 20:58:04 +01:00
Robin Appelman
d514b1d92d Merge branch 'master' into filesystem 2012-02-01 15:57:32 +01:00
David Iwanowitsch
6583d30e26 fix javascript 2012-02-01 15:40:59 +01:00
David Iwanowitsch
e229a6adec Added searchprovider for bookmarks, initial l10n support for bookmark plugin
moved some code from updateList.php to bookmarks.php, to make it reusable
2012-02-01 15:40:59 +01:00
Robin Appelman
0124809a42 prevent sharing from making aditional http requests while scanning
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
Robin Appelman
a69d3c3346 only show what folder we are scanning to save bandwith 2012-02-01 15:25:00 +01:00
Thomas Schmidt
4145e3b265 pre-select current language, sort available languages 2012-02-01 12:00:38 +01:00
Georg Ehrke
39d312861a add active to the db structure of shared calendars 2012-01-31 22:33:39 +01:00
Georg Ehrke
2b8ec1cad0 Calendar: fix html of import dialog 2012-01-31 22:03:08 +01:00
Georg Ehrke
153467dbe0 add share as a tab 2012-01-31 21:39:40 +01:00
Georg Ehrke
7b82d153c7 Merge branch 'master' into calendar 2012-01-31 21:35:08 +01:00