Christophe Vilayphiou
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +08:00 |
Matthew K. Fu JuYuan
|
7af17f19ac
|
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
|
2012-05-08 20:26:36 +08:00 |
|
Matthew K. Fu JuYuan
|
f3b58ea36d
|
starting Resque
|
2012-05-08 20:24:37 +08:00 |
|
Matthew K. Fu JuYuan
|
f949523bbb
|
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
|
2012-05-08 20:21:28 +08:00 |
|
Matthew K. Fu JuYuan
|
c28d7d59b6
|
starting Resque
|
2012-05-08 20:21:28 +08:00 |
|
Christophe Vilayphiou
|
09910ca4ae
|
Rmove therubyraces from Gemfile.lock
|
2012-04-23 14:12:18 +08:00 |
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +08:00 |
|
Christophe Vilayphiou
|
f5fd3dec7a
|
Trying nokogiri
|
2012-03-27 18:42:22 +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 |
|
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +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 |
|
Christophe Vilayphiou
|
dcc64a20d2
|
Finish sorting for announcements
|
2012-02-24 15:30:49 +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 |
|
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
|
1f7dae9bee
|
Gemfile and bugs in js for orbit-bar
|
2012-02-15 00:34:22 +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 |
|
chris2tof
|
227ca0d43a
|
Update gems
|
2011-12-05 16:29:22 +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
|
a571d1dcff
|
Clean code and workaround mongoid embedded with carrierwave
|
2011-09-08 18:12:04 +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
|
706ec745c3
|
modified V,C,M related with layout and have bug between layout and design
|
2011-08-08 09:30:44 +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 |