Commit Graph

710 Commits (d82d8b68e452ec02ba32d5df0b3364fafead9403)

Author SHA1 Message Date
Hiroyuki d5b009b186
Proclamation and Motion Quorum fixes 2021-03-24 00:15:53 -04:00
Matthew 0858f17759
Merge branch 'dev' 2021-03-23 20:58:41 -04:00
Matthew 48aeb72a9d
more merge conflict fixes 2021-03-23 20:58:15 -04:00
Matthew 8279268b3b
Merge branch 'dev' 2021-03-23 20:55:29 -04:00
Matthew 31ef35d3af
merge conflict fixes 2021-03-23 20:38:04 -04:00
Matthew 45065cd21e
merge conflict & history fix 2021-03-23 20:34:22 -04:00
Hiroyuki b9edc45e10
Pagination sorting fix 2021-03-23 20:10:39 -04:00
Matthew 938fa878bf
Merge branch 'dev' 2021-03-22 17:34:42 -04:00
Matthew d3c631f25f
limit report history docs to 31 2021-03-22 17:34:21 -04:00
Hiroyuki 3a96ed08c8
Remove slice until a proper fix is available 2021-03-20 19:56:36 -04:00
Hiroyuki 36f0456750
Final CR backend changes 2021-03-20 17:16:04 -04:00
Hiroyuki 8d9a47b93e
Resolve merge conflicts 2021-03-19 21:23:38 -04:00
Matthew daa51fc79a
Merge branch 'profile-term-1' into dev 2021-03-11 01:16:03 -05:00
Matthew 8e5f78adf4
fix usage termi 2021-03-11 01:15:11 -05:00
Matthew 232458c0e0
fix profile usage terminology 2021-03-11 01:13:18 -05:00
Matthew 88c31b491c
fixes to setnick cmd 2021-03-06 23:30:41 -05:00
Matthew 0427867cc9
remove training model from Client bind 2021-03-06 21:26:01 -05:00
Matthew 51fc884b22
remove training db model 2021-03-06 21:25:01 -05:00
Matthew 1e242f2027
remove training message handler 2021-03-06 21:24:39 -05:00
Matthew fd03f418ef
Merge branch 'dev' 2021-03-06 21:19:34 -05:00
Matthew 515b019020
typo fix 2021-03-06 19:39:37 -05:00
Matthew 986477fd96
merge conflict fix 2021-03-06 19:39:19 -05:00
Matthew 09f9cd4f63
fixes to delete operation 2021-03-06 19:25:06 -05:00
Matthew 6d0499d42c
Merge branch 'role-cmd' into dev 2021-03-06 18:33:04 -05:00
Matthew ccece92a01
changes to eslint config 2021-03-06 18:32:54 -05:00
Matthew 028094aa87
fix and add role cmd 2021-03-06 18:32:42 -05:00
Matthew 98f89b5bfd
Merge branch 'delta/communityrelations-master' into role-cmd 2021-03-06 18:13:48 -05:00
Matthew 8d77462bd8
Merge branch 'sip-fix-1' into dev 2021-03-06 18:07:33 -05:00
Matthew d1b2aa55b4
change CID name 2021-03-06 18:07:24 -05:00
Matthew e43ecb8146
fix sip cmd 2021-03-06 18:05:11 -05:00
Matthew 30c10d8984
Merge branch 'dev' 2021-03-06 13:40:12 -05:00
Matthew 79dae33fac
fix hiro's fuckups x2 2021-03-06 13:39:31 -05:00
Matthew 3d01c1262f
Merge branch 'dev' 2021-03-05 23:21:38 -05:00
Matthew f40dae8b4d
fix hiro's fuckups 2021-03-05 23:20:42 -05:00
Matthew 0961729a1d
Merge branch 'dev' of gitlab.libraryofcode.org:engineering/communityrelations into dev 2021-03-05 22:46:17 -05:00
Matthew b93edb5893
fixes or whateva 2021-03-05 22:46:00 -05:00
Matthew aeee031afa Merge branch 'profile' into 'dev'
Resubmission of MR #19

MERGE REQUEST SQUASHED

See merge request engineering/communityrelations!20
2021-03-05 22:41:01 -05:00
Hiroyuki 54282209f7 Resubmission of MR #19 2021-03-05 22:41:01 -05:00
Matthew c6b665fdde
merge conflict fix 2021-03-05 17:35:32 -05:00
Matthew 0e149a6ad9
fix to slowmode cmd 2021-03-05 17:30:32 -05:00
Hiroyuki 0289632f50
Profile command 2021-03-05 18:02:50 -04:00
Hiroyuki c0a96a5f67
Updated endpoints and typechecking 2021-03-05 00:04:47 -04:00
Hiroyuki 178c1b7b7d
Bug fixes and typo fixes 2021-03-04 23:40:39 -04:00
Hiroyuki 4530b1b3ec
stuff 2021-03-04 21:19:17 -04:00
Hiroyuki 152a4c3c3b
Fixes 2021-03-01 17:39:45 -04:00
Hiroyuki 10b10ec9c9
Proclamation recording 2021-03-01 17:35:36 -04:00
Hiroyuki ab841a792c
Merge branch 'Sterben/communityrelations-master' into master 2021-02-28 12:48:56 -04:00
Sterben a116404ef5 all endpoints updated & added 2021-02-28 00:06:13 -06:00
Hiroyuki 64b4eeb0b8
Update HTTP 401s to 403s to comply with RFC 7231 2021-02-23 15:46:28 -04:00
Matthew d00e94157f
Merge branch 'dev' 2021-02-21 23:32:09 -05:00