Commit graph

828 commits

Author SHA1 Message Date
Stas
998a0043da Merge branch '117350717-admin_sorting' into staging 2016-04-25 18:15:14 +03:00
Stas
f45b497876 117350717-sorting_fixes 2016-04-25 18:13:52 +03:00
Timo Võhmar
572a3f4e1d Merge pull request #127 from internetee/115595167-records_match
115595167 records match
2016-04-22 10:00:00 +03:00
Stas
0a73085ac2 Merge branch '108869472-objects_archive' into staging 2016-04-21 17:05:52 +03:00
Stas
76d5c96612 108869472-deleted_old_code 2016-04-21 16:19:47 +03:00
Stas
a09e6b1a42 108869472-new_qieries_and_views 2016-04-21 15:21:59 +03:00
Stas
ff33eaa031 108869472-like_query 2016-04-20 18:59:13 +03:00
Stas
698a1aa64f Merge branch '115595167-records_match' into staging 2016-04-19 19:38:57 +03:00
Stas
62d6c53180 115595167-frame_present 2016-04-19 19:38:33 +03:00
Stas
4421e2beb2 Merge branch '115595167-records_match' into staging 2016-04-15 13:08:00 +03:00
Stas
96d5ae579c 115595167-logs_migration 2016-04-15 13:02:49 +03:00
Timo Võhmar
1ae51213ec Merge branch '117124725-rant-pending-messages' into staging
Fixed incorrect pendingDeleteConfirmation reject and confirm messages
2016-04-15 11:11:23 +03:00
Timo Võhmar
8e1ce32143 fixed incorrect pending delete confirm page messages [bug 117124725] 2016-04-15 11:10:40 +03:00
Stas
b20a0ae2b2 Merge branch '108869472-objects_archive' into staging 2016-04-14 18:21:46 +03:00
Stas
9ace5aafb1 115595167-matching_column_name_changed 2016-04-14 17:22:18 +03:00
Stas
014c466c47 108869472-modification_for_archive 2016-04-14 17:16:24 +03:00
Vladimir Krylov
8890f15a6f Merge branch 'story/116962601-faster-logs' into staging 2016-04-14 14:51:09 +03:00
Vladimir Krylov
57be19a41a Story#116962601 - faster epp logs (check for presence) 2016-04-14 14:50:48 +03:00
Vladimir Krylov
fa888aa7b0 Merge branch 'story/116962601-faster-logs' into staging 2016-04-14 14:33:08 +03:00
Vladimir Krylov
5373c76c40 Story#116962601 - faster epp logs 2016-04-14 14:32:32 +03:00
Stas
00391d3582 115595167-colum_for_api_response 2016-04-11 18:46:49 +03:00
Stas
ae3467a8b1 Merge remote-tracking branch 'origin/master' into 110687814-update_values
# Conflicts:
#	app/models/epp/domain.rb
2016-04-08 18:11:47 +03:00
Stas
bf9bb8b5f1 fix typo 2016-04-06 14:22:43 +03:00
Timo Võhmar
798b5739e0 Merge pull request #110 from internetee/115040781-legaldoc_on_delete
115040781 legaldoc on delete
2016-03-30 16:39:55 +03:00
Timo Võhmar
abad5accf8 Merge pull request #109 from internetee/114554395-log_limits
114554395 log limits
2016-03-29 11:43:10 +03:00
Stas
913ac1f374 Merge branch '114554395-log_limits' into staging 2016-03-24 17:37:17 +02:00
Stas
b73ef11cc3 114554395-param_changes 2016-03-24 14:43:21 +02:00
Stas
81c4106468 Merge branch '114554395-log_limits' into staging 2016-03-22 18:15:01 +02:00
Stas
9e9d0a305a 114554395-clear_fields_modification 2016-03-22 18:14:19 +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
Timo Võhmar
71e3db611b Merge pull request #107 from internetee/105842700-registrants_portal
105842700 registrants portal
2016-03-22 11:36:36 +02:00
Stas
664c79e248 Merge branch '114554395-log_limits' into staging 2016-03-21 20:21:15 +02:00
Stas
ffb76c7372 114554395-start_date_added 2016-03-21 20:15:36 +02:00
Stas
195c9fc242 Merge branch '115040781-legaldoc_on_delete' into staging 2016-03-21 15:54:49 +02:00
Stas
431eaf5439 1150040781-contact_delete_legal_doc 2016-03-17 18:32:55 +02:00
Vladimir Krylov
a5e43ddec1 Merge branch '105842700-registrants_portal' into staging 2016-03-17 16:21:30 +02:00
Vladimir Krylov
ad4ccbb767 Story#105842700 - Add registrants to allowed contacts 2016-03-17 16:20:55 +02:00
Vladimir Krylov
927e7c6f1d Merge branch 'story/112601637-no-ident' into staging 2016-03-17 14:30:44 +02:00
Vladimir Krylov
58e383bd25 Story#112601637 - admin contacts has filter to get only ident_country_code 2016-03-17 13:59:42 +02:00
Stas
0b6bd1b80e Merge branch '108869472-objects_archive' into staging 2016-03-16 18:51:37 +02:00
Stas
7ba760a884 108869472-changes_for_real_data 2016-03-16 18:09:53 +02:00
Vladimir Krylov
0779657b41 Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	config/locales/en.yml
2016-03-16 17:51:06 +02:00
Vladimir Krylov
c957bce553 Story#105855968 - change registrar parameter from exclude_in_monthly_directo to test_registrar be used more widely 2016-03-16 17:48:35 +02:00
Vladimir Krylov
754fb7c9e5 Merge branch '105842700-registrants_portal' into staging 2016-03-16 13:55:49 +02:00
Vladimir Krylov
f4e068de12 Story#105842700 - we don't need registrant views in registrant portal as it's usual contact 2016-03-16 13:53:11 +02:00
Vladimir Krylov
332fd9cc21 Merge branch '105842700-registrants_portal' into staging 2016-03-15 14:56:24 +02:00
Vladimir Krylov
51a0449799 Story#105842700 - registrant cannot see other contact domains (legacy from FRED) 2016-03-15 14:55:51 +02:00
Stas
a80a24ee05 Merge branch '108869472-objects_archive' into staging 2016-03-14 14:00:59 +02:00
Stas
a42049e170 108869472-template_changes 2016-03-14 13:54:00 +02:00
Vladimir Krylov
2935101d95 Merge branch '105842700-registrants_portal' into staging 2016-03-11 14:20:11 +02:00