unknown
|
42d50ae534
|
Plugins
|
2012-09-14 00:05:31 +08:00 |
Matthew K. Fu JuYuan
|
5fb94f644d
|
break down Ray's HTML
|
2012-09-14 00:02:22 +08:00 |
|
Matthew K. Fu JuYuan
|
4818e3f444
|
first version for new member html
|
2012-09-14 00:02:21 +08:00 |
Christophe Vilayphiou
|
2e9af5d1a8
|
fix commit bugs
|
2012-09-13 15:53:36 +08:00 |
|
unknown
|
a1560ebcf5
|
update archive
|
2012-08-30 15:17:39 +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 |
Harry Bomrah
|
263cf130e2
|
tp
|
2012-08-20 23:16:54 +08:00 |
|
Christophe Vilayphiou
|
96fd89cca3
|
Fix js for ie in list
|
2012-08-16 01:09:45 +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 |
|
Harry Bomrah
|
9ff60d2ba4
|
form validation again
|
2012-08-14 01:02:45 +08:00 |
|
Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
|
Christophe Vilayphiou
|
33fc96ac7c
|
Changes for NCCU after email
|
2012-08-11 18:19:30 +08:00 |
|
unknown
|
d5c55c9697
|
widget & frontend field
|
2012-08-09 15:25:30 +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
|
292105bdf1
|
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
|
2012-08-08 10:53:04 +08:00 |
|
Christophe Vilayphiou
|
ecc5c39840
|
Fix remote upload file for tinymce
|
2012-08-08 10:51:54 +08:00 |
|
Harry Bomrah
|
4660c26b7a
|
fix for ie8,9 for tinymce
|
2012-08-07 20:55:18 +08:00 |
|
Christophe Vilayphiou
|
8ea7bf75cd
|
Fix uploader, ie9 ok, not ie8
|
2012-08-07 17:32:15 +08:00 |
|
Christophe Vilayphiou
|
df9a1e8057
|
Fix typo
|
2012-08-01 17:11:37 +08:00 |
|
Christophe Vilayphiou
|
f917adcdf3
|
Fix typo
|
2012-08-01 17:09:00 +08:00 |
|
Christophe Vilayphiou
|
0d048de33f
|
Fix link in sitemap
|
2012-08-01 17:08:07 +08:00 |
|
Christophe Vilayphiou
|
83acb78966
|
path instead of url
|
2012-08-01 17:05:34 +08:00 |
|
Christophe Vilayphiou
|
410dfe62e8
|
Fix typo
|
2012-08-01 17:03:39 +08:00 |
|
Christophe Vilayphiou
|
02ade108d0
|
Fix typo
|
2012-08-01 16:59:11 +08:00 |
|
Christophe Vilayphiou
|
4df4274629
|
Add links to frontend_sitemap
|
2012-08-01 16:38:07 +08:00 |
|
Christophe Vilayphiou
|
ecb75fd085
|
Fix typo
|
2012-07-30 18:37:20 +08:00 |
|
Christophe Vilayphiou
|
39b63a970c
|
Fix .class to .class.to_s
|
2012-07-30 18:34:54 +08:00 |
|
Christophe Vilayphiou
|
7440727acd
|
Fix: "._type" to ".class"
|
2012-07-30 17:21:37 +08:00 |
|
Christophe Vilayphiou
|
a8cc581279
|
Sitemap done for backend and fronted
|
2012-07-27 19:13:40 +08:00 |
|
Christophe Vilayphiou
|
934b515914
|
Sitemap with main
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
38804bd118
|
Add disable for main title
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
db9c4c0e10
|
Partial sitemap
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
12f9f666eb
|
Fix bugs after i18n_variable removal
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
53cae0a9ee
|
Remove i18n_variable for views
|
2012-07-27 19:13:39 +08:00 |
|
unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
|
Matthew K. Fu JuYuan
|
87549d4e1f
|
fix for nil value
|
2012-07-25 17:49:16 +08:00 |
|
Matthew K. Fu JuYuan
|
97b4eee798
|
full site search with google
|
2012-07-25 17:20:25 +08:00 |
|
unknown
|
10731dc211
|
demo widget
|
2012-07-18 18:07:45 +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
|
1f1868a75f
|
cache privilege user list.
|
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 |
|
Matthew K. Fu JuYuan
|
6f0cf0e92e
|
cache privilege user list.
|
2012-05-29 15:23:50 +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
|
541aa5831e
|
JS changes to load drag and drop
|
2012-05-22 17:37:15 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
|
Christophe Vilayphiou
|
aa114568c4
|
Move design to site_settings side_bar
|
2012-05-21 18:20:39 +08:00 |
|
Matthew K. Fu JuYuan
|
5f6696a358
|
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
|
2012-05-18 14:19:13 +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 |
|
Harry Bomrah
|
1b1c2c0032
|
image title and description callback fixed…
|
2012-05-17 20:19:31 +08:00 |