mitch
|
97d5305e91
|
Merge branch 'master' into feature/battle-ready-mobile
# Conflicts:
# src/main/webapp/app/entities/force/force.component.html
# src/main/webapp/app/entities/force/force.component.ts
|
2022-03-04 13:18:38 -05:00 |
|
|
|
3018d92f97
|
Merge pull request 'Added support for battlefield role in units' (#6) from feature/add-battlefield-role-to-update into master
Reviewed-on: mitch/crusade-tracker#6
|
2022-03-04 04:44:24 +00:00 |
|
mitch
|
12afd915a7
|
Added support for battlefield role in units
|
2022-03-03 23:43:38 -05:00 |
|
|
|
eccfcfb1ea
|
Merge pull request 'Improved unit-detail view adding battle honours, battle scars, and rank' (#4) from feature/update-army-view into master
Reviewed-on: mitch/crusade-tracker#4
|
2022-03-04 03:45:37 +00:00 |
|
mitch
|
9a526990ec
|
Improved unit-detail view adding battle honours, battle scars, and rank
|
2022-03-03 22:42:04 -05:00 |
|
|
|
9b20145e77
|
fixes for army-update 500 error
|
2021-08-17 07:32:53 -04:00 |
|
|
|
bff4c02f97
|
Merge pull request 'feature/army-specific-points' (#3) from feature/army-specific-points into master
Reviewed-on: http://git.nerdfortress.dev/vesem/crusade-tracker/pulls/3
|
2021-08-11 11:31:28 +00:00 |
|
|
|
04235ad967
|
Cascade delete on army
|
2021-08-11 07:30:39 -04:00 |
|
|
|
dff58a7d0a
|
Added mail configuration
|
2021-08-10 18:47:20 -04:00 |
|
|
|
230648a968
|
Added mail configuration
|
2021-08-10 18:10:09 -04:00 |
|
|
|
884446e031
|
local commit
|
2021-08-10 17:33:43 -04:00 |
|
|
|
d3670994dc
|
seperated desktop and mobile for force listing
starting mobile version of force listing
|
2021-08-06 08:11:00 -04:00 |
|
|
|
73e40980de
|
Updates to dockerfile
|
2021-08-06 06:48:42 -04:00 |
|
|
|
20ff4b4a44
|
Merge pull request 'mobile-web' (#2) from mobile-web into master
Reviewed-on: http://git.nerdfortress.dev/vesem/crusade-tracker/pulls/2
|
2021-08-06 02:39:58 +00:00 |
|
|
|
0d8382522d
|
Merge branch 'master' into mobile-web
|
2021-08-05 22:39:07 -04:00 |
|
|
|
8dce7055ff
|
Added army-detail mobile version!
|
2021-08-05 22:35:56 -04:00 |
|
|
|
6e98776290
|
Started mobile web interface
|
2021-08-04 07:03:25 -04:00 |
|
|
|
c3117f3299
|
Merge pull request 'Started mobile web interface' (#1) from general_updates into master
Reviewed-on: http://git.nerdfortress.dev/vesem/crusade-tracker/pulls/1
|
2021-08-01 12:26:07 +00:00 |
|
|
|
1d44ba766d
|
Started mobile web interface
|
2021-08-01 08:25:32 -04:00 |
|
|
|
44dea44cd5
|
Started mobile web interface
|
2021-08-01 08:19:49 -04:00 |
|
|
|
d4be261458
|
Initial Commit
|
2021-01-18 15:27:50 -05:00 |
|
