developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,839 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1839 Commits

Author SHA1 Message Date
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
Christophe Vilayphiou 43ecebf934 Merge branch 'new' of github.com:Rulingcom/orbit into new 2012-09-17 14:31:42 +08:00
Christophe Vilayphiou 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
Matthew K. Fu JuYuan 0907324a2f add member link to orbit menu 2012-09-17 14:18:27 +08:00
Matthew K. Fu JuYuan 6a174d57a6 fix setting menu 2012-09-17 14:17:06 +08:00
Matthew K. Fu JuYuan 4c7906898e add member link to orbit menu 2012-09-17 14:12:01 +08:00
Christophe Vilayphiou 228fa0fca3 Remove setting from side bar 2012-09-17 13:40:14 +08:00
Matthew K. Fu JuYuan 19db9d0037 basic function 2012-09-17 13:32:52 +08:00
unknown 9eed9ec7b6 demo site plugin 2012-09-17 13:32:52 +08:00
Christophe Vilayphiou 6b6d8ac967 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-09-17 13:32:11 +08:00
Harry Bomrah c5743a50bb event bug fixed 2012-09-17 13:28:11 +08:00
Matthew K. Fu JuYuan 8e014bf59c basic function 2012-09-17 12:06:21 +08:00
Christophe Vilayphiou 823aabd5d3 Merge branches 'gallery_orbit' and 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-09-17 12:01:08 +08:00
unknown 5bde2a9e81 demo site plugin 2012-09-17 11:02:11 +08:00
Harry Bomrah 221ffc08dd Some calendar updates 2012-09-17 04:34:03 +08:00
Harry Bomrah 9491945fd4 calendar month view update 2012-09-16 05:59:20 +08:00
Harry Bomrah b09b1cf2f5 commit for calendar 2012-09-14 21:59:20 +08:00
Harry Bomrah 0cf2f1b9a1 final commit for calendar 2012-09-14 16:10:40 +08:00
Christophe Vilayphiou 619ae7e260 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 
Conflicts:
	Gemfile.lock
	vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb
 2012-09-14 16:05:04 +08:00
devin af19f11668 calendar update 
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
 2012-09-14 15:57:44 +08:00
devin f1485556bd calendar update 2012-09-14 15:55:57 +08:00
Harry Bomrah 6b791539f5 final calendar change... 2012-09-14 15:35:12 +08:00
Harry Bomrah 0e507d549d some more changes 2012-09-14 15:32:15 +08:00
Harry Bomrah 3d9fb548e1 calendar fixed 2012-09-14 15:20:01 +08:00
Christophe Vilayphiou 7f290adfbb Fix Gemfile 2012-09-14 03:58:47 +08:00
OrbitServer ee51240102 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
Christophe Vilayphiou 194773f064 Fix bugs after merge 2012-09-14 02:27:49 +08:00