devin
0d5ab20efa
add browser compatibility page
2013-04-17 11:07:45 +08:00
Fu Matthew
9815950083
now default options can be chosen by developer at init
2013-04-17 11:07:45 +08:00
Harry Bomrah
b8ee2fd559
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 11:07:20 +08:00
Fu Matthew
69a49a69aa
style for front end
2013-04-17 11:05:57 +08:00
Harry Bomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
Fu Matthew
8e98cb3ec9
put add admin pages using orbit back end controller
2013-04-17 10:54:38 +08:00
chris
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
chris
73e9a60212
Pagination or more link for default widget
2013-03-07 21:21:48 +08:00
Spen
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
chris
27686a5d04
Merge branch 'development' into desktop
2013-03-05 19:07:58 +08:00
Rueshyna
a9bf400fac
Merge branch 'desktop_work_devin' into desktop
...
* desktop_work_devin:
tinyscrollbar minor update
desktop CSS update
tinyscrollbar minor update
desktop CSS update
Conflicts:
app/views/desktop/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
2013-03-05 18:48:12 +08:00
Rueshyna
d5f1d13670
Merge remote-tracking branch 'origin/desktop_work' into desktop
...
* origin/desktop_work:
simple layout tinyscrollbar fixed
highlighting fixed…
fixed adding.
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 17:34:28 +08:00
Rueshyna
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
devin
db2b371744
tinyscrollbar minor update
2013-03-05 17:22:53 +08:00
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
Harry Bomrah
dc92ef9f42
simple layout tinyscrollbar fixed
2013-03-05 11:04:18 +08:00
devin
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
Fu Matthew
15b9839b76
fix archive category
...
fix page adding failed
2013-03-04 14:40:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
Fu Matthew
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
Fu Matthew
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
Fu Matthew
8a8bfcb8fb
fix default widget link
2013-02-27 10:50:47 +08:00
Fu Matthew
d7699e1a46
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-27 10:49:51 +08:00
Fu Matthew
0e6599e9b9
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-27 10:49:51 +08:00
Fu Matthew
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00
Rueshyna
fb931b0a4a
Merge remote-tracking branch 'origin/desktop' into desktop
...
* origin/desktop:
Remove Gemfile.lock
sort conference and type
add conferene list order function
css minor changes.
gridster, url code fixed, views removed.
Fix selection of sub_menu for widget (the value wasn't set)
Fix bug in widget selection
css minor changes.
Fix public_r_tag selection
gridster, url code fixed, views removed.
2013-02-26 17:02:01 +08:00
Rueshyna
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
chris
3572856486
Fix selection of sub_menu for widget (the value wasn't set)
2013-02-25 10:35:59 +08:00
chris
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
unknown
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
Rueshyna
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
chris
39c6660c67
Remove useless code not removed in merge
...
Fix argument bug in link_to_field
2013-02-19 20:42:46 +08:00
chris
6d1f919bb7
Fix links in default widget
2013-02-19 18:09:50 +08:00
chris
6324233f58
Fix breadcrumb again
2013-02-19 17:50:46 +08:00
chris
a9fecec985
Add pagination to default widget for front end page
2013-02-19 17:41:01 +08:00
chris
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
chris
1f11293fbe
Fix sitemap in page edit
2013-02-19 17:39:43 +08:00
chris
2a293734c7
Change breadcrumb html
2013-02-19 17:39:42 +08:00
Rueshyna
bca4478f68
front_end widget breadcrumb done
2013-02-19 17:24:23 +08:00
Rueshyna
2a61470f8b
back_end widget breadcrumb finish
2013-02-19 17:24:19 +08:00
Fu Matthew
572e512a1d
fix link for default widget
2013-02-19 14:21:54 +08:00
Fu Matthew
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
Fu Matthew
b7d797f9dd
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-19 14:21:54 +08:00
chris
9771d42587
migrate for app config. fix panel style intro misplace
2013-02-04 18:10:39 +08:00
chris
981854870a
Changes for mobile copyright
2013-02-04 18:02:11 +08:00
chris
6eb5061237
Changes for mobile map
2013-02-04 18:02:11 +08:00
chris
b1a11b4dad
Remove isotope
2013-02-04 18:01:42 +08:00
Rueshyna
8f334f6948
modularize conference
2013-02-04 18:01:42 +08:00
Rueshyna
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
Rueshyna
b2bc62dadd
fixed orbit bar that like nccu bar now, and add rails version in Gemfile
2013-02-04 18:01:03 +08:00
unknown
0b18cf48e3
member roles edit
2013-02-04 18:01:03 +08:00
unknown
18a51f070e
member roles edit
2013-02-04 18:01:03 +08:00
chris
87a89f81ce
Fix bug for mobile app routes
2013-02-04 18:01:03 +08:00
Fu Matthew
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
Fu Matthew
bfaa22052f
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
2013-01-24 16:30:02 +08:00
Fu Matthew
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
Fu Matthew
0cc616f988
page can use default widget
2013-01-21 16:56:37 +08:00
Fu Matthew
9630d0a841
Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface
2013-01-16 14:09:05 +08:00
Fu Matthew
9edf0dca54
ika re-redesign module widget
2013-01-16 14:07:09 +08:00
Rueshyna
c44b4163e4
gprs byebye, location have two language, must have picture, long, lang have limit
2013-01-16 01:35:38 +08:00
Fu Matthew
91afad23ba
Merge branch 'new_widget_setting_interface'
2013-01-15 12:03:56 +08:00
Fu Matthew
ba75c02622
fix wrong behavior of new interface when a new page is newed
2013-01-15 12:02:13 +08:00
Fu Matthew
e1e003af6e
Complete new interface
2013-01-14 19:18:25 +08:00
Fu Matthew
16cfd27fe9
apply view
2013-01-14 19:18:25 +08:00
unknown
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
Fu Matthew
46b1d55ff6
Complete new interface
2013-01-14 18:49:23 +08:00
Rueshyna
1b6bfdb80f
modularize personal journal and pull relational setting in desktop/index.rb
2013-01-14 17:54:52 +08:00
Rueshyna
bf31d0c3dd
modularized personal journal
2013-01-14 17:54:52 +08:00
Rueshyna
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
chris
282604d1fa
Merge branch 'back' of github.com:Rulingcom/orbit into back
...
Conflicts:
app/assets/javascripts/mobile/orbit.mobile.js.erb
app/assets/stylesheets/mobile.css
app/assets/stylesheets/mobile/orbit-mobile.css.erb
app/controllers/application_controller.rb
app/controllers/mobile_controller.rb
app/views/layouts/mobile.mobile.erb
app/views/mobile/_footer.mobile.erb
app/views/mobile/_header.mobile.erb
app/views/mobile/_menu.mobile.erb
app/views/mobile/index.mobile.erb
config/routes.rb
2013-01-14 17:46:27 +08:00
chris
141eb7e723
Add mobile but remove news in it
2013-01-14 17:38:44 +08:00
chris
54d098baf2
Change translation
2013-01-14 17:02:51 +08:00
unknown
84e4a558be
member roles edit
2013-01-14 17:02:51 +08:00
chris
4e2cbac027
Remove bottom padding if no footer in mobile
...
Add a method in routes
Copy mobile routes under the scope 'app' for app usage
2013-01-11 19:14:48 +08:00
chris
91d1487a04
Fix mobile banner, icons, announcement css
2013-01-11 18:34:20 +08:00
chris
d00192f018
Fix for mobile icon and iphone5 fullscreen
2013-01-11 17:00:09 +08:00
chris
de39bce4ce
Fix the tooltips
2013-01-11 12:13:16 +08:00
chris
a7d1cdbb75
Fix for link in ad banner
2013-01-11 11:28:13 +08:00
Fu Matthew
ca51ebc08c
apply view
2013-01-10 18:00:58 +08:00
Rueshyna
08adb887c5
change *default* to *defulat*
2013-01-10 09:40:52 +08:00
chris
02e5e52159
Translation typo
...
Remove test values in ad_image form
Remove NeedReset
2013-01-09 21:17:50 +08:00
chris
b49251afee
Date picker separated: reset time when reset date
2013-01-09 21:17:50 +08:00
chris
1d405c3ffe
Add "tag" icon to orbit bar
2013-01-09 21:17:50 +08:00
chris
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
Fu Matthew
d0f474c2ab
fix wrong i18n
2013-01-09 17:13:25 +08:00
Fu Matthew
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
chris
1d80b39dcb
Fix no responding when trying to access front end page
2013-01-09 11:23:18 +08:00
chris
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
Fu Matthew
76296ab29b
Merge branch 'sidebar_config' into ntu
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
Fu Matthew
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
Rueshyna
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
Rueshyna
35e0011111
Merge remote-tracking branch 'remotes/origin/publication' into desktop
...
* remotes/origin/publication:
new desktop framework updates
2013-01-07 12:44:30 +08:00
chris
6c6bda988d
Add mobile version in site settings
2013-01-07 03:57:36 +08:00
chris
37740adb24
Add mobile but remove news in it
2013-01-07 03:03:38 +08:00
chris
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
chris
be00cec4d7
Fix link for ad_banner
...
Add missing helper for web_link_category
Show design's js in front-end
2013-01-07 00:36:48 +08:00
chris
736bda0679
Add link to default widget (temporary)
2013-01-04 12:33:37 +08:00
Rueshyna
3e8b029c5f
change bulletin object to bulletin title
2013-01-04 10:50:08 +08:00
Fu Matthew
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00