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
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +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
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
dc8ca7e575
fix i18n.file upload failed
2012-09-27 13:34:40 +08:00
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
a32027b64b
ray's fix
2012-09-19 16:34:43 +08:00
c813a6143b
fb share for iNCCU
2012-09-18 17:31:51 +08:00
6da3928626
change for NCCU ask
2012-09-18 15:49:05 +08:00
ce47109d33
change link for rss
2012-09-18 12:04:45 +08:00
0ecb4eca46
change for NCCU entry site
2012-09-18 10:54:11 +08:00
90ae361dc3
Class change for filter button
2012-09-13 17:37:17 +08:00
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
a579e16109
Change rows for news textarea
2012-09-11 16:41:35 +08:00
73e48aebc6
Change news subtitle to textarea, no tinymce
2012-09-11 15:40:27 +08:00
b110b22daa
Change 熱門 to 頭版 for news
2012-09-10 15:55:06 +08:00
4dfe3e7b3b
Change 熱門 to 頭版 for news
2012-09-10 15:19:29 +08:00
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +08:00
ae1595a008
view for preview
2012-09-04 09:24:12 +08:00
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
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
c5b95e2e0f
Fix rss feed i18n
2012-08-15 16:17:28 +08:00
efaed060d9
Change for date
2012-08-14 15:11:52 +08:00
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
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
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
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
5fcc910723
Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss
2012-08-09 00:32:09 +08:00
0d55a2f76b
Hide quick edit
2012-08-08 18:11:03 +08:00
eb91322e1f
rss branch end
2012-08-08 17:40:49 +08:00
2158e0a879
Merge branch 'nccu_fix_matt'
2012-08-08 16:15:49 +08:00
1b35415699
conditional showing quick edit.
2012-08-08 15:56:46 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
cbf7ccc13b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-07 19:21:54 +08:00
73b2cd1035
Fix typo and title in news and announcement frontend
2012-08-05 15:04:52 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
chris
OrbitServer
Matt
Fu Matthew
Matthew K. Fu JuYuan