-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/release-v24' into HEAD
- Loading branch information
Showing
139 changed files
with
3,386 additions
and
1,619 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,11 @@ | ||
| | Q | R | ||
| | ----------------------------------- | ------------------------------------------- | ||
| | Type de modification | correction de bug / nouvelle fonctionnalité / évolution | ||
| | Ticket(s) (_issue(s)_) concerné(s) | (ex #1337) | ||
| | Ticket(s) (_issue(s)_) concerné(s) | (ex : #1337) | ||
|
|
||
| ### QA | ||
|
|
||
| - Instruction 1 (ex : lancez `python manage.py migrate` et `npm run gulp build`) | ||
| - Instruction 1 (exemple : lancez `python manage.py migrate` et `npm run gulp build`) | ||
| - Instruction 2 | ||
| - etc | ||
|
|
||
| <!-- À cocher une fois la QA faite. Vous pouvez le faire sur votre pull request si un testeur confirme avoir vérifié le bon fonctionnement de votre PR et avoir relu le code. --> | ||
|
|
||
| - [ ] Ça fonctionne ! | ||
| - [ ] Code relu et approuvé ! | ||
| - ... | ||
| - Code review |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,10 +27,12 @@ env: | |
| - TEST_APP="-e front" | ||
|
|
||
| notifications: | ||
| irc: | ||
| channels: | ||
| - irc.smoothirc.net#zds-dev | ||
| skip_join: true | ||
| webhooks: | ||
| urls: | ||
| - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MHNhbmRob3NlJTNBc2FuZGhvc2UuZnIvJTIxd2dlbkt2dHpNY3NYREtiZEhZJTNBbWF0cml4Lm9yZw" | ||
| on_success: change | ||
| on_failure: always | ||
| on_start: never | ||
|
|
||
| services: | ||
| - memcached | ||
|
|
@@ -107,7 +109,7 @@ after_success: | |
| if [[ "$TEST_APP" == *"front"* ]] && [[ "$TRAVIS_PULL_REQUEST" == false ]] && [[ ! -z "$TRAVIS_TAG" ]] && [[ ! "$TRAVIS_TAG" == *"-build" ]] | ||
| then | ||
| # Adding GitHub OAuth token to login | ||
| echo "machine github.com login $GITHUB_TOKEN password x-oauth-basic" > $HOME/.netrc | ||
| echo -e "machine github.com login $BOT_LOGIN\n password $BOT_PASSWORD" > $HOME/.netrc | ||
| git config --global url."https://".insteadOf git:// | ||
| git config --global user.name "Build bot" | ||
| git config --global user.email "[email protected]" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* ===== Zeste de Savoir ==================================================== | ||
| Suggest Topic when user makes topic | ||
| --------------------------------- | ||
| Author: A-312, AmarOk | ||
| ========================================================================== */ | ||
|
|
||
| (function($, undefined) { | ||
| "use strict"; | ||
|
|
||
| if (!$("#topic-suggest")[0]) | ||
| return; | ||
|
|
||
| var timeoutCall = 0; | ||
| var timeoutHidden = 0; | ||
|
|
||
| var myHandler = function() { | ||
| var titleURI = encodeURIComponent($(this).val()); | ||
| if (titleURI.length < 3) return; | ||
| var $container = $("#topic-result-container"); | ||
| var suggestTopicsUrl = $("#topic-suggest").attr("url"); | ||
|
|
||
| if ($container.data("ajax-load") !== true) { | ||
| $.getJSON(suggestTopicsUrl + "?q=" + titleURI, function(json) { | ||
| var $ul = $("<ul></ul>"); | ||
| var $title = null; | ||
| var count = 0; | ||
|
|
||
| // clearTimeout | ||
| clearTimeout(timeoutHidden); | ||
| clearTimeout(timeoutCall); | ||
|
|
||
| $.each(json.results, function(index, topic) { | ||
| $title = $("<a></a>").attr("target", "_blank"); | ||
| $title.text(topic.title).attr("href", topic.url).attr("title", topic.subtitle); | ||
| var $topicDate = new Date(topic.pubdate).toLocaleDateString(); | ||
| var $forumLink = $("<a></a>").text(topic.forumTitle).attr("href", topic.forumUrl); | ||
| $("<li></li>").text(" dans le forum ").append($forumLink).append(" le " + $topicDate).prepend($title).appendTo($ul); | ||
| count++; | ||
| if (count === 5) return; | ||
| }); | ||
|
|
||
| if (!count) { | ||
| $("<li></li>").addClass("neither").text($container.data("neither")).appendTo($ul); | ||
| timeoutHidden = setTimeout(function () { | ||
| $("#topic-suggest").hide(800); | ||
| }, 6000); | ||
| } | ||
| $container.html("").append($ul); | ||
|
|
||
| $container.data("ajax-load", false); | ||
| $("#topic-suggest").show(800); | ||
| }); | ||
|
|
||
| $container.data("ajax-load", true); | ||
| } | ||
| }; | ||
|
|
||
| $("#id_title").on("blur", myHandler); | ||
|
|
||
| $("#id_title").on("keypress", function() { | ||
| var that = this; | ||
| var length = $(this).val().length; | ||
|
|
||
| clearTimeout(timeoutCall); | ||
| timeoutCall = setTimeout(function () { | ||
| myHandler.call(that); | ||
| }, (length < 5) ? (12 - length * 2) * 200 : 2000); // ANTI-FLOOD | ||
| }); | ||
| })(jQuery); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -229,6 +229,7 @@ | |
| float: left; | ||
| height: 50px; | ||
| width: 50px; | ||
| cursor: pointer; | ||
|
|
||
| &:after { | ||
| display: block; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -223,6 +223,10 @@ | |
| font-style: italic; | ||
| color: #999; | ||
|
|
||
| & > a { | ||
| color: #999; | ||
| } | ||
|
|
||
| &:after { | ||
| opacity: .5; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #topic-result-container { | ||
| background-color: white; | ||
| border: 1px solid #d2d5d6; | ||
|
|
||
| ul { | ||
| list-style: none; | ||
| font-size: 12px; | ||
| padding: 0; | ||
| margin: 0; | ||
|
|
||
| li { | ||
| padding: 1px 10px; | ||
| border-bottom: solid 1px #CCC; | ||
|
|
||
| &.active, &:hover { | ||
| background-color: #d7d7d7; | ||
|
|
||
| &.neither { | ||
| background-color: transparent; | ||
| } | ||
| } | ||
|
|
||
| &:last-child { | ||
| border-bottom: none; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.