saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,456 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

425 Commits

Author SHA1 Message Date
Fu Matthew 2c632551e5 fix preview filed after ad_banner created. 2013-01-02 17:51:53 +08:00
Fu Matthew ded1d9f44c Add lost file for widget option 2012-12-28 17:58:35 +08:00
Fu Matthew 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:31:32 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00
chris ec96a2e0e7 Add page counter 2012-12-28 10:36:18 +08:00
Rueshyna 1c07224694 fixed page_parts submit button 2012-12-28 10:12:17 +08:00
Rueshyna 9e07794cbc soft structure order 2012-12-27 14:37:29 +08:00
chris fcbba6660b Only one parser for front end 
Separate site map for i18n
 2012-12-19 17:15:31 +08:00
chris a1b1fc9d34 Remove test 2012-12-07 12:32:43 +08:00
chris ff435a4af4 Change the design for the whole site form designs index 2012-12-07 12:14:31 +08:00
chris c74ead8318 Redirect to designs after buying template 
Randomise buy counts
 2012-12-07 09:07:49 +08:00
chris af381e75de Add images to store 2012-12-07 02:37:05 +08:00
chris 6f1748d2b3 - template list/show is loaded from central server 
- buy a template downloads and creates it in DB
- changes in designs index
 2012-12-06 23:20:27 +08:00
OrbitServer b1f2749000 Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
unknown 7d3c535e01 add info field 2012-12-06 07:58:39 +08:00
chris e68c52bc00 Changes for store back-end 2012-12-05 13:46:10 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 036d7bbb0e Module store 2012-11-29 02:02:37 +08:00
chris 06335f9bd1 Joshua's html 2012-11-29 00:59:46 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
unknown 8a79d7ff2e member selects 2012-11-26 10:25:34 +08:00
Matthew K. Fu JuYuan 9a684f54b4 fix for showing subroles 2012-11-26 10:22:36 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan 77386f0284 disable data transform when switching attribute field type. new member stable 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan 1279af0c11 fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
chris 6789d44431 Fix design edit 2012-11-20 10:04:50 +08:00
Matthew K. Fu JuYuan 2aa9a19deb complete address field. still have javascript issue for fill back and display address ext fields in modal. 2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan 17988f2fb2 address field and text field convert 2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan a85e5fcc0d address field. js and style is broken 2012-11-20 09:53:36 +08:00
Matthew K. Fu JuYuan be448d42c9 add_more ok 2012-11-20 09:52:50 +08:00
chris 69bf552fa7 Fix: remove i18n_variable from reload_frontend_pages.js.erb 2012-11-15 18:11:01 +08:00
chris 9b1ada0af9 Fix these bugs: 
1.結構部份
    a.原選單，點選編輯，無動作反應
    b.新增選單後，左邊灰色架構部份不會更新

  2.檔案室
    a.無法編輯分類
 2012-11-15 15:51:44 +08:00
chris b40d4702d5 Merge branch 'master' into various_bugs 
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
 2012-11-06 11:44:00 +08:00
Matthew K. Fu JuYuan beb843f75b add new member with role interface. add more not usable. 
role management new attribute is ok. delete is ok.
 2012-11-04 20:42:58 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 2012-10-29 16:10:07 +08:00
Matthew K. Fu JuYuan bd0d975014 for user new interface, member role is working. 2012-10-26 11:27:37 +08:00
chris d7fd61ce55 Edit uploaded package 2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan 0a1a9d2c2e member for THU 2012-10-26 11:19:56 +08:00
chris cbfa659928 Changes for side_bar 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan f4f07c7206 fix sub role attribute fields 
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 9c16da4f46 fixed html for add link. form html 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 03b608593d can add member 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 0a56c555bb new code for attribute fields and values for new member interface 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 8b9cffd4f2 new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
Matthew K. Fu JuYuan 9f825de288 user new interface 70% 2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan e67ca84282 object_auth change to reload 2012-10-04 18:20:21 +08:00
Fu Matthew dc8ca7e575 fix i18n.file upload failed 2012-09-27 13:34:40 +08:00
Fu Matthew 87904f8b8d fix i18n 2012-09-27 11:03:08 +08:00
Matthew K. Fu JuYuan fb3364b28e Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config 2012-09-24 14:14:13 +08:00