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

1589 Commits

Author SHA1 Message Date
David O' Rojo
b3b0928b8e Update Vagrantfile configuration and include provisioning scripts 2018-02-14 12:47:49 -06:00
Sylvain
94224574cb
Merge pull request #100 from JuanPTM/master
Solved sign_up/sign_in error
2018-01-24 14:55:01 +01:00
Juan Pedro Torres
3a1dd822f5
Solved sign_up/sign_in error
Changed traduction on Sign_up and Sign_in.
2018-01-24 14:31:39 +01:00
Sylvain
c174f22c00 fix social sharing of trainings 2018-01-09 16:53:27 +01:00
Sylvain
679ccfec99 ability to share trainings on social medias 2018-01-09 15:09:48 +01:00
Sylvain
290b2ad513 [bug] facebook sharing of event has HTML tags in description 2018-01-09 15:02:45 +01:00
Sylvain
bdf799f79e [bug] a reminder notification were sent for canceled reservations 2018-01-09 14:44:19 +01:00
Sylvain
7a042ae349 Merge branch 'dev' for release 2.6.3 2018-01-02 10:26:18 +01:00
Sylvain
f622789e5d Version 2.6.3 2018-01-02 10:26:04 +01:00
Sylvain
20eca121e7
Merge pull request #97 from jeremyVignelles/patch-1
Fixed typo in command
2017-12-28 19:50:55 +01:00
Sylvain
f6eadd38f3
Merge pull request #98 from jeremyVignelles/patch-2
Fixed docker-compose.yml URL
2017-12-28 19:50:14 +01:00
Jérémy VIGNELLES
02f6b38df6
Fixed docker-compose.yml URL
Using raw.githubusercontent rather than github (HTML)
2017-12-28 19:29:44 +01:00
Jérémy VIGNELLES
ac5ae80c77
Fixed typo in command 2017-12-28 19:25:05 +01:00
Sylvain
f04ee8cbdf Merge branch 'dev' for release 2.6.2 2017-12-21 15:00:06 +01:00
Sylvain
2e19bfe9f9 Version 2.6.2 2017-12-21 14:59:53 +01:00
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
dee5bdcb13 Merge branch 'dev' for release 2.6.1 2017-12-14 16:46:21 +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