Matthew K. Fu JuYuan
|
7339d1ee4a
|
starting Resque
|
2012-05-08 11:41:58 +08:00 |
nccu
|
a1034f90ba
|
close alpha on nccu
|
2012-03-20 14:38:01 +08:00 |
Christophe Vilayphiou
|
47215693c4
|
Merge branch 'master' into ldap
Conflicts:
Gemfile
Gemfile.lock
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
|
2012-03-19 14:27:15 +08:00 |
Christophe Vilayphiou
|
f4fda08e86
|
Replace PrototypeR4 by Orbit.
Move session into mongoid_store.
Reset session when sing_in.
|
2012-03-16 14:58:32 +08:00 |
Matt Fu
|
d5a2de5476
|
LDAP with sync rake task
|
2012-03-06 16:41:06 +08:00 |
Matt Fu
|
b84b7bad63
|
ldap config for 0229 nccu demo
|
2012-02-29 12:35:54 +08:00 |
Matt Fu
|
3209f9aa27
|
Complete for 229 check.
|
2012-02-24 19:07:47 +08:00 |
Matt Fu
|
678f1eabef
|
LDAP connection and modified Devise
|
2012-02-22 14:43:24 +08:00 |
Christophe Vilayphiou
|
4389f0cf28
|
Add new created files to previous commit
|
2012-02-16 13:09:09 +08:00 |
Christophe Vilayphiou
|
a0f58b543b
|
Remove ckeditor
|
2012-02-15 01:05:24 +08:00 |
chris2tof
|
04f51f2d98
|
Update carrierwave
#{column}_identifier must be used to get the name of the file
|
2012-01-24 11:57:27 +08:00 |
unknown
|
9f93af100b
|
merge with master
|
2012-01-11 20:14:28 +08:00 |
chris2tof
|
62aaf79491
|
Merge with sub_roles
|
2011-12-23 18:34:21 +08:00 |
chris2tof
|
a570be1811
|
Skip callbacks
|
2011-09-01 18:28:04 +08:00 |
chris2tof
|
86443661e9
|
Merge server and rails_3_1
|
2011-08-18 13:43:33 +08:00 |
Matthew Fu
|
f387139ae1
|
rails 3.1 and designs (with bug)
|
2011-07-12 16:00:57 +08:00 |
chris2tof
|
0969f6b6cc
|
CKEditor.
The error came from some script in Application.js
|
2011-05-26 13:48:09 +08:00 |
chris2tof
|
964440fa86
|
Remove CKEditor due to conflicts with the jQuery library
|
2011-05-26 11:23:46 +08:00 |
chris2tof
|
a8c4e17c56
|
CKEditor.
Edition of page part for single language.
|
2011-05-25 16:27:17 +08:00 |
chris2tof
|
9fdfb140d3
|
Not needed in Rails 3
|
2011-05-02 15:59:02 +08:00 |
chris2tof
|
d88cae437d
|
update gem bson_ext and devise initializer
|
2011-04-14 13:40:16 +08:00 |
ihower
|
8a4cffae8f
|
Remove files which should be deleted in previous commit
|
2011-04-13 18:53:47 +08:00 |
chris
|
70347d4c34
|
add missing file
|
2011-04-13 18:22:51 +08:00 |
chris
|
e360baadde
|
delete /initializers/mongoid.rb
|
2011-04-13 18:22:50 +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 |
Wen-Tien Chang
|
29ee4585b2
|
upgrade to rails3, but grip is broken
|
2010-03-08 16:04:05 +08:00 |
Wen-Tien Chang
|
13065aa85a
|
Add devise gem and panel/users controller
|
2010-03-04 16:33:26 +08:00 |
Wen-Tien Chang
|
40831c1314
|
init rails 2.3.2
|
2009-05-08 00:53:18 +08:00 |