rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity
470 Commits 15 Branches 273 Tags 82 MiB
8bebf6730f
Commit Graph

470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Peng DU
40038f571c Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2016-07-06 11:22:05 +02:00
Peng DU
e57d5c96e6 cancel cache machine index json 2016-07-06 11:22:01 +02:00
Sylvain
1e235d3791 add missing translations for training form error messages 2016-07-04 16:44:01 +02:00
Sylvain
683bc835df [bug] statistics: sum of stats does not work 2016-07-04 12:53:56 +02:00
Sylvain
ee229a4e4b move 'all trainings' button to top bar 2016-07-04 12:32:13 +02:00
Sylvain
8ba797bbf2 add filters in event index view 2016-07-04 11:11:00 +02:00
Sylvain
5af4c0b9d5 fix articles image height 2016-07-04 10:53:09 +02:00
Sylvain
3f6890825b fix events index: box sizes 2016-07-04 10:39:24 +02:00
Sylvain
981999c29f simplify event view in index if event on a single day 2016-06-30 16:56:13 +02:00
Sylvain
abb91458b1 display filters infos in event show 2016-06-30 16:45:47 +02:00
Sylvain
fda619e422 add info message on categories management + fix existing categories slugs 2016-06-30 16:12:24 +02:00
Sylvain
894f836286 fix the 'load more events' button 2016-06-30 15:26:34 +02:00
Sylvain
471fe971bc remove course & workshop from seeds file 2016-06-30 15:13:58 +02:00
Sylvain
5750aec326 updated changelog 2016-06-30 14:20:17 +02:00
Sylvain
0557cb991f rake task for correct event statistics mapping in elastic 2016-06-30 14:14:46 +02:00
Sylvain
e930e04ed6 add age&theme filters to statistics 2016-06-30 12:48:46 +02:00
Sylvain
5a0bb86394 fix events pagniation 2016-06-30 12:41:47 +02:00
Sylvain
e36df94f0f server-side protection against deleting used filters 2016-06-30 11:39:56 +02:00
Sylvain
c8b42f1b7f add slugs to event filters + add categories into statistics + prevent remove linked elements in front 2016-06-30 11:24:57 +02:00
Sylvain
812d7a3c05 server-side protection against last category deletion 2016-06-30 09:57:40 +02:00
Sylvain
bb6295c487 prevent from removing the last category 2016-06-30 09:51:06 +02:00
Sylvain
5374d8d0a6 event form: do not display filters with no values 2016-06-30 09:43:24 +02:00
Sylvain
859960ce3e confirmation on event filter deletion 2016-06-30 09:34:26 +02:00
Sylvain
eb7ee6300e remove associations with events on filter deletion 2016-06-29 17:26:41 +02:00
Sylvain
e13870555b ability to link filters to events 2016-06-29 17:05:42 +02:00
Sylvain
09bcd7df2c do not display events filter if no values exists for this filter 2016-06-29 16:13:42 +02:00
Sylvain
bdda4cd7b0 [feature] ability to filter events by category, theme and age 2016-06-29 16:09:27 +02:00
Sylvain
6e5fd86ad3 fix tests for age_range 2016-06-29 11:23:21 +02:00
Sylvain
79b97eb113 [feature] manage event's age range 2016-06-29 11:21:21 +02:00