]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Fri, 28 Feb 2014 12:35:53 +0000 (13:35 +0100)]
A version bump is not necessary here
Lukas Reschke [Fri, 28 Feb 2014 12:32:09 +0000 (13:32 +0100)]
Typo + use regular assignment
Lukas Reschke [Fri, 28 Feb 2014 10:59:30 +0000 (11:59 +0100)]
Remove .htaccess creation code
1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document.
2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.
Björn Schießle [Fri, 28 Feb 2014 08:57:58 +0000 (09:57 +0100)]
Merge pull request #7454 from owncloud/enc_remember_fopen_mode
[enc] remember original fopen access type in pre-proxy
Vincent Petry [Thu, 27 Feb 2014 18:50:16 +0000 (19:50 +0100)]
Fixed wrong field name
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.
Fixes #7467
Thomas Müller [Thu, 27 Feb 2014 20:52:46 +0000 (21:52 +0100)]
Merge pull request #7439 from owncloud/unit-test-for-7430
adding test for migrations on columns using keywords
Raghu Nayyar [Thu, 27 Feb 2014 15:41:26 +0000 (21:11 +0530)]
Merge pull request #7382 from jbtbnl/master
Remove necessity of icon class
Morris Jobke [Thu, 27 Feb 2014 13:44:29 +0000 (14:44 +0100)]
Merge pull request #7452 from owncloud/icon-delete-hover
icons: automatically show delete hover instead of using explicit class
Bjoern Schiessle [Thu, 27 Feb 2014 12:58:51 +0000 (13:58 +0100)]
remember original fopen access type in pre-proxy because sometimes they change
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
Thomas Müller [Thu, 27 Feb 2014 12:51:14 +0000 (13:51 +0100)]
Merge pull request #7446 from owncloud/etag_assert_fixes
use assertSame and assertNotSame for etag checks
Thomas Müller [Thu, 27 Feb 2014 12:37:18 +0000 (13:37 +0100)]
Merge pull request #7451 from owncloud/fix-jshint
rename config to camelcase
Morris Jobke [Thu, 27 Feb 2014 12:24:44 +0000 (13:24 +0100)]
Merge pull request #7449 from owncloud/remove-input-border
remove border from log in input fields, simpler and works better with themes
Jan-Christoph Borchardt [Thu, 27 Feb 2014 11:48:25 +0000 (12:48 +0100)]
icons: automatically show delete hover instead of using explicit class
Jörn Friedrich Dreyer [Thu, 27 Feb 2014 11:42:53 +0000 (12:42 +0100)]
initialize etags of temporary storage
Raghu Nayyar [Thu, 27 Feb 2014 11:26:28 +0000 (16:56 +0530)]
Merge pull request #7450 from owncloud/rename-advanced
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
Jan-Christoph Borchardt [Thu, 27 Feb 2014 11:21:05 +0000 (12:21 +0100)]
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
Thomas Müller [Thu, 27 Feb 2014 11:16:58 +0000 (12:16 +0100)]
rename config to camelcase
Jan-Christoph Borchardt [Thu, 27 Feb 2014 11:13:09 +0000 (12:13 +0100)]
remove border from log in input fields, simpler and works better with themes
Vincent Petry [Thu, 27 Feb 2014 10:10:45 +0000 (11:10 +0100)]
Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all
close encryption session after decryption was finished
Jörn Friedrich Dreyer [Thu, 27 Feb 2014 08:51:26 +0000 (09:51 +0100)]
use assertInternalType for typechecking
Jörn Friedrich Dreyer [Thu, 27 Feb 2014 08:39:34 +0000 (09:39 +0100)]
use assertSame and assertNotSame for etag checks
Vincent Petry [Wed, 26 Feb 2014 15:26:16 +0000 (16:26 +0100)]
Also quote old column name during DB migration
This fixes alter table commands that didn't quote the old column name
Thomas Müller [Wed, 26 Feb 2014 21:21:00 +0000 (22:21 +0100)]
Merge pull request #7421 from owncloud/password-input
disable autocomplete for shared link password input, fix #7419
Thomas Müller [Wed, 26 Feb 2014 21:19:57 +0000 (22:19 +0100)]
Merge pull request #7425 from owncloud/issue/7423
Translate string when an error occured while sending a forgot password mail
Thomas Müller [Wed, 26 Feb 2014 19:47:07 +0000 (20:47 +0100)]
let's name the column 'select' because this is a keyword on all platforms
Thomas Müller [Wed, 26 Feb 2014 19:42:45 +0000 (20:42 +0100)]
adding test for migrations on columns using keywords
Joas Schilling [Wed, 26 Feb 2014 14:19:42 +0000 (15:19 +0100)]
Translate string when an error occured while sending a forgot password mail
Fix #7423
Bjoern Schiessle [Wed, 26 Feb 2014 16:18:38 +0000 (17:18 +0100)]
close encryption session after decryption was finished
Bart Visscher [Wed, 26 Feb 2014 15:05:09 +0000 (16:05 +0100)]
Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
- removed slash-adding for logout-header-redirect
Björn Schießle [Wed, 26 Feb 2014 14:19:30 +0000 (15:19 +0100)]
Merge pull request #7393 from owncloud/fix_path_in_sharing_results
fix path in sharing results if it is a file in the Shared folder
Jan-Christoph Borchardt [Wed, 26 Feb 2014 13:48:15 +0000 (14:48 +0100)]
disable autocomplete for shared link password input, fix #7419
Thomas Müller [Wed, 26 Feb 2014 13:44:12 +0000 (14:44 +0100)]
Merge pull request #7409 from owncloud/issue/5361
Add owncloud version to JS scope
Thomas Müller [Wed, 26 Feb 2014 13:42:31 +0000 (14:42 +0100)]
Merge pull request #7416 from owncloud/share_api_7311
[share api] only add "received_from" field if a share was found
Jan-Christoph Borchardt [Wed, 26 Feb 2014 13:41:07 +0000 (14:41 +0100)]
Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
Jan-Christoph Borchardt [Wed, 26 Feb 2014 13:24:34 +0000 (14:24 +0100)]
Merge pull request #7406 from owncloud/settings-apps.js-style
coding style fixes: cut long lines, whitespace
Morris Jobke [Wed, 26 Feb 2014 12:50:31 +0000 (13:50 +0100)]
Merge pull request #7410 from owncloud/scrutinizer_fix_kondou
Fix scrutinizer issue in settings/js/apps.js
Thomas Müller [Wed, 26 Feb 2014 12:42:36 +0000 (13:42 +0100)]
Merge pull request #7414 from owncloud/fix-3rdparty-submodule
Update 3rdparty submodule
Joas Schilling [Wed, 26 Feb 2014 12:10:46 +0000 (13:10 +0100)]
Remove unused variables, add doc blocks and break lines
Fix #7166
Bjoern Schiessle [Wed, 26 Feb 2014 11:52:35 +0000 (12:52 +0100)]
only add "received_from" if a share was found
Thomas Müller [Wed, 26 Feb 2014 11:22:21 +0000 (12:22 +0100)]
Update 3rdparty submodule
icewind1991 [Wed, 26 Feb 2014 11:18:34 +0000 (12:18 +0100)]
Merge pull request #7279 from owncloud/folderid-reuse
Reuse the folder id in View->getFolderContents
Jan-Christoph Borchardt [Wed, 26 Feb 2014 11:04:52 +0000 (12:04 +0100)]
Merge pull request #7399 from owncloud/themable-doc-links
introduce new theme function to allow full creation of documentation lin...
Joas Schilling [Wed, 26 Feb 2014 10:40:41 +0000 (11:40 +0100)]
Add owncloud version to JS scope
Fix #5361
kondou [Wed, 26 Feb 2014 10:41:32 +0000 (11:41 +0100)]
Fix scrutinizer issue in settings/js/apps.js
Vincent Petry [Wed, 26 Feb 2014 10:10:05 +0000 (11:10 +0100)]
Merge pull request #7405 from owncloud/files-admin.js-style
coding style fixes, cut long lines, comments not on same lines, curly braces
Vincent Petry [Wed, 26 Feb 2014 10:07:43 +0000 (11:07 +0100)]
Merge pull request #7401 from owncloud/highlight_selected_app_settings
Highlight the selected app in app-settings
Jan-Christoph Borchardt [Wed, 26 Feb 2014 09:34:38 +0000 (10:34 +0100)]
coding style fixes: cut long lines, whitespace
Joas Schilling [Wed, 19 Feb 2014 16:42:05 +0000 (17:42 +0100)]
Hide SMTP options based on selected send mode
Fix #7166
Vincent Petry [Wed, 26 Feb 2014 09:19:12 +0000 (10:19 +0100)]
Merge pull request #7328 from owncloud/McNetic-zipstreamer
McNetic zipstreamer
Jan-Christoph Borchardt [Wed, 26 Feb 2014 09:16:54 +0000 (10:16 +0100)]
coding style fixes, cut long lines, comments not on same lines, curly braces
Jan-Christoph Borchardt [Wed, 26 Feb 2014 08:32:20 +0000 (09:32 +0100)]
fix for coding style
kondou [Wed, 26 Feb 2014 03:03:41 +0000 (04:03 +0100)]
Highlight the selected app in app-settings
Thomas Müller [Tue, 25 Feb 2014 22:06:23 +0000 (23:06 +0100)]
introduce new theme function to allow full creation of documentation links: buildDocLinkToKey()
Bjoern Schiessle [Tue, 25 Feb 2014 14:28:21 +0000 (15:28 +0100)]
fix path in sharing results if it is a file in the Shared folder
Vincent Petry [Tue, 25 Feb 2014 14:27:47 +0000 (15:27 +0100)]
Merge pull request #7335 from owncloud/fix-7333
Fix code to search for mount.json in custom data folders
Vincent Petry [Tue, 25 Feb 2014 13:52:21 +0000 (14:52 +0100)]
Merge pull request #7371 from owncloud/core-storagemovedeleteall
Replace deleteAll call with unlink call on rename
VicDeo [Tue, 25 Feb 2014 13:41:10 +0000 (15:41 +0200)]
Merge pull request #6299 from leo-b/ldap_nested_groups
Add LDAP nested groups
Björn Schießle [Tue, 25 Feb 2014 11:34:49 +0000 (12:34 +0100)]
Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
[encryption] don't overwrite keys if rename was done by a stream copy
Vincent Petry [Tue, 25 Feb 2014 10:22:53 +0000 (11:22 +0100)]
Fix case where port is missing
Forward port of
6d3b5b24fd4f82c1cbfbc4cade5246a0335f8dda to master
jbtbnl [Mon, 24 Feb 2014 21:37:19 +0000 (22:37 +0100)]
Remove necessity of icon class
Only the icon specific class is needed
Bjoern Schiessle [Mon, 24 Feb 2014 15:33:57 +0000 (16:33 +0100)]
add test case if a file gets moved out from the shared folder
Bjoern Schiessle [Mon, 24 Feb 2014 12:56:53 +0000 (13:56 +0100)]
don't overwrite keys if rename was done by a stream copy
Morris Jobke [Mon, 24 Feb 2014 13:12:10 +0000 (14:12 +0100)]
Merge pull request #7285 from owncloud/mimeicons-svg
Show svg mime icons when no preview is available
Morris Jobke [Mon, 24 Feb 2014 12:34:07 +0000 (13:34 +0100)]
Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
Update page title when navigating through directories (local)
icewind1991 [Mon, 24 Feb 2014 12:29:54 +0000 (13:29 +0100)]
Merge pull request #7344 from owncloud/add-js-config-vars
Allow apps to add/modify config js output via hook.
Robin Appelman [Mon, 24 Feb 2014 12:24:10 +0000 (13:24 +0100)]
rename url parameter
Thomas Müller [Mon, 24 Feb 2014 11:53:55 +0000 (12:53 +0100)]
Merge branch 'master' into McNetic-zipstreamer
Conflicts:
3rdparty
Vincent Petry [Mon, 24 Feb 2014 11:21:48 +0000 (12:21 +0100)]
Removed unused deleteAll method on Common storage class
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
Vincent Petry [Mon, 24 Feb 2014 11:20:11 +0000 (12:20 +0100)]
Replace deleteAll call with unlink call
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
Vincent Petry [Mon, 24 Feb 2014 09:35:24 +0000 (10:35 +0100)]
Fixed mount config path
Vincent Petry [Mon, 24 Feb 2014 08:45:02 +0000 (09:45 +0100)]
Added oc_defaults stub in specHelper.js
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
Lukas Reschke [Sat, 22 Feb 2014 07:10:31 +0000 (08:10 +0100)]
Merge pull request #7305 from owncloud/extstorage-configclass
Added extra checks for ext storage class
Lukas Reschke [Sat, 22 Feb 2014 06:35:56 +0000 (07:35 +0100)]
Merge pull request #7259 from owncloud/overwritehost-always
Add overwritehost config on setup and upgrade
Morris Jobke [Fri, 21 Feb 2014 19:37:10 +0000 (20:37 +0100)]
Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
No css js delivery via php
Morris Jobke [Fri, 21 Feb 2014 16:31:24 +0000 (17:31 +0100)]
update 3rdparty submodule to current master
root [Fri, 21 Feb 2014 16:09:36 +0000 (17:09 +0100)]
replace spaces with tabs
use true instead of 1
Vincent Petry [Fri, 21 Feb 2014 16:01:00 +0000 (17:01 +0100)]
Merge pull request #7358 from owncloud/xmlfix-3rdparty
Updated submodule to include XML processing fixes
icewind1991 [Fri, 21 Feb 2014 15:18:43 +0000 (16:18 +0100)]
Merge pull request #7355 from owncloud/new-menu-svg
Use SVG icons in New file menu
Robin Appelman [Fri, 21 Feb 2014 15:07:21 +0000 (16:07 +0100)]
Merge branch 'master' into add-js-config-vars
Robin Appelman [Fri, 21 Feb 2014 15:04:31 +0000 (16:04 +0100)]
Merge branch 'master' into GuillaumeAmat-patch-1
Robin Appelman [Fri, 21 Feb 2014 14:51:41 +0000 (15:51 +0100)]
Merge branch 'master' into extstorage-configclass
icewind1991 [Fri, 21 Feb 2014 14:39:09 +0000 (15:39 +0100)]
Merge pull request #7088 from owncloud/sharing-userspathbug
Fix usersPath bug
Robin Appelman [Fri, 21 Feb 2014 14:36:24 +0000 (15:36 +0100)]
Remove fileid parameter for getFolderContent
Robin Appelman [Fri, 21 Feb 2014 14:35:12 +0000 (15:35 +0100)]
Split getFolderContentById
Morris Jobke [Fri, 21 Feb 2014 14:33:13 +0000 (15:33 +0100)]
Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
fix thumbnail generation for subdirectories in the conflicts dialog
Robin Appelman [Fri, 21 Feb 2014 14:33:12 +0000 (15:33 +0100)]
Merge branch 'master' into folderid-reuse
Lukas Reschke [Tue, 18 Feb 2014 15:26:37 +0000 (16:26 +0100)]
Add overwritehost config on setup and upgrade
icewind1991 [Fri, 21 Feb 2014 14:13:20 +0000 (15:13 +0100)]
Merge pull request #7336 from owncloud/IE-wipho-viewport
fix viewport size on windows phone
Vincent Petry [Fri, 21 Feb 2014 14:12:15 +0000 (15:12 +0100)]
Updated submodule to include XML processing fixes
Björn Schießle [Fri, 21 Feb 2014 13:24:51 +0000 (14:24 +0100)]
Merge pull request #7292 from owncloud/sharing_tests
fix sharing unit tests
Jan-Christoph Borchardt [Fri, 21 Feb 2014 13:10:13 +0000 (14:10 +0100)]
fix too much distance between text and icon
Jan-Christoph Borchardt [Fri, 21 Feb 2014 13:07:25 +0000 (14:07 +0100)]
use SVG icons from icons.css for New file menu
Robin Appelman [Fri, 21 Feb 2014 13:06:15 +0000 (14:06 +0100)]
Add url parameter to control whether previews should return 404 when the mimetype is unsupported
Jörn Friedrich Dreyer [Fri, 21 Feb 2014 10:18:23 +0000 (11:18 +0100)]
use directory from original instead of current dir
Thomas Müller [Fri, 21 Feb 2014 13:01:24 +0000 (14:01 +0100)]
Merge branch 'master' into no-css-js-delivery-via-php
Robin Appelman [Fri, 21 Feb 2014 13:00:17 +0000 (14:00 +0100)]
Merge branch 'master' into mimeicons-svg
Thomas Müller [Fri, 21 Feb 2014 12:58:23 +0000 (13:58 +0100)]
Merge pull request #7350 from owncloud/config-gitignore
ignore optional additional config files
Thomas Müller [Fri, 21 Feb 2014 12:57:18 +0000 (13:57 +0100)]
Merge branch 'master' into McNetic-zipstreamer
Björn Schießle [Fri, 21 Feb 2014 12:45:49 +0000 (13:45 +0100)]
Merge pull request #7337 from owncloud/test_for_6935
add unit test for \OC\URLGenerator::getAbsoluteURL
Robin Appelman [Fri, 21 Feb 2014 12:43:15 +0000 (13:43 +0100)]
Merge branch 'master' into sharing-userspathbug