Matthew K. Fu JuYuan
|
0a56c555bb
|
new code for attribute fields and values for new member interface
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
8b9cffd4f2
|
new code for attribute fields and values for new member interface
|
2012-10-26 11:19:55 +08:00 |
chris
|
293dc80ceb
|
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
|
2012-10-26 11:15:51 +08:00 |
Harry Bomrah
|
a5722af315
|
Calendar updates for day view
|
2012-10-26 11:15:37 +08:00 |
devin
|
8c6e5deb64
|
gallery update
please don't forget to add translation in other language
|
2012-10-26 11:15:37 +08:00 |
|
Harry Bomrah
|
79e0b8e383
|
week view updates
|
2012-10-26 11:15:37 +08:00 |
|
devin
|
98ef582e17
|
shit calendar update
|
2012-10-26 11:15:37 +08:00 |
|
Harry Bomrah
|
c29955d9e3
|
external commit
|
2012-10-26 11:15:37 +08:00 |
|
Harry Bomrah
|
d7e8663c1d
|
calendar updated for week
|
2012-10-26 11:15:36 +08:00 |
|
chris
|
6b8255f8f8
|
Remove a folder in wich Chinese characters
|
2012-10-26 11:14:13 +08:00 |
|
Harry Bomrah
|
974849b85a
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-10-24 19:11:12 +08:00 |
|
Harry Bomrah
|
f4eb95881f
|
Calendar updates for day view
|
2012-10-24 18:55:06 +08:00 |
|
chris
|
2b2dd53218
|
Edit uploaded package
|
2012-10-24 18:40:38 +08:00 |
|
Matthew K. Fu JuYuan
|
1b876d4305
|
for user new interface, member role is working.
|
2012-10-24 14:46:25 +08:00 |
|
devin
|
8c63be5c33
|
gallery update
please don't forget to add translation in other language
|
2012-10-24 09:47:09 +08:00 |
|
Harry Bomrah
|
a810312da4
|
week view updates
|
2012-10-18 22:21:13 +08:00 |
|
Christophe Vilayphiou
|
9110c3e716
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-10-18 18:51:14 +08:00 |
|
chris
|
976114cfa9
|
Add missing helper
|
2012-10-18 18:50:46 +08:00 |
|
chris
|
d1797ac8e3
|
Fix page_part creation when design is changed
|
2012-10-18 18:50:46 +08:00 |
|
Matthew K. Fu JuYuan
|
13ae2602cd
|
member for THU
|
2012-10-18 18:36:21 +08:00 |
|
devin
|
47df69f8cf
|
shit calendar update
|
2012-10-17 17:35:30 +08:00 |
|
Harry Bomrah
|
6113b9c46c
|
external commit
|
2012-10-16 21:52:10 +08:00 |
|
Harry Bomrah
|
0971e00511
|
calendar updated for week
|
2012-10-16 21:51:06 +08:00 |
|
chris
|
0d19cd6f10
|
Add missing helper
|
2012-10-16 16:20:22 +08:00 |
|
Matthew K. Fu JuYuan
|
38e6d6c2c8
|
add rake task
|
2012-10-16 15:43:31 +08:00 |
|
Matthew K. Fu JuYuan
|
a50ccdafb2
|
consolidate_object_auth for 171 production
|
2012-10-16 15:08:02 +08:00 |
|
Matthew K. Fu JuYuan
|
b3a9a7ab07
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-10-16 14:24:01 +08:00 |
|
Matthew K. Fu JuYuan
|
6dfe10040b
|
fix object auth without app_auth
|
2012-10-16 14:23:44 +08:00 |
|
chris
|
cc6c8dab2a
|
Fix page_part creation when design is changed
|
2012-10-16 14:17:12 +08:00 |
|
chris
|
afff128e9c
|
Fix page_part creation when design is changed
|
2012-10-16 14:15:33 +08:00 |
|
chris
|
f7f0b48707
|
Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
config/initializers/resque.rb
|
2012-10-16 14:14:56 +08:00 |
|
chris
|
0babd5f302
|
Changes for side_bar
|
2012-10-15 15:30:48 +08:00 |
|
chris
|
a50553219e
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 15:28:24 +08:00 |
|
Matthew K. Fu JuYuan
|
e6e547e456
|
add i18n variables
|
2012-10-15 15:15:19 +08:00 |
|
chris
|
fe183c316f
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 14:46:13 +08:00 |
|
Matthew K. Fu JuYuan
|
84929f9b4c
|
fix sub role attribute fields
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
|
2012-10-15 14:44:48 +08:00 |
|
chris
|
5913f73850
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 14:09:58 +08:00 |
|
Matthew K. Fu JuYuan
|
31b583228d
|
fixed html for add link. form html
|
2012-10-15 14:07:53 +08:00 |
|
chris
|
334e5b464c
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 13:56:16 +08:00 |
|
Matthew K. Fu JuYuan
|
7901de7b31
|
can add member
|
2012-10-15 13:54:29 +08:00 |
|
chris
|
c511600cad
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
|
2012-10-15 12:35:27 +08:00 |
|
Matthew K. Fu JuYuan
|
9027562450
|
new code for attribute fields and values for new member interface
|
2012-10-15 12:35:07 +08:00 |
|
Matthew K. Fu JuYuan
|
b5571dbc43
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
|
2012-10-12 18:17:05 +08:00 |
|
Matthew K. Fu JuYuan
|
1ce7f00084
|
new code for attribute fields and values for new member interface
|
2012-10-12 18:09:02 +08:00 |
|
chris
|
189fa553c5
|
Changes for helpers, not including all by default
|
2012-10-09 14:47:16 +08:00 |
|
Matthew K. Fu JuYuan
|
d027cf8e6a
|
add new data from NCCU
|
2012-10-09 14:40:28 +08:00 |
|
chris
|
a0103d55c4
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-10-09 07:48:17 +08:00 |
OrbitServer
|
9e2bc7e1c1
|
Ray's changes in css and js
|
2012-10-09 07:48:05 +08:00 |
|
OrbitServer
|
05f4555c66
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-10-09 07:47:00 +08:00 |
|
OrbitServer
|
483bd7de4a
|
Ray's changes in css and js
|
2012-10-09 07:44:26 +08:00 |