Sylvain
73e4439036
front-end modifications to cancel a booked event
2016-11-09 17:07:48 +01:00
Sylvain
da71ba783c
[bug] exports for events reservation always have seats=1 ( fixes #54 )
2016-11-09 15:01:58 +01:00
Sylvain
c04ed51f85
[bug] translation conflict
2016-11-09 14:35:02 +01:00
Sylvain
2dcd980be3
[bug] recurrent events doesn't have the configured theme and age range
2016-11-09 13:12:30 +01:00
Peng DU
99cca406d5
fix bug: event date period dant show correct in invoice
2016-11-03 12:17:19 +01:00
Peng DU
9dca65786a
fix project step images height bug
2016-11-03 11:26:01 +01:00
Peng DU
f1b749d5f2
Image max size is configutable, size by default is 2 megabytes
2016-11-02 15:36:22 +01:00
Peng DU
ba5e5752a4
allow add more picture for project step
2016-11-02 14:58:06 +01:00
Peng DU
84c03a690b
add padding for summernote editor modal
2016-11-02 11:12:23 +01:00
Sylvain
f9220d44a0
fix i_accept_to_receive_information_from_the_fablab in sign-up modal
2016-10-26 16:35:10 +02:00
Sylvain
42f7b3c75c
add HTML in event description
2016-10-26 16:33:21 +02:00
Sylvain
91f70e2c47
[bug] statistics graphs not working
2016-10-24 09:31:29 +02:00
Sylvain
c500518c28
[bug] sharing project or event w/o image on social network render error 500
2016-10-11 16:07:34 +02:00
Sylvain
7d54341d98
Merge remote-tracking branch 'github/master' into dev
2016-10-11 15:37:35 +02:00
Kenneth Lim
18bc37749b
locale: informations --> information
...
Not sure if this helps but information does not require an `s`. :)
Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
2016-10-07 17:11:58 +08:00
Sylvain
611652ccb5
[bug] many fixes on admin calendar
...
- [bug] after creating an element (training/machine), browse through the calendar and come back: the element appears duplicated
- [bug] deleting an element have an erronous confirmation message
- [bug] deleting an element cause the message "cannot read property 'length' of undefined" to be displayed in the console
2016-10-05 11:06:58 +02:00
Sylvain
fc747c55c7
wallet credit confirmation
2016-09-29 13:02:24 +02:00
Sylvain
1ef2c11355
add links to RSS feeds into application header
2016-09-29 11:54:08 +02:00
Sylvain
34ad1c9056
move RSS code into separate folders
2016-09-29 10:53:20 +02:00
Sylvain
376cb6dbe9
Merge branch 'rss_feeds' of git://github.com/Vincent14/fab-manager into Vincent14-rss_feeds
2016-09-29 10:09:15 +02:00
Sylvain
c2d2786515
fix default_host for dev and test environments
2016-09-29 10:02:31 +02:00
cyril
a0fef8d046
bug fix: not to force https in env production for root_url helper
2016-09-28 13:58:22 +02:00
Sylvain
785e9a42f8
test fix asset:precompile
2016-09-28 10:52:25 +02:00
Sylvain
60d60fdd65
use slugs in projects URL opened from notifications
2016-09-27 16:58:57 +02:00
Sylvain
e48bb88f1f
use slug in traning show url
2016-09-27 16:00:22 +02:00
Sylvain
b715078e83
[admin] button to delete training from view + confirmation on machine/training deletion from view
2016-09-27 15:32:49 +02:00
Sylvain
9a71dc5ea2
trainings monitoring: open current year/month by default on training selection
2016-09-27 14:56:57 +02:00
Sylvain
d45ca7213f
updated changelog
2016-09-27 14:10:00 +02:00
Sylvain
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +02:00
Sylvain
bf9ea40648
[feature #40 ] project images will show in full-size on a click
2016-09-27 11:50:05 +02:00
Sylvain
6e94850522
prevent project step reordering to trigger unsaved-changes dialog
2016-09-27 11:31:20 +02:00
Sylvain
1195451863
[bug] embedded video not working in tranings/machines descriptions
2016-09-27 10:45:07 +02:00
Sylvain
24a0f5533c
fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views
2016-09-27 09:55:24 +02:00
Sylvain
30c52dfe95
share on twitter with title
2016-09-26 16:44:45 +02:00
Sylvain
a1fd69f309
auth provider safe destroy
2016-09-26 12:41:59 +02:00
cyril
b2b66e7910
display the edit button for admin
2016-09-23 14:43:34 +02:00
cyril
c14a4d03c5
ui: machines and trainings list : remove the description
2016-09-23 14:42:53 +02:00
cyril
70a95ffcd7
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2016-09-23 14:40:47 +02:00
cyril
eed8f6519e
display caret icon for small screen in profil nav
2016-09-23 14:40:41 +02:00
Peng DU
fc9aeb00a2
remove edit wallet reference from facture
2016-09-23 12:52:43 +02:00
Peng DU
0f7238bbba
fix wallet amount display error
2016-09-23 11:46:58 +02:00
Peng DU
972a5e0a89
fix bug: admin cant pay a plan with code promo by wallet
2016-09-22 18:04:13 +02:00
Sylvain
205c45060a
update version on user login according to their role
2016-09-22 17:01:40 +02:00
Sylvain
6401b321ef
[feature] display fab-manager's version, when logged as admin
2016-09-22 16:46:14 +02:00
Peng DU
270b279ffb
user can use a code promo for pay le plan by wallet and carte visa
2016-09-21 16:19:04 +02:00
Peng DU
1008a6dd1b
fix bug: cant show correct payment modal when pay by wallet and code promo
2016-09-21 13:09:10 +02:00
Peng DU
cfd92cdc40
fix bug: code promotion change slot's price original
2016-09-20 18:39:28 +02:00
Peng DU
afb026bdc9
clear invoice_item of wallet/group if payment has a error
2016-09-20 17:42:30 +02:00
Peng DU
802e239d5b
calcul total price of reservation with coupon when use wallet
2016-09-20 16:54:23 +02:00
Peng DU
e5341b0b89
fix bug: cant subscribe a plan
2016-09-20 14:37:35 +02:00
