Commit graph

858 commits

Author SHA1 Message Date
Stas
8963c1d304 Merge branch '115693873-whodunnit_empty' into staging 2016-06-29 11:33:09 +03:00
Stas
f97bab5f87 115693873-wrong_route 2016-06-20 14:21:14 +03:00
Stas
50830b2a09 Merge branch '115693873-whodunnit_empty' into staging 2016-06-16 16:36:16 +03:00
Stas
abf736e540 115693873-initiator_catches 2016-06-15 18:27:28 +03:00
Stas
7711519538 Merge branch '115693873-whodunnit_empty' into staging 2016-06-07 16:38:34 +03:00
Stas
2f9a9bd680 115693873-job-initiator_added 2016-06-07 16:02:17 +03:00
Vladimir Krylov
de17f72dc0 Merge branch '108869472-objects_archive' into staging 2016-05-31 08:20:03 +03:00
Vladimir Krylov
00b9d50c08 Story#108869472 - domain history search not failing whenregistrants not found 2016-05-31 08:18:21 +03:00
Vladimir Krylov
6a01c8c7ab Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-30 12:49:31 +03:00
Vladimir Krylov
d1e5312b98 Story#116761157 - search by linked contacts in dynamic way 2016-05-30 12:49:06 +03:00
Vladimir Krylov
223b6b8b9f Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-27 14:31:39 +03:00
Vladimir Krylov
01234e3c55 Story#116761157 - move variable when to delete orphans to settings 2016-05-27 14:31:16 +03:00
Vladimir Krylov
c47613865a Merge branch '108869472-objects_archive' into staging 2016-05-25 12:57:58 +03:00
Vladimir Krylov
e9a8cf086b Story#120259603 - versions search is case insensitive 2016-05-25 12:45:20 +03:00
Vladimir Krylov
857225a2df Merge branch '108869472-objects_archive' into staging 2016-05-25 12:07:37 +03:00
Vladimir Krylov
a1dc8043ec Story#120259603 - sort versions by id as otherwise postgresql becomes crazy on offset 2016-05-25 11:20:45 +03:00
Vladimir Krylov
4b9ba0fe13 Story#108869472 - contact history uses same pagination what domain history does 2016-05-25 11:09:06 +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
714dd1473d Story#118912395 - EppLog saves resource 2016-05-20 16:37:38 +03:00
Vladimir Krylov
a51f536781 Story#118912395 - rearrange before_action for more readability 2016-05-20 15:32:06 +03:00
Stas
5d4fa62578 Merge branch '117690107-request_trim' into staging 2016-05-20 14:06:22 +03:00
Stas
92c7469372 117690170-request_trim 2016-05-19 18:06:27 +03:00
Stas
368b9978ef Merge branch 'master' into story/115762063-show-historical-nested 2016-05-18 16:48:14 +03:00
Stas
b4a2f2f340 Merge branch '117690107-request_trim' into staging 2016-05-16 12:33:20 +03:00
Stas
59f21221f5 117690107-request_trim 2016-05-16 12:32:47 +03:00
Stas
b2f502924b Merge branch '108869472-objects_archive' into staging 2016-04-29 14:36:43 +03:00
Stas
97c4bf0097 108869472-pagination_modification 2016-04-29 14:18:44 +03:00
Stas
09f28e0470 108869472-default_page_handler 2016-04-28 18:57:20 +03:00
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