b3a9a7ab07
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-10-16 14:24:01 +08:00
6dfe10040b
fix object auth without app_auth
2012-10-16 14:23:44 +08:00
cc6c8dab2a
Fix page_part creation when design is changed
2012-10-16 14:17:12 +08:00
afff128e9c
Fix page_part creation when design is changed
2012-10-16 14:15:33 +08:00
f7f0b48707
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/initializers/resque.rb
2012-10-16 14:14:56 +08:00
0babd5f302
Changes for side_bar
2012-10-15 15:30:48 +08:00
a50553219e
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 15:28:24 +08:00
e6e547e456
add i18n variables
2012-10-15 15:15:19 +08:00
fe183c316f
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:46:13 +08:00
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
5913f73850
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:09:58 +08:00
31b583228d
fixed html for add link. form html
2012-10-15 14:07:53 +08:00
334e5b464c
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 13:56:16 +08:00
7901de7b31
can add member
2012-10-15 13:54:29 +08:00
c511600cad
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 12:35:27 +08:00
9027562450
new code for attribute fields and values for new member interface
2012-10-15 12:35:07 +08:00
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
1ce7f00084
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
189fa553c5
Changes for helpers, not including all by default
2012-10-09 14:47:16 +08:00
d027cf8e6a
add new data from NCCU
2012-10-09 14:40:28 +08:00
a0103d55c4
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
2012-10-09 07:48:17 +08:00
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
05f4555c66
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
2012-10-09 07:47:00 +08:00
483bd7de4a
Ray's changes in css and js
2012-10-09 07:44:26 +08:00
79e4cef425
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-10-09 06:42:12 +08:00
f76253f512
Week View changes
2012-10-09 06:42:00 +08:00
bb626470e7
week view updates
2012-10-09 06:42:00 +08:00
022d28e5e7
change in algo of event generation plus now multi week events enabled
2012-10-09 06:42:00 +08:00
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
c2c3774cf9
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-09 06:40:59 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
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
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
59f97f3fef
Week View changes
2012-10-08 16:47:56 +08:00
89b1aace8a
fix for rescue job failed on 171
2012-10-08 16:42:49 +08:00
a4c94c4404
demo site plugin
2012-10-08 16:20:21 +08:00
0663e43be7
fix for web_resource tool bar
2012-10-08 16:02:33 +08:00
cf68022d4f
fix resque server stop
2012-10-08 11:26:24 +08:00
4a5fc47c0a
NCCU maintenance rake task
2012-10-08 10:35:11 +08:00
67bd68d492
harry's js fix
2012-10-08 10:11:45 +08:00
e67ca84282
object_auth change to reload
2012-10-04 18:20:21 +08:00
ae48ab5cbd
clean commit
2012-10-04 15:53:42 +08:00
962bae9a82
merge
2012-10-01 21:09:09 +08:00
b0cdcbecca
fix preview bug only happen when production
2012-10-01 21:05:16 +08:00
7919750d4f
171 doesn't have bug with javascript remove log script
2012-10-01 19:05:23 +08:00
3dc4dc2316
debug commit
2012-10-01 17:56:55 +08:00
506fa179a1
fix announcement
2012-10-01 17:48:51 +08:00
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
edcef5a8f7
make manager's news and announcement can be shown at once it be submitted.
2012-10-01 16:11:58 +08:00
5ac04ea07d
devin's css for tinymce
2012-09-28 09:58:28 +08:00
Matthew K. Fu JuYuan
chris
OrbitServer
Harry Bomrah
unknown
Matt