gregoirenovel
|
8df9462d1a
|
Merge pull request #951 from sgmap/fix-908
Fix #908
|
2017-11-20 17:10:30 +01:00 |
|
gregoirenovel
|
f856077660
|
[Fix #908] Display multi-selection values in a list
|
2017-11-20 17:05:08 +01:00 |
|
gregoirenovel
|
9b0415eed7
|
Use a case statement in _champs.html.haml
|
2017-11-20 17:05:07 +01:00 |
|
gregoirenovel
|
c9cdf48cbc
|
Merge pull request #949 from sgmap/fix-683
[Fix #683] Remove the white background from some icons
|
2017-11-20 16:08:37 +01:00 |
|
gregoirenovel
|
a3cc86a62e
|
[Fix #683] Remove the white background from some icons
|
2017-11-20 15:59:39 +01:00 |
|
gregoirenovel
|
0d569540ec
|
Merge pull request #947 from sgmap/remove-message
Remove a now outdated message
|
2017-11-20 15:59:06 +01:00 |
|
gregoirenovel
|
dbdd7098e3
|
Remove a now outdated message
|
2017-11-20 14:37:17 +01:00 |
|
gregoirenovel
|
439c9e1ee2
|
Merge pull request #946 from sgmap/remove-encoding
Remove now useless encoding statements
|
2017-11-20 14:37:02 +01:00 |
|
gregoirenovel
|
5eb9d6854c
|
Remove now useless encoding statements
As utf-8 is the default encoding since Ruby 2,
this is no longer needed
|
2017-11-20 14:14:00 +01:00 |
|
Simon Lehericey
|
9c19336780
|
Merge branch 'dev'
|
2017-11-17 15:17:22 +01:00 |
|
Mathieu Magnin
|
8b80165872
|
Merge pull request #943 from sgmap/skylight
Skylight
|
2017-11-16 18:18:14 +01:00 |
|
gregoirenovel
|
962f1d63ba
|
Enable skylight in staging
|
2017-11-16 18:10:42 +01:00 |
|
gregoirenovel
|
3796a0ab97
|
Add path to shared skylight conf file
|
2017-11-16 17:52:02 +01:00 |
|
gregoirenovel
|
84ba3f7ac0
|
Add the skylight gem
|
2017-11-16 17:52:02 +01:00 |
|
Mathieu Magnin
|
4dd61f73cf
|
Merge pull request #941 from sgmap/remove_demo_accounts_routes
Remove demo accounts routes
|
2017-11-16 12:44:50 +01:00 |
|
Mathieu Magnin
|
b187e7163a
|
Remove demo accounts routes
|
2017-11-16 12:36:58 +01:00 |
|
Mathieu Magnin
|
95b6ec2899
|
Merge pull request #936 from sgmap/rename_variable
Rename variable path_file => file_path
|
2017-11-16 12:36:06 +01:00 |
|
Mathieu Magnin
|
36491230bb
|
Rename variable path_file => file_path
|
2017-11-16 12:28:07 +01:00 |
|
Mathieu Magnin
|
1f36d20220
|
Merge pull request #940 from sgmap/remove_public_demo_page
[Fix #939] Remove demo page in staging
|
2017-11-16 12:27:39 +01:00 |
|
Mathieu Magnin
|
adaa1e0dec
|
[Fix #939] Remove demo page in staging
|
2017-11-10 18:19:41 +01:00 |
|
Mathieu Magnin
|
6c71a65e8e
|
Merge pull request #800 from sgmap/notification_that_works
Notification that works
|
2017-11-10 16:45:58 +01:00 |
|
Simon Lehericey
|
ed4e885e6f
|
Notification: new acknowledgment system
|
2017-11-10 16:29:45 +01:00 |
|
Simon Lehericey
|
f7d7cec5ae
|
Notification: use new notification system
|
2017-11-10 16:29:45 +01:00 |
|
Simon Lehericey
|
155a5f7826
|
Notification: add methods to retrieve notifications
|
2017-11-10 16:29:44 +01:00 |
|
Simon Lehericey
|
bb147bcb1f
|
Notification: rake task to init notifications
|
2017-11-10 16:29:44 +01:00 |
|
Simon Lehericey
|
909ecf2142
|
Notification: add timestamp to champs, pieces jusitificatives and follows
|
2017-11-10 16:29:44 +01:00 |
|
Mathieu Magnin
|
4e4d23e25c
|
Alert users after OVH outage
|
2017-11-09 12:53:52 +01:00 |
|
Mathieu Magnin
|
101ad54be0
|
Merge pull request #938 from sgmap/message_for_ovh_outage
Alert users after OVH outage
|
2017-11-09 12:16:13 +01:00 |
|
Mathieu Magnin
|
da5dfdff40
|
Alert users after OVH outage
|
2017-11-09 12:09:45 +01:00 |
|
Mathieu Magnin
|
e7f5770405
|
Merge pull request #933 from sgmap/typo
typo
|
2017-11-07 14:57:00 +01:00 |
|
Simon Lehericey
|
1e24f1f22a
|
Kaminari: ... as a 'truncate' fr replace
|
2017-11-07 14:49:58 +01:00 |
|
Simon Lehericey
|
9750af24d4
|
typo
|
2017-11-07 14:49:58 +01:00 |
|
Simon Lehericey
|
ca5cda9628
|
Merge branch 'dev'
|
2017-11-02 18:23:57 +01:00 |
|
LeSim
|
6978ec2136
|
Merge pull request #934 from sgmap/update_ruby_version
Ruby version: go for 2.3.5
|
2017-11-02 17:52:26 +01:00 |
|
Simon Lehericey
|
f09d5ff2fe
|
Ruby version: go for 2.3.5
|
2017-11-02 17:44:29 +01:00 |
|
LeSim
|
42bd0d2ccb
|
Merge pull request #883 from sgmap/rebuild-test-bd-after-backup-import
Rebuild test bd after backup import
|
2017-10-31 10:01:05 +01:00 |
|
Mathieu Magnin
|
676a756e1d
|
Ensure task is run on dev env
|
2017-10-31 09:56:18 +01:00 |
|
Mathieu Magnin
|
95a9c61457
|
Rebuild test db after db:import_dev task
|
2017-10-31 09:56:18 +01:00 |
|
Simon Lehericey
|
fdd96837c6
|
Merge branch 'dev'
|
2017-10-30 17:32:49 +01:00 |
|
LeSim
|
35fadc5b33
|
Merge pull request #915 from sgmap/fix_messagerie_display
[Fix #890] better display of rich text messagerie
|
2017-10-30 17:29:29 +01:00 |
|
Simon Lehericey
|
f7dc36364e
|
[Fix #890] better display of rich text messagerie
|
2017-10-30 17:24:18 +01:00 |
|
LeSim
|
c9a2b2617d
|
Merge pull request #923 from sgmap/fix_html_tag_in_excel_export
Improve excel export
|
2017-10-30 17:19:56 +01:00 |
|
Simon Lehericey
|
f4a8ff31b9
|
Champ: export multiple_drop_down_list as a [].join(', ')
|
2017-10-30 17:14:31 +01:00 |
|
Simon Lehericey
|
b658f8c8dc
|
Champ: export yes_no champ with oui non
|
2017-10-30 17:14:31 +01:00 |
|
Simon Lehericey
|
338911d1a8
|
[fix #905] Champ: add for_export method which strips tag for textarea champ
|
2017-10-30 17:14:31 +01:00 |
|
Simon Lehericey
|
3f2419a2a3
|
Dossier: rename data_with_champs to to_sorted_values
|
2017-10-30 17:14:31 +01:00 |
|
Simon Lehericey
|
f0373f6bc2
|
Dossier: remove useless return
|
2017-10-30 17:14:31 +01:00 |
|
LeSim
|
56336dbc00
|
Merge pull request #927 from sgmap/localize_select2
Select2: fr localization
|
2017-10-30 14:31:40 +01:00 |
|
Simon Lehericey
|
d40c0d3b06
|
Select2: fr localization
|
2017-10-30 14:25:54 +01:00 |
|
LeSim
|
313ce17d6f
|
Merge pull request #926 from sgmap/fix_925_space_in_avis_email
[Fix #925] strip avis email input
|
2017-10-30 14:24:58 +01:00 |
|