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 |
|
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 |
|
Harry Bomrah
|
d7d1b9e31b
|
widget update
|
2012-11-14 15:28:55 +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 |
|
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 |