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 |
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 |
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 |
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 |