Rueshyna
|
95a3831dce
|
done add journals function
|
2012-11-20 14:58:15 +08:00 |
|
Rueshyna
|
398432d0fc
|
some bugs
|
2012-11-19 16:28:05 +08:00 |
|
Rueshyna
|
8abb20b4c8
|
add edit function
|
2012-11-19 12:07:24 +08:00 |
|
Rueshyna
|
9501bf2df3
|
midify checkbox value
|
2012-11-18 14:15:00 +08:00 |
|
Rueshyna
|
26436395f5
|
finished some method of list and journal
|
2012-11-18 03:07:50 +08:00 |
|
Rueshyna
|
024b331cf3
|
split form from add.html.erb
|
2012-11-16 16:02:17 +08:00 |
|
Rueshyna
|
e60480a4be
|
add.html convert to add.html.erb done
|
2012-11-16 15:33:31 +08:00 |
|
Rueshyna
|
b51397d2e2
|
convert html template to html.erb
|
2012-11-16 12:54:21 +08:00 |
|
Rueshyna
|
b998b8f346
|
make it real
|
2012-11-16 01:54:10 +08:00 |
Harry Bomrah
|
e498be9753
|
desktopAPI update.
|
2012-11-12 15:11:36 +08:00 |
|
Harry Bomrah
|
a56d80698f
|
desktop api update..
|
2012-11-12 15:11:36 +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 |
|
Harry Bomrah
|
da5e7f670e
|
Desktop Widgtes updates..
|
2012-11-06 10:36:34 +08:00 |
|
Harry Bomrah
|
ca3e06c58b
|
update for desktop widgets
|
2012-11-05 11:40:11 +08:00 |
|
Harry Bomrah
|
2e809c5c19
|
Calander view updated...
|
2012-11-05 11:40:11 +08:00 |
Matthew K. Fu JuYuan
|
e47465d4b7
|
add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
|
2012-11-04 05:56:29 +08:00 |
|
chris
|
bc9082a858
|
Fix bug: Fix the bug due to not finding the ModuleApp
|
2012-10-30 17:10:59 +08:00 |
|
chris
|
cc5e238576
|
Fix after merge from NCCU, the translations still need to be cleaned
|
2012-10-30 11:08:26 +08:00 |
|
Matthew K. Fu JuYuan
|
664c6d2f61
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.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/back_end/writing_patents/_form_file.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
|
2012-10-30 10:11:51 +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 |
|
Matthew K. Fu JuYuan
|
bd0d975014
|
for user new interface, member role is working.
|
2012-10-26 11:27:37 +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
|
cbfa659928
|
Changes for side_bar
|
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 |
|
Matthew K. Fu JuYuan
|
1b876d4305
|
for user new interface, member role is working.
|
2012-10-24 14:46:25 +08:00 |
|
Matthew K. Fu JuYuan
|
13ae2602cd
|
member for THU
|
2012-10-18 18:36:21 +08:00 |
|
chris
|
0babd5f302
|
Changes for side_bar
|
2012-10-15 15:30:48 +08:00 |
|
chris
|
fe183c316f
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 14:46:13 +08:00 |
|
Matthew K. Fu JuYuan
|
84929f9b4c
|
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-15 14:44:48 +08:00 |
|
chris
|
5913f73850
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 14:09:58 +08:00 |
|
Matthew K. Fu JuYuan
|
31b583228d
|
fixed html for add link. form html
|
2012-10-15 14:07:53 +08:00 |
|
chris
|
334e5b464c
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 13:56:16 +08:00 |
|
Matthew K. Fu JuYuan
|
7901de7b31
|
can add member
|
2012-10-15 13:54:29 +08:00 |
|
Matthew K. Fu JuYuan
|
9027562450
|
new code for attribute fields and values for new member interface
|
2012-10-15 12:35:07 +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 |
|
Harry Bomrah
|
d2fea92969
|
GPRS and CALENDAR
|
2012-10-09 06:42:00 +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
|
e67ca84282
|
object_auth change to reload
|
2012-10-04 18:20:21 +08:00 |
Fu Matthew
|
dc8ca7e575
|
fix i18n.file upload failed
|
2012-09-27 13:34:40 +08:00 |
|
Fu Matthew
|
87904f8b8d
|
fix i18n
|
2012-09-27 11:03:08 +08:00 |
|
Matthew K. Fu JuYuan
|
fb3364b28e
|
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
|
2012-09-24 14:14:13 +08:00 |
unknown
|
975523c8b2
|
demo site plugin
|
2012-09-24 14:10:44 +08:00 |