Commit Graph

278 Commits

Author SHA1 Message Date
Maciej 80672b24d7 Merge pull request 'unit-tests' (#50) from unit-tests into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/50
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2021-01-14 15:02:39 +01:00
wrzesinski-hubert afd809a9ec tests 2021-01-14 15:02:28 +01:00
wrzesinski-hubert 78e63ce587 Merge branch 'master' of git.plannaplan.pl:y0rune/frontend into unit-tests 2021-01-14 14:29:14 +01:00
wrzesinski-hubert 57cb77e643 new test 2021-01-14 14:27:59 +01:00
wrzesinski-hubert b06a6ec07e unit-tests 2021-01-13 20:01:17 +01:00
wrzesinski-hubert 1930b80cd8 admin panel API connected 2021-01-13 19:05:11 +01:00
wrzesinski-hubert 1c7888a478 fixed hover 2021-01-12 22:59:12 +01:00
wrzesinski-hubert d4f7ad341a plan history is working correctly (i think) 2021-01-07 19:57:06 +01:00
Maciek Głowacki 0b10ed05d6 history first draft 2021-01-05 23:46:51 +01:00
Maciek Głowacki 782dbf7218 fixed token 2021-01-05 21:05:16 +01:00
Maciek Głowacki b8ef87fc83 tests 2021-01-05 19:23:44 +01:00
wrzesinski-hubert 72782880c0 Merge pull request 'Admin' (#49) from Admin into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/49
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-12-29 17:31:40 +01:00
Maciek Głowacki 171cbdac11 updated with new api 2020-12-29 17:32:06 +01:00
Maciek Głowacki bbba8618cb checkout 2020-12-29 01:06:39 +01:00
wrzesinski-hubert 3b1384ea4a Merge pull request 'Admin' (#38) from Admin into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/38
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-12-16 00:50:03 +01:00
Maciej 56b7b8ef88 Merge branch 'master' into Admin 2020-12-16 00:49:44 +01:00
Maciek Głowacki f9e06822aa Merge branch 'Admin' of http://git.plannaplan.pl/y0rune/frontend into Admin 2020-12-16 00:50:19 +01:00
Maciek Głowacki 94eca20670 logout update 2020-12-16 00:50:09 +01:00
Maciek Głowacki 8f85d605e1 topbar changes: 2020-12-16 00:23:31 +01:00
wrzesinski-hubert da183bccfa Merge pull request 'topbar changes:' (#37) from Admin into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/37
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-12-16 00:23:16 +01:00
Maciej 78ef389600 Merge branch 'master' into Admin 2020-12-16 00:22:58 +01:00
wrzesinski-hubert d65d98dfec Merge pull request 'increased delay' (#36) from Admin into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/36
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-12-14 17:24:09 +01:00
Maciek Głowacki 39a7e109c8 increased delay 2020-12-14 17:20:44 +01:00
Marcin Woźniak f7a3ab53c5
Updated: App.tsx
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-14 16:24:56 +01:00
Marcin Woźniak 274d50fac3 Merge pull request 'Admin' (#35) from Admin into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/35
Reviewed-by: Marcin Woźniak <y0rune@aol.com>
2020-12-14 15:53:26 +01:00
wrzesinski-hubert 17c77a1a3c Merge branch 'master' into Admin 2020-12-14 15:51:51 +01:00
wrzesinski-hubert 6258b40139 ... 2020-12-14 15:52:32 +01:00
Maciek Głowacki 54027d1980 admin panel changes 2020-12-12 20:32:09 +01:00
Maciek Głowacki e3a1b280e0 user interface changes 2020-12-12 19:57:16 +01:00
Maciek Głowacki 597f17695d additional changes, setup localStorage 2020-12-12 17:54:13 +01:00
wrzesinski-hubert 8ba07f5c07 ... 2020-12-10 21:51:01 +01:00
wrzesinski-hubert b6121a5eee lots of changes 2020-12-10 21:26:09 +01:00
wrzesinski-hubert a3438586bd test to test 2020-12-08 19:25:52 +01:00
Marcin Woźniak 6fffd9bb32
Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 19:08:16 +01:00
wrzesinski-hubert 68667e55de checking someone's plan in progress 2020-12-05 18:32:37 +01:00
wrzesinski-hubert c7dc37c827 new provider + select changes 2020-12-05 18:06:26 +01:00
wrzesinski-hubert 61b0a6f464 searching users 2020-12-05 00:16:59 +01:00
wrzesinski-hubert ff9db515bc Merge branch 'master' of git.plannaplan.pl:y0rune/frontend 2020-12-04 22:26:35 +01:00
Marcin Woźniak 1aeb24c345 Merge pull request 'admin-panel' (#33) from admin-panel into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/33
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2020-12-04 16:41:16 +01:00
Marcin Woźniak b97935dcd0
Merge remote-tracking branch 'origin/master' into admin-panel 2020-12-04 16:39:51 +01:00
wrzesinski-hubert 6021d1b366 Merge branch 'master' of git.plannaplan.pl:y0rune/frontend 2020-12-04 16:31:24 +01:00
wrzesinski-hubert 99d3d84efc prep for testing by users 2020-12-04 15:05:54 +01:00
wrzesinski-hubert 7d5c3ba2b9 select menu in static postition 2020-12-03 23:46:45 +01:00
wrzesinski-hubert 08e9f84521 update ednopints 2020-12-02 18:29:11 +01:00
Maciek Głowacki e7d8e024d6 design changes 2020-12-02 09:04:06 +01:00
Marcin Woźniak 3ae44b5bcf
Updated gitlab-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-30 21:54:23 +01:00
wrzesinski-hubert 19653178c4 select and admin panel 2020-11-29 23:42:36 +01:00
Marcin Woźniak 0d778051f6
WORKS: .gitlab-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-26 23:15:42 +01:00
Marcin Woźniak 38e28ea536
WORKS: .gitlab-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-26 23:13:22 +01:00
Maciek Głowacki 540bb9486c updated yml file 2020-11-26 19:18:03 +01:00