Thomas Tanghus
|
c898a8a6c9
|
Contacts: 11th hour fix for invalid VCARD from CardDAV.
|
2012-06-10 20:54:52 +02:00 |
|
Thomas Tanghus
|
cdac0eae46
|
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
|
2012-06-10 20:47:35 +02:00 |
Frank Karlitschek
|
cfea28101a
|
4.0.2
|
2012-06-10 20:31:31 +02:00 |
|
Frank Karlitschek
|
6a44d02898
|
XSS--
|
2012-06-10 19:54:04 +02:00 |
Bartek Przybylski
|
3970be3d7f
|
fix variable name and undefined index notice
|
2012-06-10 17:25:19 +02:00 |
|
Bartek Przybylski
|
31d48d4ba4
|
adding missing file
|
2012-06-10 13:20:49 +02:00 |
|
Bartek Przybylski
|
de6b683b50
|
fix first time image loading error
|
2012-06-10 13:19:22 +02:00 |
|
Bartek Przybylski
|
2dca0926b0
|
gallery: removing search provider for now
|
2012-06-10 13:19:17 +02:00 |
|
Bartek Przybylski
|
f1250a3867
|
add function in filesystem to strip webroot
|
2012-06-10 13:19:10 +02:00 |
|
Bartek Przybylski
|
e7d1af48fb
|
handle encrypted images files in oc_image
|
2012-06-10 13:19:05 +02:00 |
|
Bartek Przybylski
|
7ee722e0da
|
removing app access check, fix title for links in tiles
|
2012-06-10 13:18:55 +02:00 |
|
Bartek Przybylski
|
e073cd756c
|
tabs for spaces, fix array key name
|
2012-06-10 13:18:47 +02:00 |
|
Bartek Przybylski
|
f6c07094c2
|
hide share button until sharing wont be fixed
|
2012-06-10 13:18:41 +02:00 |
|
Bartek Przybylski
|
1853a83874
|
adding navigation bar to gallery
|
2012-06-10 13:18:36 +02:00 |
|
Bartek Przybylski
|
fe64e625ff
|
remove old code
|
2012-06-10 13:18:30 +02:00 |
|
Bartek Przybylski
|
f0f9269161
|
adding missing file
|
2012-06-10 13:18:17 +02:00 |
|
Bartek Przybylski
|
6682c60866
|
pictures: update script and removal some all stuff
|
2012-06-10 13:17:23 +02:00 |
|
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 |
|
Thomas Tanghus
|
746994c2be
|
Fixed merge conflict.
|
2012-06-10 12:59:36 +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 |
|
Frank Karlitschek
|
689c8f5f09
|
paging not yet implemented. increasing pagesize to 100 as a temporary quickfix
|
2012-06-09 22:02:29 +02:00 |
|
Frank Karlitschek
|
061938cbb5
|
finally fix the updater. next is an automatic updater. but this is a bit more tricky.
|
2012-06-09 17:56:23 +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
|
815eb2591a
|
Changed preferences configvalue to clob. Fixes several bugs e.g. oc-825 and oc-743.
|
2012-06-09 15:37:57 +02:00 |
Robin Appelman
|
8f616ecf76
|
fix potential xss in multiselect
|
2012-06-09 15:08:05 +02:00 |
|
Thomas Tanghus
|
0f454215e7
|
Code cleanup.
|
2012-06-09 15:04:08 +02:00 |
|
Thomas Tanghus
|
83caaa6d3f
|
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
|
2012-06-09 15:02:38 +02:00 |
|
Thomas Tanghus
|
59d16c5f9a
|
Contacts: Use POST instead of GET.
|
2012-06-09 15:02:23 +02:00 |
|
Robin Appelman
|
6e1ca36207
|
fix infinite redirect during setup for windows hosts
|
2012-06-09 14:38:50 +02:00 |
|
Georg Ehrke
|
cf1c3635ff
|
fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but empty aka /?app
|
2012-06-08 22:32:58 +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 |
|
Frank Karlitschek
|
a7a861b2c6
|
backport the password salting fix.
a salt is generated during setup and used to salt the user password hases in the database backend
|
2012-06-08 12:42:35 +02:00 |
|
Arthur Schiwon
|
8c7fa15aaf
|
Sharing, fix: connect to hooks from the correct classes
|
2012-06-08 11:58:00 +02:00 |
|
Bjoern Schiessle
|
4a15cf28a9
|
fixed broken lines in user table
Conflicts:
settings/css/settings.css
|
2012-06-08 11:44:04 +02:00 |