Commit Graph

2518 Commits

Author SHA1 Message Date
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 c627376fbe modified file of view bug 2012-11-15 11:18:55 +08:00
Rueshyna ba4bc67e0e tmp 2012-11-15 11:06:33 +08:00
Rueshyna e9f3b45ce8 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  file view update
2012-11-15 10:05:21 +08:00
Harry Bomrah 351767cd98 file view update 2012-11-14 21:12:10 +08:00
Rueshyna 529e2110d7 modified getjournals format 2012-11-14 17:27:36 +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 3ce2d58f57 Merge branch 'master' of https://github.com/Rulingcom/orbit
* 'master' of https://github.com/Rulingcom/orbit:
  Fix bugs in Json when missing files
2012-11-14 12:03:00 +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
Rueshyna 11b602a1bf delete demo db of journal and paper 2012-11-13 17:22:25 +08:00
Rueshyna bfdd155c1e make a json format for view of journal_p 2012-11-13 17:21:23 +08:00
chris 9095713769 Fix bugs in Json when missing files 2012-11-13 15:21:59 +08:00
Rueshyna 1ecb8a0c8b Merge branch 'master' of https://github.com/Rulingcom/orbit
* 'master' of https://github.com/Rulingcom/orbit:
  desktopAPI update.
  desktop api update..
  calendar "edit calendar" update
  change host with host_with_port
  get_album_json function can get readable json
  make json readable
  make json readable
  fixed get_bulletins_json of gprs bug
  desktopAPI update.
  desktop api update..
  fixed language of announcement filter
  add get_bulletins_json function
  refine the location module done
  Refine the location module, but it have some bugs about path ...
  all of user can get json of gprs from outside
  all of user can get json of gallery from outside
  calendar "edit calendar" update
2012-11-12 15:24:24 +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
Matthew K. Fu JuYuan 39612b879c address field. js and style is broken 2012-11-12 10:41:41 +08:00
Rueshyna 295aef32ab change host with host_with_port 2012-11-09 16:31:36 +08:00
Rueshyna 275c6f4c8a get_album_json function can get readable json 2012-11-09 16:25:11 +08:00
Rueshyna e4de229b22 make json readable 2012-11-09 16:24:37 +08:00
Rueshyna 624d12de6d make json readable 2012-11-09 16:24:23 +08:00
Rueshyna 80abfc80bf fixed get_bulletins_json of gprs bug 2012-11-09 10:41:49 +08:00
Harry Bomrah 5fb32f3867 desktopAPI update. 2012-11-08 19:42:22 +08:00
Matthew K. Fu JuYuan dafe28ffb5 add_more ok 2012-11-08 18:59:19 +08:00
Harry Bomrah b1d808cb86 Merge branch 'gallery_orbit' into desktop_devin 2012-11-08 17:05:49 +08:00
Harry Bomrah e45502cd68 desktop api update.. 2012-11-08 17:02:10 +08:00
Rueshyna 7595e20d0c fixed language of announcement filter 2012-11-08 16:01:08 +08:00
Rueshyna 800279ea69 add get_bulletins_json function 2012-11-08 15:56:14 +08:00
Rueshyna e6a9555dd8 refine the location module done 2012-11-08 12:34:26 +08:00
Rueshyna dbfc70e520 Refine the location module, but it have some bugs about path ... 2012-11-08 01:26:33 +08:00
Rueshyna 11fefa100f all of user can get json of gprs from outside 2012-11-08 01:24:37 +08:00
Rueshyna b4f5a0b04b all of user can get json of gallery from outside 2012-11-08 01:24:01 +08:00
chris 43d969a72b Fix attribute_field_helper and comment admin in I18n 2012-11-06 17:51:42 +08:00
unknown 97d2380406 Merge branch 'new' of https://github.com/Rulingcom/orbit into new 2012-11-06 14:28:03 +08:00
unknown b9c8d9d657 plugin edit 2012-11-06 14:26:37 +08:00
chris 12f5d93e1a Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-06 12:35:34 +08:00
Harry Bomrah eaf465525a rake update 2012-11-06 12:35:15 +08:00
chris 23e86bfe31 Fix bug due to change of structure for stylesheet 2012-11-06 12:33:00 +08:00
Harry Bomrah 16e5473418 rake update 2012-11-06 12:21:09 +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
chris 159e41639d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-06 10:36:52 +08:00