e57b429398
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 13:13:25 +08:00
5bb4aa95ee
fix for dept
2012-08-14 13:13:06 +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
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +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
6059edad70
Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss
2012-08-09 18:36:31 +08:00
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
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
561d510aa8
rss branch end
2012-08-09 17:04:08 +08:00
2d2172752f
remove announcement category column in announcement
2012-08-09 16:14:05 +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
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
0d55a2f76b
Hide quick edit
2012-08-08 18:11:03 +08:00
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
41930eb693
RSS first page
2012-08-08 17:41:48 +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
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
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
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
cd4c9306da
Revert useless changes
2012-08-08 10:24:44 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +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
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
5fc679e0ca
Toggle line color for announcement frontend
2012-08-04 16:16:28 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
d2564af001
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 16:38:35 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
625801c0e9
Fix auth_users bug without category in news
2012-08-01 03:07:23 +08:00
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
b2f28eabaf
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 18:23:01 +08:00
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
Matthew K. Fu JuYuan
Christophe Vilayphiou
Matt
Harry Bomrah