]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
12 years agofixed xss vulnerability
Bjoern Schiessle [Fri, 15 Jun 2012 13:51:06 +0000 (15:51 +0200)]
fixed xss vulnerability

12 years agoLoad app before running update script
Bart Visscher [Fri, 15 Jun 2012 09:18:38 +0000 (11:18 +0200)]
Load app before running update script

12 years agoDisable minizing when DEBUG is true
Bart Visscher [Thu, 14 Jun 2012 16:22:48 +0000 (18:22 +0200)]
Disable minizing when DEBUG is true

12 years agoMerge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into...
Bjoern Schiessle [Fri, 15 Jun 2012 07:51:04 +0000 (09:51 +0200)]
Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128

Conflicts:
apps/gallery/templates/index.php

12 years agoUpdate stylesheet for type=url.
Thomas Tanghus [Fri, 15 Jun 2012 02:26:03 +0000 (04:26 +0200)]
Update stylesheet for type=url.

12 years agoUse type=url for URL field.
Thomas Tanghus [Fri, 15 Jun 2012 01:26:08 +0000 (03:26 +0200)]
Use type=url for URL field.

12 years agoFix upload for Google Drive; Google Documents List API documentation was misleading
Michael Gapczynski [Fri, 15 Jun 2012 00:56:48 +0000 (20:56 -0400)]
Fix upload for Google Drive; Google Documents List API documentation was misleading

12 years agoMake sure there is a calendar after delete.
Thomas Tanghus [Fri, 15 Jun 2012 00:10:55 +0000 (02:10 +0200)]
Make sure there is a calendar after delete.

12 years agoUpdate calendar after delete.
Thomas Tanghus [Fri, 15 Jun 2012 00:07:32 +0000 (02:07 +0200)]
Update calendar after delete.

12 years agoOnly create new calendar when there are none. Fix oc-1007.
Thomas Tanghus [Thu, 14 Jun 2012 23:55:02 +0000 (01:55 +0200)]
Only create new calendar when there are none. Fix oc-1007.

12 years agoAgree on argument type (cleaned this time).
Thomas Tanghus [Thu, 14 Jun 2012 23:51:26 +0000 (01:51 +0200)]
Agree on argument type (cleaned this time).

12 years agoRevert "Agree on argument type."
Thomas Tanghus [Thu, 14 Jun 2012 22:53:13 +0000 (00:53 +0200)]
Revert "Agree on argument type."

This reverts commit 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294.

12 years agoAgree on argument type.
Thomas Tanghus [Thu, 14 Jun 2012 22:50:42 +0000 (00:50 +0200)]
Agree on argument type.

12 years agoNo need to find calendar twice.
Thomas Tanghus [Thu, 14 Jun 2012 22:28:12 +0000 (00:28 +0200)]
No need to find calendar twice.

12 years agoMake events show again.
Thomas Tanghus [Thu, 14 Jun 2012 22:26:34 +0000 (00:26 +0200)]
Make events show again.

12 years agoCleanup code.
Thomas Tanghus [Thu, 14 Jun 2012 20:44:54 +0000 (22:44 +0200)]
Cleanup code.

12 years agoIf Hr. Lerdorf had made up his mind on parameter order, life would have been a lot...
Thomas Tanghus [Thu, 14 Jun 2012 20:40:18 +0000 (22:40 +0200)]
If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...

12 years agoForgot $ sign for variable
Michael Gapczynski [Thu, 14 Jun 2012 19:14:01 +0000 (15:14 -0400)]
Forgot $ sign for variable

12 years agoRevert "Fix a counting mistake"
Michael Gapczynski [Thu, 14 Jun 2012 19:04:49 +0000 (15:04 -0400)]
Revert "Fix a counting mistake"

This reverts commit c20abfef388f9159e71b71c17a57d849faa5d913.

12 years agofirst load compatibility.js
Thomas Mueller [Thu, 14 Jun 2012 19:00:19 +0000 (21:00 +0200)]
first load compatibility.js

12 years agofix javascript error
Thomas Mueller [Thu, 14 Jun 2012 18:55:36 +0000 (20:55 +0200)]
fix javascript error

12 years agofixed handling of fallback_images
Stephan Bergemann [Thu, 14 Jun 2012 17:38:43 +0000 (19:38 +0200)]
fixed handling of fallback_images

12 years agoreverting 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1, differs between OC3 and 4
Arthur Schiwon [Thu, 14 Jun 2012 16:31:38 +0000 (18:31 +0200)]
reverting 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1, differs between OC3 and 4

12 years agoCheck for '\' as well when searching for parent folders, because Windows returns...
Michael Gapczynski [Thu, 14 Jun 2012 16:27:30 +0000 (12:27 -0400)]
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()

12 years agoContacts: Fixes for CSRF.
Thomas Tanghus [Thu, 14 Jun 2012 16:12:38 +0000 (18:12 +0200)]
Contacts: Fixes for CSRF.

12 years agoMake requesttoken global.
Thomas Tanghus [Thu, 14 Jun 2012 16:06:28 +0000 (18:06 +0200)]
Make requesttoken global.

12 years agofixed one issue with last directory in structure having a lot of
Stephan Bergemann [Thu, 14 Jun 2012 16:02:07 +0000 (18:02 +0200)]
fixed one issue with last directory in structure having a lot of
subdirectories and finally some pictures

12 years agofixed bug #996: first picture in folder is repeated in the last position behaving...
Bjoern Schiessle [Thu, 14 Jun 2012 13:14:36 +0000 (15:14 +0200)]
fixed bug #996: first picture in folder is repeated in the last position behaving like a directory

Conflicts:
apps/gallery/templates/index.php

12 years agofixed bug #996: first picture in folder is repeated in the last position behaving...
Bjoern Schiessle [Thu, 14 Jun 2012 13:14:36 +0000 (15:14 +0200)]
fixed bug #996: first picture in folder is repeated in the last position behaving like a directory

12 years agoprevent xss attacks also if some javascript ends up in the alt-tag
Bjoern Schiessle [Thu, 14 Jun 2012 12:17:30 +0000 (14:17 +0200)]
prevent xss attacks also if some javascript ends up in the alt-tag

12 years agoMerge branch 'master' of gitorious.org:owncloud/owncloud
Bjoern Schiessle [Thu, 14 Jun 2012 11:44:42 +0000 (13:44 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud

12 years agofixed xss vulnerability in un-packed version of jquery.fancybox and repack it
Bjoern Schiessle [Thu, 14 Jun 2012 11:41:39 +0000 (13:41 +0200)]
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it

12 years agoWhite-space fix.
Thomas Tanghus [Thu, 14 Jun 2012 10:57:30 +0000 (12:57 +0200)]
White-space fix.

12 years agoDon't add slash if it's there already.
Thomas Tanghus [Thu, 14 Jun 2012 10:48:42 +0000 (12:48 +0200)]
Don't add slash if it's there already.

12 years agoUse the right csrf token.
Thomas Tanghus [Thu, 14 Jun 2012 10:48:09 +0000 (12:48 +0200)]
Use the right csrf token.

12 years agodebugging output removed
Bjoern Schiessle [Thu, 14 Jun 2012 11:17:06 +0000 (13:17 +0200)]
debugging output removed

12 years agoxss vulnerability fixed for fancybox image viewer
Bjoern Schiessle [Thu, 14 Jun 2012 11:13:17 +0000 (13:13 +0200)]
xss vulnerability fixed for fancybox image viewer

12 years agowe don't neede the functions for empty stacks any more
Stephan Bergemann [Thu, 14 Jun 2012 10:51:27 +0000 (12:51 +0200)]
we don't neede the functions for empty stacks any more

12 years agowe don't have empty previewstacks any more - code cleaned up
Stephan Bergemann [Thu, 14 Jun 2012 10:39:18 +0000 (12:39 +0200)]
we don't have empty previewstacks any more - code cleaned up

12 years agosuppress warning if /dev/urandom is not readable (bug #997)
Bjoern Schiessle [Thu, 14 Jun 2012 10:01:16 +0000 (12:01 +0200)]
suppress warning if /dev/urandom is not readable (bug #997)

12 years agodeleted some debugging output
Stephan Bergemann [Tue, 12 Jun 2012 13:23:05 +0000 (15:23 +0200)]
deleted some debugging output

12 years agouse images from deeper directories for preview if the actual directory doesn't contai...
Stephan Bergemann [Tue, 12 Jun 2012 13:20:45 +0000 (15:20 +0200)]
use images from deeper directories for preview if the actual directory doesn't contain any

12 years agoimproved look of directories not containing images directly
Stephan Bergemann [Tue, 12 Jun 2012 12:38:12 +0000 (14:38 +0200)]
improved look of directories not containing images directly

12 years agonow also working for directories only containing one image
Stephan Bergemann [Tue, 12 Jun 2012 12:06:56 +0000 (14:06 +0200)]
now also working for directories only containing one image

12 years agofixed second_level_images issue
Stephan Bergemann [Tue, 12 Jun 2012 11:05:25 +0000 (13:05 +0200)]
fixed second_level_images issue

12 years agofixed sorting errors and missbehaviours - now sorting like file browser
Stephan Bergemann [Tue, 12 Jun 2012 01:23:22 +0000 (03:23 +0200)]
fixed sorting errors and missbehaviours - now sorting like file browser

12 years agofix another ui bug of calendar
Georg Ehrke [Wed, 13 Jun 2012 20:20:43 +0000 (22:20 +0200)]
fix another ui bug of calendar

12 years agoanother ui fix
Georg Ehrke [Wed, 13 Jun 2012 20:14:40 +0000 (22:14 +0200)]
another ui fix

12 years agofix a ui bug for calendar sharing
Georg Ehrke [Wed, 13 Jun 2012 20:12:54 +0000 (22:12 +0200)]
fix a ui bug for calendar sharing

12 years agoshow username of the body who shares in the summary
Georg Ehrke [Wed, 13 Jun 2012 20:06:22 +0000 (22:06 +0200)]
show username of the body who shares in the summary

12 years agoWhitespace fix
Bart Visscher [Wed, 13 Jun 2012 19:39:05 +0000 (21:39 +0200)]
Whitespace fix

12 years agoCSSMin: Remove debug code
Bart Visscher [Wed, 13 Jun 2012 19:16:23 +0000 (21:16 +0200)]
CSSMin: Remove debug code

12 years agoFiles Texteditor: Use our own "Droid Sans Mono" font-face and fonts
Bart Visscher [Wed, 13 Jun 2012 19:16:14 +0000 (21:16 +0200)]
Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts

12 years agoCalendar: Clicking #datecontrol_date gives datepicker to jump to date
Bart Visscher [Wed, 13 Jun 2012 07:05:35 +0000 (09:05 +0200)]
Calendar: Clicking #datecontrol_date gives datepicker to jump to date

12 years agoCalendar: Make button of #datecontrol_date
Bart Visscher [Wed, 13 Jun 2012 07:05:00 +0000 (09:05 +0200)]
Calendar: Make button of #datecontrol_date

12 years agoMerge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into...
Michael Gapczynski [Wed, 13 Jun 2012 19:17:46 +0000 (15:17 -0400)]
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127

Conflicts:
apps/files_external/templates/settings.php
lib/template.php

12 years agoAdd support for mounting Google Drive in external storage UI
Michael Gapczynski [Wed, 13 Jun 2012 17:54:32 +0000 (13:54 -0400)]
Add support for mounting Google Drive in external storage UI

12 years agoRemove check for encryption.
Thomas Tanghus [Wed, 13 Jun 2012 17:03:34 +0000 (19:03 +0200)]
Remove check for encryption.

12 years agoRemove debug statements.
Thomas Tanghus [Wed, 13 Jun 2012 16:57:12 +0000 (18:57 +0200)]
Remove debug statements.

12 years agoContacts: implemented CSRF prevention.
Thomas Tanghus [Wed, 13 Jun 2012 15:35:42 +0000 (17:35 +0200)]
Contacts: implemented CSRF prevention.

12 years agoAdded JSON methods for CSRF prevention. Make request token accessible from template...
Thomas Tanghus [Wed, 13 Jun 2012 15:33:19 +0000 (17:33 +0200)]
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.

12 years agofix time call
Frank Karlitschek [Wed, 13 Jun 2012 15:27:49 +0000 (17:27 +0200)]
fix time call

12 years agourlencode link fort password reset (bug #970)
Bjoern Schiessle [Wed, 13 Jun 2012 15:22:28 +0000 (17:22 +0200)]
urlencode link fort password reset (bug #970)

12 years agoFix incorrect creation of filesystem for user@group in data folder during shares
Michael Gapczynski [Wed, 13 Jun 2012 01:33:05 +0000 (21:33 -0400)]
Fix incorrect creation of filesystem for user@group in data folder during shares

12 years agocheck for view before trying to invoke method on object
Bartek Przybylski [Tue, 12 Jun 2012 22:32:44 +0000 (00:32 +0200)]
check for view before trying to invoke method on object

12 years agofixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987
Thomas Mueller [Tue, 12 Jun 2012 21:15:44 +0000 (23:15 +0200)]
fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987

12 years agoCreate directory for mount point if it doesn't already exist
Michael Gapczynski [Tue, 12 Jun 2012 19:25:13 +0000 (15:25 -0400)]
Create directory for mount point if it doesn't already exist

12 years agoincrease version of calendar app to force db upgrade
Georg Ehrke [Tue, 12 Jun 2012 17:53:26 +0000 (19:53 +0200)]
increase version of calendar app to force db upgrade

12 years agoincrease possible size of uri in database - fix oc-140
Georg Ehrke [Tue, 12 Jun 2012 17:52:25 +0000 (19:52 +0200)]
increase possible size of uri in database - fix oc-140

12 years agoAdd support for mounting Dropbox in external storage UI
Michael Gapczynski [Tue, 12 Jun 2012 15:36:25 +0000 (11:36 -0400)]
Add support for mounting Dropbox in external storage UI

12 years agoLabel the delete operation "unshare" for files in the "Shared" folder to reduce
Bjoern Schiessle [Tue, 12 Jun 2012 14:27:24 +0000 (16:27 +0200)]
Label the delete operation "unshare" for files in the "Shared" folder to reduce
confusion about the operation.

12 years agoblock slashes only for new files and new folders but not for file upload from url...
Bjoern Schiessle [Tue, 12 Jun 2012 12:11:28 +0000 (14:11 +0200)]
block slashes only for new files and new folders but not for file upload from url (bug #964)

12 years agoContacts: Final (for now) fix to encoding probs on import.
Thomas Tanghus [Tue, 12 Jun 2012 10:31:28 +0000 (12:31 +0200)]
Contacts: Final (for now) fix to encoding probs on import.

12 years agocommitted patch (bug #967) to add missing translations for file actions
Bjoern Schiessle [Tue, 12 Jun 2012 09:39:03 +0000 (11:39 +0200)]
committed patch (bug #967) to add missing translations for file actions

12 years agoapplied patch provided by bug #966 to fix broken user specific quota settings
Bjoern Schiessle [Tue, 12 Jun 2012 09:18:34 +0000 (11:18 +0200)]
applied patch provided by bug #966 to fix broken user specific quota settings

12 years agoPDF.JS updated, compatibility.js added for browser support, should fix: oc-395
Thomas Mueller [Mon, 11 Jun 2012 22:49:40 +0000 (00:49 +0200)]
PDF.JS updated, compatibility.js added for browser support, should fix: oc-395

12 years agoutf8 in der DB config
Marco B [Tue, 5 Jun 2012 15:23:22 +0000 (17:23 +0200)]
utf8 in der DB config

12 years agoAdd .vimrc to .gitignore.
Thomas Tanghus [Mon, 11 Jun 2012 20:53:20 +0000 (22:53 +0200)]
Add .vimrc to .gitignore.

12 years agoFix js for missing address fields.
Thomas Tanghus [Mon, 11 Jun 2012 20:13:45 +0000 (22:13 +0200)]
Fix js for missing address fields.

12 years agoQuick fix for index errors when not importing from files.
Thomas Tanghus [Mon, 11 Jun 2012 20:12:06 +0000 (22:12 +0200)]
Quick fix for index errors when not importing from files.

12 years agoEncoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49...
Thomas Tanghus [Mon, 11 Jun 2012 20:05:15 +0000 (22:05 +0200)]
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e

12 years agoContacts: Fix encoding errors, import errors, developer headache, paint cute kittens...
Thomas Tanghus [Mon, 11 Jun 2012 20:00:06 +0000 (22:00 +0200)]
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)

12 years agoTasks: Fix resizing of the content part
Bart Visscher [Mon, 11 Jun 2012 15:38:40 +0000 (17:38 +0200)]
Tasks: Fix resizing of the content part

12 years agoGallery: remove extra include of lib/base.php
Bart Visscher [Sat, 9 Jun 2012 14:45:53 +0000 (16:45 +0200)]
Gallery: remove extra include of lib/base.php

12 years agoCalendar: remove unused markup from #controls
Bart Visscher [Sat, 9 Jun 2012 14:15:25 +0000 (16:15 +0200)]
Calendar: remove unused markup from #controls

12 years agoRemoved unecessary sanitization
Lukas Reschke [Mon, 11 Jun 2012 17:49:24 +0000 (19:49 +0200)]
Removed unecessary sanitization

12 years agoRemoved double sanitization
Lukas Reschke [Mon, 11 Jun 2012 17:47:42 +0000 (19:47 +0200)]
Removed double sanitization

12 years agoFix double sanitization
Lukas Reschke [Mon, 11 Jun 2012 17:43:37 +0000 (19:43 +0200)]
Fix double sanitization

12 years agoFixes a issue with the log
Lukas Reschke [Mon, 11 Jun 2012 17:33:16 +0000 (19:33 +0200)]
Fixes a issue with the log

12 years agoRemoved some unessecary sanitizations
Lukas Reschke [Mon, 11 Jun 2012 17:20:48 +0000 (19:20 +0200)]
Removed some unessecary sanitizations

12 years agoMake some apps compatible
Lukas Reschke [Mon, 11 Jun 2012 17:07:51 +0000 (19:07 +0200)]
Make some apps compatible

12 years agoreplace "=0D=0A" (\r\n) with a simple "\n" in vards during import
Bjoern Schiessle [Mon, 11 Jun 2012 16:13:12 +0000 (18:13 +0200)]
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import

12 years agoCheck for string
Lukas Reschke [Mon, 11 Jun 2012 16:12:46 +0000 (18:12 +0200)]
Check for string

12 years agoMerge branch 'master' of gitorious.org:owncloud/owncloud
Bjoern Schiessle [Mon, 11 Jun 2012 15:28:15 +0000 (17:28 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud

12 years agoLDAP: offer config option for Group Display Name attribute
Arthur Schiwon [Mon, 11 Jun 2012 14:48:43 +0000 (16:48 +0200)]
LDAP: offer config option for Group Display Name attribute

12 years agomake sure that contact data are always utf8 encoded to avoid encoding problems
Bjoern Schiessle [Mon, 11 Jun 2012 14:26:21 +0000 (16:26 +0200)]
make sure that contact data are always utf8 encoded to avoid encoding problems

12 years agoRedirect HTTP Auth requests to REQUEST_URI. Partial fix for http://bugs.owncloud...
Thomas Tanghus [Mon, 11 Jun 2012 13:22:58 +0000 (15:22 +0200)]
Redirect HTTP Auth requests to REQUEST_URI. Partial fix for http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-874

12 years agoAllow same host redirects (/somepath).
Thomas Tanghus [Mon, 11 Jun 2012 13:21:37 +0000 (15:21 +0200)]
Allow same host redirects (/somepath).

12 years agoSome updates...
Lukas Reschke [Mon, 11 Jun 2012 13:03:45 +0000 (15:03 +0200)]
Some updates...

12 years agoHandling arrays
Lukas Reschke [Mon, 11 Jun 2012 12:36:11 +0000 (14:36 +0200)]
Handling arrays