9186978551
new ui member plugin sort fix and user show avatar fix
2013-09-27 11:04:52 +08:00
622534e5db
Fix user order:
...
- gender color
- add cancel button for input
2013-09-26 20:18:34 +08:00
Harry Bomrah
52c896d8c5
some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.
2013-09-26 20:11:45 +08:00
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
16c26e3273
Fix path of jquery.cycle.all.latest.js
2013-09-26 16:11:08 +08:00
Harry Bomrah
1d0ea6718f
brief added to desktop for all plugins
2013-09-25 18:23:44 +08:00
a067bcd304
Add Brief intro. for all personal plugins
...
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
8456a91968
Fix structure edit
2013-09-14 17:26:16 +08:00
Harry Bomrah
789e02e313
ad_banner banner load fixed for test site
2013-09-13 14:23:44 +08:00
Harry Bomrah
8c98645a69
small bug fix for inserting and delete button.
2013-09-11 14:03:19 +08:00
Harry Bomrah
9e10a3c944
editing for the assets are done with replacable files and description
2013-09-11 14:03:13 +08:00
Harry Bomrah
f920a4f6ba
filemanager and some update for file uploader . added file uploader to kernel
2013-09-11 14:03:06 +08:00
865be29b37
Updated Preference Page
2013-09-09 11:29:46 +08:00
0eeb7db1a8
Updated preference UI
2013-09-09 11:02:58 +08:00
7216676c40
Updated Sidebar and Preferences
2013-09-09 10:18:14 +08:00
fa857cfeea
Default Locale
2013-09-06 18:00:36 +08:00
a3f1b8d54a
Updated Preferences in Site Info
2013-09-06 18:00:30 +08:00
e9d6fa8787
Preference Page
2013-09-06 18:00:28 +08:00
6e032a8757
Add Preference and search engine
2013-09-06 18:00:23 +08:00
1558cfdb4e
Updated Sitebar with Search Engine
2013-09-06 18:00:21 +08:00
9e4686a565
Fixed Site Info completely and added search engine page
2013-09-06 18:00:18 +08:00
fef7cc4ed2
Updated Site info
2013-09-06 18:00:10 +08:00
7f0821ea84
Updated Site info page to new ui
2013-09-06 17:59:56 +08:00
2c0761aafb
Updated Sitemap to New UI
2013-09-06 17:59:54 +08:00
1e5ad750cd
Updated Site bar with correct links
2013-09-06 17:59:43 +08:00
00ddd94314
fix design index
2013-09-03 15:20:48 +08:00
8045a18230
Change modal delete to take an "remote" option
2013-09-03 15:04:05 +08:00
3123c5de0a
new ui member bug and interface fix
2013-09-02 11:22:17 +08:00
e75873273c
Updated Gallery with authorizations
2013-08-22 16:25:11 +08:00
4078d426a6
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
2013-08-21 14:13:36 +08:00
c474fa063f
New authorization
2013-08-21 13:42:29 +08:00
21a7b5da5c
Icons for sidebar
2013-08-19 17:13:36 +08:00
Harry Bomrah
b004121187
minimize bar updated to new style and more flexible.
2013-08-19 12:59:57 +08:00
7dfd5d7e00
Generate Breadcrumb for only for modules where module_apps are clearly defined
2013-08-19 09:39:45 +08:00
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
7c64e8c637
Updated AdBanner index page and Ad Image index page, and edit pages
...
Conflicts:
vendor/built_in_modules/ad_banner/config/locales/en.yml
vendor/built_in_modules/ad_banner/init.rb
2013-08-09 15:22:06 +08:00
e14cb3c74c
Updated adimage home page
2013-08-09 15:22:00 +08:00
a2e9aa2e0b
Updated ADBanner with fixes on index page, ADImage with fixes
...
Conflicts:
app/views/admin/ad_banners/index.html.erb
app/views/admin/ad_images/_form.html.erb
vendor/built_in_modules/ad_banner/init.rb
2013-08-09 15:21:51 +08:00
Harry Bomrah
c2f223b82c
new plugins added for desktop
2013-08-06 17:52:39 +08:00
Harry Bomrah
42615f02ea
new feature in desktop for uploading wallpapers or putting url link
2013-08-02 19:32:41 +08:00
0f3a8414be
Delete duplicate js and css
...
Close the form in search in orbit bar
2013-07-31 17:30:53 +08:00
d632439f80
Add class for Ray's check-box
...
Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation
2013-07-31 00:08:15 +08:00
b1755bdc80
Added Stock Backgrounds, Fixed production issue with desktop css
2013-07-30 18:37:36 +08:00
7e67d389b9
Added new orbit bar to compatibility page
2013-07-30 17:15:57 +08:00
e12b14311e
Updated Desktop with new UI
2013-07-30 16:43:41 +08:00
Harry Bomrah
79c7f8e90f
new orbit bar fixed..
...
Conflicts:
app/assets/javascripts/orbit_js_1.0.1-front-end.js
app/assets/stylesheets/basic/orbit_bar.css.erb
app/assets/stylesheets/orbit_bar_bootstrap.css
app/views/layouts/_left_menu.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_right_menu.html.erb
app/views/layouts/desktop.html.erb
2013-07-30 16:43:35 +08:00
Harry Bomrah
f7dbbf1bca
new themes added to desktop plus theme uploader created
2013-07-30 16:43:32 +08:00
Harry Bomrah
6d89eab98a
desktop final fix
2013-07-30 16:43:28 +08:00
Harry Bomrah
5f9190db39
few updates with fb integration and some other changes in user and supports data to android
...
Conflicts:
vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
2013-07-30 16:43:11 +08:00
ac58b993c2
simple component update
...
minor update
2013-07-30 16:43:09 +08:00
2b12a4775c
Various view update and change #thmbackground tag
2013-07-30 16:43:02 +08:00
Harry Bomrah
ed22a4d303
apps update -- app upload and activation
2013-07-30 16:42:50 +08:00
f2ada14b7a
app manager's view update
2013-07-30 16:42:46 +08:00
9963395b05
'select2' minor update
...
Conflicts:
app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
2013-07-30 16:42:40 +08:00
4ae1fe68cd
app manager view update
2013-07-30 16:42:33 +08:00
Harry Bomrah
2d616ab7a8
solved desktop conflict during cherry pick
2013-07-30 16:42:26 +08:00
874819266d
minor update
2013-07-30 16:42:23 +08:00
3ded19016a
apps setting view
2013-07-30 16:42:20 +08:00
Harry Bomrah
9478bb13e2
search fixed again according to devin requirements
2013-07-30 16:42:14 +08:00
Harry Bomrah
cff77fbee5
new search for app manager and few javascript fixes
2013-07-30 16:42:11 +08:00
Harry Bomrah
b70310c6fe
tiny scrollbar update
2013-07-30 16:41:25 +08:00
4215ed5538
minor update
2013-07-30 16:41:16 +08:00
74b2bbf4b7
Fix link in structure when the item is a link
...
Add internal links creation
2013-07-30 11:49:28 +08:00
c85629d3b3
Fix controller js and css loading error
2013-07-30 11:48:14 +08:00
af98f8efce
Fix orbit bar language change
2013-07-29 19:49:07 +08:00
ff59feb2e7
Fix for structure
2013-07-29 18:46:38 +08:00
f332a3191a
Fiix layout for safari
2013-07-29 17:34:29 +08:00
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +08:00
fe10cc62d9
Fix structure title (page slide)
2013-07-29 14:59:02 +08:00
d434b878a7
Add default delete modal usage:
...
- <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %>
- in default index, just set title, warning, cancel and submit in quick_edit if needed
2013-07-29 14:29:37 +08:00
0be8a74fa8
Fix missing condition in index auth
2013-07-25 17:45:39 +08:00
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +08:00
fe82427baa
Ray's changes for css and js
2013-07-22 16:31:44 +08:00
408bebaa4b
Ray's changes in structure
2013-07-22 14:06:58 +08:00
856898016b
New UI changes(tags, categories, authorisations, module index…)
...
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
e68793afc3
Fix tag delete
2013-06-14 15:23:45 +08:00
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
adc15951bb
questionnaire stuff
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
6b8b749b0f
fix chris tag cloud
2013-06-06 17:18:42 +08:00
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
30824d1620
add search to archive
2013-06-05 18:03:09 +08:00
06fd305bf9
default widget show search
2013-06-05 13:00:21 +08:00
3e0b7d81ae
clean 403 404 500
2013-05-27 16:46:49 +08:00
54a35b30be
fix design index bug when start start from blank DB.
...
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
37aa950028
user action
2013-05-23 11:55:57 +08:00
3e6c2b1ec2
fix member error with blank database
2013-05-14 11:48:13 +08:00
ef2c732d2e
make blank site working better
2013-05-14 11:26:35 +08:00
7d077a92a5
system preference
2013-04-29 15:23:15 +08:00
3e567223e3
fix for Spen's translation and Chris's tag error
2013-04-26 15:37:27 +08:00
79ef86f2c9
member translation fix
2013-04-26 11:26:11 +08:00
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
697944a029
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
2013-04-25 19:59:59 +08:00
b198b1a17b
system preference
2013-04-24 19:21:11 +08:00
62fa589e8a
add msg when user session expired at page admin
2013-04-24 11:58:48 +08:00
5ff7dfbac6
fronted open switch and backend openness
2013-04-23 18:48:18 +08:00
989e5aa974
minor update
2013-04-17 14:29:56 +08:00
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
3de4591413
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-17 14:19:32 +08:00
Harry Bomrah
c6868bf2e0
small fix in select2.js
2013-04-17 14:18:49 +08:00
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
c8aa50ee87
Lots of Update
...
1. CSS to SCSS
2. Journal Paper update
Conflicts:
Gemfile.lock
app/assets/javascripts/orbitdesktop.js
app/assets/stylesheets/desktop/desktop-main.css
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/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-04-17 14:14:23 +08:00
0f6f5aafce
fix for both part and page part settings
...
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
2013-04-17 14:12:52 +08:00
f6b600df59
deliver API
2013-04-17 14:09:01 +08:00
Harry Bomrah
dae3f069ff
app manager changed plus some changes
2013-04-17 11:09:56 +08:00
Harry Bomrah
b1d7d5345e
section page fixed..
2013-04-17 11:08:58 +08:00
0d5ab20efa
add browser compatibility page
2013-04-17 11:07:45 +08:00
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
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
8e98cb3ec9
put add admin pages using orbit back end controller
2013-04-17 10:54:38 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
73e9a60212
Pagination or more link for default widget
2013-03-07 21:21:48 +08:00
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
27686a5d04
Merge branch 'development' into desktop
2013-03-05 19:07:58 +08:00
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
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
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
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
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
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
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
8a8bfcb8fb
fix default widget link
2013-02-27 10:50:47 +08:00
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
0e6599e9b9
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-27 10:49:51 +08:00
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00
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
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
3572856486
Fix selection of sub_menu for widget (the value wasn't set)
2013-02-25 10:35:59 +08:00
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
39c6660c67
Remove useless code not removed in merge
...
Fix argument bug in link_to_field
2013-02-19 20:42:46 +08:00
6d1f919bb7
Fix links in default widget
2013-02-19 18:09:50 +08:00
6324233f58
Fix breadcrumb again
2013-02-19 17:50:46 +08:00
a9fecec985
Add pagination to default widget for front end page
2013-02-19 17:41:01 +08:00
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
1f11293fbe
Fix sitemap in page edit
2013-02-19 17:39:43 +08:00
2a293734c7
Change breadcrumb html
2013-02-19 17:39:42 +08:00
bca4478f68
front_end widget breadcrumb done
2013-02-19 17:24:23 +08:00
2a61470f8b
back_end widget breadcrumb finish
2013-02-19 17:24:19 +08:00
572e512a1d
fix link for default widget
2013-02-19 14:21:54 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
b7d797f9dd
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-19 14:21:54 +08:00
9771d42587
migrate for app config. fix panel style intro misplace
2013-02-04 18:10:39 +08:00
981854870a
Changes for mobile copyright
2013-02-04 18:02:11 +08:00
6eb5061237
Changes for mobile map
2013-02-04 18:02:11 +08:00
b1a11b4dad
Remove isotope
2013-02-04 18:01:42 +08:00
8f334f6948
modularize conference
2013-02-04 18:01:42 +08:00
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
b2bc62dadd
fixed orbit bar that like nccu bar now, and add rails version in Gemfile
2013-02-04 18:01:03 +08:00
0b18cf48e3
member roles edit
2013-02-04 18:01:03 +08:00
18a51f070e
member roles edit
2013-02-04 18:01:03 +08:00
87a89f81ce
Fix bug for mobile app routes
2013-02-04 18:01:03 +08:00
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
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
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
0cc616f988
page can use default widget
2013-01-21 16:56:37 +08:00
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
9edf0dca54
ika re-redesign module widget
2013-01-16 14:07:09 +08:00
c44b4163e4
gprs byebye, location have two language, must have picture, long, lang have limit
2013-01-16 01:35:38 +08:00
91afad23ba
Merge branch 'new_widget_setting_interface'
2013-01-15 12:03:56 +08:00
ba75c02622
fix wrong behavior of new interface when a new page is newed
2013-01-15 12:02:13 +08:00
e1e003af6e
Complete new interface
2013-01-14 19:18:25 +08:00
16cfd27fe9
apply view
2013-01-14 19:18:25 +08:00
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
46b1d55ff6
Complete new interface
2013-01-14 18:49:23 +08:00
1b6bfdb80f
modularize personal journal and pull relational setting in desktop/index.rb
2013-01-14 17:54:52 +08:00
bf31d0c3dd
modularized personal journal
2013-01-14 17:54:52 +08:00
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
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
141eb7e723
Add mobile but remove news in it
2013-01-14 17:38:44 +08:00
54d098baf2
Change translation
2013-01-14 17:02:51 +08:00
84e4a558be
member roles edit
2013-01-14 17:02:51 +08:00
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
91d1487a04
Fix mobile banner, icons, announcement css
2013-01-11 18:34:20 +08:00
d00192f018
Fix for mobile icon and iphone5 fullscreen
2013-01-11 17:00:09 +08:00
de39bce4ce
Fix the tooltips
2013-01-11 12:13:16 +08:00
a7d1cdbb75
Fix for link in ad banner
2013-01-11 11:28:13 +08:00
ca51ebc08c
apply view
2013-01-10 18:00:58 +08:00
08adb887c5
change *default* to *defulat*
2013-01-10 09:40:52 +08:00
02e5e52159
Translation typo
...
Remove test values in ad_image form
Remove NeedReset
2013-01-09 21:17:50 +08:00
b49251afee
Date picker separated: reset time when reset date
2013-01-09 21:17:50 +08:00
1d405c3ffe
Add "tag" icon to orbit bar
2013-01-09 21:17:50 +08:00
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
d0f474c2ab
fix wrong i18n
2013-01-09 17:13:25 +08:00
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
1d80b39dcb
Fix no responding when trying to access front end page
2013-01-09 11:23:18 +08:00
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
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
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
Spen
chris
Harry Bomrah
Manson Wang
saurabhbhatia
Matt K. Fu
devin chen
rulingcom
iCross
Matthew K. Fu JuYuan
devin
Fu Matthew
Rueshyna
unknown