This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
orbit-4-1/vendor/built_in_modules
Harry Bomrah 774cc5d392 added sync for journal paper books and conference.. and also disabled the icons
Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
	app/controllers/admin/import_data_controller.rb

Conflicts:
	vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb
	vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
	vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.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
2014-01-13 15:57:49 +08:00
..
ad_banner fix chinese translation 2013-12-27 18:10:44 +08:00
announcement fix new ui announcement widget_style "bulletins_and_web_links" 2014-01-13 10:49:59 +08:00
archive Changed Search to Elastic Search 2013-12-20 18:41:12 +08:00
ask ray fix for css and filemanager 2013-12-12 15:39:20 +08:00
asset filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
authorization New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
calendar_new calendar frontend js fixed and also agenda view minor fix 2014-01-08 18:26:57 +08:00
faq Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
gallery Fix Gallery widget title 2013-12-13 15:29:55 +08:00
location API for Locations 2013-11-19 16:24:15 +08:00
member new ui add setting to show in the member frontend 2014-01-03 16:35:52 +08:00
member_staff new ui add setting to show in the member frontend 2014-01-03 16:35:52 +08:00
miss_module/config/locales member plugin init edit 2013-02-21 17:53:08 +08:00
page_content page module link to pages now. 2013-12-20 18:52:20 +08:00
personal_book added sync for journal paper books and conference.. and also disabled the icons 2014-01-13 15:57:49 +08:00
personal_conference added sync for journal paper books and conference.. and also disabled the icons 2014-01-13 15:57:49 +08:00
personal_diploma Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
personal_experience Removed member and survey widget, fixed desktop personal experiences 2013-12-13 16:04:44 +08:00
personal_honor Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
personal_journal added sync for journal paper books and conference.. and also disabled the icons 2014-01-13 15:57:49 +08:00
personal_lab Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
personal_patent Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
personal_project Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
personal_research Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
survey Refactor the title locale display 2014-01-03 17:56:11 +08:00
tag Updated Authorization for member, link, tag, archive 2013-08-27 10:14:39 +08:00
video ray fix for css and filemanager 2013-12-12 15:39:20 +08:00
web_resource fix new ui web_link frontend 2014-01-08 12:34:17 +08:00