rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-12 23:09:03 +01:00
Code Issues Releases Activity
1,390 Commits 15 Branches 274 Tags 83 MiB
aac0e8125c
Commit Graph

1390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvain
aac0e8125c [ongoing] fix erb js controllers 2018-11-19 16:52:48 +01:00
Sylvain
185ea30db3 Merge branch 'erb' into es6 2018-11-19 16:20:46 +01:00
Sylvain
6352087f70 fix comments in erb files 2018-11-19 16:17:49 +01:00
Sylvain
12f74d5d08 fixed javascript for events controllers 2018-11-07 16:37:28 +01:00
Sylvain
39b18933b6 fixed javascript for application controller 2018-11-07 16:36:10 +01:00
Sylvain
e7031c90d5 restablished erb files 2018-10-25 17:08:13 +02:00
decaffeinate
5da4bf6317 decaffeinate: Run post-processing cleanups on about.coffee and 95 other files 2018-10-25 16:51:20 +02:00
decaffeinate
2c4dd31869 decaffeinate: Convert about.coffee and 95 other files to JS 2018-10-25 16:50:16 +02:00
decaffeinate
c4a2635cd9 decaffeinate: Rename about.coffee and 95 other files from .coffee to .js 2018-10-25 16:49:04 +02:00
Sylvain
944fa5f9b9 fixed erb syntax for decaffeinate 2018-10-25 13:10:39 +02:00
Sylvain
41847d75a2 removed erb suffixes 2018-10-25 13:06:09 +02:00
Sylvain
9ac23f328c eslint & package.json 2018-10-25 12:38:32 +02:00
Sylvain
8d4b354199 [bug] change group button overflow 2018-10-15 16:51:44 +02:00
Sylvain
c7c739d518 Version 2.6.7 2018-10-04 12:04:47 +02:00
Sylvain
7d8b4ba2e5 fine-grained smtp configuration 2018-10-04 12:02:16 +02:00
Sylvain
35c0455449
Merge pull request #121 from awflwafl/patch-1 
Update README.md
 2018-09-30 10:24:44 +02:00
Artemiy Knipe | Артемий Кондатьев
8f8aa0b9c9
Update README.md 
🙂Micro-fixing a typo
 2018-09-29 17:43:13 +01:00
Sylvain
6ce11db09b Merge branch 'dev' for release 2.6.6 2018-09-18 16:45:18 +02:00
Sylvain
0f6cdc960e Version 2.6.6 2018-09-18 16:45:07 +02:00
Sylvain
2126a199e0 Ability to set a neutral gender for the fablab's title (#108) 2018-09-18 16:40:50 +02:00
Sylvain
0b7f84aaff updated cassettes 2018-09-18 15:38:04 +02:00
Sylvain
1e3066f6f4 Ability to parametrize machines order on the booking page 2018-09-18 15:30:54 +02:00
Sylvain
a26e8edf19 fix rendering issues in settings 2018-09-18 14:38:43 +02:00
Sylvain
df465a7f86 do not upgrade elastic script if some requirements are not found 2018-09-18 14:12:49 +02:00
Sylvain
c046b1d26b [bug] fablab:fix:categories_slugs 2018-09-06 11:22:23 +02:00
Sylvain
643e99340c Merge branch 'dev' for release 2.6.5 2018-07-24 14:45:46 +02:00
Sylvain
bfa849acc2 Version 2.6.5 2018-07-24 14:44:14 +02:00
Sylvain
0b1ae3482e updated test suite to reflect elastic api upgrade + updated cassettes 2018-07-24 14:36:18 +02:00
Sylvain
1b33f3c865 display the machine reservation user name to other members 2018-07-24 12:24:51 +02:00
Sylvain
afc6ef40d2 fixed User.to_json 2018-07-24 11:19:30 +02:00
Sylvain
9af1e5c658 fixed User.to_json 2018-07-24 11:13:05 +02:00
Sylvain
4db9ffb7b8 updated deploy instructions 2018-07-12 14:35:41 +02:00
Sylvain
4499c10e24 [security] fix for CVE-2018-3760 2018-07-12 14:34:20 +02:00
Sylvain
38e425cbc3 [security] fix for CVE-2017-18258 2018-07-12 14:26:21 +02:00
Sylvain
a7cc1711aa Merge branch 'elastic5' into dev 2018-07-12 12:50:52 +02:00
Sylvain
407c18075c [bug] event catgories not correct in statistics 2018-07-12 12:48:50 +02:00
Sylvain
05bd65dfb2 migrate es api: top 10 aggregations 2018-07-12 11:26:13 +02:00
Sylvain
e01ff6c779 add infds about password length 2018-07-04 16:30:19 +02:00
Sylvain
d0ec493ff9 elastic upgrade instructions 2018-07-04 14:43:30 +02:00
Sylvain
7666fd88f8 fixed syntax & typo in readme 2018-07-04 14:32:17 +02:00
Sylvain
7afe62522f refactor User.as_json to use jbuilder template 2018-07-04 14:05:44 +02:00
Sylvain
17b7e96b67 [ongoing] fix top 10 aggregation 2018-06-12 12:59:23 +02:00
Sylvain
38551e8ac2 [ongoing] migrate es api: graphs (see FIXME) 2018-06-08 17:22:03 +02:00
Sylvain
f66ca9165e migrate es api: statistics 2018-06-08 12:27:11 +02:00
Sylvain
697ea87e37 [bug] unable to filter statistics from age 0 2018-06-08 12:06:22 +02:00
Sylvain
d69007c6c9 [ongoing] migrate es api 2018-06-05 12:30:08 +02:00
Sylvain
b3f5edd1a5 add info about replica 2018-06-04 15:33:54 +02:00
Sylvain
dc1c76201c fix elastic_upgrade doc 2018-06-04 12:06:14 +02:00
Sylvain
e7f4c1ffcc Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2018-06-04 12:05:10 +02:00
Sylvain
d3da7a2d35 instructions for upgrading elastic 2018-06-04 12:03:46 +02:00