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

2640 Commits

Author SHA1 Message Date
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
Rueshyna fdae7e4a2c Merge branch 'master' of https://github.com/Rulingcom/orbit 
* 'master' of https://github.com/Rulingcom/orbit: (102 commits)
  fixed fileview in english mode
  all sections and sections megerd
  Remove test
  Change the design for the whole site form designs index
  fixed fileview in english mode
  all sections and sections megerd
  Redirect to designs after buying template Randomise buy counts
  fixed empty db bug
  make factory girl file clean
  stupid fix
  section fixed and some other fixes
  try to fix problem
  fixed bug
  scroll fixed...
  fixed bug about co-author-relation
  fixed bug about co-author-relation
  fixed edit and new page of co-author
  view update
  current version
  Add images to store
  ...
 2012-12-19 15:06:57 +08:00
Matthew K. Fu JuYuan 858e942da2 fix serval bugs on sidebar. 2012-12-07 12:40:47 +08:00
Matthew K. Fu JuYuan bd743a0ca5 rename of GPRS 
now it's named location
 2012-12-07 12:40:21 +08:00
chris f1c628f2d6 Merge branch 'publication' 2012-12-07 12:39:37 +08:00
chris dc84023372 Merge branch 'publication' of github.com:Rulingcom/orbit into publication 2012-12-07 12:38:48 +08:00
Harry Bomrah 607a4f5acf fixed fileview in english mode 2012-12-07 12:38:23 +08:00
Harry Bomrah 9dde79414d all sections and sections megerd 2012-12-07 12:38:23 +08:00
Matthew K. Fu JuYuan e07fb7d434 Remove GPRS 2012-12-07 12:36:25 +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