1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Commit Graph

1273 Commits

Author SHA1 Message Date
Sylvain
9d7e128be9 Number.isInteger polyfill for IE11 2017-12-21 14:39:15 +01:00
Sylvain
2cbf2c3a79 add test for machine credits 2017-12-21 14:24:50 +01:00
Sylvain
563eee40fa add test for credits 2017-12-21 12:00:11 +01:00
Sylvain
72634162c6 [bug] unable to create training credit 2017-12-21 11:49:51 +01:00
Sylvain
247c446af0 fix typo in documentation 2017-12-21 11:32:13 +01:00
Nicolas Florentin
a29ba926c0 fix events/index order, frontend js code was conflicting with server-side behaviour 2017-12-18 16:15:38 +01:00
Nicolas Florentin
2f4dd4642a adds polyfill for Object.assign, fix for IE11 2017-12-18 14:54:46 +01:00
Sylvain
37f7642ead Version 2.6.1 2017-12-14 16:46:10 +01:00
Sylvain
77e218aa7e fix test suite
- update VCR cassettes
- fix test fixtures to allow pass test suite at the end of the week
2017-12-14 16:40:01 +01:00
Sylvain
a5b718d981 fix tests with invoices 2017-12-14 15:52:34 +01:00
Sylvain
15bae4d6f4 fix MD syntax 2017-12-14 14:41:43 +01:00
Sylvain
537fc41514 [doc] docker installation instructions 2017-12-14 14:33:49 +01:00
Sylvain
c396d90695 fix setup script 2017-12-14 12:02:50 +01:00
Sylvain
fea78f2995 setup script for docker installation 2017-12-14 11:58:23 +01:00
Sylvain
5a28b1127f [ongoing] rewrite of readme files 2017-12-13 17:51:44 +01:00
Sylvain
6539c60a14 [security] fix for CVE-2015-3224 2017-12-13 15:28:57 +01:00
Sylvain
e091b81187 fix events pagination 2017-12-13 15:20:51 +01:00
Sylvain
0b3192c3ab [bug] subscription refund generate PDF with wrong dates 2017-12-13 13:16:32 +01:00
Sylvain
d0cbe14327
Merge pull request #95 from jmrodriguesgoncalves/dev
Missing translation in #94 fixed
2017-12-12 16:55:31 +01:00
jmrodriguesgoncalves
40f6796743 Missing translation fixed 2017-12-12 10:14:21 -05:00
Sylvain
bd83e89a6f
Merge pull request #94 from jmrodriguesgoncalves/dev
Portuguese translations #91
2017-12-12 16:05:04 +01:00
jmrodriguesgoncalves
7e640b9508 Removed #translation_fixed comments 2017-12-12 09:57:13 -05:00
jmrodriguesgoncalves
0a1b64f1de Added missing translation bits 2017-12-11 18:56:38 -05:00
Cyril Farré
bf95693025
Merge pull request #92 from raqqun/patch-1
add .well-known location block for http
2017-12-05 10:48:04 +01:00
Alex Nikiforidis
b3adec16dd
add .well-known location block for http
webroot location must be accessible from http before requesting certificates from letsencrypt
2017-12-01 13:33:30 +02:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
5438fa4b16 added newlines at end of files 2017-11-20 09:58:37 +01:00
Sylvain
aa2f45ee6e Merge branch 'clemclemmm-master' into dev 2017-11-20 09:52:36 +01:00
Sylvain
a8803cb7bc Merge branch 'master' of https://github.com/clemclemmm/fab-manager into clemclemmm-master 2017-11-20 09:52:17 +01:00
Sylvain
e043e76f47 add newline at end of file 2017-11-20 09:48:35 +01:00
Sylvain
06cf85d733 fix rails.fa-CM.yml syntax 2017-11-20 09:39:05 +01:00
Sylvain
49561c8075 Merge branch 'alexcvcoelho-dev' into dev 2017-11-20 09:34:34 +01:00
Sylvain
8500bff648 Merge branch 'dev' of https://github.com/alexcvcoelho/fab-manager into alexcvcoelho-dev 2017-11-20 09:34:11 +01:00
Sylvain
0a71b6fa7e Merge branch 'bmohamet-master' into dev 2017-11-20 09:30:08 +01:00
Sylvain
c4e93eeb27 Merge branch 'master' of https://github.com/bmohamet/fab-manager into bmohamet-master 2017-11-20 09:29:33 +01:00
bmohamet
5809f9d6db
Create rails.fr-CM.yml
Adding FCA currency for Cameroon and Central Africa
2017-11-17 12:10:28 +01:00
Alex Coelho
1316550f40 Update Portuguese translations 2017-11-16 01:08:34 -02:00
Alex Coelho
5241801a3b Merge branch 'dev' of github.com:alexcvcoelho/fab-manager 2017-11-15 23:36:43 -02:00
Sylvain
8c156e4830 fix docker-compose deploy instructions 2017-11-15 10:20:23 +01:00
Sylvain
c760a96320 updated changelog with deploy instructions 2017-11-13 13:20:30 +01:00
Sylvain
80ce5c43ea Merge branch 'dev' for release 2.6.0 2017-11-13 13:17:01 +01:00
Sylvain
dc138c21a8 Version 2.6.0 2017-11-13 13:16:24 +01:00
Sylvain
89d1586e53 update VCR cassette to fix rake test: renew subscription as user 2017-11-13 13:06:57 +01:00
Sylvain
c5b3de9a76 upgrade rails minor version 2017-11-13 12:25:28 +01:00
Sylvain
639610dc7a [bug] unable to display profiles of users whom any reservation is associated with a deleted object 2017-11-13 11:15:33 +01:00
Clément CHADEYRON
4a3995604c add spanish translation
translation made spain by :
Smart Open Lab
2017-11-06 14:15:22 +01:00
Sylvain
497ad71591 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-11-02 15:34:09 +01:00
Sylvain
73a62bd9a0 [feature] allow setting decimal prices 2017-11-02 15:33:56 +01:00
Sylvain
90fe4e313b hide reserve button on machine details page is machine is disabled 2017-10-16 14:04:55 +02:00
Sylvain
a4bcad3059 updated changelog 2017-10-11 16:52:46 +02:00