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

2729 Commits

Author SHA1 Message Date
Rueshyna 5f7453c3fb generalization file type 2013-01-02 16:58:48 +08:00
Rueshyna f4692182c0 when mouse move to button of announcement file : image => preview pic, file => type 2013-01-02 16:34:38 +08:00
Rueshyna 506770bf33 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  fix NTU album module_app data
  fix object auth. show error message if user try to do object auth in a wrong way.
 2013-01-02 16:34:09 +08:00
Fu Matthew 641b5310b0 fix NTU album module_app data 2013-01-02 16:04:11 +08:00
Fu Matthew b179668a9c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2013-01-02 14:35:34 +08:00
Fu Matthew 32c6f17613 fix object auth. show error message if user try to do object auth in a wrong way. 2013-01-02 14:34:34 +08:00
Rueshyna 8a6f92b87b fixed announcement controller syntax error 2013-01-02 10:19:56 +08:00
Rueshyna 3875e8e79e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Fix deleting links and files in bulletin
  Add lost file for widget option
 2013-01-02 10:10:53 +08:00
chris 9937b4ac9b Fix deleting links and files in bulletin 2012-12-31 18:03:13 +08:00
Fu Matthew ded1d9f44c Add lost file for widget option 2012-12-28 17:58:35 +08:00
Rueshyna 30f9295010 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Remove I18n.locale for announcement front-end Fix counter in back-end edit
  gallery options
  Fix urls in tinymce source editor
  Changes for announcement widget style 1 and categories
  Changes for announcement widget style 2
  Fix orbit_front parser
  Fix counter front-end
  Fix site map and menu order
  Remove extra double quote in sub_menu Fix web link widget pagination
  Put back old tags (don't use the class ProtoTag)
  Add page counter
 2012-12-28 16:06:22 +08:00
chris 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:34:24 +08:00
chris 61b0f94c04 Remove I18n.locale for announcement front-end 
Fix counter in back-end edit
 2012-12-28 15:34:04 +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 4d965d754b Fix urls in tinymce source editor 2012-12-28 15:03:02 +08:00
chris e8e7c38221 Changes for announcement widget style 1 and categories 2012-12-28 14:01:04 +08:00
chris 455a27437d Changes for announcement widget style 2 2012-12-28 13:47:30 +08:00
chris 974a190eaf Fix orbit_front parser 2012-12-28 11:51:56 +08:00
chris 0a0298aaad Fix counter front-end 2012-12-28 11:44:33 +08:00
chris 37309a452d Fix site map and menu order 2012-12-28 11:37:37 +08:00
chris 17d93409b3 Remove extra double quote in sub_menu 
Fix web link widget pagination
 2012-12-28 11:10:33 +08:00
chris bab8328029 Put back old tags (don't use the class ProtoTag) 2012-12-28 10:43:48 +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 c219792a13 fixed delete function of archive file 2012-12-28 10:02:16 +08:00
Harry Bomrah 37f8c1637a new desktop framework updates 2012-12-27 18:25:54 +08:00
Rueshyna 2a122c7f5c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Announcement widget: remove I18n.locale Add part_id in url
 2012-12-27 17:55:19 +08:00
Rueshyna a7cf6dd694 reverse structure order 2012-12-27 17:54:52 +08:00
chris 751d3b1220 Announcement widget: remove I18n.locale 
Add part_id in url
 2012-12-27 16:52:58 +08:00
Rueshyna 3346f83923 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Fix for page_part and widget back-end
  regenerate pageparts
 2012-12-27 16:49:50 +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
Rueshyna 4db057e971 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  fix disappear widget inter block
  make longer devise timeout
 2012-12-27 15:28:01 +08:00
Fu Matthew 2901b8e30c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-27 15:06:19 +08:00
Fu Matthew 2dd0f9a9d2 fix disappear widget inter block 2012-12-27 15:06:01 +08:00
Fu Matthew 0655baab19 make longer devise timeout 2012-12-27 15:05:53 +08:00
Rueshyna 9e07794cbc soft structure order 2012-12-27 14:37:29 +08:00
Rueshyna 34ed8ae39c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Preventing site default design being deleted.
 2012-12-27 12:22:19 +08:00
Rueshyna 177a409508 fixed search_bar placeholder 2012-12-27 12:20:42 +08:00
Rueshyna 81b0e3c38f change ActiveSupport::SecureRandom to SecureRandom in orbit core 2012-12-27 12:19:42 +08:00
Fu Matthew cfb65dd056 Preventing site default design being deleted. 2012-12-27 10:26:27 +08:00
Matthew K. Fu JuYuan 71fc85c24e fix widget. 2012-12-26 19:01:17 +08:00
Matthew K. Fu JuYuan 2dd2368378 remove merge marks 2012-12-25 11:26:23 +08:00
Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
 2012-12-25 11:01:36 +08:00
Matthew K. Fu JuYuan ec791a6646 keep zh_Tw alive 2012-12-25 10:45:33 +08:00
Matthew K. Fu JuYuan 47a63e3dab fix widget. 2012-12-25 10:45:08 +08:00
Matthew K. Fu JuYuan 41bcbdd2f0 missing file? 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 062ebecae3 fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 2c69590c36 rename of GPRS 
now it's named location
 2012-12-24 16:39:53 +08:00