chris
|
2d0e8b37b2
|
Fix:
- Widgets for announcement
- Facebook link
- AdBanner nav
|
2012-11-21 18:42:14 +08:00 |
Matthew K. Fu JuYuan
|
ec0ec46303
|
visitor now can browse gallery
|
2012-11-21 18:39:28 +08:00 |
|
chris
|
0aaadbc82d
|
Merge branch 'openness' of github.com:Rulingcom/orbit into openness
Conflicts:
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
|
2012-11-21 18:33:04 +08:00 |
|
Matthew K. Fu JuYuan
|
1279af0c11
|
fix and hide for visitors,except for album
|
2012-11-21 18:31:57 +08:00 |
|
Matthew K. Fu JuYuan
|
1f8f58e930
|
album and gallery is now opened
|
2012-11-21 17:52:25 +08:00 |
Harry Bomrah
|
ef3fddd863
|
fixed sutpid bug for calendar
|
2012-11-21 16:55:18 +08:00 |
|
Harry Bomrah
|
9fc8ec8e16
|
back button fix for frontend
|
2012-11-21 15:00:07 +08:00 |
|
Matthew K. Fu JuYuan
|
fda7c43efc
|
Merge branch 'master' of github.com:Rulingcom/orbit into openness
|
2012-11-21 11:46:44 +08:00 |
|
Matthew K. Fu JuYuan
|
ee053cd8ac
|
fix and hide for visitors,except for album
|
2012-11-21 11:46:06 +08:00 |
Rueshyna
|
b359d5d566
|
some bugs
|
2012-11-21 07:37:44 +08:00 |
|
Rueshyna
|
d7599f1ccf
|
add edit function
|
2012-11-21 07:37:43 +08:00 |
|
Rueshyna
|
5eb8cc4063
|
finished some method of list and journal
|
2012-11-21 07:37:43 +08:00 |
devin
|
f2e76d27b8
|
minor update for gallery and calendar backend
|
2012-11-21 07:36:59 +08:00 |
|
Matthew K. Fu JuYuan
|
96fe482d50
|
for openness
|
2012-11-20 20:20:59 +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
|
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
|
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
|
609c932cca
|
Fix some gallery routes
|
2012-11-20 10:05:56 +08:00 |
|
Harry Bomrah
|
04469ff845
|
Minor update for gallery frontend
|
2012-11-19 18:18:46 +08:00 |
|
chris
|
fb74d74c72
|
Fix:
- page_part not including items_helper
- categories for bulletins front-end
|
2012-11-15 18:01:49 +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
|
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 |
|
devin
|
e5d31f50a0
|
calendar "edit calendar" update
|
2012-11-12 15:11:36 +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
|
b1d808cb86
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-11-08 17:05:49 +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 |