1c0fd0e199
minor update for gallery and calendar backend
2012-11-20 18:16:45 +08:00
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
1a76d5d3cb
Merge branch 'new' of github.com:Rulingcom/orbit into new
2012-11-20 10:10:16 +08:00
609c932cca
Fix some gallery routes
2012-11-20 10:05:56 +08:00
04469ff845
Minor update for gallery frontend
2012-11-19 18:18:46 +08:00
fb74d74c72
Fix:
...
- page_part not including items_helper
- categories for bulletins front-end
2012-11-15 18:01:49 +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
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
d7d1b9e31b
widget update
2012-11-14 15:28:55 +08:00
9095713769
Fix bugs in Json when missing files
2012-11-13 15:21:59 +08:00
e5d31f50a0
calendar "edit calendar" update
2012-11-12 15:11:36 +08:00
295aef32ab
change host with host_with_port
2012-11-09 16:31:36 +08:00
275c6f4c8a
get_album_json function can get readable json
2012-11-09 16:25:11 +08:00
e4de229b22
make json readable
2012-11-09 16:24:37 +08:00
624d12de6d
make json readable
2012-11-09 16:24:23 +08:00
80abfc80bf
fixed get_bulletins_json of gprs bug
2012-11-09 10:41:49 +08:00
b1d808cb86
Merge branch 'gallery_orbit' into desktop_devin
2012-11-08 17:05:49 +08:00
7595e20d0c
fixed language of announcement filter
2012-11-08 16:01:08 +08:00
800279ea69
add get_bulletins_json function
2012-11-08 15:56:14 +08:00
e6a9555dd8
refine the location module done
2012-11-08 12:34:26 +08:00
dbfc70e520
Refine the location module, but it have some bugs about path ...
2012-11-08 01:26:33 +08:00
11fefa100f
all of user can get json of gprs from outside
2012-11-08 01:24:37 +08:00
b4f5a0b04b
all of user can get json of gallery from outside
2012-11-08 01:24:01 +08:00
97d2380406
Merge branch 'new' of https://github.com/Rulingcom/orbit into new
2012-11-06 14:28:03 +08:00
b9c8d9d657
plugin edit
2012-11-06 14:26:37 +08:00
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
3c85f3ef00
Make the archive module work (it needs more details)
2012-11-06 10:35:11 +08:00
c314745545
add link of title
2012-11-05 11:42:50 +08:00
e4de1e34a2
add announcement plugin
2012-11-05 11:42:50 +08:00
9433d59c04
relpace tab with sapce
2012-11-05 11:42:49 +08:00
ed3644fb89
done journal
2012-11-05 11:42:49 +08:00
a5e2c3e0ce
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
2012-11-05 11:41:48 +08:00
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
228d43d0e2
calendar update
2012-11-05 11:40:11 +08:00
6dd9f441ef
Agenda View
2012-11-05 11:40:11 +08:00
d070c70512
calendar agenda view update
2012-11-05 11:40:11 +08:00
513671e498
lot of updates
2012-11-05 11:34:35 +08:00
fe0e49c3e9
Remove a folder in wich Chinese characters
2012-11-04 20:32:54 +08:00
bd17641d18
member plugin list add new
2012-11-04 20:24:36 +08:00
2f61b3e0c9
member plugin list add new
2012-11-02 18:28:23 +08:00
9bf812b8d9
calendar "edit calendar" update
2012-11-01 15:21:42 +08:00
d904163090
Merge branch 'gallery_orbit' into desktop_devin
2012-11-01 10:47:23 +08:00
a25199d33b
Calander view updated...
2012-11-01 10:45:22 +08:00
451d73897b
Fix bugs:
...
Page content: after edit and redirect to index, there's a gap between the headers and the first row
TinyMCE: the size of the textarea change depending on the language
2012-11-01 09:30:12 +08:00
167c993108
calendar update
2012-10-30 17:26:52 +08:00
63a57682e6
Fix bugs:
...
TinyMCE: the size of the textarea change depending on the language
Page content edit: no tab selected on first load
2012-10-30 17:09:00 +08:00
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
5da35ee65b
Agenda View
2012-10-29 19:52:34 +08:00
65ac6980c4
Merge branch 'various_bugs' into nccu_master
...
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
devin
chris
Harry Bomrah
Rueshyna
unknown