[FIX][9.0] auto_backup: Missing files by lasley · Pull Request #636 · OCA/server-tools

lasley · 2016-12-07T18:20:57Z

This reverts commit 0111be2, which was committed directly to 9.0 & pulled the files from #620 that contained an identical commit 8a078fc.

This is the cleanest way that I see to resolve #619 (comment).

The alternative is another migration, which will add another 50 some odd commits.

Anyone have thoughts?

[MIG][10.0] auto_backup #614

antespi

LGTM 👍

lasley · 2016-12-07T20:53:12Z

Dammit I just realized with this then we'll circle back around to the original #620. I guess re-migrating the module will be the best solution in hindsight. I'll just backport from my 10.0 #614 once merged.

antespi · 2016-12-07T21:01:32Z

Ok, thanks

* Remove translations that were part of bad commits & now conflict with rebasing

Added all the new fields and sentences. This will be the template for translations.

Full translation of the module to Dutch

Add Chinese translations to the module. Written by talway.

Changed some translations

Thanks to Martin Schmid!

could'nt > couldn't

Flemish translations are identical to Dutch.

Used to open fp = open(file_path,'wb') a few lines before it was needed. This shouldn't be too much of a problem but opening and closing it right after eachother keeps the session open for less time and there are less chances on failure.

…[IMP] tests

Bump module version to 8.0.1.0.1

lasley · 2016-12-09T06:26:24Z

I'm going to look at this in the next few days. I'm in conflict ~~heaven~~ hell in any sort of migration direction due to the translation files being on 9 branch.

I guess I'm just going to start again, delete the migrations, then re-upgrade this module to 9. I really only needed it in 10 though, so bottom of my work stack TBH seeing as this is will be my third time migrating it to a version I don't need.

lasley · 2016-12-13T19:02:52Z

Ok I think I got this to the state it was on merge on 9. There's this dirty hack I had to do in 8c45b49 to delete the translations that are already there so that the commits could be walked back onto the branch.

It seems there are some missing translation files in this PR though, but everything that I do ends up with them not there. I'm hoping maybe that will correct itself when Transifex tries to update the branch?

* Add self.ensure_ones * Add test coverage

antespi · 2016-12-13T21:46:14Z

Thanks @lasley 👍

antespi · 2016-12-13T21:50:17Z

Password for runbot: Admin:1234567890

susport · 2016-12-14T03:58:00Z

@antespi With that password I can not authenticate in runbot

lasley · 2016-12-14T04:06:03Z

Username is admin Password is Admin:1234567890. Hah this repo is fun now that password_security is a thing

antespi · 2016-12-14T10:09:10Z

@lasley thanks for your clarification and sorry @susport for the confusion.
Now, OCA/server-tools runbots have this issue

lasley · 2016-12-14T10:14:22Z

I'm probably going to provide a fix for that soon. Something to disable the security on the admin user unless an option is explicitly enabled I'm thinking

lasley · 2016-12-16T08:02:30Z

I'm going to go ahead and merge this. It's pretty broken on 9.0 branch as it is & this was all approved a bunch of times, so I don't see the harm. Worse case scenario it's still broken, right? 😛

Syncing from upstream OCA/server-tools (13.0)

lasley added bug needs review labels Dec 7, 2016

lasley added this to the 9.0 milestone Dec 7, 2016

antespi approved these changes Dec 7, 2016

View reviewed changes

lasley added work in progress and removed needs review labels Dec 7, 2016

lasley and others added 22 commits December 7, 2016 13:02

[FIX] auto_backup: Remove translations

8c45b49

* Remove translations that were part of bad commits & now conflict with rebasing

Update english pot file

c4f3745

Added all the new fields and sentences. This will be the template for translations.

Dutch translations

17aaf78

Full translation of the module to Dutch

Chinese translations

3bca15d

Add Chinese translations to the module. Written by talway.

Changes chinese translation

c9e5e12

Changed some translations

Full German translations

a344e40

Thanks to Martin Schmid!

Typo fix

e865e89

could'nt > couldn't

Flemish translations

eb3d687

Flemish translations are identical to Dutch.

Open FTP session on the last moment possible

2181459

Used to open fp = open(file_path,'wb') a few lines before it was needed. This shouldn't be too much of a problem but opening and closing it right after eachother keeps the session open for less time and there are less chances on failure.

Porting module to OCA 8.0

2c49a17

module

26f3d21

bug logger --> _logger call [FIX] Flake8 [RM] useless files

247ee1c

Readme.rst

29c4be9

defaults value

d27fc7a

rebased commit

8ee3b48

description index.html

9709856

porting to new api [FIX] schedule_backup method [IMP] IT translation …

01087ea

…[IMP] tests

test

ed53795

flake8

312f413

deps in travis.yml [FIX] flake8

24ee8f3

flake8 and pylint

9f4bdff

name of file

e8e5362

oca-transbot and others added 9 commits December 7, 2016 13:02

OCA Transbot updated translations from Transifex

72e1609

auto_backup: bad reference to field sftp_private_key (OCA#423)

13df2b7

Bump module version to 8.0.1.0.1

auto_backup: Empty dump using sftp backup option (OCA#432)

0c1a7d7

logger db_backup for pysftp (OCA#419)

4b6f8f1

OCA Transbot updated translations from Transifex

8312435

OCA Transbot updated translations from Transifex

64d428e

OCA Transbot updated translations from Transifex

8b25e10

OCA Transbot updated translations from Transifex

d567a06

remove en.po that was erroneously created by transbot

45a4172

lasley force-pushed the hotfix/9.0/auto_backup-commit_history branch from 3d6338a to 8aea3ba Compare December 7, 2016 21:06

lasley changed the title ~~Revert "Revert "[9.0][MIG] auto_backup (#526)""~~ [FIX][9.0] auto_backup: Missing files Dec 7, 2016

lasley mentioned this pull request Dec 9, 2016

[RFC] Contribution: Merger Commit Squashing OCA/maintainer-tools#248

Closed

lasley force-pushed the hotfix/9.0/auto_backup-commit_history branch from 8aea3ba to e5f4ed8 Compare December 13, 2016 19:00

[MIG] auto_backup: Migrate to v9

43ed6e8

* Add self.ensure_ones * Add test coverage

lasley force-pushed the hotfix/9.0/auto_backup-commit_history branch from e5f4ed8 to 43ed6e8 Compare December 13, 2016 21:06

lasley added needs review and removed work in progress labels Dec 13, 2016

lasley merged commit 1325470 into OCA:9.0 Dec 16, 2016

lasley deleted the hotfix/9.0/auto_backup-commit_history branch December 16, 2016 08:02

lasley mentioned this pull request Dec 21, 2016

[9.0] auto_backup The commit history is lost in 9.0 #619

Closed

SiesslPhillip pushed a commit to grueneerde/OCA-server-tools that referenced this pull request Nov 20, 2024

Merge pull request OCA#636 from OCA/13.0

b7db706

Syncing from upstream OCA/server-tools (13.0)

Uh oh!

Uh oh!

Conversation

lasley commented Dec 7, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

antespi left a comment

Choose a reason for hiding this comment

Uh oh!

lasley commented Dec 7, 2016

Uh oh!

antespi commented Dec 7, 2016

Uh oh!

lasley commented Dec 9, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lasley commented Dec 13, 2016

Uh oh!

antespi commented Dec 13, 2016

Uh oh!

antespi commented Dec 13, 2016

Uh oh!

susport commented Dec 14, 2016

Uh oh!

lasley commented Dec 14, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

antespi commented Dec 14, 2016

Uh oh!

lasley commented Dec 14, 2016

Uh oh!

lasley commented Dec 16, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

lasley commented Dec 7, 2016 •

edited

Loading

lasley commented Dec 9, 2016 •

edited

Loading

lasley commented Dec 14, 2016 •

edited

Loading