Commit graph

494 commits

Author SHA1 Message Date
Vladimir Krylov
bd46a21623 Merge branch 'story/120095555-ipv6-hostname' into staging 2016-06-15 11:37:14 +03:00
Vladimir Krylov
67e32f3a36 better error on validating glue IP address 2016-06-15 11:36:57 +03:00
Vladimir Krylov
90778863ae Merge branch 'story/120095555-ipv6-hostname' into staging 2016-06-13 13:17:21 +03:00
Vladimir Krylov
999c161c8e Story#120095555 - glue nameserver may have IPv4 or IPv6 2016-06-13 13:17:01 +03:00
Stas
31d2121e78 Merge branch '115693873-whodunnit_empty' into staging 2016-05-25 17:50:52 +03:00
Stas
24aec79ceb 115693873-log_changes 2016-05-25 15:58:39 +03:00
Stas
31e0f44856 Merge branch '115693873-whodunnit_empty' into staging 2016-05-24 13:59:19 +03:00
Timo Võhmar
0f87518826 Fixed merge conflict with master in domain.rb 2016-05-24 12:27:15 +03:00
Stas
248a04f63a 115693873-class_name_msg 2016-05-20 17:08:55 +03:00
Vladimir Krylov
229a249c36 Merge branch 'story/118912395-epp-log' into staging
# Conflicts:
#	app/models/domain.rb
2016-05-20 16:39:14 +03:00
Vladimir Krylov
0a0b9c323b Story#115762063 - update which children elements should be saved in logs 2016-05-20 15:40:10 +03:00
Stas
66079e7545 Merge branch '115693873-whodunnit_empty' into staging 2016-04-17 16:08:24 +03:00
Stas
1524e8eda9 115693873-added_pt 2016-04-17 16:07:02 +03:00
Stas
2bb0a86340 Merge branch '117131083-incorrect_force_delete_at_value' into staging 2016-04-17 15:19:31 +03:00
Stas
7043097ec0 117131083-timezone_precision 2016-04-17 15:12:10 +03:00
Stas
0fc5402e1c Merge branch '117131083-incorrect_force_delete_at_value' into staging 2016-04-14 17:19:37 +03:00
Stas
f3fe706eab 117131083-utc_removed 2016-04-14 17:19:17 +03:00
Stas
14b9c347d5 Merge branch '117131083-incorrect_force_delete_at_value' into staging 2016-04-13 01:15:27 +03:00
Stas
acd2c14856 117131083-deleted_at_force_delete_at 2016-04-13 01:11:13 +03:00
Stas
d551c69e91 Merge branch '117131083-incorrect_force_delete_at_value' into staging 2016-04-11 16:04:30 +03:00
Stas
178818288d 117131083-force_delete_at_calculation 2016-04-11 16:02:42 +03:00
Stas
ba1b4dbf25 117131083-force_delete_at_calculation 2016-04-11 15:56:26 +03:00
Stas
b858d190c3 Merge branch '117131083-incorrect_force_delete_at_value' into staging 2016-04-08 18:17:19 +03:00
Stas
9bfac8e401 Merge branch '115693873-whodunnit_empty' into staging 2016-04-08 18:16:05 +03:00
Stas
deb3b9a199 117131083-force_delete_at_calculation_changed 2016-04-08 17:03:40 +03:00
Stas
c447bc4d64 115693873-pt_added 2016-04-08 16:52:27 +03:00
Vladimir Krylov
8e15da5d1e Merge branch 'story/115762063--show-historical-nested' into staging
# Conflicts:
#	app/models/domain.rb
2016-04-07 16:07:01 +03:00
Vladimir Krylov
e4cdd23248 story#115762063 - revert how children ids are saved 2016-04-07 16:05:52 +03:00
Stas
bf9bb8b5f1 fix typo 2016-04-06 14:22:43 +03:00
Timo Võhmar
53fae3d535 Merge pull request #113 from internetee/story/115405945-clean_expired_pendings
Story/115405945 clean expired pendings
2016-04-05 13:45:40 +03:00
Vladimir Krylov
4238b8ffbc Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-04-04 15:10:42 +03:00
Vladimir Krylov
ee36333640 Story#115405945 - setting pending update should update updated_at 2016-04-04 14:59:09 +03:00
Vladimir Krylov
03784ad1e3 story#115762063 - render link to pure history 2016-03-30 17:11:50 +03:00
Vladimir Krylov
f873b14214 story#115762063 - children log method doesn't save ids marked for destruction 2016-03-30 17:07:27 +03:00
Vladimir Krylov
66ea1e0fa5 Merge branch 'story/115762063--show-historical-nested' into staging
# Conflicts:
#	app/models/domain.rb
2016-03-24 15:57:03 +02:00
Vladimir Krylov
2b2e2e5254 Story#115762063 - typo 2016-03-24 15:47:07 +02:00
Vladimir Krylov
f69c4ef919 Merge branch 'story/115762063--show-historical-nested' into staging
# Conflicts:
#	app/models/domain.rb
#	app/views/admin/domains/partials/_version.haml
#	config/locales/en.yml
2016-03-23 18:30:34 +02:00
Vladimir Krylov
bcc8e7b6f8 story#115762063 - use special helper method to generate class name 2016-03-23 18:28:40 +02:00
Vladimir Krylov
da7fed9577 Merge remote-tracking branch 'origin/master' into story/105855968-directo
# Conflicts:
#	Gemfile
#	Gemfile.lock
2016-03-22 11:47:18 +02:00
Vladimir Krylov
b73cc424ff Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-03-17 12:49:47 +02:00
Vladimir Krylov
92bc47adfa Story#115405945 - papertrail saves new time as record itself 2016-03-17 12:49:00 +02:00
Vladimir Krylov
4b03d843c9 Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-03-15 15:20:40 +02:00
Vladimir Krylov
d703cac62d Story#115405945 - on remove pending state create update history record 2016-03-15 15:20:08 +02:00
Vladimir Krylov
ec03169bb6 Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-03-14 17:58:41 +02:00
Vladimir Krylov
03b58f7386 Story#115405945 - clean_pendings_lowlevel saves history 2016-03-14 17:56:31 +02:00
Vladimir Krylov
7d8cc9839f Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	Gemfile
#	Gemfile.lock
2016-03-11 11:26:14 +02:00
Timo Võhmar
30697a3b6d Merge pull request #101 from internetee/story/113066359-optimization
Story/113066359 optimization
2016-03-10 13:22:54 +02:00
Vladimir Krylov
b76fb8c9ff Merge remote-tracking branch 'origin/master' into story/105855968-directo 2016-03-04 14:34:40 +02:00
Vladimir Krylov
e954c212c7 Story#105855968 - Prepare xml for Directo 2016-03-03 15:52:42 +02:00
Timo Võhmar
b60dc1d833 Merge pull request #85 from internetee/105846070-merge-with-105842700-arireg-for-registrant-port
105846070 merge with 105842700 arireg for registrant port
2016-02-29 17:48:17 +02:00