|
|
bf8ce5f5ad
|
Merge branch 'master' into 'all_new_desgn_and_in-app_display_of_events'
# Conflicts:
# readme.md
|
2018-12-30 20:57:48 +01:00 |
|
|
|
689f2dd2ae
|
the event data is now downloaded from the fanny-server
|
2018-12-30 20:56:26 +01:00 |
|
|
|
ae7d59f9ec
|
fixed layout bug in the settings delegate long description that made it overlap the next page icon
|
2018-12-28 11:47:19 +01:00 |
|
|
|
30ca123626
|
fixed bug that made old filters without role undeletable
|
2018-12-28 11:43:57 +01:00 |
|
|
|
bcf98edb9d
|
fixed issue with filters that made a "no data" error occur, when the user set at least one filter for teacher but none for students and vice versa, even if there was data available.
|
2018-12-28 11:37:06 +01:00 |
|
|
|
2ff52410d2
|
- cleaned up the views
- added teacher mode
|
2018-12-27 21:41:46 +01:00 |
|
|
|
e2e83ba5ea
|
finished up pull to refresh at the event and foodplan form
|
2018-12-27 15:01:05 +01:00 |
|
|
|
8400d2db1c
|
added basic pull to refresh on event form
|
2018-12-27 11:30:12 +01:00 |
|
|
|
74b9233a9e
|
- added a header with some basic information to the event form ( addressed issue #12 )
- when invalid event data is submitted, an "internal processing error" (900) is now thrown ( addressed issue #15 )
|
2018-12-27 11:06:26 +01:00 |
|
|
|
f7d5a111d0
|
added header to the event view, showing:
- creation date
- target date
- cleaning class
added one event block underneath the header indicating what the different fields contain
|
2018-12-26 23:44:24 +01:00 |
|
|
|
963da066af
|
Merge remote-tracking branch 'origin/all_new_desgn_and_in-app_display_of_events' into all_new_desgn_and_in-app_display_of_events
|
2018-12-26 17:55:09 +01:00 |
|
|
|
4835a77547
|
data is now downloaded from the itsblue server
|
2018-12-26 17:54:45 +01:00 |
|
|
|
6e92a9eace
|
Update CHANGELOG.md
|
2018-12-26 14:43:32 +01:00 |
|
|
|
c3e221d33e
|
Update CHANGELOG.md
|
2018-12-26 14:42:43 +01:00 |
|
|
|
26cb5109c1
|
Update CHANGELOG.md
|
2018-12-26 14:42:22 +01:00 |
|
|
|
0e1b387610
|
Update readme.md
|
2018-12-26 14:39:42 +01:00 |
|
|
|
e4935e842b
|
removed webview
|
2018-12-26 13:35:44 +01:00 |
|
|
|
0668066d22
|
small changes to the event parser
|
2018-12-26 13:28:56 +01:00 |
|
|
|
b55d398ce0
|
fixed empty event box at the bottom of the event form
( addressed issue #13 )
|
2018-12-26 10:37:14 +01:00 |
|
|
|
a7a26513c0
|
fixed "no data" label on the event form
|
2018-12-26 10:23:54 +01:00 |
|
|
|
9c0e867ffd
|
remove unnecessary file
|
2018-12-26 10:01:33 +01:00 |
|
|
|
7bd43445f4
|
ignore .Ds_Store
|
2018-12-26 10:01:15 +01:00 |
|
|
|
8b43d23733
|
- moved the login management to cpp
|
2018-12-25 20:34:53 +01:00 |
|
|
|
4271bec598
|
- finished up event filter
- started to move the login management from qml to cpp
|
2018-12-25 19:30:42 +01:00 |
|
|
|
4af8ba030e
|
added the ability to filter the events by grade and class
|
2018-12-25 15:16:24 +01:00 |
|
|
|
6ad57a4661
|
- commented code
- added settingsForm basic grade filter for the events
|
2018-12-25 00:15:25 +01:00 |
|
|
|
7f127b0feb
|
- further implementation of the event parser and view
- clean up of qml and c++ code
|
2018-12-24 21:37:32 +01:00 |
|
|
|
4e1edbe11a
|
- started to implement the eventdisplay as QAbstractItemModel
- started to adjust the serverconn getter to support that
|
2018-12-23 22:40:30 +01:00 |
|
|
|
bcfc802932
|
cleaned up code of foodplan
|
2018-12-23 21:12:33 +01:00 |
|
|
|
c6e1e12cfe
|
Finished up foodplan Display:
- now using QAbstractItem model
- added error handling so the app doesn't crash anymore when the data is invalid
|
2018-12-23 21:07:10 +01:00 |
|
|
|
99fd686c65
|
- New Design almost finished
- further implementation of in-app event display but stiff having problems
|
2018-12-23 00:06:05 +01:00 |
|
|
|
5dec809af1
|
started to implement the new design
|
2018-12-22 13:43:43 +01:00 |
|
|
|
4cec1f2ba4
|
minor bugfixes
|
2018-12-21 23:56:10 +01:00 |
|
|
|
2db43a1f76
|
Started internal cleanup and started to implement the in app display for the events
|
2018-12-21 12:23:12 +01:00 |
|
|
|
c459516e2a
|
more design fixes
|
2018-12-07 23:12:34 +01:00 |
|
|
|
58f5d4835b
|
added "show password" functionality and fixed some layout and compiling issues
|
2018-12-07 23:10:51 +01:00 |
|
|
|
89c252e203
|
Update readme.md
|
2018-12-07 21:33:22 +01:00 |
|
|
|
1868e4bbed
|
Update CHANGELOG.md
Deleted CHANGELOG
|
2018-11-30 20:33:24 +01:00 |
|
|
|
6462925e1b
|
Update pages/01.home/01.test/default.md
|
2018-11-21 15:21:02 +01:00 |
|
|
|
da248c2362
|
Update pages/01.home/01.test/default.md
Deleted 01.punkt-1/default.md
|
2018-11-21 15:20:12 +01:00 |
|
|
|
c26eaf5142
|
Update 01.punkt-1/default.md
Deleted pages/02.typography/punkt-1/default.md
|
2018-11-21 15:16:21 +01:00 |
|
dorian
|
ecadc251c0
|
(Grav GitSync) Automatic Commit from dorian
|
2018-11-21 15:10:54 +01:00 |
|
dorian
|
0f9577a06f
|
(Grav GitSync) Automatic Commit from dorian
|
2018-11-21 15:07:33 +01:00 |
|
dorian
|
e098675166
|
(Grav GitSync) Automatic Commit from dorian
|
2018-11-21 15:01:31 +01:00 |
|
|
|
3d73e0d3dc
|
Deleted pages/03.test/test.md
|
2018-11-21 15:00:49 +01:00 |
|
dorian
|
08205d2fd0
|
(Grav GitSync) Automatic Commit from dorian
|
2018-11-21 14:59:24 +01:00 |
|
dorian
|
2eef28320f
|
(Grav GitSync) Automatic Commit from dorian
|
2018-11-21 14:58:08 +01:00 |
|
|
|
6f5cd376ea
|
Update pages/03.test/test.md
|
2018-11-21 14:54:58 +01:00 |
|
|
|
7838ba6127
|
Update default.md
|
2018-11-21 14:38:06 +01:00 |
|
|
|
b3c57011c8
|
Add new file
|
2018-11-21 14:37:26 +01:00 |
|
