Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organization Member & Member Edit Pages #445

Merged
merged 31 commits into from
Jun 2, 2016
Merged

Organization Member & Member Edit Pages #445

merged 31 commits into from
Jun 2, 2016

Conversation

OAGr
Copy link
Member

@OAGr OAGr commented May 31, 2016

image
image

OAGr and others added 8 commits May 31, 2016 18:23
* master: (44 commits)
  Don't resimulate on save (it happens on change)
  Simplified onBlur code for distribution input
  Removed uneccessary css
  Style cleanup for editing button
  Added stage environments for master, ozzie, matthew
  Addressed comments from cr
  Minor color alterations
  Added cut functionality to space header
  Added view options separate component and made more closely mimic privacy settings.
  Basic refactoring for header
  Basic toolbar for space show header
  Adjusted model header to experiment
  Adding some styling to the non-editable state.
  Probably needs a refactor later, but stops us from saving every key stroke.
  minor cleanup, slight bug fix.
  Restyled. Mostly working, except console errors about findDOMNode being called out of place.
  Working prototype (though not yet really styled.
  Changed icon name to more relevant alias
  Initialize checkpointMetadata with length 1 to remove flash
  Add ref to connect to focus on distribution editor
  ...
* master:
  Removing an unused import.
  When you make a new space, the 'editableByMe prop doesn't necessarily change, just the id does, (but we need the editableByMe prop check for when you load a space fresh, as there is no update where the id changes).
  Only allow blur when selected
  Initialize checkpoints upon new model creation.
  Ensure that drop down component event listener is removed on leave
  only show in edits allowed mode
  Only show privacyToggle when is editable by me
  Ensure that space header buttons do not show up on space header bottom
  View options needs to reset both on mount and update
  Don't send previous updated at
mmcdermott and others added 2 commits June 1, 2016 17:23
@@ -54,7 +54,7 @@ export function fetchById(userId) {
}

function formatUsers(unformatted) {
return unformatted.map(u => _.pick(u, ['auth0_id', 'id', 'name', 'picture']))
return unformatted.map(u => _.pick(u, ['auth0_id', 'id', 'name', 'picture', 'sign_in_count']))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sign_in_count not needed anymore.

@mmcdermott mmcdermott merged commit f35b46f into master Jun 2, 2016
@mmcdermott mmcdermott deleted the orgs-use-images branch June 2, 2016 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants