recipes_book.md and docs.md pages are ready
Locked
recipes_book.md and docs.md pages are ready
 
|
What the subject says. Both are ready for merging.
Best, Dmitri |
|
|
Hi Dmitri! I merged recipes_book.md and also added a link to the sidebar image to go to this page. Not sure about docs.md, though. There were a bunch of modifications done since you branched I think. I've gone ahead and merged your changes, but to the documentation/_index.md file instead. Please check it on staging to make sure it's still ok. You might want to rebase your branch against master to pick up all of the changes we've done, or start a fresh branch of your own. Much of your branch is from before a bunch of changes to the theme and some file structure. (I am super happy to help you with this if it's not familiar to you). Thank you for fixing these pages! :D On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <[hidden email]> wrote: What the subject says. Both are ready for merging. -- https://patdavid.net GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC |
Re: recipes_book.md and docs.md pages are ready
|
|
Thanks, Pat,
Hmm, I did "git pull origin master", but I got "Already up-to-date" message. What am I doing wrong? Thanks, Dmitri On Sat, Apr 8, 2017 at 9:42 PM, Pat David <[hidden email]> wrote: > Hi Dmitri! > > I merged recipes_book.md and also added a link to the sidebar image to go to > this page. > > Not sure about docs.md, though. There were a bunch of modifications done > since you branched I think. > I've gone ahead and merged your changes, but to the documentation/_index.md > file instead. Please check it on staging to make sure it's still ok. > > You might want to rebase your branch against master to pick up all of the > changes we've done, or start a fresh branch of your own. Much of your > branch is from before a bunch of changes to the theme and some file > structure. (I am super happy to help you with this if it's not familiar to > you). > > Thank you for fixing these pages! :D > > On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <[hidden email]> wrote: >> >> What the subject says. Both are ready for merging. >> >> Best, >> Dmitri > > -- > https://patdavid.net > GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC |
Re: recipes_book.md and docs.md pages are ready
|
|
Ah, I think I've figured that one out. I need to do "git pull origin
dev", and then create a new branch. Right? Best, Dmitri On Sun, Apr 9, 2017 at 12:04 PM, Dmitri Popov <[hidden email]> wrote: > Thanks, Pat, > > Hmm, I did "git pull origin master", but I got "Already up-to-date" > message. What am I doing wrong? > > Thanks, > Dmitri > > On Sat, Apr 8, 2017 at 9:42 PM, Pat David <[hidden email]> wrote: >> Hi Dmitri! >> >> I merged recipes_book.md and also added a link to the sidebar image to go to >> this page. >> >> Not sure about docs.md, though. There were a bunch of modifications done >> since you branched I think. >> I've gone ahead and merged your changes, but to the documentation/_index.md >> file instead. Please check it on staging to make sure it's still ok. >> >> You might want to rebase your branch against master to pick up all of the >> changes we've done, or start a fresh branch of your own. Much of your >> branch is from before a bunch of changes to the theme and some file >> structure. (I am super happy to help you with this if it's not familiar to >> you). >> >> Thank you for fixing these pages! :D >> >> On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <[hidden email]> wrote: >>> >>> What the subject says. Both are ready for merging. >>> >>> Best, >>> Dmitri >> >> -- >> https://patdavid.net >> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC |
|
|
Master isn't in sync yet while we work - it's all in the dev branch right now.
'git checkout dev' 'git pull' That will get you on dev branch with latest updates. Then if you want a new branch: 'git checkout newbranch' That gets you a new branch from dev. Yay! :) On Sun, Apr 9, 2017 at 5:11 AM Dmitri Popov <[hidden email]> wrote: Ah, I think I've figured that one out. I need to do "git pull origin -- https://patdavid.net GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC |
Re: recipes_book.md and docs.md pages are ready
|
|
Got it! Thank you, Pat. Just one question: In which file do I find the
text on the landing page? The text needs a couple of minor tweaks. Thanks, Dmitri On Sun, Apr 9, 2017 at 5:34 PM, Pat David <[hidden email]> wrote: > Master isn't in sync yet while we work - it's all in the dev branch right > now. > > 'git checkout dev' > 'git pull' > > That will get you on dev branch with latest updates. > > Then if you want a new branch: > > 'git checkout newbranch' > > That gets you a new branch from dev. Yay! :) > > On Sun, Apr 9, 2017 at 5:11 AM Dmitri Popov <[hidden email]> wrote: >> >> Ah, I think I've figured that one out. I need to do "git pull origin >> dev", and then create a new branch. Right? >> >> Best, >> Dmitri >> >> On Sun, Apr 9, 2017 at 12:04 PM, Dmitri Popov <[hidden email]> wrote: >> > Thanks, Pat, >> > >> > Hmm, I did "git pull origin master", but I got "Already up-to-date" >> > message. What am I doing wrong? >> > >> > Thanks, >> > Dmitri >> > >> > On Sat, Apr 8, 2017 at 9:42 PM, Pat David <[hidden email]> wrote: >> >> Hi Dmitri! >> >> >> >> I merged recipes_book.md and also added a link to the sidebar image to >> >> go to >> >> this page. >> >> >> >> Not sure about docs.md, though. There were a bunch of modifications >> >> done >> >> since you branched I think. >> >> I've gone ahead and merged your changes, but to the >> >> documentation/_index.md >> >> file instead. Please check it on staging to make sure it's still ok. >> >> >> >> You might want to rebase your branch against master to pick up all of >> >> the >> >> changes we've done, or start a fresh branch of your own. Much of your >> >> branch is from before a bunch of changes to the theme and some file >> >> structure. (I am super happy to help you with this if it's not >> >> familiar to >> >> you). >> >> >> >> Thank you for fixing these pages! :D >> >> >> >> On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <[hidden email]> >> >> wrote: >> >>> >> >>> What the subject says. Both are ready for merging. >> >>> >> >>> Best, >> >>> Dmitri >> >> >> >> -- >> >> https://patdavid.net >> >> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC > > -- > https://patdavid.net > GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC |
Re: recipes_book.md and docs.md pages are ready
|
|
Hi Dimitri,
The text for the front page is located in the strings file, at /project-root/i18n/en.yaml (and other language files, though I'd rather wait until we're completely finished with English before we as for translations!). You can see which string is being called by looking at the template /project-root/themes/hugo-theme-digikam/layouts/index.html -- the string calls look like {{ i18n "someStringName" }}. -m On 2017-04-09 08:57, Dmitri Popov wrote: > Got it! Thank you, Pat. Just one question: In which file do I find the > text on the landing page? The text needs a couple of minor tweaks. > > Thanks, > Dmitri > > On Sun, Apr 9, 2017 at 5:34 PM, Pat David <[hidden email]> wrote: >> Master isn't in sync yet while we work - it's all in the dev branch >> right >> now. >> >> 'git checkout dev' >> 'git pull' >> >> That will get you on dev branch with latest updates. >> >> Then if you want a new branch: >> >> 'git checkout newbranch' >> >> That gets you a new branch from dev. Yay! :) >> >> On Sun, Apr 9, 2017 at 5:11 AM Dmitri Popov <[hidden email]> >> wrote: >>> >>> Ah, I think I've figured that one out. I need to do "git pull origin >>> dev", and then create a new branch. Right? >>> >>> Best, >>> Dmitri >>> >>> On Sun, Apr 9, 2017 at 12:04 PM, Dmitri Popov <[hidden email]> >>> wrote: >>> > Thanks, Pat, >>> > >>> > Hmm, I did "git pull origin master", but I got "Already up-to-date" >>> > message. What am I doing wrong? >>> > >>> > Thanks, >>> > Dmitri >>> > >>> > On Sat, Apr 8, 2017 at 9:42 PM, Pat David <[hidden email]> wrote: >>> >> Hi Dmitri! >>> >> >>> >> I merged recipes_book.md and also added a link to the sidebar image to >>> >> go to >>> >> this page. >>> >> >>> >> Not sure about docs.md, though. There were a bunch of modifications >>> >> done >>> >> since you branched I think. >>> >> I've gone ahead and merged your changes, but to the >>> >> documentation/_index.md >>> >> file instead. Please check it on staging to make sure it's still ok. >>> >> >>> >> You might want to rebase your branch against master to pick up all of >>> >> the >>> >> changes we've done, or start a fresh branch of your own. Much of your >>> >> branch is from before a bunch of changes to the theme and some file >>> >> structure. (I am super happy to help you with this if it's not >>> >> familiar to >>> >> you). >>> >> >>> >> Thank you for fixing these pages! :D >>> >> >>> >> On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <[hidden email]> >>> >> wrote: >>> >>> >>> >>> What the subject says. Both are ready for merging. >>> >>> >>> >>> Best, >>> >>> Dmitri >>> >> >>> >> -- >>> >> https://patdavid.net >>> >> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC >> >> -- >> https://patdavid.net >> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC |
Re: recipes_book.md and docs.md pages are ready
|
|
Got it! Thanks, Mica.
Best, Dmitri On Sun, Apr 9, 2017 at 8:19 PM, <[hidden email]> wrote: > Hi Dimitri, > > The text for the front page is located in the strings file, at > /project-root/i18n/en.yaml (and other language files, though I'd rather wait > until we're completely finished with English before we as for > translations!). You can see which string is being called by looking at the > template /project-root/themes/hugo-theme-digikam/layouts/index.html -- the > string calls look like {{ i18n "someStringName" }}. > > -m > > > On 2017-04-09 08:57, Dmitri Popov wrote: >> >> Got it! Thank you, Pat. Just one question: In which file do I find the >> text on the landing page? The text needs a couple of minor tweaks. >> >> Thanks, >> Dmitri >> >> On Sun, Apr 9, 2017 at 5:34 PM, Pat David <[hidden email]> wrote: >>> >>> Master isn't in sync yet while we work - it's all in the dev branch right >>> now. >>> >>> 'git checkout dev' >>> 'git pull' >>> >>> That will get you on dev branch with latest updates. >>> >>> Then if you want a new branch: >>> >>> 'git checkout newbranch' >>> >>> That gets you a new branch from dev. Yay! :) >>> >>> On Sun, Apr 9, 2017 at 5:11 AM Dmitri Popov <[hidden email]> wrote: >>>> >>>> >>>> Ah, I think I've figured that one out. I need to do "git pull origin >>>> dev", and then create a new branch. Right? >>>> >>>> Best, >>>> Dmitri >>>> >>>> On Sun, Apr 9, 2017 at 12:04 PM, Dmitri Popov <[hidden email]> >>>> wrote: >>>> > Thanks, Pat, >>>> > >>>> > Hmm, I did "git pull origin master", but I got "Already up-to-date" >>>> > message. What am I doing wrong? >>>> > >>>> > Thanks, >>>> > Dmitri >>>> > >>>> > On Sat, Apr 8, 2017 at 9:42 PM, Pat David <[hidden email]> wrote: >>>> >> Hi Dmitri! >>>> >> >>>> >> I merged recipes_book.md and also added a link to the sidebar image >>>> >> to >>>> >> go to >>>> >> this page. >>>> >> >>>> >> Not sure about docs.md, though. There were a bunch of modifications >>>> >> done >>>> >> since you branched I think. >>>> >> I've gone ahead and merged your changes, but to the >>>> >> documentation/_index.md >>>> >> file instead. Please check it on staging to make sure it's still ok. >>>> >> >>>> >> You might want to rebase your branch against master to pick up all of >>>> >> the >>>> >> changes we've done, or start a fresh branch of your own. Much of >>>> >> your >>>> >> branch is from before a bunch of changes to the theme and some file >>>> >> structure. (I am super happy to help you with this if it's not >>>> >> familiar to >>>> >> you). >>>> >> >>>> >> Thank you for fixing these pages! :D >>>> >> >>>> >> On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <[hidden email]> >>>> >> wrote: >>>> >>> >>>> >>> What the subject says. Both are ready for merging. >>>> >>> >>>> >>> Best, >>>> >>> Dmitri >>>> >> >>>> >> -- >>>> >> https://patdavid.net >>>> >> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC >>> >>> >>> -- >>> https://patdavid.net >>> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC > > |
«
Return to digikam-users
|
1 view|%1 views
| Free forum by Nabble | Edit this page |