developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,000 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

3000 Commits

Author SHA1 Message Date
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
Matthew K. Fu JuYuan 397729d3a1 Remove GPRS 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 53afb6ea0c sidebar rewrited 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 5f712622ad default widgets and sidebar. 2012-12-24 16:38:35 +08:00
Matthew K. Fu JuYuan 6995bb1622 put module app json into init,making orbit app work with module app. 2012-12-24 16:23:16 +08:00
Matthew K. Fu JuYuan 36f6a6fdd6 first version of confined sidebar render 2012-12-24 16:17:00 +08:00
Matthew K. Fu JuYuan 194b42c1e4 fix widget from post method 2012-12-24 15:22:26 +08:00
Matthew K. Fu JuYuan b89cd80800 fix widget bug 2012-12-24 14:04:32 +08:00
chris 5002916352 Remove mysql 2012-12-22 17:35:59 +08:00
chris 8381941d51 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-21 18:36:01 +08:00
chris e1a3201830 Fix multiple pop-ups in structure delete 2012-12-21 18:34:13 +08:00
chris 507191426e Fix submenu error 2012-12-21 14:56:12 +08:00
nccu 68266e17ed Update Gemfile for rails 3.2 2012-12-20 20:18:33 +08:00
chris 3c79200c2f Fix wrong deletion in parser for gallery 2012-12-20 16:02:03 +08:00
chris 8ec0b35245 Fix wrong deletion in parser for gallery 2012-12-20 16:01:27 +08:00
chris e9815c3d9b Fix css bug when precompiling assets 2012-12-20 14:34:02 +08:00
chris 7ac6958690 Fix css bug when precompiling assets 2012-12-20 14:32:06 +08:00
chris fc076a28bd Remove useless css 2012-12-20 13:53:28 +08:00
chris 30268ab3bc Remove useless css 2012-12-20 13:52:23 +08:00
chris 3a9106c10d Add mobile but remove news in it 2012-12-20 03:21:50 +08:00
chris d827fbc852 Comment out desktop links 2012-12-19 21:32:55 +08:00
chris cf91139b84 Merge branch 'member_data' of github.com:Rulingcom/orbit into member_data 2012-12-19 20:22:25 +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
Rueshyna 1372f51e75 .not_guest_user 2012-12-19 18:51:17 +08:00
chris 83fb5230a4 Changes for site map front end indentation 2012-12-19 17:26:38 +08:00
chris fcbba6660b Only one parser for front end 
Separate site map for i18n
 2012-12-19 17:15:31 +08:00
Rueshyna 6035428422 hidden guest user 2012-12-19 16:46:01 +08:00
Rueshyna 0fa1b43f06 fixed empty name of member list 2012-12-19 15:28:49 +08:00