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 |
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 |
|
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 |
|
Christophe Vilayphiou
|
f2a6739fa8
|
Merge branch 'new' of github.com:Rulingcom/orbit into new
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-09-14 00:06:43 +08:00 |
|
unknown
|
42d50ae534
|
Plugins
|
2012-09-14 00:05:31 +08:00 |
|
Christophe Vilayphiou
|
03b5827392
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/_side_bar.html.erb
|
2012-09-14 00:03:52 +08:00 |
|
Matthew K. Fu JuYuan
|
df6c7afd68
|
add data_migration for rename field for attribute_field. not yet tested
|
2012-09-14 00:02:22 +08:00 |
|
Matthew K. Fu JuYuan
|
5fb94f644d
|
break down Ray's HTML
|
2012-09-14 00:02:22 +08:00 |
|
Matthew K. Fu JuYuan
|
3e5978c8fd
|
users new interface controller
|
2012-09-14 00:02:21 +08:00 |
|
Matthew K. Fu JuYuan
|
4818e3f444
|
first version for new member html
|
2012-09-14 00:02:21 +08:00 |
|
Christophe Vilayphiou
|
969d8c8e57
|
Merge branch 'cal_test' of github.com:Rulingcom/orbit into cal_test
Conflicts:
.gitignore
vendor/built_in_modules/calendar/app/views/panel/orbitcalendar/back_end/calendar_categories/index.html.erb
vendor/built_in_modules/calendar/app/views/panel/orbitcalendar/back_end/cals/index.html.erb
|
2012-09-14 00:00:37 +08:00 |
|
Harry Bomrah
|
c21e204697
|
again minor shit update
|
2012-09-13 23:58:32 +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 |
|
Harry Bomrah
|
0f265e1534
|
again minor shit update
|
2012-09-13 19:02:48 +08:00 |
|
Harry Bomrah
|
bedde860a4
|
minor shit updates
|
2012-09-13 19:02:08 +08:00 |
|
Matthew K. Fu JuYuan
|
669220530d
|
add data_migration for rename field for attribute_field. not yet tested
|
2012-09-13 18:50:46 +08:00 |
|
Matthew K. Fu JuYuan
|
9bfd1d2b0c
|
break down Ray's HTML
|
2012-09-13 18:39:27 +08:00 |
|
unknown
|
5c8039e38d
|
Plugins
|
2012-09-13 18:13:34 +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 |
|
Harry Bomrah
|
1917ce5cf5
|
Manager fix and bundle update
|
2012-09-12 18:08:49 +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 |