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
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
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +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
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
561d510aa8
rss branch end
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
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
Matt
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
Christophe Vilayphiou
0d55a2f76b
Hide quick edit
2012-08-08 18:11:03 +08:00
Matt
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
Christophe Vilayphiou
41930eb693
RSS first page
2012-08-08 17:41:48 +08:00
Matthew K. Fu JuYuan
eb91322e1f
rss branch end
2012-08-08 17:40:49 +08:00
Matthew K. Fu JuYuan
2158e0a879
Merge branch 'nccu_fix_matt'
2012-08-08 16:15:49 +08:00
Matthew K. Fu JuYuan
1b35415699
conditional showing quick edit.
2012-08-08 15:56:46 +08:00
Christophe Vilayphiou
959def6c1f
Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt
...
Conflicts:
app/models/item.rb
config/locales/en.yml
vendor/built_in_modules/announcement/app/models/bulletin.rb
vendor/built_in_modules/news/app/models/news_bulletin.rb
2012-08-08 14:48:29 +08:00
Matthew K. Fu JuYuan
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
Christophe Vilayphiou
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
Matthew K. Fu JuYuan
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
Christophe Vilayphiou
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
cd4c9306da
Revert useless changes
2012-08-08 10:24:44 +08:00