Rueshyna
|
9433d59c04
|
relpace tab with sapce
|
2012-11-05 11:42:49 +08:00 |
|
Rueshyna
|
ed3644fb89
|
done journal
|
2012-11-05 11:42:49 +08:00 |
chris
|
a5e2c3e0ce
|
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
|
2012-11-05 11:41:48 +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 |
devin
|
228d43d0e2
|
calendar update
|
2012-11-05 11:40:11 +08:00 |
|
Harry Bomrah
|
6dd9f441ef
|
Agenda View
|
2012-11-05 11:40:11 +08:00 |
|
devin
|
d070c70512
|
calendar agenda view update
|
2012-11-05 11:40:11 +08:00 |
|
Harry Bomrah
|
513671e498
|
lot of updates
|
2012-11-05 11:34:35 +08:00 |
|
chris
|
58d4554b0b
|
Fixing bugs
|
2012-11-05 11:30:15 +08:00 |
|
chris
|
6783844937
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-11-04 20:43:23 +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
|
fe0e49c3e9
|
Remove a folder in wich Chinese characters
|
2012-11-04 20:32:54 +08:00 |
|
chris
|
be08682c6b
|
Merge branch 'new' of github.com:Rulingcom/orbit into new
|
2012-11-04 20:25:05 +08:00 |
unknown
|
bd17641d18
|
member plugin list add new
|
2012-11-04 20:24:36 +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 |
|
unknown
|
2f61b3e0c9
|
member plugin list add new
|
2012-11-02 18:28:23 +08:00 |
|
Harry Bomrah
|
28337c6b5b
|
update for desktop widgets
|
2012-11-01 20:42:40 +08:00 |
|
Harry Bomrah
|
d904163090
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-11-01 10:47:23 +08:00 |
|
Harry Bomrah
|
a25199d33b
|
Calander view updated...
|
2012-11-01 10:45:22 +08:00 |
|
devin
|
167c993108
|
calendar update
|
2012-10-30 17:26:52 +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 |
|
Matthew K. Fu JuYuan
|
ff9b9af7df
|
Remove useless files,add test files and Guardfile
|
2012-10-30 10:00:27 +08:00 |
|
Harry Bomrah
|
5da35ee65b
|
Agenda View
|
2012-10-29 19:52:34 +08:00 |
|
Harry Bomrah
|
b73981b19a
|
Devin commit
|
2012-10-29 10:17:49 +08:00 |
|
devin
|
12b7618cc7
|
calendar agenda view update
|
2012-10-27 00:11:26 +08:00 |
|
Harry Bomrah
|
5e25cf5849
|
lot of updates
|
2012-10-26 19:04:51 +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 |