chris
|
bc9082a858
|
Fix bug: Fix the bug due to not finding the ModuleApp
|
2012-10-30 17:10:59 +08:00 |
|
chris
|
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 |
|
chris
|
cc5e238576
|
Fix after merge from NCCU, the translations still need to be cleaned
|
2012-10-30 11:08:26 +08:00 |
|
chris
|
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 |
|
chris
|
9b5f4e4775
|
Fix bug: User cannot connect using the orbit button (Devise configuration)
|
2012-10-26 17:42:14 +08:00 |
|
chris
|
2c5539eda9
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-26 11:28:00 +08:00 |
Matthew K. Fu JuYuan
|
bd0d975014
|
for user new interface, member role is working.
|
2012-10-26 11:27:37 +08:00 |
|
chris
|
b301f6522a
|
Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update
|
2012-10-26 11:20:26 +08:00 |
|
chris
|
d7fd61ce55
|
Edit uploaded package
|
2012-10-26 11:19:57 +08:00 |
|
Matthew K. Fu JuYuan
|
0a1a9d2c2e
|
member for THU
|
2012-10-26 11:19:56 +08:00 |
|
chris
|
579c7b5e81
|
Add missing helper
|
2012-10-26 11:19:56 +08:00 |
|
chris
|
68bc4c1874
|
Fix page_part creation when design is changed
|
2012-10-26 11:19:56 +08:00 |
|
chris
|
cbfa659928
|
Changes for side_bar
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
c305a2f687
|
add i18n variables
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
f4f07c7206
|
fix sub role attribute fields
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
9c16da4f46
|
fixed html for add link. form html
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
03b608593d
|
can add member
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
0a56c555bb
|
new code for attribute fields and values for new member interface
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
8b9cffd4f2
|
new code for attribute fields and values for new member interface
|
2012-10-26 11:19:55 +08:00 |
|
chris
|
293dc80ceb
|
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
|
2012-10-26 11:15:51 +08:00 |
Harry Bomrah
|
a5722af315
|
Calendar updates for day view
|
2012-10-26 11:15:37 +08:00 |
devin
|
8c6e5deb64
|
gallery update
please don't forget to add translation in other language
|
2012-10-26 11:15:37 +08:00 |
|
Harry Bomrah
|
79e0b8e383
|
week view updates
|
2012-10-26 11:15:37 +08:00 |
|
devin
|
98ef582e17
|
shit calendar update
|
2012-10-26 11:15:37 +08:00 |
|
Harry Bomrah
|
c29955d9e3
|
external commit
|
2012-10-26 11:15:37 +08:00 |
|
Harry Bomrah
|
d7e8663c1d
|
calendar updated for week
|
2012-10-26 11:15:36 +08:00 |
|
chris
|
6b8255f8f8
|
Remove a folder in wich Chinese characters
|
2012-10-26 11:14:13 +08:00 |
|
Harry Bomrah
|
974849b85a
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-10-24 19:11:12 +08:00 |
|
Harry Bomrah
|
f4eb95881f
|
Calendar updates for day view
|
2012-10-24 18:55:06 +08:00 |
|
chris
|
2b2dd53218
|
Edit uploaded package
|
2012-10-24 18:40:38 +08:00 |
|
Matthew K. Fu JuYuan
|
1b876d4305
|
for user new interface, member role is working.
|
2012-10-24 14:46:25 +08:00 |
|
devin
|
8c63be5c33
|
gallery update
please don't forget to add translation in other language
|
2012-10-24 09:47:09 +08:00 |
|
Harry Bomrah
|
a810312da4
|
week view updates
|
2012-10-18 22:21:13 +08:00 |
|
Christophe Vilayphiou
|
9110c3e716
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-10-18 18:51:14 +08:00 |
|
chris
|
976114cfa9
|
Add missing helper
|
2012-10-18 18:50:46 +08:00 |
|
chris
|
d1797ac8e3
|
Fix page_part creation when design is changed
|
2012-10-18 18:50:46 +08:00 |
|
Matthew K. Fu JuYuan
|
13ae2602cd
|
member for THU
|
2012-10-18 18:36:21 +08:00 |
|
devin
|
47df69f8cf
|
shit calendar update
|
2012-10-17 17:35:30 +08:00 |
|
Harry Bomrah
|
6113b9c46c
|
external commit
|
2012-10-16 21:52:10 +08:00 |
|
Harry Bomrah
|
0971e00511
|
calendar updated for week
|
2012-10-16 21:51:06 +08:00 |
|
chris
|
0d19cd6f10
|
Add missing helper
|
2012-10-16 16:20:22 +08:00 |
|
Matthew K. Fu JuYuan
|
38e6d6c2c8
|
add rake task
|
2012-10-16 15:43:31 +08:00 |
|
Matthew K. Fu JuYuan
|
a50ccdafb2
|
consolidate_object_auth for 171 production
|
2012-10-16 15:08:02 +08:00 |
|
Matthew K. Fu JuYuan
|
b3a9a7ab07
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-10-16 14:24:01 +08:00 |
|
Matthew K. Fu JuYuan
|
6dfe10040b
|
fix object auth without app_auth
|
2012-10-16 14:23:44 +08:00 |
|
chris
|
cc6c8dab2a
|
Fix page_part creation when design is changed
|
2012-10-16 14:17:12 +08:00 |
|
chris
|
afff128e9c
|
Fix page_part creation when design is changed
|
2012-10-16 14:15:33 +08:00 |
|
chris
|
f7f0b48707
|
Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
config/initializers/resque.rb
|
2012-10-16 14:14:56 +08:00 |
|
chris
|
0babd5f302
|
Changes for side_bar
|
2012-10-15 15:30:48 +08:00 |
|
chris
|
a50553219e
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 15:28:24 +08:00 |