rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-03 14:24:23 +01:00
Code Issues Releases Activity
844 Commits 15 Branches 273 Tags 82 MiB
3cdbecf74a
Commit Graph

513 Commits

Author SHA1 Message Date
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
Peng DU
5d6aa163b5 change groups cache key name 2016-09-20 11:39:49 +02:00
Vincent
6920793ce1 add RSS feed to events index 2016-09-15 22:22:35 +02:00
Vincent
a5c6ba5f7d add RSS feed to projects index 2016-09-15 21:50:08 +02:00
Sylvain
64bae54bce [Bug] move event reservation is not limited by admin settings (prior-delay & disable) 2016-09-15 18:43:27 +02:00
Sylvain
32a79bec1b [bug] clicking on the text in stripe's payment modal, does not validate the checkbox 2016-09-15 18:22:52 +02:00
Sylvain
638747ff0e [SSO] improved boolean mapping interface 2016-09-15 18:15:23 +02:00
Sylvain
3c277428bf [SSO] field data mapping transformation on data reception 2016-09-15 17:10:41 +02:00
Sylvain
13f416a101 [sso] save and restore field data mapping 2016-09-15 15:58:21 +02:00
Sylvain
ee333df53f improved transformation interface 2016-09-14 18:54:53 +02:00
Sylvain
77626aa674 [SSO] interface for transforming boolean and dates datatypes 2016-09-14 18:52:18 +02:00
Sylvain
a0fb6fb683 [sso] show mapping datatype in provider edition 2016-09-14 17:32:11 +02:00
Sylvain
dc4c4b678f [sso] fix create mapping w/ datatype display 2016-09-14 17:13:07 +02:00
Sylvain
50543b8d09 [sso] give informations about the expected data in sso mapping 2016-09-14 16:41:45 +02:00
Sylvain
019cfcadea [sso] fix endpoint regexp 2016-09-13 12:09:55 +02:00
Sylvain
ec0f597067 [sso] display strategy name in providers list 2016-09-13 12:06:25 +02:00
Sylvain
627073f2be [SSO] updated user's documentation 2016-09-12 17:29:44 +02:00
Sylvain
336158c5ad [SSO] fix re-mapping of avatar, address and organization 2016-09-12 12:10:46 +02:00
Sylvain
d233297469 check coupon code server side + integration test for wrong copon 2016-09-08 15:19:12 +02:00
Sylvain
d99d090814 remove duplicate in mime types 2016-09-07 16:30:14 +02:00
Sylvain
19e89cce3d [feature] validate project attachement by mime type 2016-09-07 15:44:19 +02:00
Sylvain
6bbb45c953 add more extensions to the allowed projects attachements 2016-09-07 12:17:21 +02:00
Sylvain
c2533c0590 add custom aggs for machine & trainings stats: available bookings 2016-09-06 17:17:15 +02:00
Sylvain
9d599a14e5 display custom aggregations in front statistics 2016-09-06 16:53:04 +02:00
Sylvain
53dd54b175 working custom aggs w/ result tidy in stats query 2016-09-06 16:32:41 +02:00
Sylvain
1fec50accf ability to run custom aggregation with query and append result to query 2016-09-06 14:21:52 +02:00
Sylvain
ea671d03a4 database structure for custom aggregations in statistics 2016-09-05 17:16:23 +02:00
Sylvain
d0837706b6 fixed rake tasks 2016-09-05 15:30:46 +02:00
Sylvain
701b913eb1 [ongoing] elastic data structure for storing availabilities info 2016-09-05 15:15:31 +02:00
Sylvain
3dea7a63a9 prevent sending multiple reminders for reservations with multiple slots 2016-09-01 16:26:08 +02:00
Sylvain
71a111d8ba improved reservations settings validation (delays) 2016-09-01 16:15:41 +02:00
Sylvain
9aef331596 add textual indications about empty fields in coupon form 2016-09-01 14:54:24 +02:00
Sylvain
670e9371d8 improved machine reservation tag display 2016-09-01 14:34:08 +02:00
Sylvain
434234c235 [Bug] machine slots with tags are not displayed correctly on reservation calendar 2016-09-01 14:31:21 +02:00
Sylvain
401e88cd88 fix event hover color for age range and theme 2016-09-01 11:44:18 +02:00
Sylvain
c3505c1419 fix coupon discount if reservation+subscription when pay by stripe 2016-09-01 11:36:51 +02:00
Sylvain
cb42b46790 [Bug] machine name is not shown in plan edition 2016-08-31 17:01:01 +02:00
Sylvain
87104a6b97 remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events 2016-08-31 11:58:37 +02:00
Sylvain
4c9879768b fix statistic generation for events with custom prices 2016-08-30 17:03:05 +02:00
Sylvain
ea73b9a88b fix create event without custom price + fix test fixtures 2016-08-30 14:48:22 +02:00
Sylvain
4f41aa6554 event custom prices: various fixes and removed artifacts 2016-08-30 13:07:47 +02:00
Sylvain
63a9f8bf95 update nummber of free places after event reservation payment 2016-08-30 12:45:35 +02:00
Sylvain
b9411366c2 update nb of free places after moving an event reservation with custom prices 2016-08-30 12:34:36 +02:00
Sylvain
7de896feb9 display 'pay' button when booking only custom prices tickets 2016-08-30 12:11:51 +02:00
Sylvain
feda4861f2 ability to move reservation with custom fares reservations 2016-08-30 11:27:25 +02:00
Sylvain
f175b4b28e display custom prices places names in reservation summary after booking an event 2016-08-30 10:17:52 +02:00
Sylvain
d8e467d261 fix coupon usage with on-site payment 2016-08-30 09:47:03 +02:00
Sylvain
cd038a8550 custom price on all occurrences with recursive event creation 2016-08-30 09:37:05 +02:00
Sylvain
8aef50660a show custom price reservations in admin/events/show reservations 2016-08-29 17:51:11 +02:00
Sylvain
60a8f60be8 display custom prices in events index 2016-08-29 17:33:21 +02:00
Sylvain
7bc19f540d show custom price event bookings in dashboard 2016-08-29 17:21:20 +02:00
Sylvain
3d1c852576 show custom prices bookings in admin/editMember 2016-08-29 16:54:10 +02:00
Sylvain
d47a5aea5f statistics generation for event with custom prices 2016-08-29 16:44:07 +02:00
Sylvain
d86cccf98c custom prices in invoice generation 2016-08-29 16:37:51 +02:00
Sylvain
af883ea1ec show custom price tickets booked in event show 2016-08-29 16:28:26 +02:00
Sylvain
06d65c785a reserve event with custom prices 2016-08-29 15:43:47 +02:00
Sylvain
12eadb8ceb interface for booking event custom prices 2016-08-29 11:09:36 +02:00
Sylvain
c6a83e98cb [ongoing] db architecture for custom prices reservation 2016-08-25 18:41:33 +02:00
Sylvain
4fd31c3e9b display custom prices in event show 2016-08-25 15:36:52 +02:00
Sylvain
05b010b83f fix ability to edit custom prices 2016-08-25 14:13:30 +02:00
Sylvain
5d91756ace ability to edit event with custom prices 2016-08-25 13:56:07 +02:00
Sylvain
7dc359e4ee associate custom price categories to an event 2016-08-25 13:16:47 +02:00