Merge branch 'staging' of github.com:internetee/registry into staging

e044c959d284 misplaced paren
  Story #107192666 - bugfix: check content before determining XML format. Only use DS if DS present.:wq
  Story #104525314 - fix typo, missing paren
  Story #104525314 - EPP user must respect serverDeleteProhibited
  Story #104525314 - Test: fix bd85e0b33c paren required
  Story #104525314 - clean up, remove redundant logic, simplfy
  Story #104525314 - clean up, remove dev hacks, allow dev to verify end user experience
  Story #104525314 - fix:admin could not confirm reject pending, refactor registrant confirm
  Story #104525314 - feature reject combination of delete with deleteProhibited
  Story #104525314 - change button text to accept/reject delete
  Story #104525314 - fix -- should not show apply/delete pending for new status values
  Story #104525314 - feature: admin can accept/reject pendingDelete{Confirmation} pending_json is not required
This commit is contained in:
Stas 2015-11-11 12:04:44 +02:00
commit a476562cb1

Diff content is not available