Commit Graph

3858 Commits

Author SHA1 Message Date
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
Jenkins for ownCloud 84785a6a39 [tx-robot] updated from transifex 2015-03-04 01:55:19 -05:00
Roeland Jago Douma c9272be0b9 Avatars in share dialog fixes
* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown
2015-03-03 20:57:50 +01:00
Vincent Petry b4cfc79b5a Added missing done() calls for async tests 2015-03-03 13:59:03 +01:00
Morris Jobke 9ddff4cec0 Merge pull request #14653 from sebomoto/fix_loading_feedback
fix for loading spinner reappearing after errors in db-connection
2015-03-03 10:12:48 +01:00
Jenkins for ownCloud e271fa3ee8 [tx-robot] updated from transifex 2015-03-03 01:55:50 -05:00
Sebastian Bolt 834f7039f0 fix for loading spinner reappearing after errors in db-connection 2015-03-02 21:58:06 +01:00
Lukas Reschke d620fc8798 Merge pull request #14615 from kampka/cron-command
Allow configuring background job mode from the console
2015-03-02 21:35:57 +01:00
Christian Kampka 83e0f84fef Allow configuring background job mode from the console 2015-03-02 20:51:40 +01:00
Lukas Reschke bbd5f28415 Let users configure security headers in their Webserver
Doing this in the PHP code is not the right approach for multiple reasons:

1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.

This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
2015-03-02 19:07:46 +01:00
Joas Schilling 0f09989824 Maintenance mode message might be misleading 2015-03-02 09:51:25 +01:00
Jenkins for ownCloud 3f91e3757f [tx-robot] updated from transifex 2015-03-02 01:55:00 -05:00
Jenkins for ownCloud ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Jenkins for ownCloud 42f6448da2 [tx-robot] updated from transifex 2015-02-28 01:55:32 -05:00
Lukas Reschke 13b0b7dfaf Merge pull request #14585 from owncloud/fix-avatars-for-users-with-at
Use custom attribute instead of the div identifier
2015-02-27 18:40:53 +01:00
Lukas Reschke 92b5517229 Use custom attribute instead of the div identifier
Otherwise problems arrive when a username contains characters such as an `@`

Fixes https://github.com/owncloud/user_shibboleth/issues/38
2015-02-27 17:38:59 +01:00
Lukas Reschke 8818165e07 Fix avatars in master 2015-02-27 12:03:58 +01:00
Thomas Müller f72f9e0159 Merge pull request #14530 from owncloud/revert-14403
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
Jenkins for ownCloud d20061e5b1 [tx-robot] updated from transifex 2015-02-27 01:55:28 -05:00
Morris Jobke 55b3f6b986 Merge pull request #13969 from raimund-schluessler/master
Append search results to custom container
2015-02-26 15:16:23 +01:00
Morris Jobke a183b5d7e2 Merge pull request #14208 from owncloud/oc-msg-remove-object-dependency
Remove dependency from arbitrary data object structure for easier usage
2015-02-26 14:57:21 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Jenkins for ownCloud 8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Lukas Reschke 921a76ae2e Merge pull request #14245 from cmeh/master
Message clean-up
2015-02-25 17:46:41 +01:00
Jenkins for ownCloud 31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
Thomas Müller 58cedc07b5 print app upgrade information to console as well 2015-02-24 12:52:16 +01:00
Thomas Müller bbf7f56f94 3rd-party apps are disabled on upgrade - refs #14026 2015-02-24 12:02:36 +01:00
Lukas Reschke e5c6af5102 Merge pull request #10599 from owncloud/move_passwordchange_text
Make the password changed msg inline to fix #10242
2015-02-24 11:54:17 +01:00
Jenkins for ownCloud cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Thomas Müller e87ada86d1 Merge pull request #14416 from owncloud/setup-command
Setup command
2015-02-23 22:41:10 +01:00
Thomas Müller 66e3211fd8 Merge pull request #13439 from owncloud/app-filter
Make the search box filter apps
2015-02-23 21:51:53 +01:00
Thomas Müller eae6471105 Fix error handling 2015-02-23 17:46:08 +01:00
Thomas Müller bcd10d3dc5 implement command maintenance:install 2015-02-23 16:47:47 +01:00
Thomas Müller 1fd1b355e4 Fix namespace of OC_Setup -> \OC\Setup 2015-02-23 16:44:40 +01:00
Vincent Petry e144d3aa49 Added unit test for app filter 2015-02-23 15:29:25 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Jenkins for ownCloud 906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Joas Schilling c201bc01bb Remove dependency from arbitrary data object structure for easier usage 2015-02-20 10:43:39 +01:00
Jenkins for ownCloud 79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Lukas Reschke 602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files
Remove some old l10n files they arent loaded anymore
2015-02-19 23:31:21 +01:00
Morris Jobke 75a7bcb10c Merge pull request #14199 from owncloud/cast-type-manually
Manually type-cast all AJAX files
2015-02-19 17:19:54 +01:00
Thomas Müller 767dd4bde7 Merge pull request #14267 from owncloud/encode-eventsource
Encode requesttoken
2015-02-19 16:21:12 +01:00
Thomas Müller 7cd3f17d9c Merge pull request #14311 from raimund-schluessler/Fix#14310
Fix #14310
2015-02-19 16:17:19 +01:00
Morris Jobke 0e47d1fcca Merge pull request #14338 from owncloud/fix-nav-heigt
If no link text has been set for the navigation show the link nonetheless
2015-02-19 13:11:53 +01:00
Joas Schilling e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Jenkins for ownCloud 294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Jan-Christoph Borchardt 83bc951630 Merge pull request #12213 from sebomoto/add-loadfeedback
Add loadfeedback
2015-02-18 19:42:18 +01:00
Bernhard Posselt a5074fa629 if no link text has been set for the navigation show the link nonetheless 2015-02-18 15:34:31 +01:00