rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-11 22:24:21 +01:00
Code Issues Releases Activity
1,018 Commits 15 Branches 273 Tags 82 MiB
5abc85ae0a
Commit Graph

1018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril
e04e25e825 adding documentation to configure letsencrpyt SSL with docker 2016-07-21 15:11:08 +02:00
Peng DU
61b9cf71f0 add log level to env 2016-07-19 16:37:25 +02:00
Peng DU
79ef7f4188 refactoring show training controller and add a new action avaibilities 2016-07-19 12:16:41 +02:00
Peng DU
43740b2364 update changelog 2016-07-18 18:16:54 +02:00
Peng DU
608ed8b64f Merge branch 'calendrier' into dev 2016-07-18 18:11:17 +02:00
Peng DU
0b053b11ed change calendar default view to agendDay if screen width <= 480px 2016-07-18 18:10:39 +02:00
Peng DU
dd7f67116d change machines list icon 2016-07-18 17:57:50 +02:00
Peng DU
e504f035d3 fix orthographie 2016-07-18 17:52:03 +02:00
Peng DU
38bf35d06f hide popup of training description 2016-07-18 17:51:49 +02:00
Peng DU
120df2e716 add an aside for filter caldendar in mobile 2016-07-18 16:31:14 +02:00
Peng DU
9638b775fc fix bug: cant set correct default date for fullcalendar 2016-07-18 10:37:54 +02:00
Peng DU
70d623f65a filter calendar by machine/formation/event or disponible 2016-07-14 18:36:52 +02:00
Peng DU
0b1a19cd76 calendar training slot redirect to fetch of training 2016-07-14 12:20:04 +02:00
Peng DU
f26e211acb update locale 2016-07-14 12:20:03 +02:00
Peng DU
dbc9a388a8 fix bug: cant click machines event in < today and > first day of week 2016-07-14 12:20:03 +02:00
Peng DU
066458ca70 availability type filter 2016-07-14 12:20:03 +02:00
Peng DU
c1cdea18f3 optimise sql query 2016-07-14 12:20:03 +02:00
Peng DU
b3ca940880 show tag in availability 2016-07-14 12:20:03 +02:00
Peng DU
1fc4439df8 click slot to show machine fetch 2016-07-14 12:20:03 +02:00
Peng DU
2b08cc8594 fix bug cant navigate to yestoday in agendaDay view 2016-07-14 12:20:02 +02:00
Peng DU
49ee5011c1 show availability with reservation state 2016-07-14 12:20:02 +02:00
Peng DU
a67320121c rename a variable 2016-07-14 12:20:02 +02:00
Peng DU
68e1b959ff disable slotEventOverlap for agendaDay view 2016-07-14 12:20:02 +02:00
Peng DU
e9c1584968 availability public api 2016-07-14 12:20:02 +02:00
Peng DU
fb26a2e358 add public calendar menu, view, controller, routes and refactoring calldendar config 2016-07-14 12:20:02 +02:00
Peng DU
44b0fd8aa8 get availability border color in helper 2016-07-14 12:20:01 +02:00
Peng DU
0af0cc7878 update angular-ui-calendar and ajax load availabilites 2016-07-14 12:20:01 +02:00
Peng DU
1529e4b14e allow active/disactive a training to show in training lists 2016-07-14 12:18:24 +02:00
Peng DU
503e8fc95f fix bug: check text is exist in breakFilter 2016-07-14 11:26:03 +02:00
Sylvain
91f4694175 updated changelog 2016-07-13 18:41:08 +02:00
Sylvain
6839e8db38 Merge branch 'events' into dev 
Conflicts:
	CHANGELOG.md
	config/locales/app.shared.en.yml
	config/locales/app.shared.fr.yml
 2016-07-13 18:32:30 +02:00
Sylvain
a4d301b3c8 updated changelog 2016-07-13 18:29:34 +02:00
Sylvain
c9d98e5bf0 Merge branch 'training' into dev 
Conflicts:
	app/assets/templates/machines/_form.html.erb
	app/controllers/api/availabilities_controller.rb
	app/models/training.rb
	app/views/api/trainings/index.json.jbuilder
	config/locales/app.shared.en.yml
	config/locales/app.shared.fr.yml
	db/schema.rb
 2016-07-13 18:23:35 +02:00
Sylvain
90142ae3bb Merge branch 'training' into dev 2016-07-13 18:15:14 +02:00
Sylvain
e765267bb5 fix export for missing users 2016-07-13 18:09:32 +02:00
Sylvain
f5b435895e updated changelog 2016-07-13 16:15:50 +02:00
Sylvain
730eda0820 updated changelog 2016-07-13 16:11:31 +02:00
Sylvain
68f9324725 Merge branch 'steps' into dev 
Conflicts:
	app/assets/javascripts/controllers/projects.coffee.erb
	db/schema.rb
 2016-07-13 16:10:18 +02:00
Sylvain
a45a648b4a updated changelog 2016-07-13 16:05:13 +02:00
Sylvain
3d7b0bbdfc Merge remote-tracking branch 'origin/machines' into dev 2016-07-13 16:03:12 +02:00
Sylvain
320999e9f9 updated changelog 2016-07-13 16:02:29 +02:00
Sylvain
2c8001f38f Merge branch 'projects' into dev 
Conflicts:
	app/views/api/members/show.json.jbuilder
 2016-07-13 15:57:45 +02:00
Sylvain
c863975e9c statistics tables: sort by date 2016-07-13 11:12:16 +02:00
Sylvain
ad19bfbd79 fix custom filter CA=0 2016-07-13 10:19:43 +02:00
Sylvain
cbeb78fd7e fix members full export 2016-07-13 09:20:52 +02:00
Sylvain
3413c3040b [ongoing] members export full infos 2016-07-12 17:46:19 +02:00
Sylvain
b489b5d270 change export links to xlsx 2016-07-12 13:41:19 +02:00
Sylvain
bfe04c8be6 export reservations: eager load reservables 2016-07-12 13:38:35 +02:00
Sylvain
1b17290395 optimize export subscriptions & reservations queries 2016-07-12 13:16:29 +02:00
Sylvain
827b3334e1 migrate export subscriptions to axlsx 2016-07-12 13:10:06 +02:00