developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4eefca853185d1230c9e6a6f583af26156ddacb1
Orbit/vendor/built_in_modules
T
History
harrybomrah 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
..
ad_banner
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
announcement
now default options can be chosen by developer at init
2013-03-21 18:46:57 +08:00
archive
Spen's changes in archive
2013-03-21 14:38:04 +08:00
calendar
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
faq
faq app
2013-03-29 11:09:56 +08:00
gallery
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
location
fix member sidebar
2013-02-19 14:21:54 +08:00
miss_module/config/locales
member plugin init edit
2013-02-21 17:53:08 +08:00
page_content
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_book
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_conference
Lots of Update
2013-03-29 12:03:15 +08:00
personal_diploma
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_experience
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_honor
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_journal
Merge branch 'desktop_design_devin' into desktop_work1
2013-04-08 17:30:13 +08:00
personal_lab
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_patent
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_project
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
personal_research
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
web_resource
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00