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 |