Commit Graph

619 Commits (938fa878bf698e7ba209bd200b1f226d83303ac2)

Author SHA1 Message Date
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
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 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
Matthew d00e94157f
Merge branch 'dev' 2021-02-21 23:32:09 -05:00
Matthew effbf3bd1a
fixes to intercom 2021-02-21 23:31:44 -05:00
Matthew 3fdb1c30b2
fixes to page 2021-02-21 23:31:37 -05:00
Matthew e4b8b219ea
add sip uri dialer cmd 2021-02-21 23:29:31 -05:00
Matthew dd0f5e3d44
Merge branch 'dev' 2021-02-04 23:34:07 -05:00
Matthew 8b531db365
fixes 2021-02-04 23:33:44 -05:00
Matthew 1ed718bbf0
Merge branch 'master' of gitlab.libraryofcode.org:engineering/communityrelations 2021-02-04 23:23:58 -05:00
Matthew 9bc0e8ca4e
Merge branch 'dev' 2021-02-04 23:23:27 -05:00
Matthew 732feb91d1
Add stuff to staff model 2021-02-04 23:23:17 -05:00
Matthew 96bf8b4dc5
Merge branch 'dev' 2021-02-04 23:22:43 -05:00
Matthew da8f5e0004
fixes to score 2021-02-04 23:21:29 -05:00
Matthew 4c09a5c6ef
fixes 2021-02-04 23:20:24 -05:00
Matthew fd9e80fc71
add new stuff to whois 2021-02-04 23:17:34 -05:00
Matthew 8e591113c5 Merge branch 'master' into 'master'
Fix paging bug with emails

See merge request engineering/communityrelations!16
2021-02-02 21:56:10 -05:00
Matthew 11a6ee3827
Merge branch 'dev' 2021-02-02 02:22:47 -05:00
Matthew c86663518e
fixes 2021-02-02 02:22:40 -05:00
Matthew bb8cdf13a2
fixes 2021-02-02 02:22:26 -05:00
Matthew 3601c2a380
Merge branch 'dev' 2021-02-02 02:14:17 -05:00
Matthew 46778ec7f1
fixes 2021-02-02 02:14:00 -05:00
Matthew ec0152be4b
remerge 2021-02-02 01:46:16 -05:00
Matthew d0dfe0e730
quality of life updates 2021-02-02 01:45:03 -05:00
Hiroyuki 38f5a5f70e
Fix paging bug with emails 2021-01-26 23:33:54 -04:00
Matthew 949d2469a2
Merge branch 'dev' 2021-01-12 02:14:28 -05:00