Resubmission of MR #19 #33

Merged
ghost merged 28 commits from profile into dev 2021-03-05 22:41:03 -05:00

28 Commits (master)

Author SHA1 Message Date
Hiroyuki 7ff4afdc15
Other stuff 2021-03-05 22:16:22 -04:00
Hiroyuki 5a9738d560
Merge remote-tracking branch 'upstream/master' into profile 2021-03-05 22:16:07 -04:00
Hiroyuki 12a1b79c71
Fix linting 2021-03-05 21:51:05 -04:00
Hiroyuki ae21ad9f2a
Community Profiles 2021-03-05 21:42:00 -04:00
Hiroyuki e89b8bc087
fixes 2021-03-05 21:24:42 -04:00
Hiroyuki 94d6d7fdca
Revert changes 2021-03-05 21:23:50 -04:00
Hiroyuki 45e11803c7
Tested version of BRS 2021-03-05 20:55:54 -04: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