1437d2dc14
gallery update
...
especially upload panel
2012-08-22 01:15:50 +08:00
4a53e5faea
Minor update
2012-08-21 20:26:07 +08:00
16b1e97685
code merged … ui updated
2012-08-21 20:15:17 +08:00
0ad0ea9acf
gallery update
2012-08-21 16:32:55 +08:00
cbef7cd368
gallery update
2012-08-21 14:31:25 +08:00
1a6ecf4d0f
gallery update
2012-08-21 13:56:50 +08:00
68aed18956
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/views/layouts/_side_bar.html.erb
config/mongoid.yml
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
2012-08-20 23:24:41 +08:00
3d607cfca4
updates for tagging and language fix
2012-08-20 23:20:20 +08:00
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
489231166f
gallery update
2012-08-20 23:17:32 +08:00
1731c4bcf7
gallery update
...
add "tag panel", not complete
2012-08-20 23:17:32 +08:00
4beedb1aa4
gallery update
2012-08-20 23:17:31 +08:00
0dd1c6eb51
encoding fixed
...
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-20 23:16:54 +08:00
263cf130e2
tp
2012-08-20 23:16:54 +08:00
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
8a9e724979
gallery update
2012-08-20 23:14:11 +08:00
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
e27c1b0175
gallery update
2012-08-20 23:14:11 +08:00
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
314af3c16f
Major updates for gallery
2012-08-20 23:14:11 +08:00
0333f97bf3
Gallery update..
2012-08-20 23:14:10 +08:00
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
9f3d22360e
gallery module update
2012-08-20 23:11:32 +08:00
6e90196b77
updates for tagging and language fix
2012-08-20 22:00:57 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
edf9d8a159
Fix can_display
2012-08-16 18:55:34 +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
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
d9f6bb3b4e
can display scope
2012-08-15 11:34:19 +08:00
bcc13a47e6
Fix deadline was set to nil when update
2012-08-14 16:23:34 +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
77224bcc8f
check deadline for news
2012-08-14 13:49:24 +08:00
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
e86d5ab338
tagging
2012-08-13 16:43:23 +08:00
4d676d9ee9
Merge
2012-08-13 16:17:23 +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
34e4928ee1
authorization
2012-08-11 17:28:49 +08:00
7fb6a1e86b
gallery update
2012-08-11 01:32:53 +08:00
9333503545
demo_site widget edit
2012-08-10 15:33:28 +08:00
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
d5cc470e5d
new archive
2012-08-10 15:23:56 +08:00
cdb8d6c755
announcement edit to view file
2012-08-10 15:20:17 +08:00
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
e8cea9f0ab
new archive
2012-08-10 15:14:43 +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
50baac2cb7
gallery update
...
add "tag panel", not complete
2012-08-09 18:09:36 +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
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +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
ee03bd5b65
code merge
2012-08-08 19:35:36 +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
b5227c7b6c
gallery update
2012-08-07 14:33:30 +08:00
0f5707394b
encoding fixed
...
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-06 22:11:36 +08:00
13f3d4db70
tp
2012-08-06 20:10:38 +08:00
a08f85a3e2
Button fixes
2012-08-06 17:49:10 +08:00
5f0d6c9003
Code Merge
2012-08-06 17:05:12 +08:00
47408f4467
UI modifications
2012-08-06 17:01:53 +08:00
9ebee5daea
gallery update
2012-08-06 14:02:55 +08:00
337d690c54
gallery update
2012-08-06 11:07:58 +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
6159c04da6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-01 20:09:58 +08:00
b0ef2b6957
Multi language and side bar update
2012-08-01 20:07:54 +08:00
d2564af001
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 16:38:35 +08:00
eaa8171689
gallery update
2012-08-01 16:35:59 +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
7accbed1a0
gallery translation supported
2012-07-31 21:15:42 +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
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
af4865ceb7
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 11:01:11 +08:00
4dea025c8a
fix for
...
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
45da2971ef
Merge branch 'gallery_orbit' into desktop_harry
2012-07-31 01:16:22 +08:00
17dffb15e1
Major updates for gallery
2012-07-31 01:15:48 +08:00
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
bb154f5be6
fix error when creating bulletin and news
2012-07-30 16:38:02 +08:00
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
effad63c92
make sure no pending news or announcement will be searched out
2012-07-30 14:39:40 +08:00
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
929cd3b0cc
Gallery update..
2012-07-29 18:52:30 +08:00
afa4b7dcb3
Remove cache
2012-07-28 16:06:44 +08:00
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
23854e7adc
Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var
...
Conflicts:
app/controllers/pages_controller.rb
app/models/item.rb
app/models/site.rb
config/environments/development.rb
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-07-27 19:21:39 +08:00
207b0c5886
Remove i18n_variable for web_resource
2012-07-27 19:12:59 +08:00
30624c0bd8
Fix error in i18n_variable removal for page_content
2012-07-27 19:12:59 +08:00
50813eb57d
Remove i18n_variable for page_content
2012-07-27 19:12:59 +08:00
61c1af7316
Remove i18n_variable for news
2012-07-27 19:12:58 +08:00
8eec7b4dac
Fix announcement for i18n_variable removal
2012-07-27 19:12:58 +08:00
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
d589a1b522
fix for 標題後台為「校園新聞」，前台顯示為「新聞」 該頁面為列表，最上方卻出現「搜尋結果」？ from Mr.張
2012-07-27 07:42:00 +08:00
eed7b78357
fix for loading failed
2012-07-27 05:45:39 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
a1cf0a3eb6
Remove i18n_variable for web_resource
2012-07-26 04:10:15 +08:00
3466a19362
Fix error in i18n_variable removal for page_content
2012-07-26 04:10:02 +08:00
4a6b9fbe64
Remove i18n_variable for page_content
2012-07-26 03:47:14 +08:00
e33afc0822
Remove i18n_variable for news
2012-07-26 03:37:07 +08:00
875fad848c
Fix announcement for i18n_variable removal
2012-07-26 03:29:06 +08:00
b9cf5263f6
Remove i18n_variable for announcement
2012-07-26 02:27:43 +08:00
4768da3c7a
fix announcement loading failed caused by impression. disable pinyin search.
2012-07-25 18:26:05 +08:00
584d5d388e
Merge branch 'gallery_orbit' into desktop_harry
2012-07-25 16:21:03 +08:00
8f23755c0d
Gallery update
2012-07-25 16:20:07 +08:00
devin
Harry Bomrah
chris
unknown
Matthew K. Fu JuYuan
Matt