e6257a95a4
Fix model field naming
2013-11-13 15:05:25 +08:00
4666057748
Add RSS source link and site info
2013-11-13 15:03:03 +08:00
7c398ce4fe
Changes for NTU General Affairs
2013-09-13 15:10:27 +08:00
d766eea9f4
Changes for NTU common
...
Conflicts:
lib/tasks/migrate.rake
Conflicts:
lib/tasks/migrate.rake
Conflicts:
config/resque_schedule.yml
lib/tasks/migrate.rake
2013-09-13 15:10:10 +08:00
ceac2b842c
fix impression page counter
2013-07-18 12:04:37 +08:00
54a35b30be
fix design index bug when start start from blank DB.
...
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
9937b4ac9b
Fix deleting links and files in bulletin
2012-12-31 18:03:13 +08:00
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
78a01f5d29
fix for 0924
2012-09-24 18:30:19 +08:00
029c84328d
code that can not run on matt's air
2012-09-24 15:37:28 +08:00
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
136fc68cdc
nccu data task
2012-09-24 12:18:40 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
8b68387199
fix share loading failed
2012-09-19 15:09:08 +08:00
e12701b34b
preview for association object
2012-09-10 14:19:39 +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
edf9d8a159
Fix can_display
2012-08-16 18:55:34 +08:00
d9f6bb3b4e
can display scope
2012-08-15 11:34:19 +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
5bb4aa95ee
fix for dept
2012-08-14 13:13:06 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +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
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
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
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +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
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
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
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
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
effad63c92
make sure no pending news or announcement will be searched out
2012-07-30 14:39:40 +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
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
Bernie Chiu
chris
Matt K. Fu
Matthew K. Fu JuYuan
Fu Matthew