Commit graph

1455 commits

Author SHA1 Message Date
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
Maciej Szlosarczyk
d67e777ea8
Create a Registrant auth controller 2018-07-18 16:24:55 +03:00
Artur Beljajev
28393adfb1 Fix translation 2018-07-15 00:36:04 +03:00
Artur Beljajev
c7e426b8ed Extract translations 2018-07-14 23:46:18 +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
Maciej Szlosarczyk
6fb1e44cca
Move affected domains to the top of the hash, update integration test 2018-07-05 17:53:03 +03:00
Timo Võhmar
ea3f3ac43a
Merge pull request #888 from internetee/improve-registrant-area
Improve registrant area
2018-06-22 13:13:58 +03:00
Artur Beljajev
f299241b28 Merge branch 'master' into registry-791
# Conflicts:
#	db/structure.sql
2018-06-21 17:38:38 +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
756836001c Remove unused routes 2018-06-19 20:39:52 +03:00
Artur Beljajev
ebe831e782 Regenerate and tune Devise config 2018-06-19 20:23:54 +03:00
Artur Beljajev
0f6df9e3f8 Regenerate Devise translation 2018-06-19 20:00:40 +03:00
Artur Beljajev
31b3862fb9 Merge branch 'master' into remove-spring-gem
# Conflicts:
#	Gemfile.lock
2018-06-18 16:29:28 +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
452caffc7d Improve UI 2018-06-18 00:49:35 +03:00
Artur Beljajev
288db24ab1 Reformat 2018-06-18 00:37:10 +03:00
Artur Beljajev
152759ab73 Remove unused routes 2018-06-18 00:36:01 +03:00
Artur Beljajev
42b01512af Improve translations 2018-06-17 19:28:01 +03:00
Artur Beljajev
255b0db9cb Merge branch 'master' into registry-791 2018-06-15 16:55:58 +03:00
Timo Võhmar
5a0d191b7e
Merge pull request #869 from internetee/remove-monkey-patch
Remove monkey patch
2018-06-14 19:23:06 +03:00
Timo Võhmar
fcefd14602
Merge pull request #864 from internetee/add-uglifier-gem
Add "uglifier" gem for es6 compression
2018-06-14 17:59:59 +03:00
Artur Beljajev
a07a458745 Merge branch 'master' into remove-spring-gem
# Conflicts:
#	Gemfile
2018-06-14 13:44:48 +03:00
Timo Võhmar
d7fe0a2e2b
Merge pull request #867 from internetee/copy-puma-config-from-rails5
Copy "puma" gem config from Rails 5
2018-06-14 13:37:01 +03:00
Timo Võhmar
8ec6b80794
Merge pull request #857 from internetee/remove-rubocop-gem
Remove "rubocop" gem
2018-06-14 13:35:25 +03:00
Artur Beljajev
78d7d5d894 Merge branch 'master' into remove-spring-gem
# Conflicts:
#	config/environments/test.rb
2018-06-14 13:33:14 +03:00
Timo Võhmar
2828f8ca72
Merge pull request #859 from internetee/remove-lib-from-autoload-path
Remove `lib` folder from autoload path
2018-06-14 13:20:22 +03:00
Artur Beljajev
ec76a6bbc0 Remove monkey patch 2018-06-09 07:57:38 +03:00
Artur Beljajev
f5e19d2c1e Copy "puma" gem config from Rails 5 2018-06-09 04:37:03 +03:00
Artur Beljajev
abef25dd19 Add "uglifier" gem for es6 compression 2018-06-08 02:19:47 +03:00
Artur Beljajev
c44f3df7f5 Remove Rubocop inline directives 2018-06-07 19:17:16 +03:00
Artur Beljajev
c37f162529 Merge branch 'master' into registry-790 2018-06-06 21:53:08 +03:00
Artur Beljajev
b09e224d02 Merge branch 'master' into remove-spring-gem 2018-06-06 21:49:41 +03:00
Artur Beljajev
9e2ce0351d Merge branch 'master' into remove-lib-from-autoload-path 2018-06-06 21:48:02 +03:00
Artur Beljajev
31b96c20b6 Merge branch 'master' into improve-test-env-config 2018-06-06 21:46:51 +03:00
Timo Võhmar
157b383738
Merge pull request #780 from internetee/registry-662
Enable domain contact replacement
2018-06-06 15:39:24 +03:00
Artur Beljajev
0863b4ca25 Remove default comments 2018-06-06 11:30:47 +03:00
Artur Beljajev
f774408722 Merge branch 'master' into improve-test-env-config 2018-06-06 07:02:31 +03:00
Artur Beljajev
19e0e7c8f8 Improve test env config 2018-06-06 06:27:29 +03:00
Artur Beljajev
76d10b94c5 Turn off settings by default
- `registrar_ip_whitelist_enabled`
- `api_ip_whitelist_enabled`
2018-06-06 04:55:36 +03:00
Artur Beljajev
9f61dfdae7 Improve test env config 2018-06-05 17:33:30 +03:00
Artur Beljajev
30ac973f96 Remove lib folder from autoload path
- Load extensions explicitly
2018-06-05 17:26:14 +03:00
Maciej Szlosarczyk
2965fddef4
Merge branch 'master' into credit-and-debit-card-payments 2018-06-04 11:06:29 +03:00
Artur Beljajev
65b40997ca Merge branch 'master' into registry-790 2018-06-04 04:02:33 +03:00
Artur Beljajev
125bb4bb4a Revert translations
#662
2018-06-04 02:18:08 +03:00
Artur Beljajev
8c915164c5 Change naming
#662
2018-06-04 02:14:15 +03:00
Artur Beljajev
0a8acc72c9 Remove "spring" gem
- Regenerate binstubs
2018-06-01 15:00:33 +03:00
Artur Beljajev
f5965331c8 Merge branch 'master' into registry-662 2018-05-29 12:11:25 +03:00
Maciej Szlosarczyk
b32809cdac
Deprecate Registrant::WhoisController 2018-05-25 13:58:13 +03:00
Timo Võhmar
97ca7198fa
Merge pull request #837 from internetee/registry-795
Registry 795
2018-05-23 09:18:56 +03:00