1b876d4305
for user new interface, member role is working.
2012-10-24 14:46:25 +08:00
13ae2602cd
member for THU
2012-10-18 18:36:21 +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
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
a4c94c4404
demo site plugin
2012-10-08 16:20:21 +08:00
e44495ac9b
week view updates
2012-09-27 13:44:22 +08:00
16c51a77a7
change in algo of event generation plus now multi week events enabled
2012-09-24 21:26:15 +08:00
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
5de433d219
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-09-18 16:22:56 +08:00
84205379c1
GPRS and CALENDAR
2012-09-17 21:37:05 +08:00
43ecebf934
Merge branch 'new' of github.com:Rulingcom/orbit into new
2012-09-17 14:31:42 +08:00
2c55430c52
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-09-17 14:20:07 +08:00
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
6a174d57a6
fix setting menu
2012-09-17 14:17:06 +08:00
4c7906898e
add member link to orbit menu
2012-09-17 14:12:01 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
6b6d8ac967
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-09-17 13:32:11 +08:00
c5743a50bb
event bug fixed
2012-09-17 13:28:11 +08:00
8e014bf59c
basic function
2012-09-17 12:06:21 +08:00
Matthew K. Fu JuYuan
chris
OrbitServer
Harry Bomrah
unknown