609c932cca
Fix some gallery routes
2012-11-20 10:05:56 +08:00
d61621e198
Remove some pry and add address code
2012-11-20 10:05:38 +08:00
6789d44431
Fix design edit
2012-11-20 10:04:50 +08:00
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
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
17988f2fb2
address field and text field convert
2012-11-20 09:53:37 +08:00
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
04469ff845
Minor update for gallery frontend
2012-11-19 18:18:46 +08:00
398432d0fc
some bugs
2012-11-19 16:28:05 +08:00
db3797694b
change journal list json link
2012-11-19 12:13:05 +08:00
8abb20b4c8
add edit function
2012-11-19 12:07:24 +08:00
9501bf2df3
midify checkbox value
2012-11-18 14:15:00 +08:00
26436395f5
finished some method of list and journal
2012-11-18 03:07:50 +08:00
024b331cf3
split form from add.html.erb
2012-11-16 16:02:17 +08:00
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
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
e60480a4be
add.html convert to add.html.erb done
2012-11-16 15:33:31 +08:00
b51397d2e2
convert html template to html.erb
2012-11-16 12:54:21 +08:00
c85b15e425
rm binding.pre ...
2012-11-16 09:44:57 +08:00
34f0eea1ff
add more fake data
2012-11-16 09:13:51 +08:00
b998b8f346
make it real
2012-11-16 01:54:10 +08:00
bf5a48ef4c
add new function
2012-11-16 01:53:45 +08:00
27ed7c74dd
add fake data, execute by rake db:seed
2012-11-16 01:53:17 +08:00
3144b84d10
check file type
2012-11-15 22:39:01 +08:00
69bf552fa7
Fix: remove i18n_variable from reload_frontend_pages.js.erb
2012-11-15 18:11:01 +08:00
fb74d74c72
Fix:
...
- page_part not including items_helper
- categories for bulletins front-end
2012-11-15 18:01:49 +08:00
995bdbc86c
address field and text field convert
2012-11-15 17:23:39 +08:00
112f7000a0
Fix announcement front-end bug
2012-11-15 17:23:24 +08:00
9b1ada0af9
Fix these bugs:
...
1.結構部份
a.原選單，點選編輯，無動作反應
b.新增選單後，左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
2012-11-15 15:51:44 +08:00
e7b675c91e
rm redundant file ...
2012-11-15 12:14:34 +08:00
4a7b5a1bf6
make gallery json format to two layer
2012-11-15 12:11:58 +08:00
97c2366221
make announcement json format to two layer
2012-11-15 11:49:00 +08:00
c627376fbe
modified file of view bug
2012-11-15 11:18:55 +08:00
ba4bc67e0e
tmp
2012-11-15 11:06:33 +08:00
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
351767cd98
file view update
2012-11-14 21:12:10 +08:00
529e2110d7
modified getjournals format
2012-11-14 17:27:36 +08:00
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
4b3911e866
about route url link bug
2012-11-14 16:20:32 +08:00
d7d1b9e31b
widget update
2012-11-14 15:28:55 +08:00
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
96622b168f
modified gallery json format but it have some bugs...
2012-11-14 12:01:42 +08:00
ad429af58c
modified announcement json format but it have some bugs...
2012-11-14 12:01:18 +08:00
11b602a1bf
delete demo db of journal and paper
2012-11-13 17:22:25 +08:00
bfdd155c1e
make a json format for view of journal_p
2012-11-13 17:21:23 +08:00
9095713769
Fix bugs in Json when missing files
2012-11-13 15:21:59 +08:00
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
e8bd06307d
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-11-12 15:11:54 +08:00
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
chris
Matthew K. Fu JuYuan
Harry Bomrah
Rueshyna