1
0
forked from s434786/DINO_SCRUM
Commit Graph

59 Commits

Author SHA1 Message Date
313540f4d8 Merge remote-tracking branch 'upstream/master' 2019-01-29 00:49:03 +01:00
f2c34d7e0f Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-28 23:30:10 +00:00
Konrad Pierzyński
8504165b13 Added small bugfix with windows [closing on enter] 2019-01-29 00:12:51 +01:00
Konrad Pierzyński
9b3344aa72 Added searching, added server address to app.config 2019-01-28 23:58:03 +01:00
Konrad Pierzyński
1be5d1f7c0 Added serverURL to config, set up box for searching 2019-01-27 21:17:23 +01:00
3afd03e84c Usunięto zmianę wielkości czcionki. Zmieniono nieznacznie ułożenie napisu i obrazka. 2019-01-27 21:16:28 +01:00
4ed58fb34a Merge branch 'master' of s434713/DINO_SCRUM into master 2019-01-27 19:11:14 +00:00
9e5a1bde5b Usuniece konfliktu 2019-01-27 19:31:58 +01:00
3c332a07ea Merge branch 'master' of s434739/DINO_SCRUM into master 2019-01-27 18:16:05 +00:00
3d1be2f568 Dodano sprawdzenie polaczenia 2019-01-27 17:28:29 +01:00
63d9a5f3ca Zmieniono sposób numeracji stron, od teraz strona pierwsza to 1, druga to 2 itp. 2019-01-27 14:32:39 +01:00
40be2adfd7 Dodano obsługę wyjątku, który wyświetla błąd, gdy w polu dodania/odjęcia ilości owoców wpiszemy tekst zamiast liczby dodatniej. 2019-01-27 13:59:15 +01:00
ef026afe00 Wyśrodkowanie tekstu w okienku Wartość Magazynu. 2019-01-27 13:42:41 +01:00
ae474cec63 Dostosowano wielkość czcionki w okienku Wartość Magazynu, aby była tej samej wielkość co tekst w reszcie aplikacji 2019-01-27 13:32:54 +01:00
d145e46a4a Wyśrodkowanie nazwy owocu pod obrazkiem w okienku dodanie/odjęcie od ilości. 2019-01-27 13:18:38 +01:00
8eb4e0d538 Usuń 'README.md' 2019-01-25 16:47:46 +00:00
9240057242 Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-24 00:36:10 +00:00
Konrad Pierzyński
c73fd4e058 Added caching class to handle images 2019-01-23 23:10:44 +01:00
Konrad Pierzyński
1465eead02 Pagination optymalization, infoWindow about fruits, deleted list of themes, focusing keyboard on value input 2019-01-23 22:39:54 +01:00
2d30f25df0 Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-23 10:08:23 +00:00
Konrad Pierzyński
f16b345bfc Added + zł and names for columns 2019-01-23 11:07:24 +01:00
71a4d4e2ae Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-22 23:36:24 +00:00
Konrad Pierzyński
8e3e2ccc72 Added combo list to change theme 2019-01-23 00:33:41 +01:00
Konrad Pierzyński
93bb0a8e08 Added theme button 2019-01-23 00:13:05 +01:00
231ee392da Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-22 20:42:51 +00:00
Konrad Pierzyński
d1f4178bc1 Added Enter( return key ) handler to AmountWindow 2019-01-22 21:40:46 +01:00
Konrad Pierzyński
3fbea7ec0d Error window, error when quantityMax is touched, pagination, small bugfixs 2019-01-22 21:02:49 +01:00
0a5e4d37fa Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-22 17:16:17 +00:00
Konrad Pierzyński
e2a0994fd2 Fixed bug with loading fruits. Added easy configurable colors in App.xaml. Some small bugs with resizing windows 2019-01-22 17:35:51 +01:00
0f835efe8c Merge branch 'master' of s434739/DINO_SCRUM into master 2019-01-21 20:54:10 +00:00
3a210d9b2b Merge branch 'master' of https://git.wmi.amu.edu.pl/s434786/DINO_SCRUM 2019-01-21 21:47:48 +01:00
9e7aa5b697 Poprawa obslugi komunikatow bledu 2019-01-21 21:14:11 +01:00
07ceab2cb9 Fixed window size 2019-01-21 19:51:08 +00:00
79cede3b6d Merge branch 'master' of s434739/DINO_SCRUM into master
Jest ok. Dzięki
2019-01-21 19:50:33 +00:00
23e1fd4ef7 Zmiany po upstream 2019-01-21 19:48:10 +01:00
701ed8a173 Niedomiar, nadmiar, zmiana na polski, ustalenie max dla kazdego projektu na 2500 szt 2019-01-21 14:43:04 +01:00
cbfd3f6797 Merge branch 'master' of s442333/DINO_SCRUM into master 2019-01-17 15:30:52 +00:00
Konrad Pierzyński
95c46a534e Fixed button 'Wartosc magazynu' 2019-01-16 23:56:24 +01:00
Konrad Pierzyński
c205c3d6ed Task: 51 2019-01-16 23:24:11 +01:00
Konrad Pierzyński
566caf5554 SYSMAG: 40,45,50,54 2019-01-16 19:29:42 +01:00
89d02e0c72 Merge branch 'master' of s434713/DINO_SCRUM into master 2019-01-16 09:08:05 +00:00
8c3e6889da Deleted Fody package. 2019-01-16 02:00:30 +01:00
697fea6289 Merge branch 'master' of s434713/DINO_SCRUM into master 2019-01-16 00:27:00 +00:00
2a0dfe3587 Replaced polish word to english. 2019-01-16 00:52:00 +01:00
811922788a Zaktualizuj 'Magazyn_Client/Magazyn/MainWindow.xaml' 2019-01-15 18:09:20 +00:00
2681918135 Merge branch 'master' of s434739/DINO_SCRUM into master 2019-01-15 18:08:43 +00:00
Mateusz Lesiecki
a6e7cd50f3 Poprawki GUI 2019-01-15 17:53:09 +01:00
2d7e6888b6 Merge branch 'master' of s434739/DINO_SCRUM into master 2019-01-14 21:05:48 +00:00
Mati
d903b5b18d Zmiana GUI dodatnie MD 2019-01-14 20:10:05 +01:00
723a415808 Removed unecessary camel case usage 2019-01-13 18:38:30 +00:00