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
chris
79e4cef425
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-10-09 06:42:12 +08:00
Harry Bomrah
f76253f512
Week View changes
2012-10-09 06:42:00 +08:00
Harry Bomrah
bb626470e7
week view updates
2012-10-09 06:42:00 +08:00
Harry Bomrah
022d28e5e7
change in algo of event generation plus now multi week events enabled
2012-10-09 06:42:00 +08:00
Harry Bomrah
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
chris
c2c3774cf9
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-09 06:40:59 +08:00
Matthew K. Fu JuYuan
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan
1aacf5e2ce
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
Harry Bomrah
59f97f3fef
Week View changes
2012-10-08 16:47:56 +08:00
Matthew K. Fu JuYuan
89b1aace8a
fix for rescue job failed on 171
2012-10-08 16:42:49 +08:00
unknown
a4c94c4404
demo site plugin
2012-10-08 16:20:21 +08:00
Matthew K. Fu JuYuan
0663e43be7
fix for web_resource tool bar
2012-10-08 16:02:33 +08:00
Matthew K. Fu JuYuan
cf68022d4f
fix resque server stop
2012-10-08 11:26:24 +08:00
Matthew K. Fu JuYuan
4a5fc47c0a
NCCU maintenance rake task
2012-10-08 10:35:11 +08:00
Matthew K. Fu JuYuan
67bd68d492
harry's js fix
2012-10-08 10:11:45 +08:00
Matthew K. Fu JuYuan
e67ca84282
object_auth change to reload
2012-10-04 18:20:21 +08:00