Stas
|
759b6b7248
|
Merge branch '111601356-ident_type_validation' into staging
|
2016-05-25 17:37:08 +03:00 |
|
Stas
|
9e3bb02dd1
|
111601356-error_text_modification
|
2016-05-25 17:19:50 +03:00 |
|
Stas
|
7a27756a36
|
111601356-errors_customization
|
2016-05-25 12:42:10 +03:00 |
|
Vladimir Krylov
|
789fc10ec4
|
Merge branch 'story/120259603-git-commit-hash' into staging
|
2016-05-25 10:13:55 +03:00 |
|
Vladimir Krylov
|
3adbd0a00e
|
Story#120259603 - git uses right branch last commit message
|
2016-05-25 10:13:10 +03:00 |
|
Timo Võhmar
|
e4a4d02349
|
Merge branch 'registrant_login_notification' into staging
|
2016-05-25 08:33:42 +03:00 |
|
Timo Võhmar
|
9485c19688
|
Removed registrant specific part as unauthorized variable is used in other interfaces as well.
|
2016-05-25 08:31:07 +03:00 |
|
Timo Võhmar
|
0f87518826
|
Fixed merge conflict with master in domain.rb
|
2016-05-24 12:27:15 +03:00 |
|
Timo Võhmar
|
44c665e8a0
|
Improved notification on login screen of portal for registrants.
|
2016-05-24 11:49: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 |
|
Timo Võhmar
|
43df10ccaa
|
Merge pull request #133 from internetee/story/115762063-show-historical-nested
Story/115762063 show historical nested
|
2016-05-20 09:27:48 +03:00 |
|
Timo Võhmar
|
1894d50dd9
|
Merge pull request #134 from internetee/116209751-verified_option
116209751 verified option
|
2016-05-19 15:28:07 +03:00 |
|
Stas
|
368b9978ef
|
Merge branch 'master' into story/115762063-show-historical-nested
|
2016-05-18 16:48:14 +03:00 |
|
Stas
|
628813f604
|
Merge branch '117806281-clickable_actions' into staging
|
2016-04-28 15:23:58 +03:00 |
|
Stas
|
096c23f55e
|
117806281-clickable_actions
|
2016-04-28 15:09:51 +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 |
|
Timo Võhmar
|
c7b6090ae8
|
Merge branch '117124725-rant-pending-messages' into staging
Updated pendingUpdate and pendingDeleteConfirmation rejection messages
|
2016-04-15 10:07:26 +03:00 |
|
Timo Võhmar
|
c09c039f3c
|
changed pending update and delete rejection messages [bug 117124725]
|
2016-04-15 10:05:57 +03:00 |
|
Timo Võhmar
|
09e9828998
|
Merge pull request #120 from internetee/116207475-blank_registrant
116207475 blank registrant
|
2016-04-08 17:39:57 +03:00 |
|
Timo Võhmar
|
3af5a1d5fc
|
Merge branch 'reduce_legaldoc_min_size' into staging
Lowered the legaldoc min size to 3kB
|
2016-04-07 11:41:00 +03:00 |
|
Timo Võhmar
|
00948384a6
|
lowered the minimum legalDocument size requirement to 3kB
|
2016-04-07 11:40:02 +03:00 |
|
Stas
|
bf9bb8b5f1
|
fix typo
|
2016-04-06 14:22:43 +03:00 |
|
Stas
|
5e4c38763b
|
Merge branch '116207475-blank_registrant' into staging
|
2016-04-05 17:32:53 +03:00 |
|
Stas
|
f490d16a19
|
116207475-error_added
|
2016-04-05 17:15:34 +03:00 |
|
Stas
|
b80734808b
|
Merge branch '116209751-verified_option' into staging
|
2016-03-31 17:53:08 +03:00 |
|
Stas
|
a75d8c8407
|
116209751-option_added
|
2016-03-31 17:51:40 +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 |
|
Stas
|
b9cec46d9a
|
Merge branch '115040781-legaldoc_on_delete' into staging
|
2016-03-29 13:09:30 +03:00 |
|
Stas
|
0e35641702
|
115040781-translation_added
|
2016-03-29 12:56:23 +03:00 |
|
Vladimir Krylov
|
5cce1ed2c8
|
Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested
# Conflicts:
# app/controllers/admin/domain_versions_controller.rb
# config/locales/en.yml
|
2016-03-22 16:03:52 +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 |
|
Vladimir Krylov
|
4f458adb0f
|
Merge branch 'story/105855968-directo' into staging
# Conflicts:
# config/locales/en.yml
|
2016-03-21 12:20:33 +02:00 |
|
Vladimir Krylov
|
d67db2d7c8
|
Story#105855968 - admin/show mark if registrar is test
|
2016-03-21 12:18:48 +02:00 |
|
Vladimir Krylov
|
92605d7a08
|
Merge branch '111864739-history_legal_doc' into staging
# Conflicts:
# app/models/legal_document.rb
|
2016-03-18 16:00:32 +02:00 |
|
Vladimir Krylov
|
71aae06dd1
|
Story#111864739 - epp validation
|
2016-03-18 15:59:14 +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
|
60c9a0a766
|
Story#105855968 - show Registrar#test_registrar in admin/registrars
|
2016-03-16 17:50:19 +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 |
|
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
|
7d8cc9839f
|
Merge branch 'story/105855968-directo' into staging
# Conflicts:
# Gemfile
# Gemfile.lock
|
2016-03-11 11:26:14 +02:00 |
|
Vladimir Krylov
|
43cb1a443c
|
Story#115147999 - set mina script
|
2016-03-09 13:16:13 +02:00 |
|
Vladimir Krylov
|
acfc6dccce
|
Merge branch 'story/115147999-assets' into staging
# Conflicts:
# public/assets/.sprockets-manifest-48c2dd3ff16b86b70040480e74a50543.json
# public/assets/registrant-manifest.js
# public/assets/registrar-manifest.css
# public/assets/registrar-manifest.js
# public/assets/registrar/application.js
|
2016-03-08 13:57:44 +02:00 |
|
Vladimir Krylov
|
05e603aa9d
|
Story#115147999 - set mina script
|
2016-03-08 13:06:00 +02:00 |
|
Vladimir Krylov
|
dbe1965731
|
Story#115147999 - use digested assets
|
2016-03-08 11:19:56 +02:00 |
|
Georg Kahest
|
ceb91033a6
|
dont generate assets on the fly
|
2016-03-08 11:17:29 +02:00 |
|