- 
                Notifications
    You must be signed in to change notification settings 
- Fork 350
Reference PR #11312
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
          
     Draft
      
      
            cslzchen
  wants to merge
  14
  commits into
  CenterForOpenScience:add-new-notifications-data-model
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
Johnetordoff:add-new-notifications-data-model
  
      
      
   
  
    
  
  
  
 
  
      
    base: add-new-notifications-data-model
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Draft
            
            Reference PR #11312
                    cslzchen
  wants to merge
  14
  commits into
  CenterForOpenScience:add-new-notifications-data-model
from
Johnetordoff:add-new-notifications-data-model
  
      
      
   
              
            Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    * [ENG-8514] Remove CSRF protection from reset password api v2 POST (CenterForOpenScience#11246) * remove csrf protection from reset password endpoint * update test * add background color prop to Brand (CenterForOpenScience#11254) * fix flaky test_serialized_metadata * fix throttle test * reset throttle cache * don't ignore components when create a view-only link * fixed updating subscribe_osf_general_email subscription * [ENG-7277] Update doc to include version as relationship (CenterForOpenScience#11262) * added tests * [ENG-8691] Wrong server on reset password email (CenterForOpenScience#11271) * use same logic for admin and web password reset * fix tests * enable filtering for linked-nodes endpoint (CenterForOpenScience#11273) * remove deleted users from institutional dashboard (CenterForOpenScience#11261) * fixed tests * [ENG-7803] Update text on VOL modal for registration (CenterForOpenScience#11279) * added description filtering for preprints (CenterForOpenScience#11294) ## Purpose User should be able to filter preprints by their description ## Changes Added description to filterable fields, added tests ## Ticket https://openscience.atlassian.net/browse/ENG-8921?atlOrigin=eyJpIjoiNmY1MDUwZjI0Mjg2NDc2OGI2N2U1ZDQ0MjIwNzU0OTAiLCJwIjoiaiJ9 * [ENG-8689] - Fix/eng 8689 (CenterForOpenScience#11267) * Fix color picker for brands * Remove unnecessary exclusion * fix: file dataset metadata download (CenterForOpenScience#11296) * fix linting * merge migrations * [ENG-8958] missing metadata (dcterms:type and osf:hasOsfAddon) (CenterForOpenScience#11309) * fix: validate resource_type_general in api * fix: update search after updating addons * fix: file dataset metadata with mononym creators (CenterForOpenScience#11297) * Revert "fix: file dataset metadata with mononym creators (CenterForOpenScience#11297)" (CenterForOpenScience#11311) This reverts commit 21090b2. --------- Co-authored-by: antkryt <[email protected]> Co-authored-by: John Tordoff <[email protected]> Co-authored-by: Ihor Sokhan <[email protected]> Co-authored-by: Vlad0n20 <[email protected]> Co-authored-by: abram axel booth <[email protected]>
Misc bug fixes for angular migration
…tions-data-model Conflicts will be fixed in next commit: * api/users/views.py * api_tests/users/views/test_user_settings.py
…/johnetordoff/osf.io into add-new-notifications-data-model
b124deb    to
    6f8cf89      
    Compare
  
    6f8cf89    to
    c5fee1d      
    Compare
  
    
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
No description provided.