Harry Bomrah
|
f4eb95881f
|
Calendar updates for day view
|
2012-10-24 18:55:06 +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 |
|
Christophe Vilayphiou
|
4dff15cffb
|
Add before_filter in gallery
|
2012-09-12 17:52:24 +08:00 |
|
Harry Bomrah
|
5443aba43e
|
with gallery json
|
2012-09-12 16:50:59 +08:00 |
|
Harry Bomrah
|
f88176ee1f
|
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
|
2012-09-12 16:48:33 +08:00 |
|
Christophe Vilayphiou
|
46177000e0
|
Merge branch 'visitor_dsahbroad' of github.com:Rulingcom/orbit into visitor_dsahbroad
Conflicts:
Gemfile.lock
app/controllers/application_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
|
2012-09-12 16:32:40 +08:00 |
|
Matthew K. Fu JuYuan
|
98e8f5f607
|
complete visitor dashbroad
|
2012-09-12 16:20:15 +08:00 |
|
Matthew K. Fu JuYuan
|
45ef7fd302
|
guest user
|
2012-09-12 16:20:15 +08:00 |
|
Harry Bomrah
|
17f3104c8d
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-09-12 16:18:13 +08:00 |
|
devin
|
e96ebefe9c
|
calendar update
|
2012-09-12 16:16:01 +08:00 |
|
Harry Bomrah
|
4ea0c0ec9c
|
minor fix for sidebar
|
2012-09-12 02:14:50 +08:00 |
|
Harry Bomrah
|
8a71bd530f
|
page added...
|
2012-09-12 02:14:50 +08:00 |
|
Harry Bomrah
|
8dd69a140f
|
frontend commits
|
2012-09-12 02:12:15 +08:00 |
|
Harry Bomrah
|
3749e919cb
|
front ends updates
|
2012-09-12 02:12:15 +08:00 |
|
Harry Bomrah
|
a42a651f90
|
frontend updates
|
2012-09-12 02:08:02 +08:00 |
|
Harry Bomrah
|
199839a42a
|
frontend update
|
2012-09-12 02:08:02 +08:00 |
|
Harry Bomrah
|
3fc07b9ff1
|
one more modification
|
2012-09-12 02:07:40 +08:00 |