Sylvain
38653d22d1
fix events description on the home page
2016-11-16 16:55:56 +01:00
Sylvain
d46e6cf9c9
[members excel export] invoicing disabled
2016-11-16 15:08:24 +01:00
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
a80df7f993
updated changelog
2016-11-09 14:36:28 +01:00
Sylvain
c04ed51f85
[bug] translation conflict
2016-11-09 14:35:02 +01:00
Sylvain
d5a5b6dd29
updated changelog
2016-11-09 13:14:53 +01:00
Sylvain
2dcd980be3
[bug] recurrent events doesn't have the configured theme and age range
2016-11-09 13:12:30 +01:00
Sylvain
db280ce6d8
fix application startup warnings: Use strings for Figaro configuration
2016-11-09 13:05:26 +01:00
Sylvain
8ab2df1bc7
Merge branch 'dev' for release 2.4.2
2016-11-08 16:24:59 +01:00
Sylvain
7c328af357
Version 2.4.2
2016-11-08 16:24:34 +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
010fe37221
forum is preferred channel for feature requests
2016-10-27 11:32:50 +02: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
1449ca2b82
updated changelog
2016-10-24 09:33:46 +02:00
Sylvain
91f70e2c47
[bug] statistics graphs not working
2016-10-24 09:31:29 +02:00
Sylvain
861980951c
updated 3rd party libraries licence informations
2016-10-11 17:26:48 +02:00
Sylvain
ddde96f5ed
Merge branch 'dev' for release 2.4.1
2016-10-11 16:12:33 +02:00
Sylvain
1bb05da16a
Version 2.4.1
2016-10-11 16:11:20 +02:00
Sylvain
e7b03599ce
updated changelog
2016-10-11 16:09:04 +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
Sylvain
f7d2d8a878
Merge pull request #51 from kennethlimcp/fix/locale/en
...
fixing documentation typo
2016-10-07 11:50:17 +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
6487ea7e08
add explicit result message on rake task fablab:es_build_availabilities_index
2016-10-05 12:28:13 +02:00
Sylvain
592c250b49
updated changelog
2016-10-05 11:12:14 +02: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
cyril
00ab9cb5f6
fix syntax env navinum
2016-10-04 22:14:24 +02:00
Sylvain
dff155831a
Merge branch 'dev'
2016-10-04 16:58:48 +02:00
Sylvain
977f3dac91
Version 2.4.0
2016-10-04 16:39:10 +02:00
Sylvain
1e81de40ed
Merge pull request #47 from phd0/patch-1
...
add some log text on bulk_export rake function
2016-09-29 21:29:13 +02:00
Sylvain
d0ffd602a3
Fix typo
2016-09-29 21:28:51 +02:00
DULAC Philippe
7e16dd2a0a
add some log text on bulk_export rake function
...
ajout d'une description pour faire apparaitre cette fonction dans la liste
2016-09-29 20:50:27 +02:00
Sylvain
fc747c55c7
wallet credit confirmation
2016-09-29 13:02:24 +02:00
Sylvain
9791c7e0fe
updated changelog
2016-09-29 12:07:18 +02:00
Sylvain
8dbbbfad9e
Merge branch 'Vincent14-rss_feeds' into dev
2016-09-29 11:55:12 +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
c6cf40f7cc
updated changelog
2016-09-29 10:04:37 +02:00
Sylvain
c2d2786515
fix default_host for dev and test environments
2016-09-29 10:02:31 +02:00
cyril
57cb6c4fbe
fix default level_log config
2016-09-28 18:55:40 +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
99801bb02a
improved explanation about rebuild assets
2016-09-28 12:14:21 +02:00
Sylvain
cd6b279af4
fix typo + updated docker ENV example
2016-09-28 12:00:53 +02:00