summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14582 from rullzer/avatar_fixesMorris Jobke2015-03-044-37/+72
|\ | | | | Avatars in share dialog fixes
| * Avatars in share dialog fixesRoeland Jago Douma2015-03-034-37/+72
| | | | | | | | | | | | | | * 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
* | Merge pull request #14651 from ↵Morris Jobke2015-03-044-1/+441
|\ \ | | | | | | | | | | | | owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins Let users configure security headers in their Webserver
| * | Added missing done() calls for async testsVincent Petry2015-03-031-20/+31
| | |
| * | Let users configure security headers in their WebserverLukas Reschke2015-03-024-1/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0422-12/+90
| | |
* | | Merge pull request #14653 from sebomoto/fix_loading_feedbackMorris Jobke2015-03-031-0/+1
|\ \ \ | |_|/ |/| | fix for loading spinner reappearing after errors in db-connection
| * | fix for loading spinner reappearing after errors in db-connectionSebastian Bolt2015-03-021-0/+1
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0370-82/+90
| |
* | Merge pull request #14615 from kampka/cron-commandLukas Reschke2015-03-025-0/+179
|\ \ | |/ |/| Allow configuring background job mode from the console
| * Allow configuring background job mode from the consoleChristian Kampka2015-03-025-0/+179
| |
* | Maintenance mode message might be misleadingJoas Schilling2015-03-021-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-022-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-018-0/+36
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-288-4/+58
|
* Merge pull request #14585 from owncloud/fix-avatars-for-users-with-atLukas Reschke2015-02-272-3/+3
|\ | | | | Use custom attribute instead of the div identifier
| * Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
| | | | | | | | | | | | Otherwise problems arrive when a username contains characters such as an `@` Fixes https://github.com/owncloud/user_shibboleth/issues/38
* | Fix avatars in masterLukas Reschke2015-02-271-1/+1
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2733-665/+181
|\ | | | | Revert "Updating license headers"
| * Revert "Updating license headers"Morris Jobke2015-02-2633-665/+181
| | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2718-0/+94
| |
* | Merge pull request #13969 from raimund-schluessler/masterMorris Jobke2015-02-261-4/+11
|\ \ | | | | | | Append search results to custom container
| * | Fix variable already definedRaimund Schlüßler2015-02-091-1/+1
| | |
| * | Append search results to custom containerRaimund Schlüßler2015-02-081-4/+11
| | | | | | | | | | | | fixes #13968
* | | Merge pull request #14208 from owncloud/oc-msg-remove-object-dependencyMorris Jobke2015-02-261-36/+71
|\ \ \ | |_|/ |/| | Remove dependency from arbitrary data object structure for easier usage
| * | Remove dependency from arbitrary data object structure for easier usageJoas Schilling2015-02-201-36/+71
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-26108-426/+100
| | |
* | | Merge pull request #14245 from cmeh/masterLukas Reschke2015-02-252-6/+6
|\ \ \ | | | | | | | | Message clean-up
| * | | Cleaning-up messagescmeh2015-02-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | **Changes:** * In line 103, the middle "c" of "owncloud" is capitalised to "ownCloud". * A space is inserted between value and unit in lines 177 and 187 ("4 GB" instead of "4GB").
| * | | Update setupchecks.jscmeh2015-02-161-1/+1
| | | | | | | | | | | | Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975).
| * | | Message clean-upcmeh2015-02-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *Changes:* * "… is not yet properly setup" in line 24 is changed to " … is not yet set up properly" (better word order and space in the middle of "set up", as it is a participle of the verb "to set up"). * "internet" is corrected to "Internet" with a capitalized "I" in lines 54 and 59. * Also in line 54: "3rd party" is changed to "third-party" to for a more coherent spelling across the different ownCloud components. * "… apps don´t work" is corrected to "… apps won't work" (with a proper (and hopefully correctly escaped) (apostrophe)[http://en.wikipedia.org/wiki/Apostrophe#Typographic_form] instead of the (acute accent)[http://en.wikipedia.org/wiki/Acute_accent]). * Still in line 54: The negation is corrected from "… might also not work" to "… might not work, either".
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2586-84/+14
| | | |
* | | | print app upgrade information to console as wellThomas Müller2015-02-241-0/+6
| | | |
* | | | 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-243-11/+28
| | | |
* | | | Merge pull request #10599 from owncloud/move_passwordchange_textLukas Reschke2015-02-241-0/+4
|\ \ \ \ | | | | | | | | | | Make the password changed msg inline to fix #10242
| * | | | add fix for checkmark icon for IE8Morris Jobke2015-02-121-0/+4
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-242-2/+2
| | | | |
* | | | | Merge pull request #14416 from owncloud/setup-commandThomas Müller2015-02-233-19/+153
|\ \ \ \ \ | | | | | | | | | | | | Setup command
| * | | | | Fix error handlingThomas Müller2015-02-231-1/+6
| | | | | |
| * | | | | implement command maintenance:installThomas Müller2015-02-232-16/+145
| | | | | |
| * | | | | Fix namespace of OC_Setup -> \OC\SetupThomas Müller2015-02-231-3/+3
| | | | | |
* | | | | | Merge pull request #13439 from owncloud/app-filterThomas Müller2015-02-231-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make the search box filter apps
| * | | | | Added unit test for app filterVincent Petry2015-02-231-0/+3
| | | | | |
* | | | | | Updating license headersJenkins for ownCloud2015-02-2333-182/+665
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-222-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-216-0/+6
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-202-2/+2
| | | | | |
* | | | | | Merge pull request #14366 from owncloud/remove-old-l10n-filesLukas Reschke2015-02-191-9/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove some old l10n files they arent loaded anymore
| * | | | | | Remove some old l10n files they arent loaded anymoreJoas Schilling2015-02-191-9/+0
| | | | | | |
* | | | | | | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-192-44/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Manually type-cast all AJAX files
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 00:06:18 +0000