03b608593d
can add member
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
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
aa5d0bb1ad
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
4397adec5c
fix i18n
2012-09-28 09:46:06 +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
170bfbab52
fix i18n
2012-09-26 10:21:50 +08:00
1646b13f43
Change status translation in Chinese
2012-09-24 10:10:06 +08:00
b4ff5cea05
Merge branch 'yml' of github.com:Rulingcom/NCCU into yml
...
Conflicts:
app/helpers/admin/item_helper.rb
app/views/admin/ad_banners/_ad_banner_tab.html.erb
app/views/admin/assets/edit.html.erb
app/views/admin/assets/file_upload.html.erb
app/views/admin/assets/new.html.erb
app/views/admin/attributes/index.html.erb
app/views/admin/object_auths_new_interface/setting.html.erb
app/views/admin/page_parts/_edit.html.erb
app/views/layouts/_side_bar.html.erb
app/views/shared/_privilege_user.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
vendor/built_in_modules/news/config/locales/en.yml
vendor/built_in_modules/news/config/locales/zh_tw.yml
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
2012-09-24 09:19:19 +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
e71e890bb6
Fix bugs in zh_tw main
2012-09-24 09:02:45 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +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
e7240f2205
Fix typos after i18n yml
2012-09-12 20:36:24 +08:00
3989d382b0
Fix bugs in zh_tw main
2012-09-12 19:42:37 +08:00
8b2bc207de
Changes for i18n yml
2012-09-12 19:12:50 +08:00
7ae1dcd8e0
Calendar Module
2012-09-12 02:06:22 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +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
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
ab1c457a51
Add i18n for message in editor pop-up
2012-08-14 01:20:45 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +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
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
4dea025c8a
fix for
...
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
38804bd118
Add disable for main title
2012-07-27 19:13:39 +08:00
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
25f4e292e6
add not found for no result
2012-07-25 13:58:09 +08:00
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
2012-06-26 17:46:02 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +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
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +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
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
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
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +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
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +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
3a38992f29
Ray's changes for mail_setting i18n
2012-05-09 12:45:27 +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
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +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
8a3f0b9bdc
Add menu_enabled_for: the page can be shown even if there's no link in the menu
2012-05-07 15:47:14 +08:00
8b61314cc4
Add i18n for site_info.
...
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
088cd54b1d
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
2012-04-30 08:26:07 +08:00
8a99086802
News translation
2012-04-30 08:24:58 +08:00
0f203274a7
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
2012-04-30 08:11:40 +08:00
39410267e8
Add missing translation for news
2012-04-30 08:10:26 +08:00
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
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/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
198825a309
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
1a6242edbd
fix ad_banner sidebar
2012-04-05 17:41:43 +08:00
d8b20ae993
fix ad_banner sidebar
2012-04-05 11:11:48 +08:00
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
a1034f90ba
close alpha on nccu
2012-03-20 14:38:01 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
6b2aeadde6
Changes for nccu
2012-02-29 16:01:50 +08:00
9a40ecd1d9
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
...
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
10fd8ce455
Change locales for orbit
2012-02-29 10:48:15 +08:00
4b7b57bb3d
Add some missing translations
2012-02-29 04:48:21 +08:00
53ed4b0404
Initial changes in announcement for sorting and filtering
2012-02-23 15:51:33 +08:00
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
44a346ffe9
Changes for orbit bar, login
2012-02-19 16:33:22 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
4ed8a2164c
First complete with manager and submanager
2012-01-24 12:28:32 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
fc591ee308
Ray's back_end modification before sub_roles
2011-12-23 18:02:45 +08:00
a03e9bada8
Add missing translations
2011-11-20 02:14:51 +08:00
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
e0e14ddfac
Modify purchases list
2011-08-23 16:33:01 +08:00
2842001a3b
Update source: pull from git
2011-08-23 15:01:22 +08:00
ddc7c74436
Create page.
2011-06-01 10:24:14 +08:00
a8c4e17c56
CKEditor.
...
Edition of page part for single language.
2011-05-25 16:27:17 +08:00
24ae7ed5e3
Links edition
2011-05-13 09:08:42 +08:00
25752b7065
tags: image and css - show ID in assets/index
2011-04-13 18:22:52 +08:00
4b4cdbfd31
admin status change
2011-04-13 18:22:50 +08:00
e62df90117
user can't delete self and flash_messages
2011-04-13 18:22:50 +08:00
318c264cae
add user_info
2011-04-13 18:22:50 +08:00
27bdbadf08
404 for pages and asset column error
2011-04-13 18:22:49 +08:00
19a7d51e60
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
2011-04-13 18:19:51 +08:00
bebc51e8bb
Admin can new/edit user_attributes
2010-03-15 17:35:01 +08:00
29ee4585b2
upgrade to rails3, but grip is broken
2010-03-08 16:04:05 +08:00
13065aa85a
Add devise gem and panel/users controller
2010-03-04 16:33:26 +08:00
93169b1098
Add Item list interface, but acts_as_list can not used
2010-02-22 16:10:13 +08:00
a19e0dba6c
Add asset model and controller
2010-02-01 17:24:28 +08:00
e1440a79d8
Add Item, Page, Component, Link inheritanced models
2010-01-14 18:30:53 +08:00
9f1ba2ae66
1.fix parent page 2.add page title
2010-01-08 18:36:36 +08:00
e6d083acda
Add zh_tw locale file
2010-01-08 15:45:13 +08:00
40831c1314
init rails 2.3.2
2009-05-08 00:53:18 +08:00
Matthew K. Fu JuYuan
Harry Bomrah
Fu Matthew
Christophe Vilayphiou
unknown
Christophe Vilayphiou
nccu
Matt Fu
Matthew Kaito Juyuan Fu
ihower