Matt K. Fu
|
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 |
Matt K. Fu
|
37aa950028
|
user action
|
2013-05-23 11:55:57 +08:00 |
Matt K. Fu
|
ef2c732d2e
|
make blank site working better
|
2013-05-14 11:26:35 +08:00 |
Matt K. Fu
|
1096db79b6
|
blank site now can be start from rake site:build
|
2013-05-14 10:32:53 +08:00 |
chris
|
127ab3845c
|
Changes for queries
|
2013-05-03 12:12:19 +08:00 |
chris
|
aefd62da2a
|
Add tagged_ids to taggable
|
2013-05-03 12:12:19 +08:00 |
Matt K. Fu
|
3e567223e3
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
Matthew K. Fu JuYuan
|
d047a3d62a
|
chris tags update
|
2013-04-26 11:26:10 +08:00 |
Spen
|
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 |
Matt K. Fu
|
a0478f2a8f
|
fix page name repeated error when page creating
|
2013-04-25 12:19:25 +08:00 |
Matt K. Fu
|
b198b1a17b
|
system preference
|
2013-04-24 19:21:11 +08:00 |
Matt K. Fu
|
5ff7dfbac6
|
fronted open switch and backend openness
|
2013-04-23 18:48:18 +08:00 |
Matt K. Fu
|
3098496083
|
widget link followed by setting
|
2013-04-17 14:19:32 +08:00 |
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-17 14:16:24 +08:00 |
Harry Bomrah
|
bc0477a5ed
|
widget and gridster fixes
|
2013-04-17 14:16:24 +08:00 |
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
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 |
Matt K. Fu
|
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 |
Fu Matthew
|
f6b600df59
|
deliver API
|
2013-04-17 14:09:01 +08:00 |
chris
|
6af375efa4
|
Fix bug in setup_app_frontend_and_style
|
2013-04-17 14:09:00 +08:00 |
Fu Matthew
|
1709773b0a
|
style for front end
|
2013-04-17 14:08:01 +08:00 |
Fu Matthew
|
6efef253a6
|
add conditions for making multi cates and tags more stable
|
2013-04-17 11:08:57 +08:00 |
Harry Bomrah
|
b8ee2fd559
|
compatibility page added and tinyscrollbar drag event fixed..
|
2013-04-17 11:07:20 +08:00 |
Fu Matthew
|
4a08a1992b
|
1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
|
2013-04-17 10:56:15 +08:00 |
Fu Matthew
|
8e98cb3ec9
|
put add admin pages using orbit back end controller
|
2013-04-17 10:54:38 +08:00 |
chris
|
3e96cfe514
|
Changes for FAQ to work with not latest but stable code
|
2013-03-28 15:05:52 +08:00 |
chris
|
da8a5123c2
|
Change in announcement init for query
Change in default widget query
|
2013-03-27 16:31:42 +08:00 |
chris
|
d01968dcd0
|
Changes in query for default widget
|
2013-03-21 02:29:56 +08:00 |
chris
|
617ebfd43a
|
Revert "Fix query for top in bulletin"
This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f.
|
2013-03-19 23:44:02 +08:00 |
chris
|
b55988af33
|
Fix query for top in bulletin
|
2013-03-19 23:44:02 +08:00 |
chris
|
9684189258
|
Fix query for date in bulletin
|
2013-03-19 23:43:59 +08:00 |
chris
|
8374bc8d12
|
Set I18n from browser
|
2013-03-19 23:43:31 +08:00 |
chris
|
9cf8c2b72b
|
Revert "Page front end stay in the same page when a link is clicked (category)"
This reverts commit 14d856b4d6 .
|
2013-03-19 20:00:16 +08:00 |
chris
|
14d856b4d6
|
Page front end stay in the same page when a link is clicked (category)
|
2013-03-19 19:44:04 +08:00 |
chris
|
37a38369e7
|
Fix typo in default widget not showing objects in front end
|
2013-03-19 18:41:03 +08:00 |
chris
|
ff30b3d05e
|
Fix link not showing for default front end
|
2013-03-19 18:23:35 +08:00 |
chris
|
f3c809fd58
|
Fix link switch not showing for default front end
|
2013-03-19 17:49:46 +08:00 |
chris
|
5e4e3ac560
|
Fix link for default widget
Convert single id to array to find item
|
2013-03-19 17:14:01 +08:00 |
chris
|
7dcea95dd4
|
Fix query for multi categories and tags (empty array)
|
2013-03-19 15:10:31 +08:00 |
chris
|
ef2a32be4c
|
Fix query for multi categories and tags
|
2013-03-18 22:01:08 +08:00 |
chris
|
157935e7eb
|
Page front end stay in the same page when a link is clicked (title or pagination)
|
2013-03-18 21:54:06 +08:00 |
chris
|
e208e99a73
|
Fix page part update when no tag or category
|
2013-03-13 15:45:30 +08:00 |
Spen
|
d7d480ac12
|
archive edit & plugins edit
|
2013-03-07 21:12:31 +08:00 |
chris
|
147b7b9292
|
Fix update when no tag or category
|
2013-03-07 17:30:49 +08:00 |
Fu Matthew
|
dc3966be81
|
fix cates and tags
|
2013-03-05 18:34:41 +08:00 |
Fu Matthew
|
626b2a7bca
|
fix default failed when cate or tags set to empty
|
2013-03-05 11:48:20 +08:00 |
Fu Matthew
|
285119a5f3
|
fix for multi select cates and tags
|
2013-03-04 19:29:45 +08:00 |
chris
|
ca946fc881
|
Merge branch 'development' of github.com:Rulingcom/orbit into development
Conflicts:
lib/tasks/migrate.rake
|
2013-02-27 11:03:52 +08:00 |
Fu Matthew
|
0dabd5b95f
|
fix widget field reload
|
2013-02-27 10:51:41 +08:00 |
Fu Matthew
|
8a8bfcb8fb
|
fix default widget link
|
2013-02-27 10:50:47 +08:00 |
Fu Matthew
|
99e67c8719
|
first version of multi categories and tags
|
2013-02-27 10:49:48 +08:00 |
Fu Matthew
|
5f832a17d4
|
fix widget field reload
|
2013-02-25 12:49:06 +08:00 |
Harry Bomrah
|
9f362d9ae6
|
gridster, url code fixed, views removed.
|
2013-02-25 11:08:56 +08:00 |
chris
|
5b0b8e6c79
|
Fix bug in widget selection
|
2013-02-23 17:25:07 +08:00 |
chris
|
caac9191ce
|
Fix public_r_tag selection
|
2013-02-23 16:52:37 +08:00 |
Fu Matthew
|
73bca03b33
|
fix default widget link
|
2013-02-23 15:19:51 +08:00 |
Fu Matthew
|
9fec7beb47
|
Merge branch 'development' of github.com:Rulingcom/orbit into development
Conflicts:
app/controllers/default_widget_controller.rb
lib/tasks/migrate.rake
|
2013-02-22 17:53:49 +08:00 |
Fu Matthew
|
b315215bed
|
first version of multi categories and tags
|
2013-02-22 16:32:05 +08:00 |
chris
|
680d7908b9
|
member plugin init edit
|
2013-02-21 17:53:08 +08:00 |
unknown
|
d46abd7caf
|
member list edit
|
2013-02-21 14:13:46 +08:00 |
unknown
|
f59da3ce81
|
member plugin init edit
|
2013-02-20 18:05:09 +08:00 |
unknown
|
bc44d38948
|
member plugin edit
|
2013-02-20 17:25:20 +08:00 |
unknown
|
a7bc19768e
|
member list edit
|
2013-02-20 11:12:08 +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
|
9e9620c04a
|
Fix item looking for widget when no front end
|
2013-02-19 18:09:54 +08:00 |
chris
|
6d1f919bb7
|
Fix links in default widget
|
2013-02-19 18:09:50 +08:00 |
chris
|
3e79b787bb
|
Set default widget sort to created_at
Don't use page category when home
|
2013-02-19 17:49:23 +08:00 |
chris
|
ec9c68f039
|
Remove breadcrumb when home
|
2013-02-19 17:49:22 +08:00 |
chris
|
25d9a3d9b9
|
Add home to breadcrum
|
2013-02-19 17:49:22 +08:00 |
chris
|
324ab266af
|
Fix query in default widget for tags
|
2013-02-19 17:48:07 +08:00 |
chris
|
c27141ff5a
|
Fix query for category in default widget
|
2013-02-19 17:48:04 +08:00 |
Fu Matthew
|
5a177f34a8
|
default widget query for category and tags
|
2013-02-19 17:45:24 +08:00 |
chris
|
a9fecec985
|
Add pagination to default widget for front end page
|
2013-02-19 17:41:01 +08:00 |
chris
|
17ac564fbb
|
Fix sitemap nil
Fix namespace of role in subrole
|
2013-02-19 17:39:43 +08:00 |
chris
|
61648d23e1
|
Change delete_all to destroy_all
|
2013-02-19 17:39:42 +08:00 |
Rueshyna
|
bfad8467c8
|
breadcrumb widget of front-end has done
Conflicts:
app/controllers/front_controller.rb
lib/parsers/parser_common.rb
|
2013-02-19 17:39:42 +08:00 |
chris
|
29b8fec89a
|
Temporary fix: show for default widget
- the task migrate:recreate_page_parts must be run
- "create_parts" in page.rb must be unprotected
|
2013-02-19 17:39:34 +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
|
3a13ab4634
|
fix link for default widget
|
2013-02-18 17:03:18 +08:00 |
Fu Matthew
|
a6f6dc271c
|
fix i18n,reload problems
|
2013-02-18 15:13:31 +08:00 |
chris
|
e9f2983176
|
Fix page part kind being removed
|
2013-02-04 18:02:09 +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 |
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 |
unknown
|
d0dcd71707
|
member roles edit
|
2013-01-18 11:25:11 +08:00 |
chris
|
91830f86aa
|
Fix bug for mobile app routes
|
2013-01-16 08:14:42 +08:00 |
Fu Matthew
|
e1e003af6e
|
Complete new interface
|
2013-01-14 19:18:25 +08:00 |
unknown
|
504f5027cc
|
member role edit
|
2013-01-14 19:00:08 +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 |
Rueshyna
|
284bf34fec
|
amend file value to correct format
|
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 |