Commit Graph

43 Commits

Author SHA1 Message Date
Harry Bomrah f1c2e29bf1 form validations and ajax check plus user approval done 2013-11-29 16:40:46 +08:00
saurabhbhatia 38b2d02d92 Email added to Signup Form 2013-11-28 18:06:14 +08:00
Harry Bomrah 12127a8d6c commit for harry.tp 2013-11-27 09:45:57 +08:00
saurabhbhatia dead52d8ab Changes in Registration Process 2013-11-25 17:05:36 +08:00
saurabhbhatia 03957f565b Added Mobile Web as a separate page 2013-11-25 12:43:23 +08:00
saurabhbhatia 5e0696890a Updated Remember me, and Homepage widget more link 2013-11-11 17:23:03 +08:00
saurabhbhatia 9bdb633157 Updated with UI Changes 2013-10-01 17:39:21 +08:00
Spen 79ef86f2c9 member translation fix 2013-04-26 11:26:11 +08:00
Spen 697944a029 user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
devin e7bffe4c0f devin's new branch 2013-04-17 14:14:24 +08:00
devin c8aa50ee87 Lots of Update
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-04-17 14:14:23 +08:00
devin 4e24223c78 desktop CSS update 2013-03-05 09:39:01 +08:00
devin d03f5dc1ff view update 2012-12-06 07:59:43 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
Harry Bomrah f7f55850fe coauthor edit and destroy fixed 2012-12-04 00:31:07 +08:00
Rueshyna b1ddc9950a adjust update password textfield position 2012-12-04 00:31:06 +08:00
Rueshyna 8a7ae3f061 correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Harry Bomrah 2f67a96532 url fixed and edit form fixed for tinyscrollbar 2012-11-28 18:12:00 +08:00
chris 9b5f4e4775 Fix bug: User cannot connect using the orbit button (Devise configuration) 2012-10-26 17:42:14 +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
Matthew K. Fu JuYuan 56ecf9c69b remove remember for nccu 2012-07-03 15:59:25 +08:00
Matthew K. Fu JuYuan 3480fa2545 Fix login and label. Check sync jobs and update info function. 2012-05-24 17:01:00 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Christophe Vilayphiou 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
Matthew K. Fu JuYuan 9d97b7c008 Change for the notice msg at login page 2012-04-30 00:24:10 +08:00
Christophe Vilayphiou 2362e1cfdd Merge branch 'design_team' into ldap 2012-04-27 15:28:32 +08:00
Christophe Vilayphiou 799fd1e3ac Fix css bugs (opacity=) and changes in sign_in page 2012-04-27 15:27:59 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap
Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
Matthew K. Fu JuYuan 72921d6dfd fix useless notice at login 2012-04-25 16:10:11 +08:00
Christophe Vilayphiou 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
Christophe Vilayphiou b80339d704 Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +08:00
Christophe Vilayphiou 0c4328987a Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
nccu fe9032787c NCCU ldap debug 2012-04-23 10:13:44 +08:00
Matt Fu d5a2de5476 LDAP with sync rake task 2012-03-06 16:41:06 +08:00
Matt Fu 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
Christophe Vilayphiou 344ec86c57 Remove class 'error' in devise forms 2012-02-29 04:56:32 +08:00
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
chris2tof 4cd9854706 Ika's changes 2011-08-25 08:07:18 +08:00
ihower 19a7d51e60 Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00