Commit Graph

65 Commits

Author SHA1 Message Date
GotPPay
d2ff1e497a override missing modules using hardcoded values 2018-08-06 20:44:10 +02:00
GotPPay
09a2be6be8 environment fix 2018-08-06 20:44:10 +02:00
GotPPay
688cb1ad59 add htaccess 2018-08-06 20:44:10 +02:00
GotPPay
e3765f7b09 improve environment handling 2018-08-06 20:44:10 +02:00
Bilal Catic
c1834f679a Merge branch 'delivery-process' into 'master'
Delivery process

See merge request saburly/wiaas/new-wiaas!8
2018-08-06 18:03:45 +00:00
Almira Krdzic
569a638c89 update readme 2018-08-06 19:33:00 +02:00
Almira Krdzic
5afdde434b Delivery setup 2018-08-06 17:36:57 +02:00
Almira Krdzic
ed0e44b964 fixes 2018-08-01 14:47:02 +02:00
Almira
5e9beb2d97 Merge branch 'stops-redirect-on-login' into 'master'
stops redirect on login page

See merge request saburly/wiaas/new-wiaas!7
2018-08-01 09:59:58 +00:00
GotPPay
5b78b642e2 stops redirect on login page 2018-08-01 11:53:25 +02:00
Almira Krdzic
321fbc3f61 Wiaas delivery process integration with flow 2018-08-01 11:46:43 +02:00
Bilal Catic
158a3a97ad Merge branch 'new-project-structure' into 'master'
New project structure

See merge request saburly/wiaas/new-wiaas!6
2018-07-31 11:43:28 +00:00
Almira Krdzic
2c57157703 Update dotenv env file 2018-07-30 18:40:43 +02:00
Almira Krdzic
7f3437126f Merge branch 'new-project-structure' of gitlab.com:saburly/wiaas/new-wiaas into new-project-structure 2018-07-30 17:27:09 +02:00
Almira Krdzic
0ac5e5940b Updates 2018-07-30 17:26:55 +02:00
Almira
3b5074d422 Merge branch 'clean-frontend-in-new-structure' into 'new-project-structure'
remove obsolete config variables

See merge request saburly/wiaas/new-wiaas!5
2018-07-30 14:29:31 +00:00
Almira Krdzic
828c71c253 Update enviroment sample 2018-07-30 16:26:46 +02:00
GotPPay
8bad650d23 remove obsolete config variables 2018-07-30 16:20:51 +02:00
Almira Krdzic
6eb1cf5b39 Update README 2018-07-30 11:02:09 +02:00
Almira Krdzic
a1337592d3 Update README 2018-07-30 10:57:08 +02:00
Almira Krdzic
f399d3383c Update README 2018-07-30 10:56:46 +02:00
Almira Krdzic
2cd572b74f Update README 2018-07-30 10:56:19 +02:00
Almira Krdzic
6bc157f2ed Update README 2018-07-30 10:55:13 +02:00
Almira Krdzic
ff2b354fcc Update README 2018-07-30 10:52:12 +02:00
Almira Krdzic
b060b53553 Merge branch 'new-project-structure' of gitlab.com:saburly/wiaas/new-wiaas into new-project-structure 2018-07-30 10:28:09 +02:00
Almira Krdzic
3ab7ceb2c5 Update readme 2018-07-30 10:26:49 +02:00
Almira Krdzic
2230f984cc Readme updates 2018-07-30 10:13:34 +02:00
Almira Krdzic
481b960471 Fixes 2018-07-30 09:45:15 +02:00
Almira Krdzic
ec170577c6 Readme changes 2018-07-30 09:12:07 +02:00
Almira Krdzic
ff649553cc Readme changes 2018-07-30 09:08:28 +02:00
Almira Krdzic
ca002a86c5 Readme changes 2018-07-30 09:07:20 +02:00
Almira Krdzic
ff693b9a76 Readme changes 2018-07-30 09:03:58 +02:00
Almira Krdzic
097e4259bd Readme changes 2018-07-30 09:01:56 +02:00
Almira Krdzic
942a7d2484 Readme changes 2018-07-30 09:01:18 +02:00
Almira Krdzic
df1b42bb1e Readme changes 2018-07-30 09:00:38 +02:00
Almira Krdzic
e91e2d8a93 New project structure init 2018-07-30 08:54:41 +02:00
Almira
63cce6100c Merge branch 'login' into 'master'
Enabled Json Web Token authorisation on backend, and frontend

See merge request saburly/wiaas/new-wiaas!4
2018-07-26 12:19:12 +00:00
Nedim Uka
5c07b371a0 Fixed docker env bugs, and issues from PR 2018-07-26 13:47:59 +02:00
Nedim Uka
1f6b1043a4 Enabled Json Web Token authorisation on backend, and frontend 2018-07-24 17:28:24 +02:00
Nedim Uka
03963d6056 Merge branch 'reverse-proxy-https-to-http' into 'master'
Reverse proxy https to http

See merge request saburly/wiaas/new-wiaas!3
2018-07-19 12:36:59 +00:00
GotPPay
d09867a3a7 put .htaccess file needeed for API to work 2018-07-15 16:57:00 +02:00
GotPPay
397fd69cfe remove ssl from container and use port 80 2018-07-15 13:52:18 +02:00
Bilal Catic
e484c6dd54 Merge branch 'introduce-ssl-cert' into 'master'
Introduce ssl cert

See merge request saburly/wiaas/new-wiaas!2
2018-07-09 13:22:06 +00:00
GotPPay
762facaa4c Merge branch 'introduce-ssl-cert' of https://gitlab.com/saburly/wiaas/new-wiaas into introduce-ssl-cert 2018-07-09 10:59:53 +02:00
GotPPay
b662efc7f8 fix api access and url rewriting 2018-07-09 10:47:39 +02:00
GotPPay
796200e902 update readme 2018-07-09 10:45:48 +02:00
GotPPay
453a4ff707 stop rewriting rules, create symlink to root dir named as api 2018-07-06 17:58:30 +02:00
GotPPay
4346299a52 create ssl cer in container to serve content 2018-07-05 18:44:41 +02:00
Bilal Catic
72d474a985 Merge branch 'initial-setup' into 'master'
Initial setup

See merge request saburly/wiaas/new-wiaas!1
2018-06-21 10:44:00 +00:00
GotPPay
e9442e223e update env setup 2018-06-20 12:49:07 +02:00