chris
|
9c6c622a49
|
Add missing icons and css for icons in layout
|
2012-12-03 22:31:00 +08:00 |
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
Matthew K. Fu JuYuan
|
77386f0284
|
disable data transform when switching attribute field type. new member stable
|
2012-11-22 21:10:35 +08:00 |
chris
|
475642d375
|
Remove news and fix default_url in ImageUploader
|
2012-11-22 09:30:25 +08:00 |
chris
|
2d0e8b37b2
|
Fix:
- Widgets for announcement
- Facebook link
- AdBanner nav
|
2012-11-21 18:42:14 +08:00 |
Matthew K. Fu JuYuan
|
96fe482d50
|
for openness
|
2012-11-20 20:20:59 +08:00 |
Matthew K. Fu JuYuan
|
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 |
Matthew K. Fu JuYuan
|
17988f2fb2
|
address field and text field convert
|
2012-11-20 09:53:37 +08:00 |
Matthew K. Fu JuYuan
|
a85e5fcc0d
|
address field. js and style is broken
|
2012-11-20 09:53:36 +08:00 |
Matthew K. Fu JuYuan
|
be448d42c9
|
add_more ok
|
2012-11-20 09:52:50 +08:00 |
chris
|
43d969a72b
|
Fix attribute_field_helper and comment admin in I18n
|
2012-11-06 17:51:42 +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 |
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 |
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
|
8b9cffd4f2
|
new code for attribute fields and values for new member interface
|
2012-10-26 11:19:55 +08:00 |
chris
|
189fa553c5
|
Changes for helpers, not including all by default
|
2012-10-09 14:47:16 +08:00 |
Matthew K. Fu JuYuan
|
9f825de288
|
user new interface 70%
|
2012-10-09 06:40:18 +08:00 |
unknown
|
975523c8b2
|
demo site plugin
|
2012-09-24 14:10:44 +08:00 |
Christophe Vilayphiou
|
4fb35b00f2
|
Add missing translations
|
2012-09-24 09:02:46 +08:00 |
Christophe Vilayphiou
|
bdd5a1a047
|
Changes for i18n yml
|
2012-09-24 09:02:45 +08:00 |
Matthew K. Fu JuYuan
|
1240064e23
|
add url generate
|
2012-09-18 17:37:52 +08:00 |
Matthew K. Fu JuYuan
|
19db9d0037
|
basic function
|
2012-09-17 13:32:52 +08:00 |
OrbitServer
|
ee51240102
|
Ray's changes for new backend
|
2012-09-14 02:38:56 +08:00 |
Harry Bomrah
|
29ea95b4c6
|
event_calendar testing
|
2012-09-13 23:57:47 +08:00 |
Matthew K. Fu JuYuan
|
17195a9a23
|
fix for admin has no orbit menu
|
2012-09-12 16:20:15 +08:00 |
Matthew K. Fu JuYuan
|
98e8f5f607
|
complete visitor dashbroad
|
2012-09-12 16:20:15 +08:00 |
Matthew K. Fu JuYuan
|
45ef7fd302
|
guest user
|
2012-09-12 16:20:15 +08:00 |
Fu Matthew
|
6044857fea
|
complete preview for both new and announcement
|
2012-09-07 17:55:59 +08:00 |
Christophe Vilayphiou
|
9196deb997
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-14 01:00:25 +08:00 |
Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
Matthew K. Fu JuYuan
|
6cc470ede9
|
nccu fix
|
2012-08-13 18:35:47 +08:00 |
Christophe Vilayphiou
|
18e18a4add
|
Fix for banner on ie
|
2012-08-13 15:10:53 +08:00 |
Christophe Vilayphiou
|
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 |
Christophe Vilayphiou
|
a03d1ad10b
|
Change for getting url from key
|
2012-08-08 11:04:19 +08:00 |
Christophe Vilayphiou
|
4bed925e0f
|
Try fb from override and generated page
|
2012-08-08 11:04:19 +08:00 |
Christophe Vilayphiou
|
acf4446523
|
Add meta to head for fb share
|
2012-08-08 11:04:19 +08:00 |
Matthew K. Fu JuYuan
|
85a556a4a2
|
first version of fb_share
|
2012-08-08 11:04:19 +08:00 |
Christophe Vilayphiou
|
39b63a970c
|
Fix .class to .class.to_s
|
2012-07-30 18:34:54 +08:00 |
Christophe Vilayphiou
|
7440727acd
|
Fix: "._type" to ".class"
|
2012-07-30 17:21:37 +08:00 |
Christophe Vilayphiou
|
49dd3a1770
|
Remove i18n_variable for controllers, helpers and models
|
2012-07-27 19:13:39 +08:00 |
Matthew K. Fu JuYuan
|
c5fdff764e
|
orbit disable object for categories
|
2012-07-05 16:00:45 +08:00 |
Matthew K. Fu JuYuan
|
56b1bd9eaa
|
add translation
|
2012-06-26 10:57:51 +08:00 |
Matthew K. Fu JuYuan
|
4f484599b7
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 15:23:50 +08:00 |
Christophe Vilayphiou
|
eab82269c1
|
Remove seconds from date display
|
2012-05-22 20:19:04 +08:00 |
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |