Commit Graph

4207 Commits

Author SHA1 Message Date
Morris Jobke 37a5b62abb Merge pull request #15639 from rullzer/fix_15368
Reset sharedialog values
2015-04-23 00:18:23 +02:00
Roeland Jago Douma b971029652 Added unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma 595adfd193 moved from html to $('html') to fix unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma c456f5dee1 Reset sharedialog values 2015-04-17 09:38:09 +02:00
Jenkins for ownCloud da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Thomas Müller b6f79567aa files_encryption -> encryption 2015-04-16 10:46:34 +02:00
Jenkins for ownCloud 8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Jenkins for ownCloud d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Joas Schilling 2c396a7080 Remove the app version from disabled app list 2015-04-20 17:03:19 +02:00
Jenkins for ownCloud fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Jenkins for ownCloud 37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Morris Jobke 9e46b7175d Merge pull request #15638 from owncloud/primary-button-disabled
add disabled state to primary action button
2015-04-15 16:43:40 +02:00
Jan-Christoph Borchardt 14b92c3ce6 Merge pull request #15632 from owncloud/remove-tooltip-fade
remove slow fade animation for remaining tipsy tooltips
2015-04-15 14:42:45 +02:00
Jan-Christoph Borchardt 008e3376c6 add disabled state to primary action button 2015-04-15 14:23:54 +02:00
Jan-Christoph Borchardt 04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Vincent Petry 75268860fc Merge pull request #15626 from owncloud/remove-tooltip-fade
remove slow fade animation for tipsy tooltip
2015-04-15 12:14:54 +02:00
Jan-Christoph Borchardt 9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Jenkins for ownCloud 1a894bd0d8 [tx-robot] updated from transifex 2015-04-15 01:54:38 -04:00
Jenkins for ownCloud 843290a0fb [tx-robot] updated from transifex 2015-04-14 18:22:17 -04:00
Jenkins for ownCloud 7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Morris Jobke 59efcb63a3 fix filepicker
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
Lukas Reschke 84041a4fa2 Merge pull request #15541 from owncloud/add-reply-to-support
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
Jan-Christoph Borchardt 573c57402f fix wrong typeface being used for some buttons 2015-04-11 13:29:55 +02:00
Lukas Reschke e3ad99d252 Add "Reply-To" support to sharing mails and refactor code 2015-04-10 17:30:07 +02:00
Thomas Müller 7b2d53603c Merge pull request #15489 from owncloud/dont_hide_exceptions_master
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Jan-Christoph Borchardt 9c76bcd479 fix share input loading spinner, fix #15522 2015-04-10 11:32:02 +02:00
Morris Jobke 473d3e14c8 more robust share dialog 2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer 8964c5068c do not disclose information, show generic error on login page
Conflicts:
	core/templates/login.php
	lib/base.php
2015-04-10 09:12:37 +02:00
Thomas Müller 13178db465 Merge pull request #15404 from Crote/occ-password-from-env
Add password input from env variable for occ user:{add, resetpassword}
2015-04-10 00:08:40 +02:00
Thomas Müller 20eaadd72b Merge pull request #15182 from rullzer/fix-8231
ajax/share.php should return correct list of suggestions
2015-04-10 00:05:11 +02:00
Vincent Petry 10ffa3b770 Merge pull request #15512 from owncloud/autoclose-settings-menu
Don't stop event execution for menu item click
2015-04-09 19:53:43 +02:00
Morris Jobke 51e4633187 Don't stop event execution for menu item click
* fixes #12326 - the settings menu is closed now, because the event is executed
2015-04-09 18:32:33 +02:00
Morris Jobke f5a145b410 Merge pull request #15501 from owncloud/better-output-format-console
Add an option to get the output in plain, json or print_r syntax
2015-04-09 15:46:36 +02:00
Morris Jobke b9eaa386c4 Merge pull request #15235 from owncloud/remote-share-hint
Hint for remote sharing syntax
2015-04-09 14:54:57 +02:00
Joas Schilling 98bdfa1518 change handling in app:list 2015-04-09 14:44:30 +02:00
Joas Schilling def3b687ee Replace print_r() with pretty json 2015-04-09 14:42:44 +02:00
Morris Jobke 9246c7e8ee Merge pull request #15500 from owncloud/installation-hint
add link to installation documentation to setup page
2015-04-09 14:33:55 +02:00
Joas Schilling 6f51beac23 Correctly generate the doc link via go.php 2015-04-09 12:30:18 +02:00
Joas Schilling 4a01d5c588 Fix config usage 2015-04-09 12:19:42 +02:00
Jan-Christoph Borchardt 7f237223e5 fix remote share info icon for IE8 2015-04-09 12:11:42 +02:00
Jan-Christoph Borchardt 65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Joas Schilling dd5063bd49 Add an option to get the output in plain, json or print_r syntax 2015-04-09 11:46:52 +02:00
Jan-Christoph Borchardt dd7e519cda add link to installation documentation to setup page 2015-04-09 11:39:46 +02:00
Jan-Christoph Borchardt f3efd7a51e fix position of SQLite warning 2015-04-09 11:10:41 +02:00
Jan-Christoph Borchardt 50f9ed78d3 code style fixes 2015-04-09 11:10:15 +02:00
Jan-Christoph Borchardt 000b09ee7a add more present info about remote shares, fix layout of inputs 2015-04-09 10:16:29 +02:00
Lukas Reschke ba52f6f8fc Merge pull request #15314 from owncloud/app-categories-15274
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
Morris Jobke 84ae9532c8 Merge pull request #15448 from owncloud/occ-check-server-env-master
Adding check command to validate server environment
2015-04-09 00:07:08 +02:00
Thomas Müller 4f0769fc07 Merge pull request #15483 from owncloud/maintenance-refresh
Fix maintenance refresh interval
2015-04-08 22:46:35 +02:00
Jan-Christoph Borchardt 84c2fe85b7 add icons to files sidebar, fix shade, fix position of settings icon and text 2015-04-08 19:25:28 +02:00
Morris Jobke 78ec7543d5 Fix maintenance refresh interval
* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php
2015-04-08 18:02:00 +02:00
Thomas Müller f099c9883e Adding check command to validate server environment - fixes #15429 2015-04-08 00:19:23 +02:00
Thomas Müller 1fbf5d86df Merge pull request #14472 from owncloud/feature/wipencryptionapp
encryption 2.0 app
2015-04-07 16:46:45 +02:00
Thomas Müller 00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Joas Schilling 81ec1c8a1a Remove hardcoded link to performance docs 2015-04-07 12:25:30 +02:00
Jan-Christoph Borchardt 6250365bf4 app mgmt app level design enhancements 2015-04-07 11:55:10 +02:00
Jenkins for ownCloud 95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Thomas Müller 8062b906b9 Merge pull request #15403 from Crote/occ-user-add-return
Fix occ user:add failure return codes
2015-04-04 16:34:40 +02:00
Laurens Post d9323ca1be Add password input from env variable for occ user:{add, resetpassword}
This commit adds the --password-from-env switch to the `occ user:add` and
`occ user:resetpassword` commands. When this parameter is given, Owncloud
will use the password specified in environment variable OC_PASS. This
is safer than using command line parameters, as those can be read by any
process.
2015-04-04 13:24:57 +02:00
Laurens Post 6ce790ebbc Fix occ user:add failure return codes 2015-04-04 12:25:34 +02:00
Jenkins for ownCloud 9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Lukas Reschke 0816cf9142 Add experimental applications switch
Allows administrators to disable or enabled experimental applications as well as show the trust level.
2015-04-03 13:21:24 +02:00
Jenkins for ownCloud 23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Thomas Müller 4a215cad3c Merge pull request #15372 from Volker-E/master
fixing #15344
2015-04-02 18:01:09 +02:00
Jenkins for ownCloud cc96105ebe [tx-robot] updated from transifex 2015-04-02 01:54:47 -04:00
Volker E f4502b4670 fixing #15344 - `title` has no added value here (not on screen readers not for robots) 2015-04-01 21:10:48 +02:00
Morris Jobke 46e43d49ac Merge pull request #15358 from owncloud/global-cmd
Allow app:check-code and l10n:createjs commands when not installed
2015-04-01 18:20:09 +02:00
Robin McCorkell cbbff87d0c Allow app:check-code and l10n:createjs commands when not installed 2015-04-01 13:18:56 +01:00
Morris Jobke 1a06f8df57 add title to entries in app menu 2015-04-01 09:10:19 +02:00
Jenkins for ownCloud f5c7ba6b81 [tx-robot] updated from transifex 2015-04-01 01:55:33 -04:00
Jenkins for ownCloud 1d06d93d27 [tx-robot] updated from transifex 2015-03-31 01:55:55 -04:00
Morris Jobke bf17ac929d Merge pull request #15169 from rullzer/fix_displayNamesInGroup
Groupmanagers displayNamesInGroup should actually search in displaynames
2015-03-30 17:04:09 +02:00
Robin McCorkell 4f0abd910c Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache
Add check for activated local memcache
2015-03-30 11:24:44 +01:00
Morris Jobke 00b2be11dd Merge pull request #15239 from owncloud/see-no-evil
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
Morris Jobke 0edeefd031 Merge pull request #15295 from owncloud/add-more-spacing-dialog
Add more spacing to the file picker dialog
2015-03-30 08:07:40 +02:00
Jenkins for ownCloud da55ff630c [tx-robot] updated from transifex 2015-03-30 01:54:41 -04:00
Jenkins for ownCloud 1db9605afb [tx-robot] updated from transifex 2015-03-29 01:55:31 -04:00
Lukas Reschke 397264f361 Add more spacing to the file picker dialog
Without this the first `>` looked somewhat off, to test this change go to the personal settings and choose a profile picture in a subfolder.
2015-03-28 14:19:27 +01:00
Lukas Reschke 65202d2a18 Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.

Fixes https://github.com/owncloud/core/issues/14956
2015-03-28 13:59:22 +01:00
Jenkins for ownCloud 8b9b600644 [tx-robot] updated from transifex 2015-03-28 01:55:46 -04:00
Morris Jobke 5aa81833f9 Merge pull request #15260 from owncloud/adjust-controls-bar-width
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
Morris Jobke a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jan-Christoph Borchardt 701cb27a9e fix scrutinizer issues 2015-03-27 09:38:41 +01:00
Jan-Christoph Borchardt 908538d863 fix layout for Sharing settings 2015-03-27 09:38:13 +01:00
Jenkins for ownCloud 880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Jan-Christoph Borchardt d728b85fdd adjust controls bar width to not overlay scrollbar 2015-03-27 01:34:55 +01:00
Thomas Müller 710498402f Merge pull request #15256 from owncloud/emptycontent-messages
fine-tuning the empty content messages
2015-03-27 01:17:46 +01:00
Thomas Müller 055c18a7b4 Merge pull request #15245 from owncloud/fix-14864-master
More elaborate command description for upgrade
2015-03-26 23:50:06 +01:00
Jan-Christoph Borchardt 6b4985f5ad adjust shade of empty content icons, fix files icon shade 2015-03-26 23:49:32 +01:00
Robin McCorkell c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Lukas Reschke 9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +01:00
Thomas Müller a4171b295d More elaborate command description for upgrade - fixes #14864 2015-03-26 22:30:35 +01:00
Jan-Christoph Borchardt 0d3bea37c3 correct remote share hint 2015-03-26 20:30:51 +01:00
Morris Jobke 0a589d938c fix enforced password for share in IE8 2015-03-26 20:05:41 +01:00
Bjoern Schiessle aab5f6b6df add remote share status to the config 2015-03-26 18:32:46 +01:00
Jan-Christoph Borchardt d32e3870d2 add hint in Share placeholder on remote share syntax 2015-03-26 18:30:55 +01:00
Jan-Christoph Borchardt e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style
popover style for apps and user dropdown menus
2015-03-26 18:07:35 +01:00
Jan-Christoph Borchardt d1db727d1f mock up missing elements in the tests 2015-03-26 17:13:50 +01:00
Jan-Christoph Borchardt e7dcc01017 only move dropdown triangle when navigation is opened, fix timing bug 2015-03-26 17:01:35 +01:00
Jan-Christoph Borchardt 6b8f5abf98 detail corrections for search box layout 2015-03-26 15:06:11 +01:00
Jan-Christoph Borchardt fd9214de23 fix user dropdown for IE8 2015-03-26 15:02:31 +01:00
Jan-Christoph Borchardt f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Jan-Christoph Borchardt 30b745fc59 reintroduce quick animation for menus 2015-03-26 11:59:30 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Vincent Petry ca6b715b31 Added ext storage mount options GUI
Added option to disable autoscan of external storages
Mount option file system scan is now an int
Move priority field to avoid undefined field in storage options

All input elements inside the storage options block get parsed into
storage options.

Moving the priority field outside prevents it to appear in the storage
config, as expected. It is still parsed by special code.
2015-03-26 11:21:03 +01:00
Jan-Christoph Borchardt 07335c844a fix log in issue, fix arrow position, make dropdown work in Firefox 2015-03-26 11:12:02 +01:00
Jan-Christoph Borchardt cd88ddddaf fix accessibility of ownCloud logo and navigation entries, fix #15013g 2015-03-26 10:31:00 +01:00
Jenkins for ownCloud 40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Jan-Christoph Borchardt d7414fbf0d move triangle of apps dropdown to align with app name triangle 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt dd7eb4c7c3 reduce logo size a bit for a better look 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt 4546a33d58 adjust share dropdown border radius to 3px 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt 70a4df1418 more small fixes in header 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt ad596a0198 further adjustments of header and dropdown styles 2015-03-26 00:41:41 +01:00
Jan-Christoph Borchardt 095197d1a7 popover style for apps and user dropdown menus 2015-03-26 00:40:30 +01:00
Morris Jobke 285f9e32e5 Merge pull request #15190 from owncloud/hide-update-notification-on-mobile
do not show update notification on mobile, fix overlapping of header menus
2015-03-25 15:48:34 +01:00
Jan-Christoph Borchardt 090eb832f0 do not show update notification on mobile, fix overlapping of header menus, fix #10544 2015-03-25 12:43:05 +01:00
Jan-Christoph Borchardt fa43480b55 highlight active user menu entry 2015-03-25 09:27:43 +01:00
Jan-Christoph Borchardt e188f0e436 Merge pull request #14970 from owncloud/sidebar-enhancements
sidebar fixes
2015-03-25 09:16:49 +01:00
Roeland Jago Douma 9c19a5dbcc Make sure we do not return people that we already shared with
We should use the provided list of users and groups that we already
shared with to filter suggestions.
2015-03-25 09:13:51 +01:00
Jenkins for ownCloud fb61889490 [tx-robot] updated from transifex 2015-03-25 01:55:46 -04:00
Roeland Jago Douma 4163a5efad Call the proper function
* Fix for #6967
2015-03-24 21:45:31 +01:00
Morris Jobke 968fca8b55 Merge pull request #15048 from owncloud/avatar-crop-square
round width and height when cropping avatar
2015-03-24 15:23:14 +01:00
Daniel Hansson 8ee1fa98df Don't use hardcoded date and time
Use local time instead. http://momentjs.com/
2015-03-24 13:41:55 +01:00
Jan-Christoph Borchardt 83580d08eb Merge pull request #15143 from owncloud/24h-time-format
Use 24h format instead of 12h format
2015-03-24 13:30:52 +01:00
Morris Jobke c8af615c01 Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list
Issue/15138 feedback for empty apps list
2015-03-24 13:02:56 +01:00
Morris Jobke e07a2fd8a2 Merge pull request #15012 from Volker-E/master
fixing #15011 by adding ARIA roles where distinct
2015-03-24 12:07:26 +01:00
Joas Schilling 17fbffceeb Use the same style when no search result was found 2015-03-24 11:29:29 +01:00
Joas Schilling c3c2517131 Display a message when no apps can be found for this oc version 2015-03-24 11:29:28 +01:00
Daniel Hansson 946a7c3a83 Use 24h format instead of 12h format
Use correct time format in WebUI
2015-03-24 11:20:20 +01:00
Vincent Petry ce5d2ab7db Revert "Change to 24H format instead of 12H format"
This reverts commit 8279dde97a.
2015-03-24 11:08:53 +01:00
Jenkins for ownCloud 9cb07f126d [tx-robot] updated from transifex 2015-03-24 01:55:24 -04:00
Daniel Hansson 8279dde97a Change to 24H format instead of 12H format
Update how the time shows in WebUI.

My first PR to core, woha. :)
2015-03-23 22:05:44 +01:00
Morris Jobke 10eeb35167 Merge pull request #15121 from owncloud/email-sent-unbold
unbold share email sent notification
2015-03-23 18:57:20 +01:00
Morris Jobke 0adcb99110 Merge pull request #14862 from owncloud/introduce-shipped.json-master
shipped apps are now defined in core/shipped.json - the shipped tag in i...
2015-03-23 17:17:33 +01:00
Jan-Christoph Borchardt fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Thomas Müller 33cd60ab9a adding enterprise apps to shipped.json 2015-03-23 15:11:16 +01:00
Jan-Christoph Borchardt 5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Jenkins for ownCloud a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Jenkins for ownCloud a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Volker E 599ee5ce4e fixing #15023, getting comments out of HTML output 2015-03-21 07:10:46 +01:00
Jenkins for ownCloud e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Thomas Müller afa8872955 Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
Preview provider registration in manager
2015-03-20 16:34:22 +01:00
Vincent Petry e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework
Cleanup ext storage CRUD code, introduce storage config id
2015-03-20 14:17:32 +01:00
Robin McCorkell b6676c32d6 Merge pull request #15046 from owncloud/exception-show-type
show exception type in debug mode
2015-03-20 08:48:22 +00:00
Jenkins for ownCloud e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Robin Appelman bd1d7107bb round width and height when cropping avatar 2015-03-20 04:08:24 +01:00
Robin Appelman 2df20aaffb show exception type in debug mode 2015-03-20 03:51:21 +01:00
Volker E 0e4d52f9d2 fixing #15027, cleaning up obsolete IE5-7 workaround code 2015-03-19 09:10:58 +01:00
Jenkins for ownCloud e40b0701d7 [tx-robot] updated from transifex 2015-03-19 01:55:06 -04:00
Volker E 0d0c73cf2b fixing #15011 by adding ARIA roles where distinct 2015-03-18 19:29:15 +01:00
Jan-Christoph Borchardt e5fd6816df fix position of 'Deleted files' sidebar entry, fix #10815 2015-03-18 13:31:16 +01:00
Jan-Christoph Borchardt 093efa458c Merge pull request #14981 from Volker-E/master
addressing #14978 - remove html root classes targeting IE6/IE7
2015-03-18 11:24:42 +01:00
Jenkins for ownCloud 8a95bf18b7 [tx-robot] updated from transifex 2015-03-18 01:55:22 -04:00
Volker E 790324b313 addressing #14984 removing redundant type attributes 2015-03-18 05:33:17 +01:00
Volker E 4c46d0c46c addressing #14983 obsolete Google Chrome Frame 2015-03-18 02:11:47 +01:00
Volker E 6ad76b5cc2 addressing #14982 self-closing tags ending slash doesn't have a purpose & should be removed 2015-03-17 23:57:23 +01:00
Volker E 25b77159c4 adressing #14979 meta charset declaration should be first in head 2015-03-17 23:36:05 +01:00
Volker E e8c99a60ec addressing #14978 - remove html root classes targeting IE6/IE7 2015-03-17 23:16:42 +01:00
Volker E f3cd552797 addressing #14978 - remove html root classes targeting IE6/IE7 2015-03-17 22:35:20 +01:00
Jan-Christoph Borchardt ccc9db6c54 add bottom padding to sidebar, fix last element being hidden below settings, fix #13264 2015-03-17 18:42:11 +01:00
Jan-Christoph Borchardt 37a41dad56 add more whitespace to share link options in dropdown for better clickability and look 2015-03-17 18:19:45 +01:00
Jan-Christoph Borchardt 6ac677f17a fix checkbox alignment in share dialog, fix #11515 2015-03-17 18:18:07 +01:00
Lukas Reschke b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer
Migrate OC_Mail to SwiftMailer
2015-03-17 11:15:39 +01:00
Jenkins for ownCloud b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Lukas Reschke 283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke 13486a5ada Migrate to SwiftMail
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling 8ed27d2ce0 Create an interface for OC_Image and OCP\Image for the public API 2015-03-16 12:45:15 +01:00
Joas Schilling 4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Thomas Müller c262d0d966 Update shipped.json 2015-03-16 11:59:40 +01:00
Jenkins for ownCloud c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Joas Schilling 5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Joas Schilling 8304f5f508 Fix getting the avatar of a non-existing user 2015-03-13 15:29:52 +01:00
Thomas Müller 40b2889785 shipped apps are now defined in core/shipped.json - the shipped tag in info.xml is ignored from now on - never trust an app 🙊 2015-03-13 11:18:39 +01:00
Jenkins for ownCloud d17630d6be [tx-robot] updated from transifex 2015-03-13 01:54:55 -04:00
Vincent Petry ce94a998dd Use storage id + appframework for ext storage CRUD
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
2015-03-12 18:51:02 +01:00
Morris Jobke 89e1b920cc Merge pull request #14613 from kampka/no-table-prefix
Install command should not require table prefix
2015-03-12 10:06:21 +01:00
Jenkins for ownCloud 454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Christian Kampka 277503209a Install command should not require table prefix 2015-03-11 21:06:25 +01:00
Lukas Reschke f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller
Move AvatarController to AppFramework
2015-03-11 17:15:42 +01:00
Roeland Jago Douma 1a0f9c375b Avatar controller moved to AppFrameWork
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
2015-03-11 16:37:42 +01:00
Lukas Reschke 73dc02d42c Merge pull request #14798 from owncloud/enable-oci-autotest-master
Setting oci as supported database
2015-03-11 16:14:54 +01:00
Morris Jobke caa672ceeb Merge pull request #14794 from owncloud/add-console-command-user-add
Add a console command user:add to create users over the console
2015-03-11 16:09:23 +01:00
Thomas Müller 96b223676d Don't play with config values ... 2015-03-11 15:47:24 +01:00
Thomas Müller cba3ec2c7f Setting oci as supported database 2015-03-11 14:29:22 +01:00
Joas Schilling b1ff21ee28 Add a console command user:add to create users over the console 2015-03-11 14:22:23 +01:00
Morris Jobke ad97ceb787 Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail
Do not abort when meeting unfixable legacy storages
2015-03-11 13:32:33 +01:00
Thomas Müller b3bb65eae5 Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
Add an option to include the installed app version in "occ app:list"
2015-03-11 12:23:22 +01:00
Joas Schilling 560137ca23 Always include the installed app version in "occ app:list" 2015-03-11 09:47:41 +01:00
Thomas Müller 6c1a1234f8 Properly handle available databases at runtime and respect setup checks in command line as well 2015-03-11 09:27:12 +01:00
Jenkins for ownCloud 01ea056ac8 [tx-robot] updated from transifex 2015-03-11 01:55:38 -04:00
Jenkins for ownCloud e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Lukas Reschke c0a02f1615 Verify CSRF token already in update.php and not the EventSource code
Issue report:
> Hum, well I upgraded the package then visited the web interface to
trigger the update and it failed; the UI would say there was a
possible CSRF attack and after that it'd be stuck in maintenance mode.
Tried a few times (by editing maintenance to false in owncloud.conf)
and same result each time.

That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is:

1. User has somehow an invalid CSRF token in session (or none at all)
2. User clicks the update button
3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode
4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode

I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK

To verify this test:

1. Delete your ownCloud cookies
2. Increment the version in version.php
3. Try to upgrade
=> Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help
=> After the patch: Instance shows an error, a refresh helps though.

This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then…

That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)
2015-03-09 10:07:30 +01:00
Morris Jobke 674654c210 Merge pull request #14743 from owncloud/autoconfig-password
Convert 'abcpassword' to 'abcpass' during setup
2015-03-09 07:54:22 +01:00
Jenkins for ownCloud 174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud 377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Robin McCorkell f43b047636 Convert 'abcpassword' to 'abcpass' during setup
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
2015-03-07 13:10:43 +00:00
Jenkins for ownCloud 73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Jenkins for ownCloud d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Morris Jobke f507601e25 Merge pull request #14582 from rullzer/avatar_fixes
Avatars in share dialog fixes
2015-03-04 10:30:09 +01:00
Morris Jobke f1d74e8803 Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins
Let users configure security headers in their Webserver
2015-03-04 09:36:01 +01:00