Fu Matthew
|
d6dd38744b
|
fix javascript disable checkbox failed after cate and tags being reloaded.
|
2013-02-23 11:34:47 +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 |
Rueshyna
|
158fd8ffff
|
fixed conference icon and rename _p to _window of conference view
|
2013-02-21 13:51:42 +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
|
d19ba7b1c6
|
Change css mobile for 3 columns
|
2013-02-19 18:31:34 +08:00 |
|
chris
|
a9aa1dd150
|
Fix for path renaming
|
2013-02-19 18:09:55 +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
|
6324233f58
|
Fix breadcrumb again
|
2013-02-19 17:50:46 +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
|
b049e16634
|
Create part and save pages when layout is edited
|
2013-02-19 17:48:06 +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
|
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
|
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 |
|
chris
|
3676de8a14
|
Change validation for url: can include IPs
|
2013-02-19 17:39:42 +08:00 |
|
chris
|
2a293734c7
|
Change breadcrumb html
|
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
|
0b88f7d1f8
|
deliver app config. fix wrong value cause error for default widget
|
2013-02-19 14:21:54 +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 |
|
Fu Matthew
|
96455f31e1
|
deliver app config. fix wrong value cause error for default widget
|
2013-02-18 19:04:04 +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 |
|
Fu Matthew
|
29bb92f841
|
fix member sidebar
add i18n for modules and default_widgets
|
2013-02-06 17:44:38 +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
|
e9f2983176
|
Fix page part kind being removed
|
2013-02-04 18:02:09 +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 |