Orbit/vendor/built_in_modules/personal_journal
Harry Bomrah 96b6f7e3fd Merge branch 'desktop_design_devin' into desktop_work1
Conflicts:
	app/assets/javascripts/orbitdesktop.js
	vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
2013-04-08 17:30:13 +08:00
..
app Merge branch 'desktop_design_devin' into desktop_work1 2013-04-08 17:30:13 +08:00
config Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
db correct model method 2013-03-21 18:29:25 +08:00
lib Plugins 2012-09-14 00:05:31 +08:00
script Plugins 2012-09-14 00:05:31 +08:00
spec/factories remove redundant space of co_author sample data 2013-03-21 18:24:20 +08:00
.gitignore Plugins 2012-09-14 00:05:31 +08:00
Gemfile Plugins 2012-09-14 00:05:31 +08:00
Gemfile.lock breadcrumb widget of back-end has done, front-end has bug... 2013-02-19 17:39:41 +08:00
MIT-LICENSE Plugins 2012-09-14 00:05:31 +08:00
README.rdoc Plugins 2012-09-14 00:05:31 +08:00
Rakefile Plugins 2012-09-14 00:05:31 +08:00
init.rb member plugin init add frontend 2013-02-22 18:21:11 +08:00
personal_journal.gemspec Plugins 2012-09-14 00:05:31 +08:00
personal_journal.json Plugins 2012-09-14 00:05:31 +08:00

README.rdoc

= PersonalJournal

This project rocks and uses MIT-LICENSE.