Commit Graph
4 Commits
Author SHA1 Message Date
Adam Shaw c04bbba6d6 Merge branch 'master' into skeleton
Conflicts:
	src/agenda/AgendaDayView.js
	src/agenda/AgendaEventRenderer.js
	src/agenda/AgendaView.js
	src/agenda/AgendaWeekView.js
	src/basic/BasicDayView.js
	src/basic/BasicView.js
	src/basic/BasicWeekView.js
	src/basic/MonthView.js
	src/common/DayEventRenderer.js
	src/common/SelectionManager.js
2014-08-06 18:08:15 -07:00
Adam Shaw 564ce15882 moment-2.8 compatibility, automated tests, LL formatting change 2014-08-06 17:32:23 -07:00
Adam Shaw f0bdab23ce update tests for new HTML/CSS skeleton refactor 2014-07-23 13:16:38 -07:00
Adam Shaw 67853e0866 automated tests for titleFormat 2014-05-30 15:35:21 -07:00