Commit Graph

278 Commits

Author SHA1 Message Date
0190115aef Merge pull request 'Update' (#31) from cidi into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/31
2020-10-21 18:53:48 +02:00
7a80915f45 Update
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-21 18:54:25 +02:00
13df63c026 Update
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-21 18:50:19 +02:00
71b08f95c2 Merge pull request 'Update' (#30) from cidi into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/30
2020-10-21 18:49:52 +02:00
8da403d4fe Update
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-21 18:45:19 +02:00
ec0c915198 Merge pull request 'Update' (#29) from cidi into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/29
2020-10-21 18:44:36 +02:00
a16623d982 Added gitlabci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-21 18:42:07 +02:00
4565583704 Merge pull request 'Added gitlabci' (#28) from cidi into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/28
2020-10-21 18:41:37 +02:00
76b7397b8c Merge pull request 'we store user token in session storage now' (#21) from auth into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/21
2020-10-21 18:35:05 +02:00
maciekglowacki
a4ff47bdb5 we store user token in session storage now 2020-10-21 18:34:59 +02:00
Maciej
99d878762e Merge pull request 'debounce i css' (#20) from update-endpoints into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/20
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2020-10-21 14:01:20 +02:00
wrzesinski-hubert
443427166b test zmiana 2020-10-21 13:39:05 +02:00
wrzesinski-hubert
9b95e976fb 123 2020-10-21 13:08:42 +02:00
wrzesinski-hubert
f7a0a01811 123 2020-10-21 13:01:59 +02:00
wrzesinski-hubert
25a956da9f Merge branch 'update-endpoints' of git.plannaplan.pl:y0rune/frontend into update-endpoints 2020-10-21 13:00:54 +02:00
wrzesinski-hubert
6f4a0c7a47 123 2020-10-21 12:58:24 +02:00
wrzesinski-hubert
c3b1930db1 Merge branch 'master' into update-endpoints 2020-10-21 12:50:21 +02:00
wrzesinski-hubert
16056abc27 debounce i css 2020-10-16 18:53:34 +02:00
Maciej
77abef45e6 Merge pull request 'update-endpoints' (#19) from update-endpoints into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/19
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2020-10-12 17:39:05 +02:00
wrzesinski-hubert
0c7fe6348f css changes 2020-10-08 20:21:52 +02:00
wrzesinski-hubert
15448503e3 snackbar 2020-10-04 17:21:51 +02:00
Maciek Głowacki
ffce67ab42 mocked saveBasket to backend 2020-10-01 20:06:38 +02:00
Maciek Głowacki
d6aa58fd34 Added splitting groups into lectures and classes 2020-10-01 19:51:06 +02:00
wrzesinski-hubert
3cf62c8298 Merge branch 'master' of git.plannaplan.pl:y0rune/frontend 2020-10-01 18:19:04 +02:00
Maciej
8b812dcbed Merge pull request 'convert-to-table' (#18) from convert-to-table into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/18
Reviewed-by: Maciej <glowackimaciej97@gmail.com>
2020-10-01 18:15:20 +02:00
wrzesinski-hubert
b5c2d21057 123 2020-10-01 18:09:58 +02:00
wrzesinski-hubert
12d50c790b color croups and lectures 2020-09-28 20:16:54 +02:00
Maciek Głowacki
45a226b4b8 Hover state of close icon 2020-09-28 18:54:53 +02:00
wrzesinski-hubert
c1cf27d828 delete from basket 2020-09-28 18:36:38 +02:00
wrzesinski-hubert
fe1d103759 split groups at schedule and other stuff 2020-09-20 20:23:46 +02:00
Maciek Głowacki
44150eb322 Added popover and removed onClick event from scheduler 2020-09-19 00:17:23 +02:00
Maciek Głowacki
0ae374a0fb Simplified import starting with React. Added name property to group object passed to table. changed group interface shape.
;

;

l
;
d
2020-09-18 23:00:11 +02:00
wrzesinski-hubert
e90ffbe04d tylko wybrane gruppy 2020-09-11 18:56:14 +02:00
wrzesinski-hubert
78e54b70e4 prep 2020-09-11 08:08:49 +02:00
wrzesinski-hubert
d75530887e click na grupe niezwija karty przedmiotu 2020-08-31 18:10:36 +02:00
wrzesinski-hubert
1e9e336ee9 duperelki 2020-08-30 10:42:52 +02:00
Maciek Głowacki
9f531de1a5 Didn't convert to table but managed to change stylings accordingly 2020-08-29 18:52:03 +02:00
wrzesinski-hubert
f622ab66bd Merge branch 'master' of git.plannaplan.pl:y0rune/frontend 2020-08-27 17:01:24 +02:00
wrzesinski-hubert
d30852b97d Merge pull request 'you can add lectures now:' (#17) from add-lecture into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/17
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-08-26 18:42:46 +02:00
Maciek Głowacki
15c03b146f you can add lectures now:
:
2020-08-26 18:42:29 +02:00
wrzesinski-hubert
dcac0fb44e Merge branch 'master' of git.plannaplan.pl:y0rune/frontend 2020-08-26 17:32:20 +02:00
wrzesinski-hubert
651b32a245 Merge pull request 'minor patch' (#16) from minor-patch into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/16
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-08-26 17:30:51 +02:00
Maciek Głowacki
1cb1383a22 minor patch 2020-08-26 17:29:35 +02:00
wrzesinski-hubert
dd8fb0da3c Merge branch 'master' of git.plannaplan.pl:y0rune/frontend 2020-08-26 17:28:43 +02:00
Maciek Głowacki
796c641512 hihihi 2020-08-26 17:01:25 +02:00
wrzesinski-hubert
65e8306979 Merge pull request 'reset: master' (#14) from xd into master
Reviewed-on: http://git.plannaplan.pl/y0rune/frontend/pulls/14
Reviewed-by: wrzesinski-hubert <wrzesinski.hubert@gmail.com>
2020-08-26 16:38:23 +02:00
Maciek Głowacki
193427a412 reset: 2020-08-24 23:40:30 +02:00
wrzesinski-hubert
0927d94824 Merge branch 'master' into dropdown 2020-08-24 22:07:52 +02:00
Maciek Głowacki
457169fe0e Classes display correctly, still need to work on lectures: 2020-08-23 17:22:50 +02:00
Maciek Głowacki
9a0ee68317 Add course to basket functionality 2020-08-23 16:10:10 +02:00