Commit Graph

14 Commits

Author SHA1 Message Date
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
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
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
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00