Commit graph

2231 commits

Author SHA1 Message Date
Bartek Przybylski
9c1cc15c8d adding title when fancybox is displayed 2012-06-10 13:16:19 +02:00
Bartek Przybylski
c932f93a40 replace spaces with tabs, use const and linkTo instead of static path 2012-06-10 13:16:12 +02:00
Bartek Przybylski
276aefba81 hack for file download 2012-06-10 13:16:06 +02:00
Bartek Przybylski
71b4cddd52 removing test image 2012-06-10 13:16:00 +02:00
Bartek Przybylski
c67de113c6 aviod incorrect image size returning in gallery listing 2012-06-10 13:15:51 +02:00
Bartek Przybylski
63c02fd595 use fancybox to display image preview 2012-06-10 13:15:45 +02:00
Bartek Przybylski
7aff5eae6c navigate on galleries 2012-06-10 13:15:39 +02:00
Bartek Przybylski
2b80102909 new db scheme 2012-06-10 13:15:32 +02:00
Bartek Przybylski
9b2b5e0f6d git status 2012-06-10 13:15:23 +02:00
Frank Karlitschek
be6848a549 let´s put the files_odfviewer application into the stable4 branch for convinience. We release it as part of ownCloud 4.0.x anyways. 2012-06-09 23:18:56 +02:00
Georg Ehrke
642e7ce110 fix another XSS 2012-06-09 16:44:48 +02:00
Georg Ehrke
f955f6a685 fix XSS in Calendar 2012-06-09 16:36:01 +02:00
Georg Ehrke
ff4b175622 increase height of event dialog 2012-06-09 15:40:27 +02:00
Georg Ehrke
009fbd89b4 fix creation of monthly repeated events 2012-06-09 15:40:27 +02:00
Thomas Tanghus
0f454215e7 Code cleanup. 2012-06-09 15:04:08 +02:00
Thomas Tanghus
59d16c5f9a Contacts: Use POST instead of GET. 2012-06-09 15:02:23 +02:00
Thomas Tanghus
23533a763a Don't fix bugs not present in this branch ;-) 2012-06-08 20:44:58 +02:00
Thomas Tanghus
5eb5d23ac1 Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
Conflicts:

	apps/contacts/ajax/uploadphoto.php
2012-06-08 20:43:42 +02:00
Bjoern Schiessle
eb192ff4f3 code cleanup from previous commit 2012-06-08 16:31:12 +02:00
Bjoern Schiessle
cf1430df45 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-06-08 16:27:07 +02:00
Bjoern Schiessle
0722ff6e32 fix for bug #872: Folders not holding any images are ignored, even if they hold subfolders with images 2012-06-08 16:24:31 +02:00
Arthur Schiwon
0dc371f579 typo in var 2012-06-08 14:58:07 +02:00
Arthur Schiwon
8c7fa15aaf Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:58:00 +02:00
Arthur Schiwon
0f68276921 LDAP: cache the results, reduce LDAP searches 2012-06-07 18:56:06 +02:00
Arthur Schiwon
4beabe23e7 ldap: enable the destructor 2012-06-07 18:15:11 +02:00
Arthur Schiwon
f3f3c791ba ldap: correct query condition and determining of success 2012-06-07 13:40:26 +02:00
Arthur Schiwon
691f00eb39 ldap: check index carefully, can be 0 2012-06-07 13:40:16 +02:00
Thomas Tanghus
9266f4da99 Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511 2012-06-07 13:10:19 +02:00
Thomas Tanghus
de6d550cce Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:22:25 +02:00
Thomas Tanghus
3d48bf18d3 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:58:15 +02:00
Bjoern Schiessle
bb07c20bf4 fixed var name, $filename should be $foldername 2012-06-06 18:11:23 +02:00
Arthur Schiwon
48ccfa42d3 LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914 2012-06-06 12:31:22 +02:00
Thomas Tanghus
517bd28940 Corrected typos. 2012-06-06 11:49:45 +02:00
Robin Appelman
f1b10fcc93 update translations 2012-06-06 00:29:44 +02:00
Robin Appelman
063c9accb6 prevent creating files with a / the name 2012-06-06 00:04:02 +02:00
Bjoern Schiessle
3a5076d646 show pictures in folder with special characters, e.g. '+' 2012-06-05 17:58:23 +02:00
Arthur Schiwon
769d94ab26 linkTo instead of hard links in Files and Files_Archive. Hope that makes sense. 2012-06-05 14:14:26 +02:00
Bjoern Schiessle
44260a552c xss vulnerability fixed 2012-06-05 10:49:36 +02:00
Bjoern Schiessle
e817504569 xss vulnerability fixed 2012-06-05 10:49:26 +02:00
Bjoern Schiessle
4bc88ef59d prevent xss attacks by manipulating image file names 2012-06-04 18:11:17 +02:00
Bjoern Schiessle
d5566d0267 prevent xss attacks by manipulating text file names 2012-06-04 18:11:08 +02:00
Bjoern Schiessle
c8f670dfab Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 14:00:35 +02:00
Arthur Schiwon
8983c6dd6b commited a bit too much before 2012-06-04 13:27:55 +02:00
Thomas Tanghus
d657263403 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-04 13:13:53 +02:00
Thomas Tanghus
74ac2ac63a Contacts: When editing photo on a newly created contact the name in the contact list was cleared. 2012-06-04 13:13:43 +02:00
Arthur Schiwon
b48228ae3d LDAP: link to documentation on settings page 2012-06-04 13:04:18 +02:00
Arthur Schiwon
34464b1f8b LDAP group backend: Set configured true when it is... fixe oc-887 2012-06-01 16:02:04 +02:00
Arthur Schiwon
86279bc192 LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867 2012-06-01 14:05:08 +02:00
Frank Karlitschek
e44f9ab46e correctly detect https 2012-06-01 11:47:14 +02:00
Frank Karlitschek
8ed13e627e don´t do warnings.
Not sure if this start_session call is really needed here.
2012-06-01 11:08:40 +02:00