developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,619 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

1300 Commits

Author SHA1 Message Date
Harry Bomrah 5de7fcfaf6 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-23 11:59:58 +08:00
Manson Wang 668c1e7d75 Added sync button in personal plugin back_end 
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb
 2014-01-23 11:59:58 +08:00
saurabhbhatia 5fee058006 Import Data, Sync Data 
Conflicts:
	config/mongoid.yml
	vendor/built_in_modules/personal_book/app/models/writing_book.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
	vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
 2014-01-23 11:59:58 +08:00
Bernie Chiu d19223c873 Fix duplicate options 2014-01-22 10:35:56 +08:00
Manson Wang 332658d394 Fix translations and side_bar order 2014-01-16 10:45:58 +08:00
Saurabh Bhatia 2931676ecf Reverted back Locations Module 2014-01-14 11:39:20 +08:00
Saurabh Bhatia a108426412 Updated Module Store to Install a Module directly from Store.tp 2014-01-14 11:20:30 +08:00
Spen 304bf0d445 fix new ui announcement widget_style "bulletins_and_web_links" 2014-01-13 10:49:59 +08:00
Harry Bomrah 07cc9cc4b1 calendar frontend js fixed and also agenda view minor fix 2014-01-08 18:26:57 +08:00
rulingcom 3fbbbbc3eb UI Changes for Calendar - Ray's Changes 2014-01-08 17:52:16 +08:00
Spen eb9038965a fix new ui web_link frontend 2014-01-08 12:34:17 +08:00
Bernie Chiu db86d5248f Refactor the title locale display 2014-01-03 17:56:11 +08:00
Bernie Chiu 291a16585b Fix wrong displayed field in current locale 
Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
 2014-01-03 17:56:03 +08:00
Bernie Chiu 14b742b022 Fix added option field to sync with primary locale 2014-01-03 17:42:13 +08:00
Spen e4cc6d543b new ui add setting to show in the member frontend 2014-01-03 16:35:52 +08:00
saurabhbhatia ca8c895ac8 Removed update taggable ids method 2014-01-03 16:02:56 +08:00
saurabhbhatia ec2fe965d0 Removed callback that was not required anymore 2014-01-03 14:54:23 +08:00
saurabhbhatia f3e3d702a4 Fix for Tags 2014-01-03 14:53:13 +08:00
saurabhbhatia d90351b82c Changed production settings for sendgrid 2014-01-03 09:44:46 +08:00
saurabhbhatia 684f2c75be Fix for tags 2013-12-31 12:01:11 +08:00
saurabhbhatia caef586691 Fixed Update tagging issue in announcement 2013-12-30 18:07:52 +08:00
thomaschen 6a6640b84c fix chinese translation 2013-12-27 18:10:44 +08:00
thomaschen bb25da5dad fix missing header in survey 2013-12-27 18:10:38 +08:00
Bernie Chiu a070a88438 Makes Default Widget available for Survey Frontend 2013-12-24 16:02:36 +08:00
saurabhbhatia d89e90b8f7 Display Bulletin Category on the Search Result Page 2013-12-23 10:34:24 +08:00
saurabhbhatia 9573d18ea6 Changed Back to Search Results path 2013-12-23 10:15:45 +08:00
saurabhbhatia 728ba622b7 Frontend for Search working 2013-12-23 10:07:58 +08:00
saurabhbhatia 9b10703283 Removed Sunspot Mongo from weblinks 2013-12-20 22:41:33 +08:00
Harry Bomrah c36d730bd3 page module link to pages now. 2013-12-20 18:52:20 +08:00
Harry Bomrah a828d6d8e0 language tab fixed for survey on language change 2013-12-20 18:48:22 +08:00
Bernie Chiu 30bb2e107c Fix default tab sync with current language setting 2013-12-20 18:48:17 +08:00
Bernie Chiu d40fa2c48e Fix question tab translation 2013-12-20 18:48:10 +08:00
Bernie Chiu 607f414b41 Update missing translation in Survey Module 2013-12-20 18:48:03 +08:00
saurabhbhatia 0924f1fcde removed search from widget for now. 2013-12-20 18:43:17 +08:00
saurabhbhatia 84edbdb6db Changed Search to Elastic Search 2013-12-20 18:41:12 +08:00
saurabhbhatia fd24fbe082 Commit for Basic Site 2013-12-16 16:08:12 +08:00
thomaschen 0ab7041341 delete useless variable in link widget controller 2013-12-13 16:19:07 +08:00
saurabhbhatia 03b29a7b4a Removed member and survey widget, fixed desktop personal experiences 2013-12-13 16:04:44 +08:00
thomaschen bd154c9cab fix link widget title 2013-12-13 15:30:04 +08:00
Bernie Chiu 445a13c645 Fix Gallery widget title 2013-12-13 15:29:55 +08:00
thomaschen b33fe549da fix archive widget title 2013-12-13 15:29:46 +08:00
saurabhbhatia b52e6b979b Removed announcement index as it not required anymore 2013-12-13 11:52:37 +08:00
rulingcom 4c85d62866 ray fix for css and filemanager 2013-12-12 15:39:20 +08:00
saurabhbhatia 6c01d517d2 Fixed page data count 2013-12-12 12:49:20 +08:00
Bernie Chiu 5faa7e73c0 Fix links and remove unneeded codes 2013-12-11 18:13:46 +08:00
Bernie Chiu f13c21c1b4 Fix widget index 2013-12-11 18:13:29 +08:00
saurabhbhatia 3643555a6c Commented out Reason for Rejection 2013-12-11 15:04:32 +08:00
saurabhbhatia f31f18e193 Fixed issue with announcement frontend 2013-12-11 15:01:19 +08:00
Harry Bomrah 800f108be3 added enabling and disabling feature of widget count in module init 2013-12-10 17:43:31 +08:00
thomaschen 26c4d69e07 fixed announcement widget index mode title i18n missing 2013-12-10 16:04:21 +08:00