developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/vendor/built_in_modules/personal_journal
History
Rueshyna a9bf400fac Merge branch 'desktop_work_devin' into desktop 
* desktop_work_devin:
  tinyscrollbar minor update
  desktop CSS update
  tinyscrollbar minor update
  desktop CSS update

Conflicts:
	app/views/desktop/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
 		2013-03-05 18:48:12 +08:00
..
app Merge branch 'desktop_work_devin' into desktop 2013-03-05 18:48:12 +08:00
config using refine tiny scroll bar js for personal plugin 2013-03-04 16:35:09 +08:00
db split db/seeds.rb file to local plugin and done journal 2013-02-26 15:52:20 +08:00
lib Plugins 2012-09-14 00:05:31 +08:00
script Plugins 2012-09-14 00:05:31 +08:00
spec/factories split db/seeds.rb file to local plugin and done journal 2013-02-26 15:52: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.