]>
source.dussan.org Git - nextcloud-server.git/log
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
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
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
Jenkins for ownCloud [Wed, 27 Feb 2013 23:05:40 +0000 (00:05 +0100)]
[tx-robot] updated from transifex
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
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
Bart Visscher [Tue, 26 Feb 2013 21:41:05 +0000 (22:41 +0100)]
Disable query cache for Sqlite
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
Bart Visscher [Wed, 27 Feb 2013 20:38:58 +0000 (21:38 +0100)]
Use the plain urlencoded path info for the routing matching
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.
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.
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
Thomas Müller [Wed, 27 Feb 2013 17:08:00 +0000 (09:08 -0800)]
Merge pull request #1967 from eMerzh/refix_1931
Refix #1931
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
Brice Maron [Wed, 27 Feb 2013 16:51:28 +0000 (17:51 +0100)]
Refix #1931
Frank Karlitschek [Wed, 27 Feb 2013 15:12:50 +0000 (07:12 -0800)]
Merge pull request #1964 from owncloud/versions_cleanup
Versions cleanup
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
Björn Schießle [Wed, 27 Feb 2013 14:53:08 +0000 (15:53 +0100)]
remove admin settings from app.php
Björn Schießle [Wed, 27 Feb 2013 14:50:08 +0000 (15:50 +0100)]
Merge branch 'master' into versions_cleanup
Björn Schießle [Wed, 27 Feb 2013 14:46:49 +0000 (15:46 +0100)]
rename History to Versions
Björn Schießle [Wed, 27 Feb 2013 14:44:02 +0000 (15:44 +0100)]
remove admin settings for versions
Bernhard Posselt [Wed, 27 Feb 2013 14:44:00 +0000 (15:44 +0100)]
timeout after a longer time
Jenkins for ownCloud [Wed, 27 Feb 2013 13:37:12 +0000 (14:37 +0100)]
[tx-robot] updated from transifex
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
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...
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
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
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
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
Bernhard Posselt [Wed, 27 Feb 2013 11:10:29 +0000 (03:10 -0800)]
Merge pull request #1957 from owncloud/fix-895
Fix 895
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
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
Bernhard Posselt [Wed, 27 Feb 2013 10:36:05 +0000 (11:36 +0100)]
only add style.css to initsession
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
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
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:30:06 +0000 (11:30 +0100)]
fix ugly giant triangles
Jan-Christoph Borchardt [Wed, 27 Feb 2013 10:22:13 +0000 (11:22 +0100)]
fix shared by text going out of box, fix #895
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.
Bernhard Posselt [Wed, 27 Feb 2013 10:17:14 +0000 (11:17 +0100)]
add css and scripts before session init
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
Björn Schießle [Wed, 27 Feb 2013 09:51:32 +0000 (10:51 +0100)]
escape regular expressions; fix typo in variable name
Michael Gapczynski [Wed, 27 Feb 2013 00:14:45 +0000 (16:14 -0800)]
Merge pull request #1949 from owncloud/fix-dropbox
Fix undefined root parameter in Dropbox storage
Jenkins for ownCloud [Tue, 26 Feb 2013 23:09:33 +0000 (00:09 +0100)]
[tx-robot] updated from transifex
Michael Gapczynski [Tue, 26 Feb 2013 22:52:06 +0000 (17:52 -0500)]
Fix undefined root parameter in Dropbox storage
Arthur Schiwon [Tue, 26 Feb 2013 21:56:55 +0000 (22:56 +0100)]
sort users according to display name
Robin Appelman [Tue, 26 Feb 2013 21:41:48 +0000 (22:41 +0100)]
Disable prepared query caching while doing an upgrade
Arthur Schiwon [Tue, 26 Feb 2013 21:27:09 +0000 (22:27 +0100)]
LDAP: sort users on server-side
Thomas Müller [Tue, 26 Feb 2013 20:40:12 +0000 (12:40 -0800)]
Merge pull request #1931 from owncloud/fastcgi
add cgi pathinfo when fcgi is enabled #1189
Thomas Müller [Tue, 26 Feb 2013 20:37:23 +0000 (12:37 -0800)]
Merge pull request #1942 from owncloud/fix-1925-wrong-quotes
Fix using wrong quotes for breaking long lines
Thomas Müller [Tue, 26 Feb 2013 20:34:12 +0000 (12:34 -0800)]
Merge pull request #1929 from owncloud/htaccess-utf8
added defaultcharset to utf-8 in htaccess
Bart Visscher [Tue, 26 Feb 2013 19:49:59 +0000 (11:49 -0800)]
Merge pull request #1941 from owncloud/session_heartbeat
generate url only once for heartbeat
Bart Visscher [Tue, 26 Feb 2013 19:48:01 +0000 (20:48 +0100)]
Fix using wrong quotes for breaking long lines
Fixes #1925
Bernhard Posselt [Tue, 26 Feb 2013 19:45:25 +0000 (20:45 +0100)]
generate url only once
Lukas Reschke [Tue, 26 Feb 2013 19:28:15 +0000 (11:28 -0800)]
Merge pull request #1939 from owncloud/session_heartbeat
use 15 min instead of 15 sec timeout
Bernhard Posselt [Tue, 26 Feb 2013 19:25:07 +0000 (20:25 +0100)]
use 15 min instead of 15 sec timeout
Frank Karlitschek [Tue, 26 Feb 2013 19:02:09 +0000 (11:02 -0800)]
Merge pull request #1938 from owncloud/session_heartbeat
implemented a heartbeat request which is calls the server every 15 minut...
Bernhard Posselt [Tue, 26 Feb 2013 18:34:46 +0000 (19:34 +0100)]
implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout
Jan-Christoph Borchardt [Tue, 26 Feb 2013 17:49:20 +0000 (18:49 +0100)]
remove general CSS from IE specific rules, displays Shared state permanently again
Bernhard Posselt [Tue, 26 Feb 2013 17:00:07 +0000 (18:00 +0100)]
add cgi pathinfo when fcgi is enabled #1189
Bernhard Posselt [Tue, 26 Feb 2013 16:38:59 +0000 (17:38 +0100)]
added defaultcharset to utf-8 in htaccess
Lukas Reschke [Tue, 26 Feb 2013 15:34:46 +0000 (07:34 -0800)]
Merge pull request #1920 from owncloud/catch_vcategories_exceptions
Catch exceptions on malformed categories.
Thomas Müller [Tue, 26 Feb 2013 15:33:15 +0000 (07:33 -0800)]
Merge pull request #1922 from owncloud/missing_
Add missing echo
Lukas Reschke [Tue, 26 Feb 2013 15:10:52 +0000 (16:10 +0100)]
Add missing echo
Frank Karlitschek [Tue, 26 Feb 2013 14:20:58 +0000 (06:20 -0800)]
Merge pull request #1915 from owncloud/fix_webdav_mount
cleanPath needs to be public
Frank Karlitschek [Tue, 26 Feb 2013 14:16:42 +0000 (06:16 -0800)]
Merge pull request #1919 from owncloud/logo-pixelperfect
Logo pixel perfect
Thomas Tanghus [Tue, 26 Feb 2013 14:01:42 +0000 (15:01 +0100)]
Catch exceptions on malformed categories.
Jan-Christoph Borchardt [Tue, 26 Feb 2013 13:28:17 +0000 (14:28 +0100)]
remove more unused logo files, now in promo
Jan-Christoph Borchardt [Tue, 26 Feb 2013 13:27:29 +0000 (14:27 +0100)]
align logo type pixel perfectly
Björn Schießle [Tue, 26 Feb 2013 11:24:52 +0000 (12:24 +0100)]
cleanPath needs to be public
Frank Karlitschek [Tue, 26 Feb 2013 08:58:12 +0000 (00:58 -0800)]
Merge pull request #1902 from owncloud/angularcsp
add CSP turned on for angularjs
Bernhard Posselt [Tue, 26 Feb 2013 08:44:42 +0000 (00:44 -0800)]
Merge pull request #1906 from owncloud/storage-stat-fail
Common storage: don't throw warning when a stat fails
Bernhard Posselt [Tue, 26 Feb 2013 08:37:11 +0000 (00:37 -0800)]
Merge pull request #1903 from owncloud/fix_version_check
return true once one owncloud version number is bigger at any position
Frank Karlitschek [Tue, 26 Feb 2013 08:19:42 +0000 (00:19 -0800)]
Merge pull request #1885 from houqp/issue_1776
when user changes displayName, also update it on expand button
Robin Appelman [Tue, 26 Feb 2013 01:53:02 +0000 (02:53 +0100)]
Storage: don't throw warnings when a stat fails
Michael Gapczynski [Tue, 26 Feb 2013 01:52:01 +0000 (20:52 -0500)]
Move space
Robin Appelman [Tue, 26 Feb 2013 01:51:57 +0000 (02:51 +0100)]
Code style
Michael Gapczynski [Tue, 26 Feb 2013 01:20:29 +0000 (20:20 -0500)]
Fix adding share icons to share action
Michael Gapczynski [Tue, 26 Feb 2013 00:45:01 +0000 (19:45 -0500)]
Fix Dropbox and Google ui
Jenkins for ownCloud [Mon, 25 Feb 2013 23:06:26 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Michael Gapczynski [Mon, 25 Feb 2013 22:56:40 +0000 (17:56 -0500)]
Merge branch 'master' into external_storage_ui_feedback
Qingping Hou [Mon, 25 Feb 2013 22:22:04 +0000 (17:22 -0500)]
remove Gwr
Qingping Hou [Mon, 25 Feb 2013 22:18:20 +0000 (17:18 -0500)]
use text method instead of html method
Qingping Hou [Mon, 25 Feb 2013 22:16:03 +0000 (17:16 -0500)]
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
Bernhard Posselt [Mon, 25 Feb 2013 22:06:26 +0000 (23:06 +0100)]
return true once one owncloud version number is bigger at any position
Lukas Reschke [Mon, 25 Feb 2013 22:00:12 +0000 (14:00 -0800)]
Merge pull request #1898 from owncloud/session_start_fix
set http 500 when session could not be started to prevent serving of emp...
Bernhard Posselt [Mon, 25 Feb 2013 21:54:05 +0000 (22:54 +0100)]
add CSP turned on for angularjs
Lukas Reschke [Mon, 25 Feb 2013 21:41:32 +0000 (13:41 -0800)]
Merge pull request #1837 from owncloud/fix-user-template
Remove unneeded code for user layout template
Lukas Reschke [Mon, 25 Feb 2013 20:53:23 +0000 (12:53 -0800)]
Merge pull request #1839 from owncloud/no_recursive_object_walking
Don't walk objects with array_walk_recursive()
Thomas Müller [Mon, 25 Feb 2013 20:50:32 +0000 (12:50 -0800)]
Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
Qingping Hou [Mon, 25 Feb 2013 20:40:57 +0000 (15:40 -0500)]
add span tag to displayname on expand button
Frank Karlitschek [Mon, 25 Feb 2013 19:00:40 +0000 (20:00 +0100)]
5 beta 2
Bernhard Posselt [Mon, 25 Feb 2013 18:17:29 +0000 (19:17 +0100)]
use error template
Frank Karlitschek [Mon, 25 Feb 2013 17:48:25 +0000 (09:48 -0800)]
Merge pull request #1894 from owncloud/texfix
fixed bug that prevented a newly created file to be opened with register...
Bernhard Posselt [Mon, 25 Feb 2013 17:47:34 +0000 (18:47 +0100)]
added simple error message for the browser
Bernhard Posselt [Mon, 25 Feb 2013 17:42:09 +0000 (18:42 +0100)]
write an error log when session could not be initialized
Bernhard Posselt [Mon, 25 Feb 2013 17:37:05 +0000 (18:37 +0100)]
set http 500 when session could not be started to prevent serving of empty files see #1049
Bernhard Posselt [Mon, 25 Feb 2013 16:50:17 +0000 (17:50 +0100)]
fixed bug that prevented a newly created file to be opened with registered files actions
Bernhard Posselt [Mon, 25 Feb 2013 16:27:20 +0000 (08:27 -0800)]
Merge pull request #1891 from owncloud/set_timeout
use a 5 sec timeout for the webdav check
Frank Karlitschek [Mon, 25 Feb 2013 16:23:32 +0000 (08:23 -0800)]
Merge pull request #1864 from owncloud/fix_display_default
LDAP: simplify default for user home settings, fixes wrong display of de...
Björn Schießle [Mon, 25 Feb 2013 15:59:09 +0000 (07:59 -0800)]
Merge pull request #1890 from owncloud/trashbin_fix
fix quota calculation for trash bin and versions