mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,432 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

16432 Commits

Author SHA1 Message Date
Thomas Müller 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
Raghu Nayyar e304809612 Merge pull request #7382 from jbtbnl/master 
Remove necessity of icon class
 2014-02-27 21:11:26 +05:30
Morris Jobke 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
Thomas Müller 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
Thomas Müller f62b8a7896 Merge pull request #7451 from owncloud/fix-jshint 
rename config to camelcase
 2014-02-27 13:37:18 +01:00
Morris Jobke 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
Jan-Christoph Borchardt 58bc6aee51 icons: automatically show delete hover instead of using explicit class 2014-02-27 12:48:25 +01:00
Jörn Friedrich Dreyer 2ba6cd4e2b initialize etags of temporary storage 2014-02-27 12:44:07 +01:00
Raghu Nayyar 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
Jan-Christoph Borchardt af467d92f6 Installation: relabel 'Advanced' to more descriptive 'Storage & database' 2014-02-27 12:24:14 +01:00
Thomas Müller a5a671392c rename config to camelcase 2014-02-27 12:16:58 +01:00
Jan-Christoph Borchardt f0cd08ab5d remove border from log in input fields, simpler and works better with themes 2014-02-27 12:13:09 +01:00
Vincent Petry 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
Jörn Friedrich Dreyer 131c12ad8d use assertInternalType for typechecking 2014-02-27 09:51:26 +01:00
Jörn Friedrich Dreyer 39f2f564a9 use assertSame and assertNotSame for etag checks 2014-02-27 09:39:34 +01:00
Vincent Petry 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
Thomas Müller 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
Thomas Müller 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
Thomas Müller 230e5e3788 let's name the column 'select' because this is a keyword on all platforms 2014-02-26 20:47:07 +01:00
Thomas Müller 459b5086d5 adding test for migrations on columns using keywords 2014-02-26 20:42:45 +01:00
Joas Schilling 922c1909f8 Translate string when an error occured while sending a forgot password mail 
Fix #7423
 2014-02-26 17:29:47 +01:00
Bjoern Schiessle 86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +01:00
Bart Visscher 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
Björn Schießle 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
Jan-Christoph Borchardt 6c5cc46380 disable autocomplete for shared link password input, fix #7419 2014-02-26 14:48:15 +01:00
Thomas Müller 2f0db9af07 Merge pull request #7409 from owncloud/issue/5361 
Add owncloud version to JS scope
 2014-02-26 14:44:12 +01:00
Thomas Müller 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
Jan-Christoph Borchardt 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
Jan-Christoph Borchardt 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
Morris Jobke 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
Thomas Müller 901afbd4cf Merge pull request #7414 from owncloud/fix-3rdparty-submodule 
Update 3rdparty submodule
 2014-02-26 13:42:36 +01:00
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines 
Fix #7166
 2014-02-26 13:10:46 +01:00
Bjoern Schiessle 3be5e48b0c only add "received_from" if a share was found 2014-02-26 12:52:35 +01:00
Thomas Müller df1a5a2dfa Update 3rdparty submodule 2014-02-26 12:22:21 +01:00
icewind1991 59df3ffdf4 Merge pull request #7279 from owncloud/folderid-reuse 
Reuse the folder id in View->getFolderContents
 2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt 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
Joas Schilling cb14b1c58d Add owncloud version to JS scope 
Fix #5361
 2014-02-26 11:50:52 +01:00
kondou 593adab258 Fix scrutinizer issue in settings/js/apps.js 2014-02-26 11:41:32 +01:00
Vincent Petry 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
Vincent Petry 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
Jan-Christoph Borchardt bc1c136cd6 coding style fixes: cut long lines, whitespace 2014-02-26 10:34:38 +01:00
Joas Schilling 331bd527a7 Hide SMTP options based on selected send mode 
Fix #7166
 2014-02-26 10:30:22 +01:00
Vincent Petry 5c98e0c7c7 Merge pull request #7328 from owncloud/McNetic-zipstreamer 
McNetic zipstreamer
 2014-02-26 10:19:12 +01:00
Jan-Christoph Borchardt 2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 2014-02-26 10:16:54 +01:00
Jan-Christoph Borchardt 1a561fced0 fix for coding style 2014-02-26 09:32:20 +01:00
kondou e32acf933d Highlight the selected app in app-settings 2014-02-26 04:03:41 +01:00
Thomas Müller 574883c47a introduce new theme function to allow full creation of documentation links: buildDocLinkToKey() 2014-02-25 23:06:23 +01:00
Bjoern Schiessle e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 
Fix code to search for mount.json in custom data folders
 2014-02-25 15:27:47 +01:00
Vincent Petry 9b4af31bac Merge pull request #7371 from owncloud/core-storagemovedeleteall 
Replace deleteAll call with unlink call on rename
 2014-02-25 14:52:21 +01:00