Commit Graph

250 Commits

Author SHA1 Message Date
wrzesinski-hubert
1235484538 Merge branch 'statistics' of git.plannaplan.pl:y0rune/frontend into statistics 2021-01-19 21:37:59 +01:00
wrzesinski-hubert
b2e5a16e7d clean 2021-01-19 21:37:11 +01:00
wrzesinski-hubert
34f85561c3 Merge branch 'master' into statistics 2021-01-19 21:33:04 +01:00
wrzesinski-hubert
edda909c66 go to master 2021-01-19 21:32:43 +01:00
wrzesinski-hubert
aedc0ea708 ... 2021-01-19 17:47:19 +01:00
wrzesinski-hubert
135deb56c6 transfer c.d 2021-01-19 17:46:14 +01:00
wrzesinski-hubert
6748309fbd transfer 2021-01-19 17:04:07 +01:00
wrzesinski-hubert
f9fa6412ef downloading file 2021-01-19 16:10:43 +01:00
Maciek Głowacki
26a54912cd changes 2021-01-19 07:23:35 +01:00
Maciek Głowacki
df1d26f653 changes 2021-01-18 22:37:31 +01:00
Maciek Głowacki
8b563d3e70 modal setup 2021-01-18 00:57:01 +01:00
wrzesinski-hubert
429c58befb ... 2021-01-17 22:24:44 +01:00
wrzesinski-hubert
31a85db790 statistics 2021-01-17 19:03:54 +01:00
wrzesinski-hubert
b7424826ad console logi 2021-01-14 15:32:50 +01:00
Maciej
6db69f95fb Merge pull request 'console logi' (#56) from idk into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/56
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2021-01-14 15:32:33 +01:00
Maciej
88899d9703 Merge branch 'master' into idk 2021-01-14 15:32:20 +01:00
wrzesinski-hubert
0d433c12ad date-fns 2021-01-14 15:30:18 +01:00
Maciej
64869bbd51 Merge pull request 'date-fns' (#55) from idk into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/55
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2021-01-14 15:29:22 +01:00
7fbf7e3fad
Merge from plan-hisotry 2021-01-14 15:22:23 +01:00
wrzesinski-hubert
93107fcd0b ... 2021-01-14 15:14:54 +01:00
wrzesinski-hubert
bcd8a62d4e ... 2021-01-14 15:09:51 +01:00
wrzesinski-hubert
e8580c6a75 ... 2021-01-14 15:08:25 +01:00
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
f7a3ab53c5
Updated: App.tsx
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-14 16:24:56 +01:00
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