rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity
1,255 Commits 15 Branches 273 Tags 82 MiB
d0cbe14327
Commit Graph

1255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sylvain
18b8d516ee Merge branch 'disable' into dev 2017-10-11 16:11:02 +02:00
Sylvain
8acd5eba27 updated changelog 2017-10-11 16:10:18 +02:00
Sylvain
f4fd919dde display disabled status for machines & trainings in openAPI 2017-10-11 16:03:04 +02:00
Sylvain
cc94a19ba6 hide disabled spaces in admin pricing area 2017-10-11 15:50:18 +02:00
Sylvain
02a155e7af prevent create availability for disabled space 2017-10-11 15:23:42 +02:00
Sylvain
1631e4ae5c hide disabled spaces & machines in public calendar 2017-10-11 15:18:44 +02:00
Sylvain
f8f45bcb69 filter and hide disabled spaces in list 2017-10-11 15:15:30 +02:00
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
02baf9097e hide disabled machine in admin pricing zone + prevent creating negative credits 2017-10-11 14:48:03 +02:00
Sylvain
ad288628cc hide disabled trainings in pricing admin zone 2017-10-11 13:09:52 +02:00
Sylvain
0ab01091cd prevent create availabilities for disabled machines 2017-10-11 13:02:54 +02:00
Sylvain
45465e8b59 prevent associate disabled machines w/ training 2017-10-11 13:00:46 +02:00
Sylvain
c9c7fe00c5 filter disabled machines in list + improve responsiveness 2017-10-11 12:54:13 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
5ce6d4486e fix profile complete mail template for non imported users 2017-10-11 11:56:43 +02:00
Sylvain
41eef71ead fix c/p issue + prevent link disabled training to user 2017-10-11 11:40:21 +02:00
Sylvain
4d7a317315 prevent create new availability with disabled training 2017-10-10 18:17:22 +02:00
Sylvain
0e38574ef8 hide disabled trainings in public calendar 2017-10-10 18:13:30 +02:00