Commit Graph

46 Commits

Author SHA1 Message Date
4544c8f398 Merge branch 'master' into VIS-40-VIS-41 2021-01-18 16:14:12 +01:00
VanillaHellen
1c7aa28ed0 fix 2021-01-18 16:13:21 +01:00
VanillaHellen
a4b04c7c8f added the view after uploading the file 2021-01-18 16:10:17 +01:00
0dd70ee9b7 Merge pull request 'VIS-37' (#8) from VIS-37 into master
Reviewed-on: #8
2021-01-11 16:25:46 +01:00
VanillaHellen
98c1768d4f fix 2021-01-11 16:24:30 +01:00
VanillaHellen
47a0a52475 refreshes the table after deleting the file 2021-01-11 16:22:46 +01:00
5cceb7c77f Merge branch 'VIS-38' 2021-01-11 10:25:27 +01:00
cf29bdc68b Added Help tab, changed Home to File 2021-01-11 10:24:05 +01:00
a19168fc05 Merge pull request 'VIS-34' (#7) from VIS-34 into master
Reviewed-on: #7
2021-01-04 13:02:59 +01:00
VanillaHellen
2ef84b5fb3 Merge remote-tracking branch 'origin/master' into VIS-34 2021-01-04 13:01:40 +01:00
VanillaHellen
0ef2278faf changed Upload view 2021-01-04 12:58:04 +01:00
6ea143b46f Merge pull request 'created Visualisations tab with the same table' (#6) from VIS-32 into master
Reviewed-on: #6
2021-01-04 12:48:38 +01:00
VanillaHellen
5a37492188 created Visualisations tab with the same table 2021-01-04 12:47:36 +01:00
cbd200ea98 Merge pull request 'added popup confirmation' (#5) from VIS-26 into master
Reviewed-on: #5
2021-01-04 12:26:50 +01:00
VanillaHellen
5c7912aeab Merge remote-tracking branch 'origin/master' into VIS-26 2021-01-04 12:26:21 +01:00
e25ea9936d Merge pull request 'deleting the file' (#4) from VIS-24 into master
Reviewed-on: #4
2021-01-04 12:24:22 +01:00
ebba0059e2 Merge branch 'master' into VIS-24 2021-01-04 12:24:16 +01:00
VanillaHellen
36d5a30be0 added popup confirmation 2021-01-04 12:23:17 +01:00
VanillaHellen
f75fb1f333 deleting the file 2021-01-04 12:22:19 +01:00
2c19e7f472 added test output file 2020-12-21 23:47:55 +01:00
21b49e425d added 2nd test 2020-12-21 23:45:46 +01:00
467f8e5578 Merge branch 'TESTS' 2020-12-21 23:12:23 +01:00
59fb733468 added save_input unittest 2020-12-21 23:10:17 +01:00
d02d0e53d1 Merge branch 'TESTS' 2020-12-21 22:43:51 +01:00
fcb6d5f225 fixed uploading file 2020-12-21 22:42:37 +01:00
ec69d2df9d Merge branch 'master' into TESTS 2020-12-21 21:45:09 +01:00
6f22a62e91 Merge branch 'master' of https://git.wmi.amu.edu.pl/s406917/VisionScore 2020-12-21 21:41:01 +01:00
ffdb50f07f changed format of main window to class 2020-12-21 21:39:56 +01:00
a0790ead09 Merge pull request 'added View function and a txt file to test it' (#3) from VIS-23 into master
Reviewed-on: #3
2020-12-21 18:20:16 +01:00
VanillaHellen
ece0e50d51 added View function and a txt file to test it 2020-12-21 18:18:47 +01:00
9a522349b4 added empty tests file 2020-12-21 17:58:39 +01:00
3862848a7e Merge pull request 'VIS-22 added Library table' (#2) from VIS-22 into master
Reviewed-on: #2
2020-12-21 17:43:16 +01:00
VanillaHellen
bfd9402e59 added Library table 2020-12-21 17:40:37 +01:00
4d2cf50bd9 Merge branch 'VIS-20' 2020-12-21 15:15:46 +01:00
ad18b109d0 Added draft context menu 2020-12-21 15:13:58 +01:00
ff6a994f3a Merge branch 'VIS-16-VIS-18-VIS-19' 2020-12-14 15:40:18 +01:00
893f822341 Added app icon and logo in window 2020-12-14 15:38:18 +01:00
2dfc748f90 Merge branch 'VIS-17' 2020-12-14 14:29:59 +01:00
813aca6ed5 Created venv and base app 2020-12-14 14:28:42 +01:00
VanillaHellen
931fde64d5 removed table of contents since it didn't work 2020-11-30 19:25:39 +01:00
VanillaHellen
e78531cda4 fixed links formatting 2020-11-30 19:25:12 +01:00
VanillaHellen
958cc58900 Merge branch 'master' of https://git.wmi.amu.edu.pl/s406917/VisionScore 2020-11-30 19:23:41 +01:00
VanillaHellen
2ed7f7a494 somehow correct readme 2020-11-30 19:23:23 +01:00
f90a935be6 Merge pull request 'VIS-1 test' (#1) from VIS-1-TEST into master
Reviewed-on: #1
2020-11-30 18:29:33 +01:00
VanillaHellen
1da74952d8 test 2020-11-30 18:25:17 +01:00
VanillaHellen
7341092200 added readme 2020-11-30 18:16:04 +01:00