Commit Graph

7 Commits

Author SHA1 Message Date
Mike Ng
3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log
# Conflicts:
#	resources/www/common/js/components/common.js
2018-01-08 16:26:28 +04:00
Xavier Rousset
c7f6b325d8 PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups 2017-12-18 18:02:48 +01:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +01:00
Benoît Burnichon
93fd4bda03 Add orderable status in admin forms 2016-02-24 17:23:06 +01:00
Benoît Burnichon
721edc33c6 Add Orderable to subdef Controller 2016-02-10 17:06:08 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
8136f06a54 Refactor SubdefsController 2015-04-13 18:25:28 +02:00