1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
fab-manager/app/assets/templates/shared
Sylvain 2c8001f38f Merge branch 'projects' into dev
Conflicts:
	app/views/api/members/show.json.jbuilder
2016-07-13 15:57:45 +02:00
..
_admin_form.html fixes in datepicker 2016-03-29 13:31:02 +02:00
_member_form.html.erb Merge remote-tracking branch 'origin/open-api' into dev 2016-06-27 16:31:50 +02:00
_member_select.html.erb [feature] member select with lazy loading 2016-06-14 09:57:39 +02:00
_partner_new_modal.html release 2.0 rc 2016-03-23 18:39:41 +01:00
_social_link.html fix social links position & website icon 2016-05-18 09:11:08 +02:00
_user_avatar.html.erb init depot fabmanager 2015-05-05 03:10:25 +02:00
about.html.erb [feature] link to CGV in about page 2016-03-31 12:59:29 +02:00
confirm_modal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00
confirm_modify_slot_modal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00
deviseModal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00
header.html.erb migrate profile edit to 'my parameters' tab and add public profile in dashboard 2016-05-12 13:53:59 +02:00
leftnav.html.erb migrate profile edit to 'my parameters' tab and add public profile in dashboard 2016-05-12 13:53:59 +02:00
passwordEditModal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00
passwordNewModal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00
publicProfile.html.erb Merge branch 'projects' into dev 2016-07-13 15:57:45 +02:00
signalAbuseModal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00
signupModal.html.erb Revert "ask for user agreement to CGV on signup" 2016-03-31 13:00:54 +02:00
valid_reservation_modal.html.erb release 2.0 rc 2016-03-23 18:39:41 +01:00