]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoEscape the data only in the template
Lukas Reschke [Sat, 2 Mar 2013 19:21:51 +0000 (20:21 +0100)]
Escape the data only in the template

11 years agoMerge pull request #1976 from owncloud/from-insane-autoescape-to-p
Lukas Reschke [Fri, 1 Mar 2013 22:31:06 +0000 (14:31 -0800)]
Merge pull request #1976 from owncloud/from-insane-autoescape-to-p

Replace insane auto sanitization with p()

11 years agoMerge master
Lukas Reschke [Fri, 1 Mar 2013 22:11:26 +0000 (23:11 +0100)]
Merge master

11 years agoMerge master
Lukas Reschke [Fri, 1 Mar 2013 22:11:03 +0000 (23:11 +0100)]
Merge master

11 years agoMerge branch 'master' into from-insane-autoescape-to-p
Thomas Mueller [Fri, 1 Mar 2013 22:09:20 +0000 (23:09 +0100)]
Merge branch 'master' into from-insane-autoescape-to-p

Conflicts:
apps/files/templates/index.php

11 years agoMerge pull request #2016 from owncloud/fixing-1844-master
Lukas Reschke [Fri, 1 Mar 2013 22:00:30 +0000 (14:00 -0800)]
Merge pull request #2016 from owncloud/fixing-1844-master

validate the generated email address and fall back to localhost.localdom...

11 years agovalidate the generated email address and fall back to localhost.localdomain in case...
Thomas Mueller [Fri, 1 Mar 2013 21:24:19 +0000 (22:24 +0100)]
validate the generated email address and fall back to localhost.localdomain in case it is not valid

fixes #1844

11 years agoMerge pull request #2015 from owncloud/fixing-2001-master
Bernhard Posselt [Fri, 1 Mar 2013 20:52:36 +0000 (12:52 -0800)]
Merge pull request #2015 from owncloud/fixing-2001-master

in case the user has no permissions to upload/create files...

11 years agofixes #2001 - in case the user has no permissions to upload/create files/folders...
Thomas Mueller [Fri, 1 Mar 2013 20:43:34 +0000 (21:43 +0100)]
fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed

11 years agoMerge pull request #2014 from owncloud/fixing-1909-master
Bernhard Posselt [Fri, 1 Mar 2013 20:42:52 +0000 (12:42 -0800)]
Merge pull request #2014 from owncloud/fixing-1909-master

for this self test we don't care if the ssl certificate is self signed a...

11 years agofor this self test we don't care if the ssl certificate is self signed and the peer...
Thomas Mueller [Fri, 1 Mar 2013 19:34:16 +0000 (20:34 +0100)]
for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.

11 years agoMerge pull request #2005 from owncloud/trash_add_signals
Bernhard Posselt [Fri, 1 Mar 2013 17:41:07 +0000 (09:41 -0800)]
Merge pull request #2005 from owncloud/trash_add_signals

add post_moveToTrash and post_restore signals to the trash bin

11 years agoMerge pull request #2007 from owncloud/fix_1834_master
Bernhard Posselt [Fri, 1 Mar 2013 17:40:37 +0000 (09:40 -0800)]
Merge pull request #2007 from owncloud/fix_1834_master

make sure that the version app always works on the users real home folder [master]

11 years agoMerge pull request #2008 from owncloud/1999-requesttoken
Frank Karlitschek [Fri, 1 Mar 2013 14:12:09 +0000 (06:12 -0800)]
Merge pull request #2008 from owncloud/1999-requesttoken

Check if requesttoken exists in session

11 years agoCheck if requesttoken exists in session
Lukas Reschke [Fri, 1 Mar 2013 13:59:51 +0000 (14:59 +0100)]
Check if requesttoken exists in session

Ref #1999

11 years agoStyle fixes
Lukas Reschke [Fri, 1 Mar 2013 13:59:24 +0000 (14:59 +0100)]
Style fixes

11 years agofix getVersions() call for the history view
Björn Schießle [Fri, 1 Mar 2013 12:55:10 +0000 (13:55 +0100)]
fix getVersions() call for the history view

11 years agomake sure that the version app always work on the users real home folder and not...
Björn Schießle [Fri, 1 Mar 2013 12:54:26 +0000 (13:54 +0100)]
make sure that the version app always work on the users real home folder and not on the mount point

11 years agoadd additional parameter to signal
Björn Schießle [Fri, 1 Mar 2013 11:44:43 +0000 (12:44 +0100)]
add additional parameter to signal

11 years agoadd post_moveToTrash and post_restore signals to the trash bin
Björn Schießle [Fri, 1 Mar 2013 11:20:29 +0000 (12:20 +0100)]
add post_moveToTrash and post_restore signals to the trash bin

11 years ago5.0 RC 1 v5.0.0RC1
Frank Karlitschek [Fri, 1 Mar 2013 06:53:14 +0000 (07:53 +0100)]
5.0 RC 1

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 28 Feb 2013 23:07:02 +0000 (00:07 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1979 from maelzx/patch-2
Lukas Reschke [Thu, 28 Feb 2013 20:53:15 +0000 (12:53 -0800)]
Merge pull request #1979 from maelzx/patch-2

Fix window.location mistakes in previous code

11 years agoMerge pull request #1992 from owncloud/fix-heartbeat
Lukas Reschke [Thu, 28 Feb 2013 20:50:56 +0000 (12:50 -0800)]
Merge pull request #1992 from owncloud/fix-heartbeat

The router base url is without / on the end

11 years agoMerge pull request #1937 from owncloud/check-resharing
Bart Visscher [Thu, 28 Feb 2013 19:39:11 +0000 (11:39 -0800)]
Merge pull request #1937 from owncloud/check-resharing

Check resharing setting

11 years agoSed was wrong
Lukas Reschke [Thu, 28 Feb 2013 19:21:14 +0000 (20:21 +0100)]
Sed was wrong

11 years agoMerge master
Lukas Reschke [Thu, 28 Feb 2013 19:03:06 +0000 (20:03 +0100)]
Merge master

11 years agoMerge pull request #1988 from owncloud/permissionscache_clean
icewind1991 [Thu, 28 Feb 2013 18:24:20 +0000 (10:24 -0800)]
Merge pull request #1988 from owncloud/permissionscache_clean

Clean permissions cache when deleting file

11 years agoThe router base url is without / on the end
Bart Visscher [Thu, 28 Feb 2013 17:02:26 +0000 (18:02 +0100)]
The router base url is without / on the end

11 years agoMerge pull request #1989 from owncloud/selectSanitize
Björn Schießle [Thu, 28 Feb 2013 16:51:07 +0000 (08:51 -0800)]
Merge pull request #1989 from owncloud/selectSanitize

Sanitize HTML in html_select_options

11 years agoSanitize HTML in html_select_options
Lukas Reschke [Thu, 28 Feb 2013 16:19:04 +0000 (17:19 +0100)]
Sanitize HTML in html_select_options

11 years agoCache: cleanup permissions cache when removing a file from the cache
Robin Appelman [Thu, 28 Feb 2013 16:04:50 +0000 (17:04 +0100)]
Cache: cleanup permissions cache when removing a file from the cache

11 years agoCache: add option to delete file from permissions cache for all users
Robin Appelman [Thu, 28 Feb 2013 16:04:34 +0000 (17:04 +0100)]
Cache: add option to delete file from permissions cache for all users

11 years agoMerge pull request #1987 from owncloud/fixinstalldeps
Bernhard Posselt [Thu, 28 Feb 2013 14:36:19 +0000 (06:36 -0800)]
Merge pull request #1987 from owncloud/fixinstalldeps

add checks for xml and dom when installing

11 years agoadd checks for xml and dom when installing
Bernhard Posselt [Thu, 28 Feb 2013 14:13:18 +0000 (15:13 +0100)]
add checks for xml and dom when installing

11 years agoMerge pull request #1397 from owncloud/trash_fileactions
Jan-Christoph Borchardt [Thu, 28 Feb 2013 13:43:51 +0000 (05:43 -0800)]
Merge pull request #1397 from owncloud/trash_fileactions

Enable fileactions while viewing trash

11 years agoTrash: fix opening folders
Robin Appelman [Thu, 28 Feb 2013 12:32:08 +0000 (13:32 +0100)]
Trash: fix opening folders

11 years agoMerge pull request #1985 from owncloud/sharing-more
Bernhard Posselt [Thu, 28 Feb 2013 11:44:51 +0000 (03:44 -0800)]
Merge pull request #1985 from owncloud/sharing-more

up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135

11 years agoup limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
Jan-Christoph Borchardt [Thu, 28 Feb 2013 11:07:50 +0000 (12:07 +0100)]
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135

11 years agoFix window.location mistakes in previous code
maelzx [Thu, 28 Feb 2013 03:26:42 +0000 (11:26 +0800)]
Fix window.location mistakes in previous code

Sorry guys, I commit the incomplete code. It should be window.location.assign(url);

However this is just tested in google chrome.

11 years agoMerge pull request #1973 from owncloud/share-improvements
Jan-Christoph Borchardt [Wed, 27 Feb 2013 23:07:07 +0000 (15:07 -0800)]
Merge pull request #1973 from owncloud/share-improvements

reduce minimum length for username suggestions in share dialog, fix #1666

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 27 Feb 2013 23:05:40 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years ago[Files] Use p() instead of echo
Lukas Reschke [Wed, 27 Feb 2013 20:14:15 +0000 (21:14 +0100)]
[Files] Use p() instead of echo

11 years agoMerge master
Lukas Reschke [Wed, 27 Feb 2013 22:36:52 +0000 (23:36 +0100)]
Merge master

11 years agoRemove uneeded OAuth files
Lukas Reschke [Wed, 27 Feb 2013 22:26:00 +0000 (23:26 +0100)]
Remove uneeded OAuth files

11 years agoTypo...
Lukas Reschke [Wed, 27 Feb 2013 22:19:38 +0000 (23:19 +0100)]
Typo...

11 years agoAdd a missing )
Lukas Reschke [Wed, 27 Feb 2013 22:15:18 +0000 (23:15 +0100)]
Add a missing )

11 years ago[core] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 21:55:39 +0000 (22:55 +0100)]
[core] From echo to p

11 years agoMerge pull request #1972 from owncloud/raw-pathinfo
Bernhard Posselt [Wed, 27 Feb 2013 21:43:47 +0000 (13:43 -0800)]
Merge pull request #1972 from owncloud/raw-pathinfo

Use the plain urlencoded path info for the routing matching

11 years agoRemove uneeded file
Lukas Reschke [Wed, 27 Feb 2013 21:35:37 +0000 (22:35 +0100)]
Remove uneeded file

11 years agoMerge pull request #1945 from owncloud/sqlite-query-cache
Bernhard Posselt [Wed, 27 Feb 2013 21:34:09 +0000 (13:34 -0800)]
Merge pull request #1945 from owncloud/sqlite-query-cache

Disable query cache for Sqlite

11 years agoDisable query cache for Sqlite
Bart Visscher [Tue, 26 Feb 2013 21:41:05 +0000 (22:41 +0100)]
Disable query cache for Sqlite

11 years ago[user_webdavauth] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 21:06:50 +0000 (22:06 +0100)]
[user_webdavauth] From echo to p

11 years ago[user_ldap] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 21:04:57 +0000 (22:04 +0100)]
[user_ldap] From echo to p

11 years ago[files_versions] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 20:50:22 +0000 (21:50 +0100)]
[files_versions] From echo to p

11 years agoMerge pull request #1944 from owncloud/query-caching-upgrade
Bernhard Posselt [Wed, 27 Feb 2013 20:48:42 +0000 (12:48 -0800)]
Merge pull request #1944 from owncloud/query-caching-upgrade

Disable prepared query caching while doing an upgrade

11 years ago[files_trashbin] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 20:46:37 +0000 (21:46 +0100)]
[files_trashbin] From echo to p

11 years ago[files] Unescape file size
Lukas Reschke [Wed, 27 Feb 2013 20:40:06 +0000 (21:40 +0100)]
[files] Unescape file size

11 years agoUse the plain urlencoded path info for the routing matching
Bart Visscher [Wed, 27 Feb 2013 20:38:58 +0000 (21:38 +0100)]
Use the plain urlencoded path info for the routing matching

11 years ago[files_sharing] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 20:37:14 +0000 (21:37 +0100)]
[files_sharing] From echo to p

11 years ago[files_external] From echo to p
Lukas Reschke [Wed, 27 Feb 2013 20:31:27 +0000 (21:31 +0100)]
[files_external] From echo to p

11 years agoMerge pull request #1969 from j-ed/master
icewind1991 [Wed, 27 Feb 2013 20:29:39 +0000 (12:29 -0800)]
Merge pull request #1969 from j-ed/master

OC5 beta 2 - prevent multiple slashes in a row when building URLs.

11 years ago[files_encryption] Use p() instead of echo()
Lukas Reschke [Wed, 27 Feb 2013 20:20:37 +0000 (21:20 +0100)]
[files_encryption] Use p() instead of echo()

11 years ago[Files] Use htmlspecialchars()
Lukas Reschke [Wed, 27 Feb 2013 20:19:11 +0000 (21:19 +0100)]
[Files] Use htmlspecialchars()

11 years ago[Files] Use p() instead of echo
Lukas Reschke [Wed, 27 Feb 2013 20:14:15 +0000 (21:14 +0100)]
[Files] Use p() instead of echo

11 years agoRemove the template autoescaping
Lukas Reschke [Wed, 27 Feb 2013 19:53:52 +0000 (20:53 +0100)]
Remove the template autoescaping

Ref #1963

11 years agoTrash: disable text editor from trash for now
Robin Appelman [Wed, 27 Feb 2013 19:37:50 +0000 (20:37 +0100)]
Trash: disable text editor from trash for now

11 years agoTrash: fix download.php
Robin Appelman [Wed, 27 Feb 2013 19:31:21 +0000 (20:31 +0100)]
Trash: fix download.php

11 years agoTrash: fix trash when default quota is used
Robin Appelman [Wed, 27 Feb 2013 19:29:49 +0000 (20:29 +0100)]
Trash: fix trash when default quota is used

11 years agoMerge master into trash_fileactions
Robin Appelman [Wed, 27 Feb 2013 19:29:19 +0000 (20:29 +0100)]
Merge master into trash_fileactions

11 years agoUpdate apps/files/templates/part.list.php
j-ed [Wed, 27 Feb 2013 18:09:37 +0000 (19:09 +0100)]
Update apps/files/templates/part.list.php

prevent multiple slashes in a row when building URLs.

11 years agoMerge pull request #1031 from owncloud/external_storage_ui_feedback
Michael Gapczynski [Wed, 27 Feb 2013 18:00:22 +0000 (10:00 -0800)]
Merge pull request #1031 from owncloud/external_storage_ui_feedback

External Storage UI Improvements

11 years agoMerge pull request #1967 from eMerzh/refix_1931
Thomas Müller [Wed, 27 Feb 2013 17:08:00 +0000 (09:08 -0800)]
Merge pull request #1967 from eMerzh/refix_1931

Refix #1931

11 years agoreduce minimum length for username suggestions in share dialog, fix #1666
Jan-Christoph Borchardt [Wed, 27 Feb 2013 16:57:40 +0000 (17:57 +0100)]
reduce minimum length for username suggestions in share dialog, fix #1666

11 years agoRefix #1931
Brice Maron [Wed, 27 Feb 2013 16:51:28 +0000 (17:51 +0100)]
Refix #1931

11 years agoMerge pull request #1964 from owncloud/versions_cleanup
Frank Karlitschek [Wed, 27 Feb 2013 15:12:50 +0000 (07:12 -0800)]
Merge pull request #1964 from owncloud/versions_cleanup

Versions cleanup

11 years agoMerge pull request #1962 from owncloud/big_upload_fix
Bernhard Posselt [Wed, 27 Feb 2013 15:05:19 +0000 (07:05 -0800)]
Merge pull request #1962 from owncloud/big_upload_fix

timeout after a longer time

11 years agoremove admin settings from app.php
Björn Schießle [Wed, 27 Feb 2013 14:53:08 +0000 (15:53 +0100)]
remove admin settings from app.php

11 years agoMerge branch 'master' into versions_cleanup
Björn Schießle [Wed, 27 Feb 2013 14:50:08 +0000 (15:50 +0100)]
Merge branch 'master' into versions_cleanup

11 years agorename History to Versions
Björn Schießle [Wed, 27 Feb 2013 14:46:49 +0000 (15:46 +0100)]
rename History to Versions

11 years agoremove admin settings for versions
Björn Schießle [Wed, 27 Feb 2013 14:44:02 +0000 (15:44 +0100)]
remove admin settings for versions

11 years agotimeout after a longer time
Bernhard Posselt [Wed, 27 Feb 2013 14:44:00 +0000 (15:44 +0100)]
timeout after a longer time

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 27 Feb 2013 13:37:12 +0000 (14:37 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1956 from owncloud/session-error-format
Bart Visscher [Wed, 27 Feb 2013 13:21:17 +0000 (05:21 -0800)]
Merge pull request #1956 from owncloud/session-error-format

add styles before session init

11 years agoMerge pull request #1961 from owncloud/trans_fix
Bart Visscher [Wed, 27 Feb 2013 13:17:30 +0000 (05:17 -0800)]
Merge pull request #1961 from owncloud/trans_fix

fixed bug that would cause a failure because of undefined variable  inst...

11 years agofixed bug that would cause a failure because of undefined variable instead of %s...
Bernhard Posselt [Wed, 27 Feb 2013 13:13:07 +0000 (14:13 +0100)]
fixed bug that would cause a failure because of undefined variable  instead of %s in a translation string

11 years agoMerge pull request #1953 from owncloud/escape_regular_expressions
Frank Karlitschek [Wed, 27 Feb 2013 12:29:17 +0000 (04:29 -0800)]
Merge pull request #1953 from owncloud/escape_regular_expressions

escape regular expressions; fix typo in variable name

11 years agoMerge pull request #1955 from owncloud/login-button-alignment
Bernhard Posselt [Wed, 27 Feb 2013 12:05:47 +0000 (04:05 -0800)]
Merge pull request #1955 from owncloud/login-button-alignment

quick fix for log in button not being aligned with input fields

11 years agoMerge pull request #1958 from owncloud/fixing-1933-master
Björn Schießle [Wed, 27 Feb 2013 11:15:03 +0000 (03:15 -0800)]
Merge pull request #1958 from owncloud/fixing-1933-master

the locale name is no longer part of the translation string

11 years agoMerge pull request #1957 from owncloud/fix-895
Bernhard Posselt [Wed, 27 Feb 2013 11:10:29 +0000 (03:10 -0800)]
Merge pull request #1957 from owncloud/fix-895

Fix 895

11 years agofixes 1933 - the locale name is no longer part of the translation string
Thomas Mueller [Wed, 27 Feb 2013 10:41:50 +0000 (11:41 +0100)]
fixes 1933 - the locale name is no longer part of the translation string

11 years agoMerge pull request #1948 from owncloud/improve_user_sorting
Bernhard Posselt [Wed, 27 Feb 2013 10:39:22 +0000 (02:39 -0800)]
Merge pull request #1948 from owncloud/improve_user_sorting

Sort after display name + LDAP server side sorting

11 years agoonly add style.css to initsession
Bernhard Posselt [Wed, 27 Feb 2013 10:36:05 +0000 (11:36 +0100)]
only add style.css to initsession

11 years agoMerge pull request #1905 from owncloud/fix-share-icons
Thomas Müller [Wed, 27 Feb 2013 10:31:52 +0000 (02:31 -0800)]
Merge pull request #1905 from owncloud/fix-share-icons

Fix adding share icons to share action

11 years agoproperly align triangle and unshare icons to text, also fixes line hopping
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:30:33 +0000 (11:30 +0100)]
properly align triangle and unshare icons to text, also fixes line hopping

11 years agofix ugly giant triangles
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:30:06 +0000 (11:30 +0100)]
fix ugly giant triangles

11 years agofix shared by text going out of box, fix #895
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:22:13 +0000 (11:22 +0100)]
fix shared by text going out of box, fix #895

11 years agoMerge pull request #1800 from raghunayyar/sharing-dropdown-fixes
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:19:35 +0000 (02:19 -0800)]
Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes

Various Layout Fixes for Sharing Dropdown.

11 years agoadd css and scripts before session init
Bernhard Posselt [Wed, 27 Feb 2013 10:17:14 +0000 (11:17 +0100)]
add css and scripts before session init

11 years agoquick fix for log in button not being aligned with input fields
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:04:08 +0000 (11:04 +0100)]
quick fix for log in button not being aligned with input fields