99f28a0cba
sidebar rewrited
2012-12-05 18:35:58 +08:00
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
451d73897b
Fix bugs:
...
Page content: after edit and redirect to index, there's a gap between the headers and the first row
TinyMCE: the size of the textarea change depending on the language
2012-11-01 09:30:12 +08:00
63a57682e6
Fix bugs:
...
TinyMCE: the size of the textarea change depending on the language
Page content edit: no tab selected on first load
2012-10-30 17:09:00 +08:00
65ac6980c4
Merge branch 'various_bugs' into nccu_master
...
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
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/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
579c7b5e81
Add missing helper
2012-10-26 11:19:56 +08:00
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +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
eed7b78357
fix for loading failed
2012-07-27 05:45:39 +08:00
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
73fbed8837
fix 1.page_content user empty problem
...
2.add i18n variable for news and announcement
2012-06-26 10:04:40 +08:00
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
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
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
be7ce0bf45
Redmine change's
2012-05-17 06:25:38 +08:00
3462c0e319
Add each page name to page_context index
2012-05-15 21:31:54 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
9f6c9156c6
Spen patch for nccu
2012-04-24 16:25:30 +08:00
5f5871d1c2
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
2012-04-05 15:24:39 +08:00
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
9382ef6ae8
Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
2012-04-05 15:16:33 +08:00
ccb0110b77
fix announcement & add lang tab
2012-04-05 14:48:31 +08:00
172d3d7847
Remove bad references to NewBlog
2012-03-27 19:42:07 +08:00
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
a30bc499c7
fix announcement & links
2012-03-27 14:19:58 +08:00
42519d9f78
fix announcement & links
2012-03-23 18:04:11 +08:00
3aa7c5120d
Put tinymce in its own js file.
...
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
6f6e84b015
fix dashboard & announcement
2012-03-16 14:44:57 +08:00
b6d49df145
Change Obit to Orbit
2012-03-16 11:54:31 +08:00
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
20c320961f
edit page_content
2012-02-23 15:13:36 +08:00
9b001aa6c3
new page_content app
2012-02-21 19:22:42 +08:00
Matthew K. Fu JuYuan
chris
Christophe Vilayphiou
unknown