Oswaldo Acauan 378c94ce7b Resolve merge conflicts		2016-06-01 13:45:01 -03:00
..
.meteor	Merge pull request #3145 from oswaldoacauan/feature-actionsbar	2016-05-20 17:29:44 -04:00
client	Resolve merge conflicts	2016-06-01 13:45:01 -03:00
imports	Resolve merge conflicts	2016-06-01 13:45:01 -03:00
lib	Switch from ion-router to react-router	2016-04-28 15:57:14 -04:00
log	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
public/fonts	Add basic styles for new design	2016-05-02 19:42:54 -03:00
server	split emitter.on; move to api	2016-05-16 19:12:49 +00:00
tests	restructure modifiers and methods	2016-05-12 17:43:59 +00:00
.gitignore	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
.jscsrc	Incorporated linting into the build process.	2016-04-06 10:06:08 -03:00
config.js	Some linting	2016-05-19 19:27:49 +00:00
grunt-instructions.txt	Updated the instructions on running Grunt.	2016-04-06 10:08:33 -03:00
Gruntfile.js	lint mostly	2016-05-16 14:35:59 +00:00
package.json	Resolve merge conflicts	2016-06-01 13:45:01 -03:00
settings-development.json	Fix nav-bar userlist toggle icon	2016-05-20 13:39:58 -03:00
settings-production.json	Split the Meteor command into options stored as Meteor settings.	2016-04-28 18:27:43 -04:00
start.sh	Revert changes to start.sh and remove useless file added on my last commit	2016-05-31 17:39:11 -03:00