arcHIVE-tech/Arc-hive-omeka-theme
arcHIVE-tech/Arc-hive-omeka-theme
4
0
Fork 0
Code Issues 9 Pull requests Projects Releases Wiki Activity

update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
Conversation 3 Commits 166 Files changed 81 +26000 -2063
chris commented 2021-11-30 12:20:32 +01:00
Owner
Copy link

Hi @jorge

I think we can merge develop into main. What do you think?

Hi @jorge I think we can merge develop into main. What do you think?
chris added 166 commits 2021-11-30 12:20:33 +01:00 
Reviewed-on: #2
Reviewed-on: #3
I can't see any inconvenients to proceed.
Reviewed-on: #8
Reviewed-on: #9
Reviewed-on: #10
Reviewed-on: #12
to be able to fix accordion-content layout
This reverts commit 12bade8fb2, reversing
changes made to aefde4a14f.
Reviewed-on: #14
Reviewed-on: #17
Reviewed-on: #19
Reviewed-on: #28
Reviewed-on: #29
Reviewed-on: #30
Reviewed-on: #33
Reviewed-on: #36
Reviewed-on: #38
Reviewed-on: #39
Closes #1
Reviewed-on: #40
Reviewed-on: #41
Reviewed-on: #43
Reviewed-on: #46
lists media in flexbox
jorge commented 2021-12-01 11:19:59 +01:00
Owner
Copy link

sounds good to me

right now at https://collections.arc-hive.zone/ the branch being used is main-collection wich was a fork from one month ago in orther to solve the delivery status.

sounds good to me right now at https://collections.arc-hive.zone/ the branch being used is [main-collection](https://git.hangar.org/arcHIVE-tech/Arc-hive-omeka-theme/src/branch/main-collection) wich was a fork from one month ago in orther to solve the delivery status.
jorge merged commit c102696a8d into main 2021-12-01 11:20:13 +01:00
jorge commented 2021-12-01 11:30:46 +01:00
Owner
Copy link

I have applied main branch in https://dev-archive.hangar.org/ looks ok to me.

When trying to apply same result to https://collections.arc-hive.zone/ i've come up with this situation in the server:

:/var/www/collections.arc-hive.zone/themes/archive# git status
On branch develop
Your branch is up to date with 'origin/develop'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   view/common/block-layout/list-of-sites.phtml

no changes added to commit (use "git add" and/or "git commit -a")

We have a locally modified file wich I am not shure if has to be restored.

@chris can you please review this situation?
tx

I have applied main branch in https://dev-archive.hangar.org/ looks ok to me. When trying to apply same result to https://collections.arc-hive.zone/ i've come up with this situation in the server: ``` :/var/www/collections.arc-hive.zone/themes/archive# git status On branch develop Your branch is up to date with 'origin/develop'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: view/common/block-layout/list-of-sites.phtml no changes added to commit (use "git add" and/or "git commit -a") ``` We have a locally modified file wich I am not shure if has to be restored. @chris can you please review this situation? tx
chris commented 2021-12-01 12:01:29 +01:00
Author
Owner
Copy link

ok. that's because of a local change I made to the file view/common/block-layout/list-of-sites.phtml

Where I changed the data-page_size

div id="site-list">
  <div
       data-vue-component="archive-list"
       data-collections='<?= $projects ?>'
       data-page_size=20>
  </div>
</div>

We're on main ! :)

ok. that's because of a local change I made to the file `view/common/block-layout/list-of-sites.phtml` Where I changed the `data-page_size` ``` div id="site-list"> <div data-vue-component="archive-list" data-collections='<?= $projects ?>' data-page_size=20> </div> </div> ``` We're on `main` ! :)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: arcHIVE-tech/Arc-hive-omeka-theme#47
No description provided.
Delete branch "develop"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?