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

Migration: Upload migration files from profile settings and start processing #8274

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from

Commits on Sep 19, 2021

  1. Configuration menu
    Copy the full SHA
    9fb0909 View commit details
    Browse the repository at this point in the history
  2. Multiple_migrations_are_allowed

    The datamodel and implementation supports multiple imports from different locations
    This Commit removes a test and fixes the validation, which is not supported in the datamodel
    tclaus committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    c6c19b7 View commit details
    Browse the repository at this point in the history
  3. Moving Texts to localization file

    - Updates (most) texts to goobs proposal
    - Moved texts to localization file
    - Fixed file-upload buttons
    tclaus committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    c539d8c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7fa8057 View commit details
    Browse the repository at this point in the history
  5. Fixed style errors

    tclaus committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    c82f6c3 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    26995bd View commit details
    Browse the repository at this point in the history
  7. changes in texts

    tclaus committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    1eec8a4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5255767 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Merge remote-tracking branch 'upstream/develop' into upload_migration…

    …_files
    
    # Conflicts:
    #	app/controllers/users_controller.rb
    #	app/models/photo.rb
    #	app/models/user.rb
    #	app/services/migration_service.rb
    #	app/uploaders/exported_photos.rb
    #	app/uploaders/exported_user.rb
    #	app/uploaders/secure_uploader.rb
    #	lib/archive_importer.rb
    #	lib/tasks/accounts.rake
    #	spec/models/user_spec.rb
    tclaus committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    901e3e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2022

  1. Fixing merge errors

    On profile file upload the same fields in the user table are used than for generated exporting files.
    This conflicts if any export files exists and user wants to import something
    tclaus committed Jun 11, 2022
    Configuration menu
    Copy the full SHA
    6927c21 View commit details
    Browse the repository at this point in the history
  2. Fixing styles

    tclaus committed Jun 11, 2022
    Configuration menu
    Copy the full SHA
    14743e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. Fixing review issues

    tclaus committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    2e7dbb5 View commit details
    Browse the repository at this point in the history