Commit Graph

48 Commits

Author SHA1 Message Date
mitch
32cfe52c89 CT-39 Feature: Add highlightning around each unit on force.html 2022-04-19 23:26:49 -04:00
mitch
df0c418980 Updated comment 2022-04-19 22:52:02 -04:00
e3b6ea10ad CT-38 (#17)
Co-authored-by: mitch <mitchellthom@gmail.com>
Reviewed-on: mitch/crusade-tracker#17
2022-04-19 12:36:09 +00:00
mitch
ea61369763 Removed statement 2022-04-15 08:52:55 -04:00
06913a7f20 Merge pull request 'CT-33: Added alert for units needing to rank up' (#16) from feature/CT-33/add-missing-level-notice into master
Reviewed-on: mitch/crusade-tracker#16
2022-04-15 12:27:56 +00:00
mitch
bbd3d69fba CT-33: Added alert for units needing to rank up 2022-04-15 08:26:50 -04:00
mitch
46ffde929d Added heavy support to unit-army-update.component.html 2022-04-11 20:10:11 -04:00
f02f267de0 Merge pull request 'CT-30 BUG: Forcetracker clear button removes login token' (#15) from feature/CT-32/remove-unit-detail-page into master
Reviewed-on: mitch/crusade-tracker#15
2022-03-28 12:13:33 +00:00
mitch
9747e08167 CT-30 BUG: Forcetracker clear button removes login token 2022-03-28 08:12:29 -04:00
d89469dac2 Merge pull request 'CT-30 BUG: Forcetracker clear button removes login token' (#14) from bugfix/CT-36/btn-continues-removing-on-mobile into master
Reviewed-on: mitch/crusade-tracker#14
2022-03-23 13:04:59 +00:00
mitch
0aa3dd51fd CT-30 BUG: Forcetracker clear button removes login token 2022-03-23 09:04:16 -04:00
a522f61243 Merge pull request 'CT-30 BUG: clear button removes login token' (#12) from bugfig/CT-30/clear-button-removes-login-token into master
Reviewed-on: mitch/crusade-tracker#12
2022-03-23 12:42:31 +00:00
mitch
2a20d5bec4 CT-30 BUG: clear button removes login token 2022-03-23 08:41:46 -04:00
3d94c3f2ec Merge pull request 'CT-31: Added save to force.component.ts on modification to allow for page reloading' (#11) from bugfix/CT-31/save-forcelist-on-modifictaion into master
Reviewed-on: mitch/crusade-tracker#11
2022-03-23 12:22:34 +00:00
mitch
59e8f363c9 CT-31: Added save to force.component.ts on modification to allow for page reloading 2022-03-23 08:21:54 -04:00
e98f62aa55 Merge pull request 'Added force tracker' (#10) from feature/battle-ready-mobile into master
Reviewed-on: mitch/crusade-tracker#10
2022-03-23 10:37:51 +00:00
mitch
7b4c1d6f5e Added force tracker 2022-03-23 06:31:42 -04:00
mitch
f954180b1d Added battles tied tally 2022-03-15 09:56:11 -04:00
mitch
aa721c5a55 Removed ranged, melee, and psychic destroyed 2022-03-13 11:09:18 -04:00
mitch
a154b220eb Added dedicated transport
Added mobile support for unit-army detail view
2022-03-13 10:11:43 -04:00
0e9e145715 Merge pull request 'sorted crusade cards' (#9) from feature/sort-army-list into master
Reviewed-on: mitch/crusade-tracker#9
2022-03-05 22:02:43 +00:00
mitch
e6557fade3 sorted crusade cards 2022-03-05 17:02:04 -05:00
mitch
50bbb6a54d fixed master build 2022-03-05 06:56:26 -05:00
848d06bb8c Merge pull request 'removed unused fields from db' (#8) from feature/remote-unused_fields into master
Reviewed-on: mitch/crusade-tracker#8
2022-03-05 11:51:00 +00:00
mitch
3cd4c617b6 Merge branch 'master' into feature/remote-unused_fields
# Conflicts:
#	src/main/webapp/app/entities/force/force.component.html
2022-03-05 06:50:40 -05:00
mitch
794ff6aa22 removed unused fields from db 2022-03-04 18:59:43 -05:00
9bad9a9fd4 Merge pull request 'feature/battle-ready-mobile' (#7) from feature/battle-ready-mobile into master
Reviewed-on: mitch/crusade-tracker#7
2022-03-04 23:26:49 +00:00
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