Homec4science

Merge and solve conflict

Authored by aubort on Mar 10 2016, 18:12.

Description

Merge and solve conflict

Details

Committed
aubortMar 10 2016, 18:12
Pushed
adminMar 10 2016, 18:12
Differential Revision
Restricted Differential Revision
Parents
rPHINFRA93d0f6fb9bcc: Add example for field names
rPHINFRA103b95c90d54: Uneeded code
Branches
Unknown
Tags
Unknown

Event Timeline

Unknown Object (User) committed rPHINFRA2ab7df617e79: Merge and solve conflict (authored by Unknown Object (User)).Mar 10 2016, 18:12

Merged Changes

CommitAuthorDetailsCommitted
93d0f6fb9bccD29aubort
Add example for field names 
Mar 10 2016
aa216d5b3160D29aubort
Better captions and labels 
Mar 10 2016
31dfe951797dD29aubort
Add error, fix typo 
Mar 10 2016
ece801bb63a1D29aubort
generate username from firstname and lastname 
Mar 10 2016
e50a8188cddcD29aubort
Save the value 
Mar 10 2016
4ef684181167D29aubort
Better login button for Shibboleth 
Mar 10 2016