8b68387199
fix share loading failed
2012-09-19 15:09:08 +08:00
79006201cd
ad_image date picker fixed
2012-09-19 12:23:05 +08:00
6fd2dac4d5
fix ad_banner data picker not working when on 180
2012-09-19 12:15:03 +08:00
d480a10661
fix for object_auth update
2012-09-19 11:12:22 +08:00
959b6aee12
fix for listing object error
2012-09-19 10:45:03 +08:00
1240064e23
add url generate
2012-09-18 17:37:52 +08:00
c813a6143b
fb share for iNCCU
2012-09-18 17:31:51 +08:00
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
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
6da3928626
change for NCCU ask
2012-09-18 15:49:05 +08:00
42c62ebca0
Fix preview for announcement (was retuning js instead of html)
2012-09-18 14:31:50 +08:00
ce47109d33
change link for rss
2012-09-18 12:04:45 +08:00
0ecb4eca46
change for NCCU entry site
2012-09-18 10:54:11 +08:00
84205379c1
GPRS and CALENDAR
2012-09-17 21:37:05 +08:00
43ecebf934
Merge branch 'new' of github.com:Rulingcom/orbit into new
2012-09-17 14:31:42 +08:00
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
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
6a174d57a6
fix setting menu
2012-09-17 14:17:06 +08:00
4c7906898e
add member link to orbit menu
2012-09-17 14:12:01 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
6b6d8ac967
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-09-17 13:32:11 +08:00
c5743a50bb
event bug fixed
2012-09-17 13:28:11 +08:00
8e014bf59c
basic function
2012-09-17 12:06:21 +08:00
823aabd5d3
Merge branches 'gallery_orbit' and 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-09-17 12:01:08 +08:00
5bde2a9e81
demo site plugin
2012-09-17 11:02:11 +08:00
221ffc08dd
Some calendar updates
2012-09-17 04:34:03 +08:00
9491945fd4
calendar month view update
2012-09-16 05:59:20 +08:00
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
0cf2f1b9a1
final commit for calendar
2012-09-14 16:10:40 +08:00
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
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
f1485556bd
calendar update
2012-09-14 15:55:57 +08:00
6b791539f5
final calendar change...
2012-09-14 15:35:12 +08:00
0e507d549d
some more changes
2012-09-14 15:32:15 +08:00
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
7f290adfbb
Fix Gemfile
2012-09-14 03:58:47 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
194773f064
Fix bugs after merge
2012-09-14 02:27:49 +08:00
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
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
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
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
df6c7afd68
add data_migration for rename field for attribute_field. not yet tested
2012-09-14 00:02:22 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
3e5978c8fd
users new interface controller
2012-09-14 00:02:21 +08:00
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
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
c21e204697
again minor shit update
2012-09-13 23:58:32 +08:00
Matthew K. Fu JuYuan
Matt
Christophe Vilayphiou
Harry Bomrah
unknown
devin
OrbitServer