Commit graph

11723 commits

Author SHA1 Message Date
gregoirenovel
ec69086ebc Don’t use alias_method_chain, use a proxy method 2017-06-08 12:22:48 +02:00
gregoirenovel
bc7fc2634e Fix test indentation, name and remove a blank line 2017-06-08 12:22:48 +02:00
gregoirenovel
d557906fe9 Remove unused variable in MailTemplatesController#edit 2017-06-08 12:22:47 +02:00
gregoirenovel
07ad7b4c84 mails -> mail_templates 2017-06-08 12:22:46 +02:00
gregoirenovel
07ea0ceea1 Make MailTemplateConcern.slug a constant 2017-06-08 12:22:44 +02:00
gregoirenovel
18d6204980 find_the_right_email -> find_mail_template_by_slug 2017-06-08 12:22:42 +02:00
gregoirenovel
41b3fa62ed Refactor MailTemplatesController#mails 2017-06-08 12:22:42 +02:00
gregoirenovel
9988444459 Remove useless blank lines 2017-06-08 12:22:40 +02:00
gregoirenovel
e06ddeb168 Make all Mails classes inherit from ApplicationRecord 2017-06-08 12:22:38 +02:00
gregoirenovel
5a59115df4 Refactor the TAGS management in MailTemplateConcern 2017-06-08 12:22:36 +02:00
gregoirenovel
0a842480c1 Merge pull request #407 from sgmap/chartkick-colors
Use the Chartkick colors option
2017-06-07 16:45:13 +02:00
gregoirenovel
ba865215af Use the Chartkick colors option 2017-06-07 14:53:10 +02:00
gregoirenovel
d21e63d490 Merge pull request #366 from sgmap/fix-234
[Fix #234] Remove dynamic email templates handling code in Procedure
2017-06-07 10:11:17 +02:00
gregoirenovel
1794da5a30 [Fix #234] Remove dynamic email templates handling code in Procedure 2017-06-07 10:10:15 +02:00
Mathieu Magnin
fe31d66665 Merge pull request #387 from sgmap/track_ask_demo_button
Track ask demo click on home page
2017-06-02 15:45:47 +02:00
Mathieu Magnin
9d323fd387 Click on Demander une démo, opens a new tab 2017-06-02 15:38:24 +02:00
Mathieu Magnin
8b92b44ab0 Track ask demo click on home page 2017-06-02 10:05:00 +02:00
gregoirenovel
2029e8f031 Merge pull request #391 from sgmap/fix_email_collision_in_tests
Fix email collision in tests
2017-06-01 18:23:56 +02:00
Mathieu Magnin
c52a979199 Fix email collision in tests 2017-06-01 18:11:56 +02:00
gregoirenovel
b3cec9d48b Merge pull request #360 from sgmap/clean-dossier
[Fix #125] Clean dossier
2017-06-01 14:43:21 +02:00
gregoirenovel
d5023a3d38 Use the same order for constants and scopes in Dossier 2017-06-01 11:08:26 +02:00
gregoirenovel
0971ede57e Add a termine scope to Dossier 2017-06-01 11:08:00 +02:00
gregoirenovel
5e5a01cdc8 Do not test scopes 2017-06-01 11:07:32 +02:00
gregoirenovel
68da2ecbae Use symbols instead of strings in for the order arg in scopes 2017-06-01 11:07:30 +02:00
gregoirenovel
8fb6a41386 Remove an unused argument in some Dossier scopes 2017-06-01 11:07:04 +02:00
gregoirenovel
e0a3a48f76 Improve the formatting of Dossier scopes 2017-06-01 11:05:51 +02:00
gregoirenovel
ddac4bbfdb Change the order in the all_state scope for consistency 2017-06-01 10:58:09 +02:00
gregoirenovel
7055aec634 Add some more state scopes and use them 2017-06-01 10:58:09 +02:00
gregoirenovel
9c2c0346b6 [Fix #125] Transform some Dossier class methods into scopes 2017-06-01 10:58:08 +02:00
gregoirenovel
ab1c19c09b Rename some Dossier scopes 2017-06-01 10:58:08 +02:00
gregoirenovel
51dd6df1c0 Improve the formatting of the Dossier state enum 2017-06-01 10:58:08 +02:00
gregoirenovel
1816aef7d0 Group the Dossier scopes and move them at the top 2017-06-01 10:58:07 +02:00
gregoirenovel
6731f28e23 Move the state constants below the state enum 2017-06-01 10:58:07 +02:00
Mathieu Magnin
1cf4326f1d Merge pull request #382 from sgmap/fix_bug_on_admin_sign_out
Fix bug on admin sign out
2017-06-01 10:44:56 +02:00
Mathieu Magnin
8e9144f565 [Fix #378] Remove redirect based on referrer 2017-06-01 10:36:36 +02:00
Mathieu Magnin
d2d2c78461 Remove unused code 2017-06-01 10:36:36 +02:00
Mathieu Magnin
2c5721c150 Merge pull request #386 from sgmap/fix_cache_bug_on_stats_page
Fix cache bug on stats page
2017-06-01 10:34:50 +02:00
Mathieu Magnin
705a3f3e1b Fix cache bug on stats page 2017-06-01 09:44:22 +02:00
Mathieu Magnin
c789b85a2d Merge pull request #385 from sgmap/delete-staging
[Fix #77] Kill staging
2017-05-31 17:52:21 +02:00
Mathieu Magnin
a7969e5507 Branch value in log is now correct 2017-05-31 17:29:59 +02:00
Mathieu Magnin
46c0e04b0c Save 8 lines of code 2017-05-31 17:29:59 +02:00
gregoirenovel
a348d95057 [Fix #77] Staging is dead => change the CI and deploy info
Use develop instead
2017-05-31 17:29:59 +02:00
Mathieu Magnin
57460431e6 Merge pull request #383 from sgmap/Fix_375_Avis_no_method_error
Avis: ugly workaround for #375
2017-05-31 16:52:49 +02:00
Simon Lehericey
c185f60dd2 Avis: ugly workaround for #375 2017-05-31 16:44:06 +02:00
Mathieu Magnin
96d743415e Merge pull request #271 from sgmap/stats_for_avis
Stats for avis
2017-05-31 14:53:06 +02:00
Simon Lehericey
9e6098dc09 Add the weekly avis answer percentage to Stats 2017-05-31 14:24:33 +02:00
Mathieu Magnin
068b635b7c Add the weekly avis answer time average to Stats 2017-05-31 14:24:32 +02:00
Simon Lehericey
b5f1b898c7 Add the weekly avis usage to Stats 2017-05-31 13:31:19 +02:00
Simon Lehericey
d19585db4e AdminProceduresInfoHaml: remove localtime to date 2017-05-31 10:47:21 +02:00
gregoirenovel
082898af45 Merge pull request #365 from sgmap/clean
Clean
2017-05-31 10:03:28 +02:00