a0aa5e6d45
can add relation between co-author
2012-12-03 12:10:45 +08:00
ccacef6d9e
Merge branch 'publication' into journal_list
...
* publication: (23 commits)
adjust update password textfield position
correct user passwd and sent json to front-end
correct user passwd and sent json to front-end
if coauthor not in coauthor db then it will be add in db
fixed journal update method
jumping menus updated..
remove edit page cancel buttom
delete fixed..
multiple file fixed
have done multiple file
can add multiple file
Module store
Joshua's html
Change icons
add quick link to change user password, but it's not work
change template
add templete
add templete
url fixed and edit form fixed for tinyscrollbar
easy to make fake data
...
2012-11-30 21:02:18 +08:00
390da0e49a
Change icons
2012-11-29 00:49:53 +08:00
2f05885c4a
add journal list template
2012-11-28 11:45:23 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
96fe482d50
for openness
2012-11-20 20:20:59 +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
43d969a72b
Fix attribute_field_helper and comment admin in I18n
2012-11-06 17:51:42 +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
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
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
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
8b9cffd4f2
new code for attribute fields and values for new member interface
2012-10-26 11:19:55 +08:00
189fa553c5
Changes for helpers, not including all by default
2012-10-09 14:47:16 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
1240064e23
add url generate
2012-09-18 17:37:52 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
17195a9a23
fix for admin has no orbit menu
2012-09-12 16:20:15 +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
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +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
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +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
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
eab82269c1
Remove seconds from date display
2012-05-22 20:19:04 +08:00
Rueshyna
chris
Matthew K. Fu JuYuan
unknown
OrbitServer
Harry Bomrah
Fu Matthew