Matt
|
962bae9a82
|
merge
|
2012-10-01 21:09:09 +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 |
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 |
|
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 |
|
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 |
|
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 |