Commit graph

581 commits

Author SHA1 Message Date
Artur Beljajev
3d51a93f95 Merge branch 'master' into registry-790 2018-08-27 15:24:05 +03:00
Artur Beljajev
1f78856ea9 Merge branch 'master' into refactor-devise-integration 2018-08-25 17:29:00 +03:00
Artur Beljajev
732997bf9e Merge branch 'registry-791' into registry-790
# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml
2018-08-09 16:42:43 +03:00
Artur Beljajev
8c744f091b Remove unneeded attribute 2018-08-09 13:49:26 +03:00
Artur Beljajev
024a993547 Use standard UI 2018-07-28 22:21:21 +03:00
Artur Beljajev
4b30234c86 Merge branch 'registry-791' into registry-790 2018-07-27 16:18:28 +03:00
Artur Beljajev
106592e53e Merge branch 'master' into registry-791
# Conflicts:
#	db/structure.sql
2018-07-19 20:40:45 +03:00
Artur Beljajev
e4305e7865 Merge branch 'master' into registry-790 2018-07-19 17:28:56 +03:00
Artur Beljajev
2374d94714 Remove unneeded condition 2018-07-19 00:24:10 +03:00
Artur Beljajev
e369d90e20 Make UI consistent 2018-07-19 00:23:17 +03:00
Artur Beljajev
2e1ed2733a Extract translation 2018-07-18 23:24:56 +03:00
Artur Beljajev
5561825584 Use standard Devise sessions controller in admin area
Fixes a bug when retrying to login with correct credentials
2018-07-18 20:02:05 +03:00
Artur Beljajev
84bf967780 Fix template 2018-07-15 19:01:33 +03:00
Artur Beljajev
32ecf36057 Rename users.password to users.plain_text_password
Otherwise it conflicts with Devise
2018-07-13 23:09:21 +03:00
Artur Beljajev
e5cdb2e8db Merge branch 'master' into refactor-devise-integration
# Conflicts:
#	app/controllers/registrant/contacts_controller.rb
#	config/routes.rb
2018-07-10 18:09:03 +03:00
Artur Beljajev
9684c8e59f Refactor Devise integration
- Use scoped users
- Use the named route helpers instead of hardcoded paths
2018-06-20 12:21:22 +03:00
Artur Beljajev
28416a3375 Use singular controller 2018-06-19 20:43:23 +03:00
Artur Beljajev
5b821f4074 Merge branch 'master' into registry-790
# Conflicts:
#	app/models/domain_cron.rb
#	lib/tasks/dev.rake
2018-06-18 16:27:56 +03:00
Artur Beljajev
4e2d32a6ce Unify contact.auth_info look and feel 2018-06-18 13:30:57 +03:00
Artur Beljajev
255b0db9cb Merge branch 'master' into registry-791 2018-06-15 16:55:58 +03:00
Artur Beljajev
ec76a6bbc0 Remove monkey patch 2018-06-09 07:57:38 +03:00
Artur Beljajev
c37f162529 Merge branch 'master' into registry-790 2018-06-06 21:53:08 +03:00
Artur Beljajev
65b40997ca Merge branch 'master' into registry-790 2018-06-04 04:02:33 +03:00
Artur Beljajev
f5965331c8 Merge branch 'master' into registry-662 2018-05-29 12:11:25 +03:00
Timo Võhmar
97ca7198fa
Merge pull request #837 from internetee/registry-795
Registry 795
2018-05-23 09:18:56 +03:00
Maciej Szlosarczyk
255706fb45
Remove unecessary handling of newlines in contact views 2018-04-26 12:30:17 +03:00
Maciej Szlosarczyk
2c494d9373
Fix brakeman issue by extracting gsub into a function 2018-04-26 08:57:28 +03:00
Maciej Szlosarczyk
a82db7a67a
Solve both sides of the missing fields bug, not only one 2018-04-26 08:46:21 +03:00
Maciej Szlosarczyk
764414ba34
Add new Setting to handle whois disclaimers 2018-04-25 14:34:37 +03:00
Maciej Szlosarczyk
cec05c3943
Test and fix contact_versions controller affected by the same bug 2018-04-24 13:19:34 +03:00
Maciej Szlosarczyk
a93228c579
Extract block to helper function 2018-04-24 13:19:11 +03:00
Maciej Szlosarczyk
b0bec41f56
Write a test that covers missing and non-existent values 2018-04-24 11:53:27 +03:00
Artur Beljajev
696a3871b7 Merge branch 'master' into registry-791 2018-04-20 17:37:43 +03:00
Artur Beljajev
453acf6616 Merge branch 'master' into registry-790 2018-04-18 19:08:32 +03:00
Artur Beljajev
72dcb24e3e Merge branch 'master' into registry-662 2018-04-18 17:33:00 +03:00
Timo Võhmar
b27ce14aa8
Merge pull request #806 from internetee/registry-792
Registry 792
2018-04-17 16:23:48 +03:00
Artur Beljajev
fb9f7a561e Merge branch 'master' into registry-662 2018-04-17 15:30:26 +03:00
Artur Beljajev
4bae19b66d Merge branch 'master' into registry-662 2018-04-17 13:41:46 +03:00
Artur Beljajev
96e2136c38 Merge branch 'master' into registry-787
# Conflicts:
#	db/structure.sql
2018-04-17 12:38:55 +03:00
Artur Beljajev
9d6a5910e3 Merge branch 'master' into registry-790 2018-04-15 19:11:20 +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
Maciej Szlosarczyk
18ad5e8e5e
Fix missing translation error 2018-04-11 12:38:10 +03:00
Artur Beljajev
3dd17f83f3 Remove unneeded attribute alias
#791
2018-04-08 22:55:53 +03:00
Artur Beljajev
cc4a244844 Enable to keep a domain
#790
2018-04-08 18:52:32 +03:00
Artur Beljajev
a932d43dda Improve UI
#790
2018-04-08 15:45:01 +03:00
Artur Beljajev
228078a84e Add bulk replace to registrar area
#662
2018-04-06 00:16:17 +03:00
Artur Beljajev
f269796382 Show label in UI if a domain is discarded
#792
2018-04-03 15:22:20 +03:00
Artur Beljajev
1dcf7bcd62 Remove unused partial
#792
2018-04-03 00:30:49 +03:00
Artur Beljajev
4435183a0e Clean up
#792
2018-04-03 00:17:27 +03:00
Artur Beljajev
639021d262 Reformat
#792
2018-04-03 00:15:29 +03:00