Matthew K. Fu JuYuan
|
be448d42c9
|
add_more ok
|
2012-11-20 09:52:50 +08:00 |
chris
|
b40d4702d5
|
Merge branch 'master' into various_bugs
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
|
2012-11-06 11:44:00 +08:00 |
|
chris
|
58d4554b0b
|
Fixing bugs
|
2012-11-05 11:30:15 +08:00 |
|
Matthew K. Fu JuYuan
|
beb843f75b
|
add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
|
2012-11-04 20:42:58 +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 |
|
Matthew K. Fu JuYuan
|
bd0d975014
|
for user new interface, member role is working.
|
2012-10-26 11:27:37 +08:00 |
|
Matthew K. Fu JuYuan
|
13ae2602cd
|
member for THU
|
2012-10-18 18:36:21 +08:00 |
|
Matthew K. Fu JuYuan
|
7901de7b31
|
can add member
|
2012-10-15 13:54:29 +08:00 |
|
Matthew K. Fu JuYuan
|
b5571dbc43
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
|
2012-10-12 18:17:05 +08:00 |
|
Matthew K. Fu JuYuan
|
1ce7f00084
|
new code for attribute fields and values for new member interface
|
2012-10-12 18:09:02 +08:00 |
|
Matthew K. Fu JuYuan
|
9f825de288
|
user new interface 70%
|
2012-10-09 06:40:18 +08:00 |
|
Matthew K. Fu JuYuan
|
e16a27601d
|
user new interface 70%
|
2012-10-08 16:58:33 +08:00 |
|
Matthew K. Fu JuYuan
|
3a65f599e6
|
first version app config for Spen durning Chris's leave.
|
2012-09-24 11:43:48 +08:00 |
|
Matthew K. Fu JuYuan
|
19db9d0037
|
basic function
|
2012-09-17 13:32:52 +08:00 |
|
Matthew K. Fu JuYuan
|
3e5978c8fd
|
users new interface controller
|
2012-09-14 00:02:21 +08:00 |