devin
789c2df7fd
gallery frontend update
2012-09-12 02:05:10 +08:00
Harry Bomrah
8259dee4a3
Ruby update
2012-09-12 02:05:10 +08:00
devin
cc6986cb16
language fix
2012-09-12 02:05:10 +08:00
devin
0be494c62b
front end added
2012-09-12 02:05:09 +08:00
Harry Bomrah
6a23e29f33
Ruby structure implementation
2012-09-12 02:05:09 +08:00
Harry Bomrah
26ff2af078
View only update
2012-09-12 02:04:36 +08:00
Harry Bomrah
f62eba182e
Commit for view only
2012-09-12 02:04:36 +08:00
Harry Bomrah
f4dde67344
frontend fixes
2012-09-12 02:04:36 +08:00
Harry Bomrah
8caa798c08
frontend updates
2012-09-12 02:04:36 +08:00
devin
29c5126455
gallery update
2012-09-12 02:04:36 +08:00
devin
4b6eebba7c
gallery update
2012-09-12 02:04:08 +08:00
devin
b6f10951b8
gallery update
...
especially upload panel
2012-09-12 02:04:07 +08:00
Harry Bomrah
6e6d441b26
code merged … ui updated
2012-09-12 02:03:02 +08:00
devin
2274df4111
gallery update
2012-09-12 02:02:29 +08:00
devin
584d1eb0e0
gallery update
2012-09-12 02:02:01 +08:00
devin
ede9727a18
gallery update
2012-09-12 02:02:00 +08:00
devin
0e5a305f39
gallery update
2012-09-12 01:58:23 +08:00
devin
0c624794d5
gallery update
2012-09-12 01:58:23 +08:00
devin
887b2d528d
gallery update
...
especially upload panel
2012-09-12 01:58:23 +08:00
Harry Bomrah
ad431b1d06
Minor update
2012-09-12 01:58:23 +08:00
Harry Bomrah
91d45b64da
code merged … ui updated
2012-09-12 01:58:23 +08:00
devin
17c4b9a1bf
gallery update
2012-09-12 01:58:22 +08:00
devin
01eae75ad0
gallery update
2012-09-12 01:58:22 +08:00
devin
a2ed9e3350
gallery update
2012-09-12 01:58:22 +08:00
Christophe Vilayphiou
a579e16109
Change rows for news textarea
2012-09-11 16:41:35 +08:00
Christophe Vilayphiou
73e48aebc6
Change news subtitle to textarea, no tinymce
2012-09-11 15:40:27 +08:00
Matthew K. Fu JuYuan
e486ac5d25
complete visitor dashbroad
2012-09-11 11:30:58 +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
Christophe Vilayphiou
b110b22daa
Change 熱門 to 頭版 for news
2012-09-10 15:55:06 +08:00
Christophe Vilayphiou
4dfe3e7b3b
Change 熱門 to 頭版 for news
2012-09-10 15:19:29 +08:00
Harry Bomrah
7bab8bf8ad
page added...
2012-09-10 14:44:21 +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
Harry Bomrah
8295286c6e
frontend commits
2012-09-05 19:08:48 +08:00
Harry Bomrah
b726c10857
front ends updates
2012-09-04 21:30:17 +08:00
Harry Bomrah
a080667615
frontend updates
2012-09-04 17:17:18 +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
Harry Bomrah
4a12c9d6fb
frontend update
2012-09-03 21:49:35 +08:00
Harry Bomrah
202d736a5d
one more modification
2012-08-31 22:02:06 +08:00
Harry Bomrah
4d6a9a8e87
Modifications in ruby
2012-08-31 22:01:19 +08:00
chris
dcdd730a01
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
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
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-08-31 14:31:54 +08:00
unknown
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
unknown
bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
unknown
c739ab3984
new archive
2012-08-30 14:49:31 +08:00
unknown
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
unknown
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
unknown
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
unknown
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
unknown
10d9253399
announcement edit to view file
2012-08-30 14:25:51 +08:00
unknown
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
unknown
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
Harry Bomrah
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
devin
34764fb28d
front update
2012-08-29 17:54:18 +08:00
devin
43294b2f49
backend update
2012-08-29 17:48:29 +08:00
Harry Bomrah
4fc196fb71
resize thumbnails
2012-08-29 17:36:12 +08:00
Harry Bomrah
a2da065ce6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-29 17:19:04 +08:00
Harry Bomrah
4e6703dae6
ruby update for form and edit tagging
2012-08-29 17:13:45 +08:00
devin
e17bc400f1
gallery frontend update
2012-08-29 17:12:20 +08:00
Harry Bomrah
a11d865dd1
Ruby update
2012-08-28 21:04:48 +08:00
Harry Bomrah
833349bf6c
Merge branch 'gallery_orbit' into desktop_devin
2012-08-28 15:45:20 +08:00
devin
86535874f7
language fix
2012-08-28 15:38:35 +08:00
devin
d2733bde28
front end added
2012-08-28 15:23:55 +08:00
Harry Bomrah
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
Harry Bomrah
99096c4ac0
View only update
2012-08-23 21:30:37 +08:00
Harry Bomrah
33bc430df5
Commit for view only
2012-08-23 19:25:56 +08:00
Harry Bomrah
861f521da3
Merge branch 'gallery_orbit' into desktop_devin
2012-08-23 17:15:03 +08:00
Harry Bomrah
e2c16e1931
frontend fixes
2012-08-23 17:13:33 +08:00
Matthew K. Fu JuYuan
e4cc80248d
Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad
...
Conflicts:
config/mongoid.yml
2012-08-23 16:08:17 +08:00
Matthew K. Fu JuYuan
01d278d688
guest user
2012-08-23 16:05:14 +08:00
Harry Bomrah
4d9244005a
Code merge
2012-08-23 01:40:55 +08:00
Harry Bomrah
1e4d534908
frontend updates
2012-08-23 01:36:56 +08:00
devin
93da8520ed
gallery update
2012-08-23 01:36:56 +08:00
devin
9430f66bee
gallery update
2012-08-23 01:36:56 +08:00
devin
1a4097d1c0
gallery update
...
especially upload panel
2012-08-23 01:36:56 +08:00
Harry Bomrah
4fe4dc35de
Minor update
2012-08-23 01:36:55 +08:00
Harry Bomrah
0799fb4f87
code merged … ui updated
2012-08-23 01:36:55 +08:00
devin
d6b24c6454
gallery update
2012-08-23 01:36:55 +08:00
devin
a732910f35
gallery update
2012-08-23 01:36:55 +08:00
devin
7b42adc9a0
gallery update
2012-08-23 01:36:55 +08:00
chris
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
devin
75b6c447fc
gallery update
2012-08-22 16:46:37 +08:00
devin
e8a0015365
gallery update
2012-08-22 15:59:06 +08:00
devin
1437d2dc14
gallery update
...
especially upload panel
2012-08-22 01:15:50 +08:00
Harry Bomrah
4a53e5faea
Minor update
2012-08-21 20:26:07 +08:00
Harry Bomrah
16b1e97685
code merged … ui updated
2012-08-21 20:15:17 +08:00
devin
0ad0ea9acf
gallery update
2012-08-21 16:32:55 +08:00
devin
cbef7cd368
gallery update
2012-08-21 14:31:25 +08:00
devin
1a6ecf4d0f
gallery update
2012-08-21 13:56:50 +08:00
chris
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
Harry Bomrah
3d607cfca4
updates for tagging and language fix
2012-08-20 23:20:20 +08:00
Harry Bomrah
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
devin
489231166f
gallery update
2012-08-20 23:17:32 +08:00
devin
1731c4bcf7
gallery update
...
add "tag panel", not complete
2012-08-20 23:17:32 +08:00
devin
4beedb1aa4
gallery update
2012-08-20 23:17:31 +08:00
devin
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
Harry Bomrah
263cf130e2
tp
2012-08-20 23:16:54 +08:00
Harry Bomrah
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
Harry Bomrah
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
devin
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
devin
8a9e724979
gallery update
2012-08-20 23:14:11 +08:00
Harry Bomrah
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
devin
e27c1b0175
gallery update
2012-08-20 23:14:11 +08:00
Harry Bomrah
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
Harry Bomrah
314af3c16f
Major updates for gallery
2012-08-20 23:14:11 +08:00
Harry Bomrah
0333f97bf3
Gallery update..
2012-08-20 23:14:10 +08:00
Harry Bomrah
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
Harry Bomrah
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
Harry Bomrah
9f3d22360e
gallery module update
2012-08-20 23:11:32 +08:00
Harry Bomrah
6e90196b77
updates for tagging and language fix
2012-08-20 22:00:57 +08:00
unknown
23a3a7eff6
update archive
2012-08-20 17:14:13 +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
Harry Bomrah
e86d5ab338
tagging
2012-08-13 16:43:23 +08:00
Harry Bomrah
4d676d9ee9
Merge
2012-08-13 16:17:23 +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
Harry Bomrah
34e4928ee1
authorization
2012-08-11 17:28:49 +08:00
devin
7fb6a1e86b
gallery update
2012-08-11 01:32:53 +08:00
unknown
9333503545
demo_site widget edit
2012-08-10 15:33:28 +08:00
Christophe Vilayphiou
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
unknown
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
unknown
d5cc470e5d
new archive
2012-08-10 15:23:56 +08:00
unknown
cdb8d6c755
announcement edit to view file
2012-08-10 15:20:17 +08:00
unknown
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
unknown
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
unknown
e8cea9f0ab
new archive
2012-08-10 15:14:43 +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
devin
50baac2cb7
gallery update
...
add "tag panel", not complete
2012-08-09 18:09:36 +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
unknown
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +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
Harry Bomrah
ee03bd5b65
code merge
2012-08-08 19:35:36 +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
Harry Bomrah
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
Matthew K. Fu JuYuan
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
devin
b5227c7b6c
gallery update
2012-08-07 14:33:30 +08:00
devin
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
Harry Bomrah
13f3d4db70
tp
2012-08-06 20:10:38 +08:00
Harry Bomrah
a08f85a3e2
Button fixes
2012-08-06 17:49:10 +08:00
Harry Bomrah
5f0d6c9003
Code Merge
2012-08-06 17:05:12 +08:00
Harry Bomrah
47408f4467
UI modifications
2012-08-06 17:01:53 +08:00
devin
9ebee5daea
gallery update
2012-08-06 14:02:55 +08:00
devin
337d690c54
gallery update
2012-08-06 11:07:58 +08:00
Christophe Vilayphiou
73b2cd1035
Fix typo and title in news and announcement frontend
2012-08-05 15:04:52 +08:00
Christophe Vilayphiou
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
Christophe Vilayphiou
5fc679e0ca
Toggle line color for announcement frontend
2012-08-04 16:16:28 +08:00
Christophe Vilayphiou
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
Christophe Vilayphiou
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
Christophe Vilayphiou
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
Harry Bomrah
6159c04da6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-01 20:09:58 +08:00
Harry Bomrah
b0ef2b6957
Multi language and side bar update
2012-08-01 20:07:54 +08:00
Christophe Vilayphiou
d2564af001
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 16:38:35 +08:00
devin
eaa8171689
gallery update
2012-08-01 16:35:59 +08:00
Christophe Vilayphiou
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
Matthew K. Fu JuYuan
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
Christophe Vilayphiou
625801c0e9
Fix auth_users bug without category in news
2012-08-01 03:07:23 +08:00
Christophe Vilayphiou
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
Harry Bomrah
7accbed1a0
gallery translation supported
2012-07-31 21:15:42 +08:00
Matthew K. Fu JuYuan
b2f28eabaf
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 18:23:01 +08:00
Matthew K. Fu JuYuan
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
Christophe Vilayphiou
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
Christophe Vilayphiou
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
Matthew K. Fu JuYuan
af4865ceb7
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 11:01:11 +08:00
Matthew K. Fu JuYuan
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
Harry Bomrah
45da2971ef
Merge branch 'gallery_orbit' into desktop_harry
2012-07-31 01:16:22 +08:00
Harry Bomrah
17dffb15e1
Major updates for gallery
2012-07-31 01:15:48 +08:00
Christophe Vilayphiou
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
Christophe Vilayphiou
4d7a53866e
Delete remaining impressionist files
2012-07-30 17:45:26 +08:00
Matthew K. Fu JuYuan
bb154f5be6
fix error when creating bulletin and news
2012-07-30 16:38:02 +08:00
Matthew K. Fu JuYuan
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
Matthew K. Fu JuYuan
effad63c92
make sure no pending news or announcement will be searched out
2012-07-30 14:39:40 +08:00
Matthew K. Fu JuYuan
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
Harry Bomrah
929cd3b0cc
Gallery update..
2012-07-29 18:52:30 +08:00
Christophe Vilayphiou
afa4b7dcb3
Remove cache
2012-07-28 16:06:44 +08:00
Christophe Vilayphiou
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
Christophe Vilayphiou
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
Christophe Vilayphiou
cd6d95204f
Move Impressionist to Gemfile
2012-07-27 19:14:25 +08:00
Christophe Vilayphiou
207b0c5886
Remove i18n_variable for web_resource
2012-07-27 19:12:59 +08:00
Christophe Vilayphiou
30624c0bd8
Fix error in i18n_variable removal for page_content
2012-07-27 19:12:59 +08:00
Christophe Vilayphiou
50813eb57d
Remove i18n_variable for page_content
2012-07-27 19:12:59 +08:00
Christophe Vilayphiou
61c1af7316
Remove i18n_variable for news
2012-07-27 19:12:58 +08:00
Christophe Vilayphiou
8eec7b4dac
Fix announcement for i18n_variable removal
2012-07-27 19:12:58 +08:00
Christophe Vilayphiou
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan
d589a1b522
fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張
2012-07-27 07:42:00 +08:00
Matthew K. Fu JuYuan
eed7b78357
fix for loading failed
2012-07-27 05:45:39 +08:00
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
Christophe Vilayphiou
a1cf0a3eb6
Remove i18n_variable for web_resource
2012-07-26 04:10:15 +08:00
Christophe Vilayphiou
3466a19362
Fix error in i18n_variable removal for page_content
2012-07-26 04:10:02 +08:00
Christophe Vilayphiou
4a6b9fbe64
Remove i18n_variable for page_content
2012-07-26 03:47:14 +08:00
Christophe Vilayphiou
e33afc0822
Remove i18n_variable for news
2012-07-26 03:37:07 +08:00
Christophe Vilayphiou
875fad848c
Fix announcement for i18n_variable removal
2012-07-26 03:29:06 +08:00
Christophe Vilayphiou
b9cf5263f6
Remove i18n_variable for announcement
2012-07-26 02:27:43 +08:00
Matthew K. Fu JuYuan
4768da3c7a
fix announcement loading failed caused by impression. disable pinyin search.
2012-07-25 18:26:05 +08:00
Harry Bomrah
584d5d388e
Merge branch 'gallery_orbit' into desktop_harry
2012-07-25 16:21:03 +08:00
Harry Bomrah
8f23755c0d
Gallery update
2012-07-25 16:20:07 +08:00
Matthew K. Fu JuYuan
25f4e292e6
add not found for no result
2012-07-25 13:58:09 +08:00
Matthew K. Fu JuYuan
98fd9223a8
open search for news
2012-07-25 10:42:55 +08:00
Matthew K. Fu JuYuan
397b444390
fix for bugs
2012-07-24 20:58:34 +08:00
Matthew K. Fu JuYuan
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
Harry Bomrah
642e0c20ae
Routes conflicts removed
2012-07-19 15:54:04 +08:00
Harry Bomrah
59ab1e6d17
Got gallery update
2012-07-19 15:51:41 +08:00
Harry Bomrah
37f6037333
Gallery started.
2012-07-19 15:44:44 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan
033667f99b
fix for missing disable category at frontend and widget
2012-07-17 11:26:50 +08:00
Matthew K. Fu JuYuan
a4b1681d39
fix rejection for announcement and news.
2012-07-17 10:21:46 +08:00
Harry Bomrah
87be934aa3
gallery module update
2012-07-16 20:26:04 +08:00
Matthew K. Fu JuYuan
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan
85d6bbe1c9
add i18n variable. fix web_links for disable category
2012-07-11 17:56:31 +08:00
Matthew K. Fu JuYuan
ca2c056a07
fix for not displaying bulletin at fronted when it's parent category is disable
2012-07-11 17:17:44 +08:00
Harry Bomrah
ba3d13790c
gallery module update
2012-07-10 17:43:21 +08:00
Matthew K. Fu JuYuan
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
unknown
89446ba796
demo
2012-07-09 16:28:04 +08:00
unknown
fce2762ec3
demo
2012-07-09 16:28:04 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
Matthew K. Fu JuYuan
09d46f2f75
NCCU 上傳版本 0709
...
Merge branch 'nccu0621'
Conflicts:
Gemfile
config/resque.god
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
2012-07-09 16:02:59 +08:00
Matthew K. Fu JuYuan
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
Matthew K. Fu JuYuan
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
Matthew K. Fu JuYuan
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
Matthew K. Fu JuYuan
32480e10ed
en translation
2012-07-04 17:43:52 +08:00
Matthew K. Fu JuYuan
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
Matthew K. Fu JuYuan
4fe92b844e
Add sorting order for NCCU request
2012-07-03 15:47:28 +08:00
Matthew K. Fu JuYuan
c0b3798bad
fix for date for qu menu
2012-06-29 11:41:06 +08:00
Matthew K. Fu JuYuan
f66c3d9c0c
fix bugs.
2012-06-29 11:17:35 +08:00
Matthew K. Fu JuYuan
6c4c1046bc
fix date select cause error back to the time of Jesus
2012-06-28 15:19:51 +08:00
Matthew K. Fu JuYuan
58a11ff569
fix javascript for new and anc link removing
2012-06-28 13:50:11 +08:00
Matthew K. Fu JuYuan
243c9e2946
fix relation between bulletin and category (news also)
2012-06-27 15:16:16 +08:00
Matthew K. Fu JuYuan
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
2.優先處理-編輯中的檔案列表,無法刪除
3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
2012-06-27 14:21:06 +08:00
Christophe Vilayphiou
4c4929c20a
Fix js for news quick_edit and edit for files
2012-06-27 11:36:18 +08:00
Matthew K. Fu JuYuan
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
Matthew K. Fu JuYuan
83a72bdf6e
fix for announcement
2012-06-26 18:23:44 +08:00
Matthew K. Fu JuYuan
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位
2012-06-26 17:46:02 +08:00
Matthew K. Fu JuYuan
df722ba90f
change display of user dept for showing announcement
2012-06-26 16:21:18 +08:00
Matthew K. Fu JuYuan
2b54067ecb
change order of display menu of categories of news_bulletin and bulletin.
2012-06-26 14:28:21 +08:00
Matthew K. Fu JuYuan
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
Matthew K. Fu JuYuan
73fbed8837
fix 1.page_content user empty problem
...
2.add i18n variable for news and announcement
2012-06-26 10:04:40 +08:00
Matthew K. Fu JuYuan
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
Matthew K. Fu JuYuan
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
Christophe Vilayphiou
a663231c8c
Merge branch 'design_team' into ldap
2012-05-25 10:01:41 +08:00
Christophe Vilayphiou
75b67dddf5
Fix date bugs
2012-05-25 09:59:39 +08:00
Christophe Vilayphiou
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
Christophe Vilayphiou
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
Christophe Vilayphiou
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
Matthew K. Fu JuYuan
e0260542d3
fix code
2012-05-22 16:11:52 +08:00
Matthew K. Fu JuYuan
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
Christophe Vilayphiou
27cf99462e
Fix bug in page and news
2012-05-22 14:42:19 +08:00
Christophe Vilayphiou
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
Christophe Vilayphiou
dc4116bc3d
Fix page hits count
2012-05-19 01:59:17 +08:00
Christophe Vilayphiou
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +08:00
Christophe Vilayphiou
4d33c7a56d
Changes for dat and time format
...
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +08:00
Matthew K. Fu JuYuan
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
Matt
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
Christophe Vilayphiou
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
Christophe Vilayphiou
f72d0bc7e0
Merge branch 'design_team' into ldap
2012-05-18 10:51:20 +08:00
Christophe Vilayphiou
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +08:00
Christophe Vilayphiou
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
Christophe Vilayphiou
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
Christophe Vilayphiou
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan
16ada34585
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
2012-05-17 23:35:46 +08:00
Christophe Vilayphiou
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
Christophe Vilayphiou
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
Christophe Vilayphiou
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
Christophe Vilayphiou
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
Christophe Vilayphiou
be7ce0bf45
Redmine change's
2012-05-17 06:25:38 +08:00
Christophe Vilayphiou
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
unknown
ab616fc3b5
announcement edit to view file
2012-05-16 01:15:00 +08:00
unknown
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
unknown
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
unknown
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
Christophe Vilayphiou
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Christophe Vilayphiou
42881553a8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-15 22:48:40 +08:00
Christophe Vilayphiou
5e9b55e08e
Ray took out 'default' tags
2012-05-15 22:47:28 +08:00
Christophe Vilayphiou
a8c1cbdbba
Add vendor/impressionist
2012-05-15 22:42:49 +08:00
Christophe Vilayphiou
3462c0e319
Add each page name to page_context index
2012-05-15 21:31:54 +08:00
Christophe Vilayphiou
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
Christophe Vilayphiou
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
Christophe Vilayphiou
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
Christophe Vilayphiou
039e837fff
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/admin/object_auths_new_interface/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
2012-05-14 00:51:53 +08:00
Matthew K. Fu JuYuan
b804ba4d96
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
Christophe Vilayphiou
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
Christophe Vilayphiou
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
Matthew K. Fu JuYuan
e696516aae
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-11 17:07:21 +08:00
Matthew K. Fu JuYuan
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
Matthew K. Fu JuYuan
20a1a6e30f
New Interface for App Auth and Object Auth
2012-05-11 16:44:40 +08:00
Christophe Vilayphiou
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
Christophe Vilayphiou
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
Matthew K. Fu JuYuan
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
Christophe Vilayphiou
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
Matthew K. Fu JuYuan
07815eee8f
fix display for announcement and remove ut field
2012-05-10 10:29:18 +08:00
Christophe Vilayphiou
99c4e94729
Fix for home_list widget
2012-05-10 10:28:29 +08:00
Matthew K. Fu JuYuan
f13e006e4d
fix display for announcement and remove ut field
2012-05-10 10:27:01 +08:00
Christophe Vilayphiou
64effbd83c
Remove extra widgets declaration
2012-05-10 00:41:32 +08:00
Christophe Vilayphiou
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
Christophe Vilayphiou
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
Christophe Vilayphiou
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
Christophe Vilayphiou
6727f27181
Change for 0509 Nccu check
2012-05-09 16:58:12 +08:00
Matthew K. Fu JuYuan
9a6b66c57d
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
2012-05-09 15:54:59 +08:00
Matthew K. Fu JuYuan
93946c37f4
fix wrong link
2012-05-09 15:54:00 +08:00
Matthew K. Fu JuYuan
a9c241658a
Repeat code for news module
2012-05-09 15:28:02 +08:00
Matthew K. Fu JuYuan
c82d701b55
Permission setting for announcement for bulletin cate
2012-05-09 15:28:02 +08:00
Matthew K. Fu JuYuan
618e4f4047
Repeat code for news module
2012-05-09 15:22:15 +08:00
Christophe Vilayphiou
1785da51a2
Merge branch 'design_team' into ldap
2012-05-09 15:04:06 +08:00
Christophe Vilayphiou
50edfdd02f
Changes for tag key in side_bar announcement and news, fix ad_banner css for dot
2012-05-09 14:59:06 +08:00
Matthew K. Fu JuYuan
71a5731fe8
Permission setting for announcement for bulletin cate
2012-05-09 14:54:20 +08:00
Christophe Vilayphiou
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
Christophe Vilayphiou
23d2d9a81e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:36:35 +08:00
Christophe Vilayphiou
41424d2829
Fix error in front-end announcement index
2012-05-08 17:40:14 +08:00
Christophe Vilayphiou
ef9afca19f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:28:05 +08:00
Christophe Vilayphiou
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +08:00
Christophe Vilayphiou
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
Christophe Vilayphiou
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
Matthew K. Fu JuYuan
7603cb91ad
Change subrole's context from code to text at approval setting.
2012-05-08 16:21:10 +08:00
Christophe Vilayphiou
caba8ce7a4
Add nccu icon
...
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
Christophe Vilayphiou
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
Christophe Vilayphiou
ba4385e3fd
Add module authorization for news
...
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
Christophe Vilayphiou
2aaff21000
Add missing class in widget news_bulletin/index
2012-05-07 23:23:17 +08:00
Christophe Vilayphiou
ca88d0e01b
Fix bug that was never displaying preview
2012-05-07 17:29:56 +08:00
Christophe Vilayphiou
4c7a3842d6
Add drop_down to news_bulletin widget index for categories
2012-05-07 15:58:52 +08:00
Christophe Vilayphiou
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
Christophe Vilayphiou
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
Christophe Vilayphiou
b48099d752
Fix bug in is_admin?
...
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
Christophe Vilayphiou
8e6fd277c2
Fix bug: preview was always true
2012-05-04 19:02:40 +08:00
Christophe Vilayphiou
e9b337a385
Copy changes into news after merge
2012-05-04 18:49:07 +08:00
Matthew K. Fu JuYuan
119d8ff13a
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
048ce4c97e
disable input
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
Christophe Vilayphiou
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
Christophe Vilayphiou
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
Christophe Vilayphiou
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
Christophe Vilayphiou
63ee8eaca9
Remove url from sorting
...
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
Christophe Vilayphiou
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
382932036d
Hide Approval button when bulletin is checked.
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
Christophe Vilayphiou
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
Christophe Vilayphiou
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
Christophe Vilayphiou
bf2c89da54
Add sorting to web_links
2012-04-27 14:20:09 +08:00
Christophe Vilayphiou
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
Christophe Vilayphiou
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
Christophe Vilayphiou
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00