This repository has been archived by the owner on Oct 12, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #65 from epfl-idevelop/fix-update-wp-content-from-…
…container-wp-volumes Updated WP files from container-wp-volumes, and added HOWTO
- Loading branch information
Showing
8 changed files
with
96 additions
and
21 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| a:6:{s:11:"wp_postmeta";a:0:{}s:10:"wp_options";a:2:{i:0;a:4:{s:9:"option_id";s:3:"108";s:11:"option_name";s:21:"_transient_doing_cron";s:12:"option_value";s:33:"1499089485.9377639293670654296875";s:8:"autoload";s:3:"yes";}i:1;a:4:{s:9:"option_id";s:3:"139";s:11:"option_name";s:16:"addtoany_options";s:12:"option_value";s:1361:"a:32:{s:8:"position";s:3:"top";s:30:"display_in_posts_on_front_page";s:1:"1";s:33:"display_in_posts_on_archive_pages";s:1:"1";s:19:"display_in_excerpts";s:1:"1";s:16:"display_in_posts";s:1:"1";s:16:"display_in_pages";s:1:"1";s:22:"display_in_attachments";s:1:"1";s:15:"display_in_feed";s:1:"1";s:7:"onclick";s:2:"-1";s:9:"icon_size";s:2:"32";s:6:"button";s:4:"NONE";s:13:"button_custom";s:0:"";s:17:"button_show_count";s:2:"-1";s:6:"header";s:0:"";s:23:"additional_js_variables";s:0:"";s:14:"additional_css";s:0:"";s:12:"custom_icons";s:2:"-1";s:16:"custom_icons_url";s:1:"/";s:17:"custom_icons_type";s:3:"png";s:18:"custom_icons_width";s:0:"";s:19:"custom_icons_height";s:0:"";s:10:"inline_css";s:1:"1";s:5:"cache";s:2:"-1";s:11:"button_text";s:5:"Share";s:24:"special_facebook_options";a:1:{s:10:"show_count";s:2:"-1";}s:24:"special_linkedin_options";a:1:{s:10:"show_count";s:2:"-1";}s:15:"active_services";a:5:{i:0;s:8:"facebook";i:1;s:7:"twitter";i:2;s:8:"linkedin";i:3;s:11:"google_plus";i:4;s:5:"email";}s:29:"special_facebook_like_options";a:1:{s:4:"verb";s:4:"like";}s:29:"special_twitter_tweet_options";a:1:{s:10:"show_count";s:2:"-1";}s:30:"special_google_plusone_options";a:1:{s:10:"show_count";s:2:"-1";}s:33:"special_google_plus_share_options";a:1:{s:10:"show_count";s:2:"-1";}s:29:"special_pinterest_pin_options";a:1:{s:10:"show_count";s:2:"-1";}}";s:8:"autoload";s:3:"yes";}}s:8:"wp_terms";a:0:{}s:11:"wp_termmeta";a:0:{}s:16:"wp_term_taxonomy";a:0:{}s:21:"wp_term_relationships";a:0:{}} | ||
| a:6:{s:11:"wp_postmeta";a:0:{}s:10:"wp_options";a:2:{i:0;a:4:{s:9:"option_id";s:3:"111";s:11:"option_name";s:21:"_transient_doing_cron";s:12:"option_value";s:33:"1499764738.3464829921722412109375";s:8:"autoload";s:3:"yes";}i:1;a:4:{s:9:"option_id";s:3:"150";s:11:"option_name";s:16:"addtoany_options";s:12:"option_value";s:1371:"a:32:{s:8:"position";s:6:"bottom";s:30:"display_in_posts_on_front_page";s:2:"-1";s:33:"display_in_posts_on_archive_pages";s:2:"-1";s:19:"display_in_excerpts";s:2:"-1";s:16:"display_in_posts";s:2:"-1";s:16:"display_in_pages";s:2:"-1";s:22:"display_in_attachments";s:2:"-1";s:15:"display_in_feed";s:2:"-1";s:7:"onclick";s:2:"-1";s:9:"icon_size";s:2:"32";s:6:"button";s:4:"NONE";s:13:"button_custom";s:0:"";s:17:"button_show_count";s:2:"-1";s:6:"header";s:0:"";s:23:"additional_js_variables";s:0:"";s:14:"additional_css";s:0:"";s:12:"custom_icons";s:2:"-1";s:16:"custom_icons_url";s:1:"/";s:17:"custom_icons_type";s:3:"png";s:18:"custom_icons_width";s:0:"";s:19:"custom_icons_height";s:0:"";s:10:"inline_css";s:1:"1";s:5:"cache";s:2:"-1";s:11:"button_text";s:5:"Share";s:24:"special_facebook_options";a:1:{s:10:"show_count";s:2:"-1";}s:24:"special_linkedin_options";a:1:{s:10:"show_count";s:2:"-1";}s:15:"active_services";a:5:{i:0;s:8:"facebook";i:1;s:7:"twitter";i:2;s:8:"linkedin";i:3;s:11:"google_plus";i:4;s:5:"email";}s:29:"special_facebook_like_options";a:1:{s:4:"verb";s:4:"like";}s:29:"special_twitter_tweet_options";a:1:{s:10:"show_count";s:2:"-1";}s:30:"special_google_plusone_options";a:1:{s:10:"show_count";s:2:"-1";}s:33:"special_google_plus_share_options";a:1:{s:10:"show_count";s:2:"-1";}s:29:"special_pinterest_pin_options";a:1:{s:10:"show_count";s:2:"-1";}}";s:8:"autoload";s:3:"yes";}}s:8:"wp_terms";a:0:{}s:11:"wp_termmeta";a:0:{}s:16:"wp_term_taxonomy";a:0:{}s:21:"wp_term_relationships";a:0:{}} |
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # HOWTO update the WP files from container-wp-volumes | ||
|
|
||
| The theme and our supported plugins are located in tow places: | ||
|
|
||
| 1. historically, in [container-wp-volumes](https://github.com/epfl-idevelop/container-wp-volumes). This repository is used by [jahiap](https://github.com/epfl-idevelop/jahiap), the historical repository of the project. That is the place where Aline pushes her updates | ||
| 2. in this repository/[data](https://github.com/epfl-idevelop/jahia2wp/tree/master/data). This is the source of the code for the current phase of the project | ||
|
|
||
| As for now, the current repository must be manually updated. | ||
|
|
||
| ## Pre-requisites | ||
|
|
||
| You have cloned the two repositories with your favorite method, i.e SSH or HTTPS. | ||
|
|
||
| We will make the assumptions that you have your repos in the following paths: | ||
|
|
||
| container-wp-volumes $ | ||
|
|
||
| jahia2wp $ | ||
|
|
||
| ## Procedure | ||
|
|
||
| 1. Update your repos | ||
|
|
||
| container-wp-volumes $ git pull | ||
|
|
||
| jahia2wp $ git checkout fix-update-wp-content-from-container-wp-volumes | ||
| jahia2wp $ git pull | ||
|
|
||
| 2. RSync | ||
|
|
||
| jahia2wp $ rsync -av ../container-wp-volumes/wp-content/ data/wp/wp-content/ | ||
|
|
||
| 3. Update changelog if necessary | ||
|
|
||
| 4. Review, commit and push | ||
|
|
||
| jahia2wp $ git status | ||
| jahia2wp $ git commit -am "updated wp-content with content of last sprint" | ||
| jahia2wp $ git push | ||
|
|
||
| 5. Create PR on [github](https://github.com/epfl-idevelop/jahia2wp/branches). You probably can use your CHANGELOG description as the description of your PR |