chris
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan
0a1a9d2c2e
member for THU
2012-10-26 11:19:56 +08:00
chris
579c7b5e81
Add missing helper
2012-10-26 11:19:56 +08:00
chris
68bc4c1874
Fix page_part creation when design is changed
2012-10-26 11:19:56 +08:00
chris
cbfa659928
Changes for side_bar
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
c305a2f687
add i18n variables
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
f4f07c7206
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-26 11:19:56 +08:00
Matthew K. Fu JuYuan
9c16da4f46
fixed html for add link. form html
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
03b608593d
can add member
2012-10-26 11:19:56 +08:00
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
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
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
189fa553c5
Changes for helpers, not including all by default
2012-10-09 14:47:16 +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
unknown
a4c94c4404
demo site plugin
2012-10-08 16:20:21 +08:00
Harry Bomrah
e44495ac9b
week view updates
2012-09-27 13:44:22 +08:00
Harry Bomrah
16c51a77a7
change in algo of event generation plus now multi week events enabled
2012-09-24 21:26:15 +08:00
Matthew K. Fu JuYuan
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
unknown
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
Matthew K. Fu JuYuan
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
Matthew K. Fu JuYuan
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
Matthew K. Fu JuYuan
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
Harry Bomrah
84205379c1
GPRS and CALENDAR
2012-09-17 21:37:05 +08:00