6789d44431
Fix design edit
2012-11-20 10:04:50 +08:00
2aa9a19deb
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-20 09:53:37 +08:00
17988f2fb2
address field and text field convert
2012-11-20 09:53:37 +08:00
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
398432d0fc
some bugs
2012-11-19 16:28:05 +08:00
8abb20b4c8
add edit function
2012-11-19 12:07:24 +08:00
9501bf2df3
midify checkbox value
2012-11-18 14:15:00 +08:00
26436395f5
finished some method of list and journal
2012-11-18 03:07:50 +08:00
024b331cf3
split form from add.html.erb
2012-11-16 16:02:17 +08:00
b4a2737407
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/helpers/attribute_fields_helper.rb
app/views/admin/infos/_form.html.erb
config/locales/zh_tw.yml
2012-11-16 15:42:39 +08:00
3034e53423
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-16 15:36:08 +08:00
e60480a4be
add.html convert to add.html.erb done
2012-11-16 15:33:31 +08:00
b51397d2e2
convert html template to html.erb
2012-11-16 12:54:21 +08:00
b998b8f346
make it real
2012-11-16 01:54:10 +08:00
69bf552fa7
Fix: remove i18n_variable from reload_frontend_pages.js.erb
2012-11-15 18:11:01 +08:00
995bdbc86c
address field and text field convert
2012-11-15 17:23:39 +08:00
9b1ada0af9
Fix these bugs:
...
1.結構部份
a.原選單，點選編輯，無動作反應
b.新增選單後，左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
2012-11-15 15:51:44 +08:00
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
39612b879c
address field. js and style is broken
2012-11-12 10:41:41 +08:00
dafe28ffb5
add_more ok
2012-11-08 18:59:19 +08:00
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
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
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
bc9082a858
Fix bug: Fix the bug due to not finding the ModuleApp
2012-10-30 17:10:59 +08:00
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
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
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
9b5f4e4775
Fix bug: User cannot connect using the orbit button (Devise configuration)
2012-10-26 17:42:14 +08:00
bd0d975014
for user new interface, member role is working.
2012-10-26 11:27:37 +08:00
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
0a1a9d2c2e
member for THU
2012-10-26 11:19:56 +08:00
cbfa659928
Changes for side_bar
2012-10-26 11:19:56 +08:00
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
9c16da4f46
fixed html for add link. form html
2012-10-26 11:19:56 +08:00
03b608593d
can add member
2012-10-26 11:19:56 +08:00
0a56c555bb
new code for attribute fields and values for new member interface
2012-10-26 11:19:56 +08:00
8b9cffd4f2
new code for attribute fields and values for new member interface
2012-10-26 11:19:55 +08:00
1b876d4305
for user new interface, member role is working.
2012-10-24 14:46:25 +08:00
13ae2602cd
member for THU
2012-10-18 18:36:21 +08:00
0babd5f302
Changes for side_bar
2012-10-15 15:30:48 +08:00
fe183c316f
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:46:13 +08:00
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
5913f73850
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:09:58 +08:00
31b583228d
fixed html for add link. form html
2012-10-15 14:07:53 +08:00
334e5b464c
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 13:56:16 +08:00
7901de7b31
can add member
2012-10-15 13:54:29 +08:00
9027562450
new code for attribute fields and values for new member interface
2012-10-15 12:35:07 +08:00
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
1ce7f00084
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
e67ca84282
object_auth change to reload
2012-10-04 18:20:21 +08:00
dc8ca7e575
fix i18n.file upload failed
2012-09-27 13:34:40 +08:00
87904f8b8d
fix i18n
2012-09-27 11:03:08 +08:00
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
2ca7e1b548
Fix typos after i18n yml
2012-09-24 09:02:45 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
79006201cd
ad_image date picker fixed
2012-09-19 12:23:05 +08:00
6fd2dac4d5
fix ad_banner data picker not working when on 180
2012-09-19 12:15:03 +08:00
d480a10661
fix for object_auth update
2012-09-19 11:12:22 +08:00
959b6aee12
fix for listing object error
2012-09-19 10:45:03 +08:00
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
0e507d549d
some more changes
2012-09-14 15:32:15 +08:00
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
194773f064
Fix bugs after merge
2012-09-14 02:27:49 +08:00
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
2e9af5d1a8
fix commit bugs
2012-09-13 15:53:36 +08:00
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +08:00
e88b09cf72
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/controllers/pages_controller.rb
app/views/layouts/_side_bar.html.erb
lib/parsers/parser_common.rb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
vendor/built_in_modules/gallery/config/locales/en.yml
vendor/built_in_modules/gallery/config/locales/zh_tw.yml
2012-09-12 02:21:18 +08:00
4ea0c0ec9c
minor fix for sidebar
2012-09-12 02:14:50 +08:00
8a71bd530f
page added...
2012-09-12 02:14:50 +08:00
7ae1dcd8e0
Calendar Module
2012-09-12 02:06:22 +08:00
6a23e29f33
Ruby structure implementation
2012-09-12 02:05:09 +08:00
c84b6a626e
minor fix for sidebar
2012-09-11 16:50:42 +08:00
7bab8bf8ad
page added...
2012-09-10 14:44:21 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
dcdd730a01
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-08-31 14:31:54 +08:00
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
3ebe7378b9
Delete duplicate side_bar code
2012-08-30 14:49:31 +08:00
bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
e281262b6d
new archive
2012-08-30 14:49:31 +08:00
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
7ce4a51b73
new archive
2012-08-30 14:45:28 +08:00
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
becf88bc20
Delete duplicate side_bar code
2012-08-30 14:39:48 +08:00
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
57717eef33
new archive
2012-08-30 14:36:48 +08:00
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
c5c7b0ca7c
new archive
2012-08-30 14:18:16 +08:00
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
faf2d914b6
Page added for desktop
2012-08-20 23:17:31 +08:00
263cf130e2
tp
2012-08-20 23:16:54 +08:00
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
fb53ad524a
Add time to announcement quick edit
...
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
2012-08-14 14:38:21 +08:00
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
05e61b63bb
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 11:04:19 +08:00
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
292105bdf1
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
2012-08-08 10:53:04 +08:00
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
df9a1e8057
Fix typo
2012-08-01 17:11:37 +08:00
f917adcdf3
Fix typo
2012-08-01 17:09:00 +08:00
0d048de33f
Fix link in sitemap
2012-08-01 17:08:07 +08:00
83acb78966
path instead of url
2012-08-01 17:05:34 +08:00
410dfe62e8
Fix typo
2012-08-01 17:03:39 +08:00
02ade108d0
Fix typo
2012-08-01 16:59:11 +08:00
4df4274629
Add links to frontend_sitemap
2012-08-01 16:38:07 +08:00
ecb75fd085
Fix typo
2012-07-30 18:37:20 +08:00
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
934b515914
Sitemap with main
2012-07-27 19:13:39 +08:00
38804bd118
Add disable for main title
2012-07-27 19:13:39 +08:00
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
12f9f666eb
Fix bugs after i18n_variable removal
2012-07-27 19:13:39 +08:00
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
87549d4e1f
fix for nil value
2012-07-25 17:49:16 +08:00
13ec25ed10
fix for orbit bar broken
2012-07-25 17:44:50 +08:00
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
2ae6b54a45
fix for not working cache
2012-07-13 18:32:17 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
bfaed4deb4
timeline change
2012-07-05 16:49:03 +08:00
312e63f242
New Timeline with books and seminar pages
2012-07-05 16:42:00 +08:00
bb75383ef0
Seminar Pages modified
2012-07-05 16:27:59 +08:00
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
6b9926539d
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
2012-07-04 18:31:00 +08:00
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +08:00
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
6533abf214
font awesome update
2012-07-02 11:10:01 +08:00
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人，應該只能看到自己發佈的新聞&公告，但是目前可以看到全部，而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時，發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
2f500ff460
For non-login user,show no drop down menu and return to home after press orbit button.
2012-05-29 16:33:38 +08:00
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
a78b72ebfc
app update
2012-05-21 15:25:18 +08:00
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
5f6696a358
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
2012-05-18 14:19:13 +08:00
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +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
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
60988f97fb
Merge branch 'design_team' into ldap
2012-05-17 19:41:24 +08:00
2f7d561310
Put back I18n for file_upload
2012-05-17 19:40:30 +08:00
25de941df7
Merge branch 'design_team' into ldap
2012-05-17 19:10:22 +08:00
606050627e
Remove I18n for file_upload html
2012-05-17 19:09:52 +08:00
698c750cd7
Merge branch 'design_team' into ldap
2012-05-17 18:37:56 +08:00
27fd2d0714
Hide assets links from side_bar
2012-05-17 18:37:46 +08:00
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-17 06:43:39 +08:00
03387d3c07
Object auth for ad_banner
2012-05-17 06:42:33 +08:00
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
b05836835a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 06:28:49 +08:00
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
27a0984da1
tinymce loading fixed…
2012-05-16 18:51:37 +08:00
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
b31846f424
Delete duplicate side_bar code
2012-05-16 04:35:19 +08:00
ad9ac5f3f7
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/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-05-16 01:31:16 +08:00
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
80e84c10ba
Remove link from dashboard
2012-05-15 23:01:00 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
a184f96ce7
AdBanner app_auth
2012-05-14 00:49:22 +08:00
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +08:00
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
01d0c002f5
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/pages/_edit.html.erb
app/views/admin/pages/_form.html.erb
lib/parsers/parser_back_end.rb
2012-05-13 23:14:13 +08:00
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
ef2d416c70
Ray's changes for page_edit
2012-05-13 19:36:04 +08:00
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
ef49df448d
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/helpers/admin/item_helper.rb
2012-05-11 18:09:34 +08:00
076f5ad6ef
Ray's changes for drag and drop in structure's side_bar
2012-05-11 17:54:33 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
1a9fa8f505
Merge branch 'desktop_harry' into desktop_devin
2012-05-11 15:28:05 +08:00
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
5eba2638ce
Merge branch 'design_team' into ldap
2012-05-10 14:17:38 +08:00
b6aad17681
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 14:16:37 +08:00
ada56a7a63
some update
2012-05-10 10:54:43 +08:00
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
9161dc73b5
Translation for "or"
2012-05-10 00:27:12 +08:00
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
ecd21338bc
Matt's changes for side_bar
2012-05-10 00:23:42 +08:00
dc9af65524
Merge branch 'design_team' into ldap
2012-05-09 15:25:16 +08:00
038378be9a
Ray's changes for inccu in orbit_bar
2012-05-09 15:20:09 +08:00
9d01f624da
Merge branches 'nccu_0509' and 'design_team' into ldap
2012-05-09 14:21:24 +08:00
6c9944918a
Fix i18 variable
2012-05-09 14:18:52 +08:00
47bca643af
hidding new ad_banner
2012-05-09 14:17:20 +08:00
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
f9f7ddc8ee
Hide some links in side_bar for site_settings
2012-05-09 12:53:42 +08:00
44a485611a
Site_info and site_setting i18n
2012-05-09 12:29:46 +08:00
9216f29bc9
Ray's changes for mail settings
2012-05-09 12:19:32 +08:00
41c0c26330
Add mail_settings
2012-05-09 11:38:29 +08:00
b3be210ff7
Small adjustment for dashboard
2012-05-09 05:55:47 +08:00
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +08:00
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
caba8ce7a4
Add nccu icon
...
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
ba4385e3fd
Add module authorization for news
...
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
chris
Matthew K. Fu JuYuan
Rueshyna
Harry Bomrah
Fu Matthew
unknown
Matt
OrbitServer
devin
Joshua Milton
Christophe Vilayphiou