Commit Graph

680 Commits

Author SHA1 Message Date
Harry Bomrah 5da35ee65b Agenda View 2012-10-29 19:52:34 +08:00
Harry Bomrah b73981b19a Devin commit 2012-10-29 10:17:49 +08:00
devin 12b7618cc7 calendar agenda view update 2012-10-27 00:11:26 +08:00
Harry Bomrah 5e25cf5849 lot of updates 2012-10-26 19:04:51 +08:00
chris 579c7b5e81 Add missing helper 2012-10-26 11:19:56 +08:00
chris cbfa659928 Changes for side_bar 2012-10-26 11:19:56 +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
OrbitServer 9e2bc7e1c1 Ray's changes in css and js 2012-10-09 07:48:05 +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
unknown a4c94c4404 demo site plugin 2012-10-08 16:20:21 +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
unknown 9eed9ec7b6 demo site plugin 2012-09-17 13:32:52 +08:00
Harry Bomrah c5743a50bb event bug fixed 2012-09-17 13:28: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 3d9fb548e1 calendar fixed 2012-09-14 15:20:01 +08:00
devin 17768867a5 calendar update
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
2012-09-14 00:27:35 +08:00
unknown 42d50ae534 Plugins 2012-09-14 00:05:31 +08:00
Harry Bomrah 73d5074037 minor shit updates 2012-09-13 23:57:48 +08:00
Harry Bomrah 29ea95b4c6 event_calendar testing 2012-09-13 23:57:47 +08:00
Matthew K. Fu JuYuan f009a1c942 startup for config 2012-09-13 18:31:44 +08:00
devin 3e3699c873 calendar update 2012-09-13 18:06:18 +08:00
Christophe Vilayphiou 90ae361dc3 Class change for filter button 2012-09-13 17:37:17 +08:00
Christophe Vilayphiou 2e9af5d1a8 fix commit bugs 2012-09-13 15:53:36 +08:00
Christophe Vilayphiou 45ccc315c7 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-09-12 17:53:47 +08:00