9750 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brian Lich	b6e62b9e8c	Bug# 7594539	2016-05-18 11:31:53 -07:00
Brian Lich	707165c23e	Merge branch 'master' into live	2016-05-18 11:17:53 -07:00
Brian Lich	ad59ed84fc	Merge branch 'live'	2016-05-18 11:16:07 -07:00
Brian Lich	f64f9b9bad	adding files	2016-05-18 10:43:49 -07:00
Trudy Hakala	9f92101632	Merge remote-tracking branch 'refs/remotes/origin/master' into sh-7358843	2016-05-18 08:18:46 -07:00
jdeckerMS	95bc3b01ff	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs	2016-05-18 07:44:47 -07:00
jdeckerMS	ba9d3459fe	Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1	2016-05-18 07:43:50 -07:00
jdeckerMS	41a42421bb	fixed graphic for color/shape differentiation	2016-05-18 07:40:16 -07:00
jdeckerMS	97a4c863b6	Merge remote-tracking branch 'refs/remotes/origin/master' into edu-may	2016-05-18 07:31:05 -07:00
Joey Caparas	6c66b2faaf	fix typo	2016-05-18 11:58:20 +10:00
Joey Caparas	432f56a43b	Merge remote-tracking branch 'refs/remotes/origin/master' into windef-atp	2016-05-18 11:50:12 +10:00
jdeckerMS	ac641a5aaf	correct spelling	2016-05-17 14:27:55 -07:00
jdeckerMS	eefc119cc3	fix broken link	2016-05-17 13:31:52 -07:00
jdeckerMS	9334918f64	Merge remote-tracking branch 'refs/remotes/origin/master' into edu-may	2016-05-17 13:17:18 -07:00
jdeckerMS	3d925ce9dd	updated multiple	2016-05-17 13:16:42 -07:00
LizRoss	8a1d1c89fe	Merge remote-tracking branch 'refs/remotes/origin/master' into live	2016-05-17 10:02:14 -07:00
LizRoss	bcdc34b99f	Merge remote-tracking branch 'refs/remotes/origin/vs-7489849'	2016-05-17 09:53:47 -07:00
LizRoss	9587a33724	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7489849	2016-05-17 09:53:05 -07:00
LizRoss	ea6cbf4213	Updated based on tech review	2016-05-17 09:52:31 -07:00
Trudy Hakala	97f879c847	Merge remote-tracking branch 'refs/remotes/origin/master' into sh-7358843	2016-05-17 09:43:22 -07:00
jdeckerMS	fd991165e2	pop single PC topic	2016-05-17 09:29:55 -07:00
LizRoss	62983c00b3	Updated based on tech review	2016-05-17 09:23:24 -07:00
LizRoss	8dd85557af	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7489849	2016-05-17 09:06:55 -07:00
jdeckerMS	d58330d74f	populate techref	2016-05-17 09:02:06 -07:00
jdeckerMS	bc1a379f6f	Merge remote-tracking branch 'refs/remotes/origin/master' into edu-may	2016-05-17 09:01:40 -07:00
Brian Lich	8da0442ef3	changing event volume to very high	2016-05-17 08:53:26 -07:00
Brian Lich	ccd9520155	changing redirect to https instead of htp	2016-05-17 08:50:30 -07:00
jdeckerMS	ded583a15c	restrctured take-a-test	2016-05-17 08:25:42 -07:00
jdeckerMS	463a9a6694	fixed filename	2016-05-17 07:17:50 -07:00
jdeckerMS	4dc10a879f	new topic staged	2016-05-17 07:03:50 -07:00
jdeckerMS	819808579e	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs	2016-05-16 14:21:44 -07:00
jdeckerMS	d3931f2f1d	Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1	2016-05-16 14:20:49 -07:00
jdeckerMS	fbf54ebf3a	add quick actions to list, still 6802598	2016-05-16 14:20:16 -07:00
jdeckerMS	3da773cd71	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs	2016-05-16 14:15:03 -07:00
jdeckerMS	4b5f99d368	Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1	2016-05-16 14:13:19 -07:00
jdeckerMS	a92070f349	6802598	2016-05-16 14:12:42 -07:00
jdeckerMS	c5a00da731	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs	2016-05-16 14:04:56 -07:00
jdeckerMS	4398c5d231	sync to switch forks	2016-05-16 14:04:12 -07:00
jdeckerMS	53fe36898c	fixed list format	2016-05-16 13:35:12 -07:00
jdeckerMS	d7569ea192	added proc	2016-05-16 13:32:08 -07:00
jdeckerMS	cd7844801f	Merge remote-tracking branch 'refs/remotes/origin/master' into edu-may	2016-05-16 13:23:42 -07:00
jdeckerMS	e714c6b23c	update for RS	2016-05-16 13:23:02 -07:00
jdeckerMS	797edcd630	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov	2016-05-16 12:53:21 -07:00
jdeckerMS	33c2fe417a	Merge remote-tracking branch 'refs/remotes/origin/master' into rs1	2016-05-16 12:52:48 -07:00
jdeckerMS	77ff08a08e	added encryption to simple	2016-05-16 12:52:17 -07:00
jdeckerMS	4dde23b054	remove email refs	2016-05-16 12:42:46 -07:00
jdeckerMS	9e8791b6db	7391986	2016-05-16 12:28:02 -07:00
jdeckerMS	b2cca677f0	adv prov	2016-05-16 12:17:57 -07:00
jdeckerMS	f6f60f45d6	update for RS simple prov	2016-05-16 12:01:02 -07:00
H. Poulsen	7c0c4984df	Merge remote-tracking branch 'refs/remotes/origin/master' into jan-edu	2016-05-16 10:24:23 -07:00