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

2043 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan ee053cd8ac fix and hide for visitors,except for album 2012-11-21 11:46:06 +08:00
Matthew K. Fu JuYuan 96fe482d50 for openness 2012-11-20 20:20:59 +08:00
chris 6273300c28 Fix for ad_image 2012-11-20 15:47:07 +08:00
chris 7416020161 Add force_order_for_user for ad_images 2012-11-20 14:24:49 +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 dcd781b36b Restore "force_order_for_user" for ad_banner 2012-11-20 12:38:35 +08:00
chris df58d4c5f3 Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format 
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
 2012-11-20 12:14:53 +08:00
Rueshyna bb63e68ee7 rm redundant file ... 2012-11-20 12:13:18 +08:00
Rueshyna 47075944e7 make gallery json format to two layer 2012-11-20 12:13:18 +08:00
Rueshyna 81f67fc08a make announcement json format to two layer 2012-11-20 12:11:35 +08:00
Rueshyna bfef1a8e7c tmp 2012-11-20 12:11:35 +08:00
Rueshyna bd7518093f about route url link bug 2012-11-20 12:11:35 +08:00
Rueshyna 310d7523bd modified gallery json format but it have some bugs... 2012-11-20 12:11:35 +08:00
Rueshyna 36b4cb1ec1 modified announcement json format but it have some bugs... 2012-11-20 12:09:58 +08:00
chris c1da80761e Remove wrong mongo port 2012-11-20 12:04:34 +08:00
chris 3beed406a7 Fix Nokogiri when '.first' returns nothing 2012-11-20 12:00:18 +08:00
chris 747b0d4620 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
 2012-11-20 10:11:59 +08:00
chris 1a76d5d3cb Merge branch 'new' of github.com:Rulingcom/orbit into new 2012-11-20 10:10:16 +08:00
chris 192e52b5de Remove middle site 2012-11-20 10:06:07 +08:00
chris 609c932cca Fix some gallery routes 2012-11-20 10:05:56 +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
chris 05081c1a5c Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 
Conflicts:
	app/helpers/attribute_fields_helper.rb
 2012-11-20 09:56:28 +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
Harry Bomrah 04469ff845 Minor update for gallery frontend 2012-11-19 18:18:46 +08:00
Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 
Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml
 2012-11-16 15:42:39 +08:00
Matthew K. Fu JuYuan 3034e53423 complete address field. still have javascript issue for fill back and display address ext fields in modal. 2012-11-16 15:36:08 +08:00
chris 69bf552fa7 Fix: remove i18n_variable from reload_frontend_pages.js.erb 2012-11-15 18:11:01 +08:00
chris fb74d74c72 Fix: 
- page_part not including items_helper
  - categories for bulletins front-end
 2012-11-15 18:01:49 +08:00
Matthew K. Fu JuYuan 995bdbc86c address field and text field convert 2012-11-15 17:23:39 +08:00
chris 112f7000a0 Fix announcement front-end bug 2012-11-15 17:23:24 +08:00
chris 9b1ada0af9 Fix these bugs: 
1.結構部份
    a.原選單，點選編輯，無動作反應
    b.新增選單後，左邊灰色架構部份不會更新

  2.檔案室
    a.無法編輯分類
 2012-11-15 15:51:44 +08:00
Rueshyna e7b675c91e rm redundant file ... 2012-11-15 12:14:34 +08:00
Rueshyna 4a7b5a1bf6 make gallery json format to two layer 2012-11-15 12:11:58 +08:00
Rueshyna 97c2366221 make announcement json format to two layer 2012-11-15 11:49:00 +08:00
Rueshyna ba4bc67e0e tmp 2012-11-15 11:06:33 +08:00
Harry Bomrah 46f80ade6a Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit 
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
 2012-11-14 16:25:02 +08:00
Rueshyna 4b3911e866 about route url link bug 2012-11-14 16:20:32 +08:00
Harry Bomrah d7d1b9e31b widget update 2012-11-14 15:28:55 +08:00
Rueshyna 96622b168f modified gallery json format but it have some bugs... 2012-11-14 12:01:42 +08:00
Rueshyna ad429af58c modified announcement json format but it have some bugs... 2012-11-14 12:01:18 +08:00
chris 9095713769 Fix bugs in Json when missing files 2012-11-13 15:21:59 +08:00
chris e8bd06307d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-12 15:11:54 +08:00
Harry Bomrah e498be9753 desktopAPI update. 2012-11-12 15:11:36 +08:00
Harry Bomrah a56d80698f desktop api update.. 2012-11-12 15:11:36 +08:00
devin e5d31f50a0 calendar "edit calendar" update 2012-11-12 15:11:36 +08:00