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

356 Commits

Author SHA1 Message Date
chris bab8328029 Put back old tags (don't use the class ProtoTag) 2012-12-28 10:43:48 +08:00
chris 269e5b033f Fix for page_part and widget back-end 2012-12-27 16:20:40 +08:00
Fu Matthew 2d6b70b97f regenerate pageparts 2012-12-27 15:50:05 +08:00
Fu Matthew 2dd0f9a9d2 fix disappear widget inter block 2012-12-27 15:06:01 +08:00
Rueshyna b4633a2ccb .not_guest_user 2012-12-19 19:48:13 +08:00
Rueshyna 3d39c2c3c3 hidden guest user 2012-12-19 19:48:13 +08:00
Rueshyna ec1fad9729 fixed empty name of member list 2012-12-19 19:48:13 +08:00
chris fcbba6660b Only one parser for front end 
Separate site map for i18n
 2012-12-19 17:15:31 +08:00
chris ff435a4af4 Change the design for the whole site form designs index 2012-12-07 12:14:31 +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
Rueshyna e0e1c30f68 delete onside widget in db 2012-12-06 07:59:42 +08:00
unknown 7d3c535e01 add info field 2012-12-06 07:58:39 +08:00
Rueshyna 58e71c29b3 uniq relation 2012-12-04 00:31:46 +08:00
Rueshyna 9759a32394 can display relation between author 2012-12-04 00:31:46 +08:00
Rueshyna e143f9a345 can select relection from relation db 2012-12-04 00:31:46 +08:00
Rueshyna 7822ffc33d can add relation between co-author 2012-12-04 00:31:06 +08:00
Rueshyna eb97d417bd if coauthor not in coauthor db then it will be add in db 2012-12-04 00:31:06 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 9254b9960d Add timeout to user 2012-12-03 21:45:00 +08:00
chris 4f9aa63045 Remove extra end 2012-12-03 18:45:32 +08:00
chris 5c7f1aa164 Fix saving of page_part after layout change 2012-12-03 18:42:50 +08:00
chris 2757044c32 Forgot to save the page_parts 2012-12-03 17:49:26 +08:00
chris bdcfb46294 Fix previous commit 2012-12-03 17:38:55 +08:00
chris 6543491a53 Save pages to generate page_parts when a layout is updated 2012-12-03 17:25:27 +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
Rueshyna d502f561ef add co-author db and curd page, but it can't destory it... 2012-11-21 18:36:32 +08:00
Harry Bomrah 97ffb5ff18 file view update 2012-11-21 07:37:42 +08:00
Rueshyna 5643b0a528 delete demo db of journal and paper 2012-11-21 07:37:41 +08:00
chris c8bbb28d42 Fix wrong alias in design.rb for themes 2012-11-20 12:46:50 +08:00
chris 84c284fa71 Fix wrong naming in theme.rb 2012-11-20 12:42:53 +08:00
chris d61621e198 Remove some pry and add address code 2012-11-20 10:05:38 +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 23e86bfe31 Fix bug due to change of structure for stylesheet 2012-11-06 12:33:00 +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
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
Harry Bomrah ca3e06c58b update for desktop widgets 2012-11-05 11:40:11 +08:00
chris 58d4554b0b Fixing bugs 2012-11-05 11:30:15 +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 bc9082a858 Fix bug: Fix the bug due to not finding the ModuleApp 2012-10-30 17:10:59 +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
chris 9b5f4e4775 Fix bug: User cannot connect using the orbit button (Devise configuration) 2012-10-26 17:42:14 +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 68bc4c1874 Fix page_part creation when design is changed 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 03b608593d can add member 2012-10-26 11:19:56 +08:00