Merge branch 'hotfix/compile-js'

Bumped version to v1.1.3
Compile js production
2019-05-20 08:45:53 +07:00 · 2019-05-20 08:45:38 +07:00 · 2019-05-20 08:44:41 +07:00 · 2019-05-20 08:32:32 +07:00 · 2019-05-20 08:32:29 +07:00 · 2019-05-20 08:31:32 +07:00
7 changed files with 9 additions and 47512 deletions
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -12,7 +12,9 @@ class TrustProxies extends Middleware
     *
     * @var array
     */
-    protected $proxies;
+    protected $proxies = [
+        '192.168.1.40',
+    ];

    /**
     * The headers that should be used to detect proxies.
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "smk-kelulusan",
-  "version": "1.1.1",
+  "version": "1.1.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "smk-kelulusan",
-  "version": "1.1.1",
+  "version": "1.1.3",
  "description": "",
  "main": "webpack.mix.js",
  "directories": {
--- a/public/css/main.css
+++ b/public/css/main.css
--- a/public/js/app.js
+++ b/public/js/app.js
--- a/resources/js/components/SKHasilBelajar.js
+++ b/resources/js/components/SKHasilBelajar.js
@@ -58,7 +58,7 @@ var component = {
                    ' siswa yang telah mencetak surat keterangan hasil belajar.'
                ]),
                m('h1.title', 'Surat Keterangan Hasil Belajar Siswa SMK Bhakti Anindya'),
-                m('span', 'Silahkan masukkan Nama Lengkap dan NISN kamu di bawah ini.'),
+                m('span', 'Silahkan masukkan NISN dan Tanggal Lahir kamu di bawah ini.'),
            ]),
            m('form.form', {
                onsubmit: e => {
--- a/resources/js/components/SuratKelulusan.js
+++ b/resources/js/components/SuratKelulusan.js
@@ -22,7 +22,7 @@ var component = {
                    ' siswa yang telah melihat pengumuman kelulusan.'
                ]),
                m('h1.title', 'Surat Kelulusan Siswa SMK Bhakti Anindya'),
-                m('span', 'Silahkan masukkan Nama Lengkap dan NISN kamu di bawah ini.'),
+                m('span', 'Silahkan masukkan NISN dan Tanggal Lahir kamu di bawah ini.'),
            ]),
            m('form.form', {
                onsubmit: e => {
Author	SHA1	Message	Date
Gregorio Chiko Putra	05af7a9ae5	Merge branch 'hotfix/compile-js'	2019-05-20 08:45:53 +07:00
Gregorio Chiko Putra	69ccceb125	Bumped version to v1.1.3	2019-05-20 08:45:38 +07:00
Gregorio Chiko Putra	103861d5e0	Compile js production	2019-05-20 08:44:41 +07:00
Gregorio Chiko Putra	d0743b7443	Merge branch 'hotfix/https-and-input-description'	2019-05-20 08:32:32 +07:00
Gregorio Chiko Putra	3f53b17ba2	Bumped version to v1.1.2	2019-05-20 08:32:29 +07:00
Gregorio Chiko Putra	4fbc685015	Added proxy to fix https issue, changed the description for form inputs	2019-05-20 08:31:32 +07:00