Skip to content
Snippets Groups Projects
Commit 2d8e311a authored by Aria Givi's avatar Aria Givi
Browse files

Merge branch '646-ubersetzung-fur-js-dateien-einbauen' into 'MetaGer-Redesign'

Resolve "Übersetzung für JS-Dateien einbauen"

See merge request !1190
parents 33743bf9 47b3e677
No related branches found
No related tags found
4 merge requests!1262WIP: Resolve "Spendenseite Texte anpassen",!1207WIP: Resolve "Rechtschreibfehler",!1198Meta ger redesign,!1190Resolve "Übersetzung für JS-Dateien einbauen"
...@@ -18,11 +18,11 @@ mix ...@@ -18,11 +18,11 @@ mix
// js // js
.scripts(['resources/assets/js/lib/jquery.js', 'resources/assets/js/lib/jquery-ui.min.js', 'resources/assets/js/lib/bootstrap.js', 'resources/assets/js/lib/lightslider.js', .scripts(['resources/assets/js/lib/jquery.js', 'resources/assets/js/lib/jquery-ui.min.js', 'resources/assets/js/lib/bootstrap.js', 'resources/assets/js/lib/lightslider.js',
'resources/assets/js/lib/masonry.js', 'resources/assets/js/lib/imagesloaded.js', 'resources/assets/js/lib/openpgp.min.js', 'resources/assets/js/lib/iframeResizer.min.js', 'resources/assets/js/lib/masonry.js', 'resources/assets/js/lib/imagesloaded.js', 'resources/assets/js/lib/openpgp.min.js', 'resources/assets/js/lib/iframeResizer.min.js',
'resources/assets/js/lib/md5.js', 'resources/assets/js/translations.js'], 'public/js/lib.js') 'resources/assets/js/lib/md5.js'], 'public/js/lib.js')
.scripts(['resources/assets/js/scriptStartPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptStartPage.js') .scripts(['resources/assets/js/scriptStartPage.js', 'resources/assets/js/result-saver.js'], 'public/js/scriptStartPage.js')
.scripts(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js') .scripts(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js')
.scripts(['resources/assets/js/searchbar.js', 'resources/assets/js/translations.js'], 'public/js/searchbar.js') .scripts('resources/assets/js/searchbar.js', 'public/js/searchbar.js')
.scripts(['resources/assets/js/focus-creator.js', 'resources/assets/js/translations.js'], 'public/js/focus-creator.js') .scripts('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
// utility // utility
.scripts(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js') .scripts(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js')
.version(); .version();
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment