chris
|
455a27437d
|
Changes for announcement widget style 2
|
2012-12-28 13:47:30 +08:00 |
chris
|
751d3b1220
|
Announcement widget: remove I18n.locale
Add part_id in url
|
2012-12-27 16:52:58 +08:00 |
Matthew K. Fu JuYuan
|
49e6c33b57
|
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/routes.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/archive/init.rb
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
|
2012-12-25 11:01:36 +08:00 |
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
Matthew K. Fu JuYuan
|
36f6a6fdd6
|
first version of confined sidebar render
|
2012-12-24 16:17:00 +08:00 |
Rueshyna
|
b4633a2ccb
|
.not_guest_user
|
2012-12-19 19:48:13 +08:00 |
chris
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
Rueshyna
|
4a8878132e
|
add content for announcement rss
|
2012-12-06 07:59:42 +08:00 |
Matthew K. Fu JuYuan
|
ca290f3519
|
Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
|
2012-12-05 11:36:32 +08:00 |
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
Matthew K. Fu JuYuan
|
4bc80f2bd3
|
default widgets and sidebar.
|
2012-12-03 18:52:36 +08:00 |
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
Rueshyna
|
114ca5493a
|
replace rss format with json in announcement
|
2012-11-28 13:43:48 +08:00 |
Matthew K. Fu JuYuan
|
3d573680b2
|
Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
Conflicts:
app/models/user/attribute_value.rb
app/views/layouts/_side_bar_content.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
|
2012-11-26 17:55:53 +08:00 |
chris
|
475642d375
|
Remove news and fix default_url in ImageUploader
|
2012-11-22 09:30:25 +08:00 |
chris
|
2d0e8b37b2
|
Fix:
- Widgets for announcement
- Facebook link
- AdBanner nav
|
2012-11-21 18:42:14 +08:00 |
Matthew K. Fu JuYuan
|
96fe482d50
|
for openness
|
2012-11-20 20:20:59 +08:00 |
Matthew K. Fu JuYuan
|
c6894be962
|
first version of confined sidebar render
|
2012-11-20 15:56:52 +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
|
36b4cb1ec1
|
modified announcement json format but it have some bugs...
|
2012-11-20 12:09:58 +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 |
Rueshyna
|
e4de229b22
|
make json readable
|
2012-11-09 16:24:37 +08:00 |
Rueshyna
|
80abfc80bf
|
fixed get_bulletins_json of gprs bug
|
2012-11-09 10:41: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 |
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 |
Rueshyna
|
c314745545
|
add link of title
|
2012-11-05 11:42:50 +08:00 |
Rueshyna
|
e4de1e34a2
|
add announcement plugin
|
2012-11-05 11:42:50 +08:00 |
Rueshyna
|
9433d59c04
|
relpace tab with sapce
|
2012-11-05 11:42:49 +08:00 |
chris
|
cc5e238576
|
Fix after merge from NCCU, the translations still need to be cleaned
|
2012-10-30 11:08:26 +08:00 |
chris
|
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 |
OrbitServer
|
9e2bc7e1c1
|
Ray's changes in css and js
|
2012-10-09 07:48:05 +08:00 |
Matthew K. Fu JuYuan
|
ae48ab5cbd
|
clean commit
|
2012-10-04 15:53:42 +08:00 |
Matthew K. Fu JuYuan
|
b0cdcbecca
|
fix preview bug only happen when production
|
2012-10-01 21:05:16 +08:00 |
Matt
|
b65d785834
|
harry's fix, announcement still broken
|
2012-10-01 17:21:23 +08:00 |
Matthew K. Fu JuYuan
|
edcef5a8f7
|
make manager's news and announcement can be shown at once it be submitted.
|
2012-10-01 16:11:58 +08:00 |
Matthew K. Fu JuYuan
|
7a523281c3
|
fix announcement
|
2012-09-25 09:52:13 +08:00 |
Matthew K. Fu JuYuan
|
5634e87144
|
fix announcement block
|
2012-09-24 18:43:43 +08:00 |
Matthew K. Fu JuYuan
|
78a01f5d29
|
fix for 0924
|
2012-09-24 18:30:19 +08:00 |
Matthew K. Fu JuYuan
|
029c84328d
|
code that can not run on matt's air
|
2012-09-24 15:37:28 +08:00 |
Matthew K. Fu JuYuan
|
7ca0d2a62b
|
Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
|
2012-09-24 12:20:59 +08:00 |
Matthew K. Fu JuYuan
|
136fc68cdc
|
nccu data task
|
2012-09-24 12:18:40 +08:00 |
Matthew K. Fu JuYuan
|
3a65f599e6
|
first version app config for Spen durning Chris's leave.
|
2012-09-24 11:43:48 +08:00 |
Christophe Vilayphiou
|
c846a102ff
|
Page by page changes for i18n yml
|
2012-09-24 09:06:44 +08:00 |
Christophe Vilayphiou
|
4fb35b00f2
|
Add missing translations
|
2012-09-24 09:02:46 +08:00 |
Christophe Vilayphiou
|
bdd5a1a047
|
Changes for i18n yml
|
2012-09-24 09:02:45 +08:00 |
Matthew K. Fu JuYuan
|
a32027b64b
|
ray's fix
|
2012-09-19 16:34:43 +08:00 |
Matthew K. Fu JuYuan
|
8b68387199
|
fix share loading failed
|
2012-09-19 15:09:08 +08:00 |
Matthew K. Fu JuYuan
|
c813a6143b
|
fb share for iNCCU
|
2012-09-18 17:31:51 +08:00 |
Matthew K. Fu JuYuan
|
6da3928626
|
change for NCCU ask
|
2012-09-18 15:49:05 +08:00 |
Christophe Vilayphiou
|
42c62ebca0
|
Fix preview for announcement (was retuning js instead of html)
|
2012-09-18 14:31:50 +08:00 |
Matthew K. Fu JuYuan
|
ce47109d33
|
change link for rss
|
2012-09-18 12:04:45 +08:00 |
Matthew K. Fu JuYuan
|
0ecb4eca46
|
change for NCCU entry site
|
2012-09-18 10:54:11 +08:00 |
unknown
|
9eed9ec7b6
|
demo site plugin
|
2012-09-17 13:32:52 +08:00 |
Christophe Vilayphiou
|
90ae361dc3
|
Class change for filter button
|
2012-09-13 17:37:17 +08:00 |
Christophe Vilayphiou
|
2e9af5d1a8
|
fix commit bugs
|
2012-09-13 15:53:36 +08:00 |
Christophe Vilayphiou
|
46177000e0
|
Merge branch 'visitor_dsahbroad' of github.com:Rulingcom/orbit into visitor_dsahbroad
Conflicts:
Gemfile.lock
app/controllers/application_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
|
2012-09-12 16:32:40 +08:00 |
Matthew K. Fu JuYuan
|
98e8f5f607
|
complete visitor dashbroad
|
2012-09-12 16:20:15 +08:00 |
Matthew K. Fu JuYuan
|
45ef7fd302
|
guest user
|
2012-09-12 16:20:15 +08:00 |
Matthew K. Fu JuYuan
|
e486ac5d25
|
complete visitor dashbroad
|
2012-09-11 11:30:58 +08:00 |
Matt
|
71021b8c69
|
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
|
2012-09-11 00:41:52 +08:00 |
Matthew K. Fu JuYuan
|
e12701b34b
|
preview for association object
|
2012-09-10 14:19:39 +08:00 |
Matthew K. Fu JuYuan
|
a20db344f1
|
preview for update
|
2012-09-10 11:53:59 +08:00 |
Fu Matthew
|
6044857fea
|
complete preview for both new and announcement
|
2012-09-07 17:55:59 +08:00 |
Matthew K. Fu JuYuan
|
671f86b612
|
First version of new preview. Only plain text
|
2012-09-04 12:31:27 +08:00 |
Matthew K. Fu JuYuan
|
ae1595a008
|
view for preview
|
2012-09-04 09:24:12 +08:00 |
unknown
|
10d9253399
|
announcement edit to view file
|
2012-08-30 14:25:51 +08:00 |
Matthew K. Fu JuYuan
|
01d278d688
|
guest user
|
2012-08-23 16:05:14 +08:00 |
chris
|
7d5531bf01
|
Merge branch 'nccu_master' into demo_site
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
|
2012-08-22 18:07:49 +08:00 |
chris
|
edf9d8a159
|
Fix can_display
|
2012-08-16 18:55:34 +08:00 |
chris
|
3c283d1a7a
|
Set default picture
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
|
2012-08-16 17:24:12 +08:00 |
Christophe Vilayphiou
|
c5b95e2e0f
|
Fix rss feed i18n
|
2012-08-15 16:17:28 +08:00 |
Christophe Vilayphiou
|
43bc704468
|
Error popup only shows on flash[:error]
|
2012-08-15 15:55:29 +08:00 |
Matthew K. Fu JuYuan
|
d9f6bb3b4e
|
can display scope
|
2012-08-15 11:34:19 +08:00 |
Christophe Vilayphiou
|
bcc13a47e6
|
Fix deadline was set to nil when update
|
2012-08-14 16:23:34 +08:00 |
Christophe Vilayphiou
|
efaed060d9
|
Change for date
|
2012-08-14 15:11:52 +08:00 |
Christophe Vilayphiou
|
fb53ad524a
|
Add time to announcement quick edit
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
|
2012-08-14 14:38:21 +08:00 |
Matthew K. Fu JuYuan
|
77224bcc8f
|
check deadline for news
|
2012-08-14 13:49:24 +08:00 |
Matthew K. Fu JuYuan
|
e57b429398
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-14 13:13:25 +08:00 |
Matthew K. Fu JuYuan
|
5bb4aa95ee
|
fix for dept
|
2012-08-14 13:13:06 +08:00 |
Christophe Vilayphiou
|
9196deb997
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-14 01:00:25 +08:00 |
Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
Matthew K. Fu JuYuan
|
83569fac82
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-13 18:36:04 +08:00 |
Matthew K. Fu JuYuan
|
6cc470ede9
|
nccu fix
|
2012-08-13 18:35:47 +08:00 |
Christophe Vilayphiou
|
c2f3f45196
|
Fix for link in nccu widget
|
2012-08-13 11:34:14 +08:00 |
Matthew K. Fu JuYuan
|
080974b563
|
Merge branch 'new_rss'
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
|
2012-08-12 23:32:28 +08:00 |
Matthew K. Fu JuYuan
|
f1b4d9e204
|
Add authorization for rescue interface
Change logic for NCCU site for status panel.
|
2012-08-12 23:29:13 +08:00 |
Christophe Vilayphiou
|
33fc96ac7c
|
Changes for NCCU after email
|
2012-08-11 18:19:30 +08:00 |
unknown
|
9333503545
|
demo_site widget edit
|
2012-08-10 15:33:28 +08:00 |
Christophe Vilayphiou
|
2bd132cef9
|
Pass category and tag to search to redirect to the right page
Ray's change for mouseover (take out the black background)
|
2012-08-09 19:16:26 +08:00 |
Matthew K. Fu JuYuan
|
6059edad70
|
Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss
|
2012-08-09 18:36:31 +08:00 |
Matthew K. Fu JuYuan
|
1e7bc9aadd
|
1.Rss feed but no entry for clicking now. wait for design.
2.Unit link is now fixed.
|
2012-08-09 17:04:37 +08:00 |
Christophe Vilayphiou
|
e256440678
|
RSS first page
|
2012-08-09 17:04:08 +08:00 |
Matthew K. Fu JuYuan
|
2d2172752f
|
remove announcement category column in announcement
|
2012-08-09 16:14:05 +08:00 |
unknown
|
d5c55c9697
|
widget & frontend field
|
2012-08-09 15:25:30 +08:00 |
Matthew K. Fu JuYuan
|
987e6fff2b
|
1.Rss feed but no entry for clicking now. wait for design.
2.Unit link is now fixed.
|
2012-08-09 02:20:10 +08:00 |
Matthew K. Fu JuYuan
|
5fcc910723
|
Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss
|
2012-08-09 00:32:09 +08:00 |