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
|
b58db48d26
|
Changes in Gemfile
|
2012-03-19 14:04:28 +08:00 |
unknown
|
a755eb184b
|
fix announcement links & files
|
2012-03-16 16:49:25 +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
|
7f05f21930
|
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
config/environments/development.rb
|
2012-03-01 10:13:49 +08:00 |
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +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
|
7f9a7edc98
|
Changes in bulletins widget and front-end, add categories to link
|
2012-02-28 04:24:09 +08:00 |
|
Christophe Vilayphiou
|
f13ebc6c46
|
Fix bugs and changes for nccu
|
2012-02-27 18:50:56 +08:00 |
|
Matt Fu
|
3209f9aa27
|
Complete for 229 check.
|
2012-02-24 19:07:47 +08:00 |
|
Christophe Vilayphiou
|
f8d1d7242d
|
Merge branch 'design_team' into dashboard
|
2012-02-23 16:05:33 +08:00 |
|
Christophe Vilayphiou
|
1a6e497b3d
|
Ika's changes
|
2012-02-23 15:53:15 +08:00 |
|
Matt Fu
|
678f1eabef
|
LDAP connection and modified Devise
|
2012-02-22 14:43:24 +08:00 |
|
Christophe Vilayphiou
|
c304819d6b
|
Commented out code for Windows
|
2012-02-20 08:55:21 +08:00 |
|
Christophe Vilayphiou
|
cf038183b9
|
Ika's changes in modules
|
2012-02-20 08:48:27 +08:00 |
|
Christophe Vilayphiou
|
6b551defce
|
Remove therubyracer, it's already a dependency of execjs
|
2012-02-15 10:07:41 +08:00 |
|
Christophe Vilayphiou
|
1913f0aca8
|
Add tinymce
|
2012-02-15 10:02:05 +08:00 |
|
Christophe Vilayphiou
|
a0f58b543b
|
Remove ckeditor
|
2012-02-15 01:05:24 +08:00 |
|
Christophe Vilayphiou
|
c3e57f8bde
|
Put back therubyracer
|
2012-02-13 17:22:13 +08:00 |
|
unknown
|
964d7b6054
|
announcement path error
|
2012-02-13 17:09:37 +08:00 |
|
Christophe Vilayphiou
|
c6048ada82
|
Include therubyracer in Gemfile
|
2012-02-13 17:09:37 +08:00 |
|
Christophe Vilayphiou
|
b8243df5b5
|
Update gems but stay on rails 3.1 for now
|
2012-01-24 13:07:40 +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 |
|
Christophe Vilayphiou
|
3e912b6262
|
Merge branches 'master' and 'exception_notification' into new_announcement_dev
|
2012-01-16 07:57:40 +08:00 |
|
Christophe Vilayphiou
|
a55a93cb3b
|
Add exception notification in development env
|
2012-01-13 15:49:07 +08:00 |
|
unknown
|
ec235bcaa3
|
merge with master
|
2012-01-11 20:31:52 +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 |
|
Christophe Vilayphiou
|
c0fbb999e7
|
Modification of Gemfile for linux
|
2011-12-05 19:19:05 +08:00 |
Matthew Fu
|
84ebc8306b
|
APP zip package placed in lib now can be unzip into vendor
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
|
2011-11-16 15:21:31 +08:00 |
|
Matthew Kaito Juyuan Fu
|
cb07a35cc9
|
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
|
2011-10-20 10:06:06 +08:00 |
|
Matthew Kaito Juyuan Fu
|
ff82391b7d
|
Revert "Merge with new_blog"
This reverts commit 64c68fcdeb.
|
2011-10-20 10:01:39 +08:00 |
|
chris2tof
|
64c68fcdeb
|
Merge with new_blog
|
2011-10-18 11:36:01 +08:00 |
|
chris2tof
|
2e86d8081f
|
Modifications for images in html code
|
2011-10-18 11:21:24 +08:00 |
|
chris2tof
|
1d214bedec
|
Revert "Revert "Clean code and add 'name' in theme.rb""
This reverts commit 00813c9060.
|
2011-08-24 02:06:27 +08:00 |
|
chris2tof
|
00813c9060
|
Revert "Clean code and add 'name' in theme.rb"
This reverts commit 608180646b.
|
2011-08-24 02:04:54 +08:00 |
|
chris2tof
|
608180646b
|
Clean code and add 'name' in theme.rb
|
2011-08-24 01:39:28 +08:00 |
|
chris2tof
|
090b1fdd7f
|
rails 3.1.rc4 -> rails 3.1.rc6
|
2011-08-23 19:04:45 +08:00 |
|
chris2tof
|
86443661e9
|
Merge server and rails_3_1
|
2011-08-18 13:43:33 +08:00 |
|
Kaito
|
e0811c14db
|
adding upload package for design. bugs in
|
2011-08-11 18:20:16 +08:00 |
|
Kaito
|
c8d58e30aa
|
make design work with layout and testing with package andreas05 within r tag
|
2011-08-01 18:17:28 +08:00 |
|
Kaito
|
b6db304579
|
add nokogiri into Gemfile and fixing dup bug again...
|
2011-07-29 17:49:10 +08:00 |
|
Matthew Fu
|
f387139ae1
|
rails 3.1 and designs (with bug)
|
2011-07-12 16:00:57 +08:00 |
unknown
|
7215b56f7e
|
changes for windows
|
2011-06-14 15:04:37 +08:00 |
|
chris2tof
|
2522cde2f5
|
Edition of page part for multiple languages.
|
2011-05-27 11:27:54 +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
|
d88cae437d
|
update gem bson_ext and devise initializer
|
2011-04-14 13:40:16 +08:00 |
ihower
|
99d83279f5
|
Update gems and install rspec
|
2011-04-13 19:02:18 +08:00 |