Commit graph

6007 commits

Author SHA1 Message Date
Timo Võhmar
b02df5ef02
Merge pull request #775 from internetee/registry-623
Registry 623
2018-04-13 14:10:00 +03:00
Artur Beljajev
5061962c40 Fix test
#623
2018-04-12 18:01:30 +03:00
Artur Beljajev
963f6f87cf Use setup block instead of method in tests
#623
2018-04-12 17:31:04 +03:00
Artur Beljajev
a8046ce9cf Remove global setting for tests
#623
2018-04-12 17:27:39 +03:00
Artur Beljajev
7ffc62e370 Merge branch 'master' into registry-623
# Conflicts:
#	test/integration/admin/registrars/show_registrar_test.rb
2018-04-12 17:16:58 +03:00
Artur Beljajev
bee233e00b Fix incorrect method
#623
2018-04-12 12:06:42 +03:00
Timo Võhmar
9d128d0914
Merge pull request #818 from internetee/small-fix-for-l18n
Fix missing translation error in Mail templates page
2018-04-11 15:50:15 +03:00
Timo Võhmar
df741f133f
Merge pull request #809 from internetee/tune-test-env
Tune test env
2018-04-11 15:49:29 +03:00
Maciej Szlosarczyk
18ad5e8e5e
Fix missing translation error 2018-04-11 12:38:10 +03:00
Artur Beljajev
8b8b8df394 Reset WebMock after integration tests 2018-04-05 16:06:10 +03:00
Artur Beljajev
5c34d9f468 Merge branch 'master' into registry-623 2018-04-04 16:32:17 +03:00
Artur Beljajev
2908fd512f Reset setting after each test 2018-04-04 15:26:51 +03:00
Artur Beljajev
817a672143 Reset time after each test 2018-04-04 01:43:40 +03:00
Artur Beljajev
f8eda810f9 Use setup/teardown blocks instead of methods 2018-04-04 01:42:59 +03:00
Artur Beljajev
b1e0371188 Run tests in random order 2018-04-04 01:41:40 +03:00
Timo Võhmar
f7c2b25a66
Merge pull request #807 from internetee/Changelog_update_180403
Update CHANGELOG.md
2018-04-03 19:10:20 +03:00
Timo Võhmar
efda76a195
Update CHANGELOG.md
spelling corrections
2018-04-03 19:08:32 +03:00
Timo Võhmar
adf0eb3307
Merge pull request #804 from internetee/Changelog_update_180403
Changelog update 180403
2018-04-02 20:57:37 +03:00
Timo Võhmar
d766e2d82c
Changelog update 180403 2018-04-02 20:53:53 +03:00
Timo Võhmar
7cca7b2976
Merge pull request #798 from internetee/registry-678
Registry 678
2018-04-02 00:49:05 +03:00
Artur Beljajev
7155d08f6e Fix test 2018-04-01 23:03:52 +03:00
Artur Beljajev
29a8f39cb6 Prohibit renewing an invalid domain
#678
2018-04-01 22:59:19 +03:00
Artur Beljajev
139b7f290d Update fixtures 2018-04-01 22:42:49 +03:00
Artur Beljajev
5cc16552ab Backport Rails 5 test assertions
#799
2018-04-01 22:41:48 +03:00
Artur Beljajev
a7b89797c2 Merge branch 'reformat-structure.sql' into registry-623 2018-03-31 11:33:44 +03:00
Artur Beljajev
5ef56e13e0 Reformat structure.sql 2018-03-31 11:33:19 +03:00
Artur Beljajev
49757f183c Merge branch 'master' into registry-623 2018-03-31 11:23:27 +03:00
Timo Võhmar
5b0032cd30
Merge pull request #796 from internetee/fix-structure-sql
Fix structure.sql
2018-03-29 17:24:58 +03:00
Artur Beljajev
8124023809 Fix structure.sql 2018-03-29 12:23:32 +03:00
Artur Beljajev
837f326ef6 Merge branch 'master' into registry-623
# Conflicts:
#	app/controllers/admin/registrars_controller.rb
#	app/models/registrar.rb
#	app/views/admin/registrars/_billing.html.erb
#	app/views/admin/registrars/show.html.erb
#	config/locales/admin/registrars.en.yml
#	config/locales/en.yml
#	db/migrate/20180309053424_add_registrars_unique_constraints.rb
#	db/structure.sql
#	test/fixtures/registrars.yml
#	test/integration/admin/registrars/delete_test.rb
#	test/integration/admin/registrars/new_test.rb
#	test/models/registrar_test.rb
2018-03-29 12:13:59 +03:00
Timo Võhmar
d501ee90e0
Merge pull request #761 from internetee/registry-642
Do not check IP in bank link callback URL
2018-03-28 13:17:29 +03:00
Timo Võhmar
7cff2bb4cf
Merge pull request #770 from internetee/registry-765
Refactor registrars
2018-03-28 11:47:40 +03:00
Timo Võhmar
1d2f8ca45d
Merge pull request #779 from internetee/registry-759
Disable spell checking globally
2018-03-27 17:29:20 +03:00
Timo Võhmar
de5979790f
Merge pull request #783 from internetee/update-loofah-gem
Update loofah gem
2018-03-27 12:43:27 +03:00
Artur Beljajev
0f6a47d73d Refactor registrars
#765
2018-03-26 07:00:54 +03:00
Artur Beljajev
e0de0943f5 Update loofah gem 2018-03-23 16:32:05 +02:00
Timo Võhmar
cee51e1ac5
Merge pull request #777 from internetee/registry-776
Drop uniqueness validation
2018-03-19 14:08:03 +02:00
Timo Võhmar
a04aa96724
Merge pull request #778 from internetee/Changelog_update_180319
Changelog update 180319
2018-03-19 11:04:03 +02:00
Artur Beljajev
f2e8bebab2 Disable spell checking globally
#759
2018-03-18 01:41:29 +02:00
Timo Võhmar
7e018265b1
Changelog update 180306 2018-03-16 13:40:08 +02:00
Artur Beljajev
7266662fac Drop uniqueness validation
#776
2018-03-15 17:01:37 +02:00
Artur Beljajev
69d0a20115 Fix tests
#623
2018-03-14 23:53:53 +02:00
Artur Beljajev
f8088df798 Fix tests
#623
2018-03-14 23:26:54 +02:00
Artur Beljajev
169c67839e Add "VATCode" and "TotalVAT" fields to Directo
#623
2018-03-14 14:48:20 +02:00
Artur Beljajev
1107dc67b8 Simplify method
#623
2018-03-14 14:30:20 +02:00
Artur Beljajev
094c06bee7 Fix directo
#623
2018-03-14 12:58:49 +02:00
Artur Beljajev
e1b0f3044e Fix invoice
#623
2018-03-14 12:19:44 +02:00
Artur Beljajev
fb35ec5cbb Require invoices.total
#623
2018-03-13 14:49:36 +02:00
Artur Beljajev
9a4380fd96 Fix invoice total calculation
#623
2018-03-13 14:32:38 +02:00
Artur Beljajev
ef6f482528 Format inline
#623
2018-03-13 14:32:17 +02:00