357fdb1a4d
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.
2014-02-28 11:59:30 +01:00
61bc76fdd6
Merge pull request #7454 from owncloud/enc_remember_fopen_mode
...
[enc] remember original fopen access type in pre-proxy
2014-02-28 09:57:58 +01:00
fefd724858
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
2014-02-27 23:53:29 +01:00
93b8aba3a1
Merge pull request #7439 from owncloud/unit-test-for-7430
...
adding test for migrations on columns using keywords
2014-02-27 21:52:46 +01:00
e304809612
Merge pull request #7382 from jbtbnl/master
...
Remove necessity of icon class
2014-02-27 21:11:26 +05:30
7af846e656
Merge pull request #7452 from owncloud/icon-delete-hover
...
icons: automatically show delete hover instead of using explicit class
2014-02-27 14:44:29 +01:00
4ace1a273d
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
2014-02-27 14:16:03 +01:00
ba4b593f84
Merge pull request #7446 from owncloud/etag_assert_fixes
...
use assertSame and assertNotSame for etag checks
2014-02-27 13:51:14 +01:00
f62b8a7896
Merge pull request #7451 from owncloud/fix-jshint
...
rename config to camelcase
2014-02-27 13:37:18 +01:00
6fe1cf7ae4
Merge pull request #7449 from owncloud/remove-input-border
...
remove border from log in input fields, simpler and works better with themes
2014-02-27 13:24:44 +01:00
58bc6aee51
icons: automatically show delete hover instead of using explicit class
2014-02-27 12:48:25 +01:00
2ba6cd4e2b
initialize etags of temporary storage
2014-02-27 12:44:07 +01:00
832f6e4e42
Merge pull request #7450 from owncloud/rename-advanced
...
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
2014-02-27 16:56:28 +05:30
af467d92f6
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
2014-02-27 12:24:14 +01:00
a5a671392c
rename config to camelcase
2014-02-27 12:16:58 +01:00
f0cd08ab5d
remove border from log in input fields, simpler and works better with themes
2014-02-27 12:13:09 +01:00
577e47e207
Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all
...
close encryption session after decryption was finished
2014-02-27 11:10:45 +01:00
131c12ad8d
use assertInternalType for typechecking
2014-02-27 09:51:26 +01:00
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
22adc397de
Also quote old column name during DB migration
...
This fixes alter table commands that didn't quote the old column name
2014-02-27 09:09:16 +01:00
9e59e64c79
Merge pull request #7421 from owncloud/password-input
...
disable autocomplete for shared link password input, fix #7419
2014-02-26 22:21:00 +01:00
d4f15853e8
Merge pull request #7425 from owncloud/issue/7423
...
Translate string when an error occured while sending a forgot password mail
2014-02-26 22:19:57 +01:00
230e5e3788
let's name the column 'select' because this is a keyword on all platforms
2014-02-26 20:47:07 +01:00
459b5086d5
adding test for migrations on columns using keywords
2014-02-26 20:42:45 +01:00
922c1909f8
Translate string when an error occured while sending a forgot password mail
...
Fix #7423
2014-02-26 17:29:47 +01:00
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
7f05c23231
Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
...
- removed slash-adding for logout-header-redirect
2014-02-26 16:05:09 +01:00
b7385986ae
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
2014-02-26 15:19:30 +01:00
6c5cc46380
disable autocomplete for shared link password input, fix #7419
2014-02-26 14:48:15 +01:00
2f0db9af07
Merge pull request #7409 from owncloud/issue/5361
...
Add owncloud version to JS scope
2014-02-26 14:44:12 +01:00
4b8717df9d
Merge pull request #7416 from owncloud/share_api_7311
...
[share api] only add "received_from" field if a share was found
2014-02-26 14:42:31 +01:00
d9a153dbe9
Merge pull request #7174 from owncloud/issue/7166
...
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
84eea47991
Merge pull request #7406 from owncloud/settings-apps.js-style
...
coding style fixes: cut long lines, whitespace
2014-02-26 14:24:34 +01:00
beff83feb2
Merge pull request #7410 from owncloud/scrutinizer_fix_kondou
...
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 13:50:31 +01:00
901afbd4cf
Merge pull request #7414 from owncloud/fix-3rdparty-submodule
...
Update 3rdparty submodule
2014-02-26 13:42:36 +01:00
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
3be5e48b0c
only add "received_from" if a share was found
2014-02-26 12:52:35 +01:00
df1a5a2dfa
Update 3rdparty submodule
2014-02-26 12:22:21 +01:00
59df3ffdf4
Merge pull request #7279 from owncloud/folderid-reuse
...
Reuse the folder id in View->getFolderContents
2014-02-26 12:18:34 +01:00
8759c35e74
Merge pull request #7399 from owncloud/themable-doc-links
...
introduce new theme function to allow full creation of documentation lin...
2014-02-26 12:04:52 +01:00
cb14b1c58d
Add owncloud version to JS scope
...
Fix #5361
2014-02-26 11:50:52 +01:00
593adab258
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 11:41:32 +01:00
37a2f8c6cb
Merge pull request #7405 from owncloud/files-admin.js-style
...
coding style fixes, cut long lines, comments not on same lines, curly braces
2014-02-26 11:10:05 +01:00
a1600a289c
Merge pull request #7401 from owncloud/highlight_selected_app_settings
...
Highlight the selected app in app-settings
2014-02-26 11:07:43 +01:00
bc1c136cd6
coding style fixes: cut long lines, whitespace
2014-02-26 10:34:38 +01:00
331bd527a7
Hide SMTP options based on selected send mode
...
Fix #7166
2014-02-26 10:30:22 +01:00
5c98e0c7c7
Merge pull request #7328 from owncloud/McNetic-zipstreamer
...
McNetic zipstreamer
2014-02-26 10:19:12 +01:00
2b423e5a44
coding style fixes, cut long lines, comments not on same lines, curly braces
2014-02-26 10:16:54 +01:00
1a561fced0
fix for coding style
2014-02-26 09:32:20 +01:00
e32acf933d
Highlight the selected app in app-settings
2014-02-26 04:03:41 +01:00
Lukas Reschke
Björn Schießle
Vincent Petry
Thomas Müller
Raghu Nayyar
Morris Jobke
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Joas Schilling
Bart Visscher
icewind1991
kondou