Matt K. Fu
f2247aab32
ray's css fix
2013-05-14 11:27:15 +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
Matt K. Fu
88d55989de
change logger
2013-05-14 10:29:11 +08:00
chris
c2331695cd
Set order of page context to match the order of structure
...
Add some params to keep the sorting
2013-05-07 11:15:30 +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
chris
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
Matt K. Fu
7d077a92a5
system preference
2013-04-29 15:23:15 +08:00
Matt K. Fu
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
Matt K. Fu
3e567223e3
fix for Spen's translation and Chris's tag error
2013-04-26 15:37:27 +08:00
Spen
79ef86f2c9
member translation fix
2013-04-26 11:26:11 +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
62fa589e8a
add msg when user session expired at page admin
2013-04-24 11:58:48 +08:00
Matt K. Fu
5ff7dfbac6
fronted open switch and backend openness
2013-04-23 18:48:18 +08:00
Matt K. Fu
41168f4c99
fix for fronted routing failed
2013-04-23 10:01:02 +08:00
Matt K. Fu
7e9fce0c2d
clean Harry's code
2013-04-17 14:31:10 +08:00
Harry Bomrah
38d5a193e0
tiny scrollbar trigger fixed and devin branch merged
2013-04-17 14:31:09 +08:00
devin chen
989e5aa974
minor update
2013-04-17 14:29:56 +08:00
devin chen
aedab01ae6
minor update
2013-04-17 14:29:04 +08:00
devin chen
e3782c9cf7
minor update
2013-04-17 14:29:04 +08:00
Harry Bomrah
e2802d94d0
rake task added
2013-04-17 14:28:13 +08:00
devin chen
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
Matt K. Fu
a4ebe31ada
fix for widget edit js missing
2013-04-17 14:19:32 +08:00
Matt K. Fu
3098496083
widget link followed by setting
2013-04-17 14:19:32 +08:00
Matt K. Fu
28f0df5da8
fix default widget link failed
2013-04-17 14:19:32 +08:00
Matt K. Fu
3de4591413
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-17 14:19:32 +08:00
devin chen
d177fe0369
minor update
2013-04-17 14:19:32 +08:00
Harry Bomrah
c6868bf2e0
small fix in select2.js
2013-04-17 14:18:49 +08:00
devin chen
95e308e046
minor update
2013-04-17 14:18:49 +08:00
Matt K. Fu
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
devin chen
dc5f24ab22
starting new branch ( add rules in .gitignore for SASS cache folder )
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
devin
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +08:00
chris
dd10b3147c
Fix js bug and asset url after merge
2013-04-17 14:14:24 +08:00
devin
cae43e8acd
recover .gitignore file
...
Conflicts:
.gitignore
2013-04-17 14:14:23 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
devin
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
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
Harry Bomrah
764f83d58c
app manager changed plus some changes
2013-04-17 14:01:14 +08:00
Harry Bomrah
8dee211ab4
section page fixed..
2013-04-17 14:01:14 +08:00
Harry Bomrah
f9e7cefc94
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 13:59:16 +08:00
Harry Bomrah
41643d1f61
tinyscrollbar pagination fixed
2013-04-17 12:11:33 +08:00
Harry Bomrah
54af5e8bd4
insert and remove columns
2013-04-17 12:06:33 +08:00
Harry Bomrah
6db9e70132
Major tinyscrollbar update
2013-04-17 12:04:22 +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
Fu Matthew
6efef253a6
add conditions for making multi cates and tags more stable
2013-04-17 11:08:57 +08:00
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
Harry Bomrah
323fadc210
tinyscrollbar pagination fixed
2013-04-17 11:05:57 +08:00
Fu Matthew
69a49a69aa
style for front end
2013-04-17 11:05:57 +08:00
Rueshyna
625f2e9ad6
have done conference author filter, journal haven't been done, yet
2013-04-17 11:04:52 +08:00
Harry Bomrah
d840b82fa9
insert and remove columns
2013-04-17 10:56:15 +08:00
devin
84dfb44e78
tinyscrollbar css minor update
2013-04-17 10:56:15 +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
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
Harry Bomrah
0189d1c2c0
all none fixed
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
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
147b7b9292
Fix update when no tag or category
2013-03-07 17:30:49 +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
Fu Matthew
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +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
Fu Matthew
626b2a7bca
fix default failed when cate or tags set to empty
2013-03-05 11:48:20 +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
285119a5f3
fix for multi select cates and tags
2013-03-04 19:29:45 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
Fu Matthew
15b9839b76
fix archive category
...
fix page adding failed
2013-03-04 14:40:29 +08:00
Harry Bomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
0f12314213
some changes for gridster
2013-03-04 12:37:29 +08:00
Harry Bomrah
b8ee748723
Lot of changes in gridster
2013-03-04 12:37:29 +08:00
Rueshyna
ee4b94ace0
Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop
...
* 'desktop' of https://github.com/Rulingcom/orbit :
fix widget field reload
link to more
fix default widget link
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
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
fix widget field reload
link to more
fix default widget link
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
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
2013-03-04 12:17:14 +08:00
Rueshyna
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Harry Bomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
Harry Bomrah
7ef02d3108
Merge branch 'desktop' into desktop_work
2013-02-27 11:51:56 +08:00
Harry Bomrah
912080482b
some changes for gridster
2013-02-27 11:47:41 +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
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
Harry Bomrah
e9c0f443b7
Lot of changes in gridster
2013-02-26 11:47:39 +08:00
Fu Matthew
5f832a17d4
fix widget field reload
2013-02-25 12:49:06 +08:00
Harry Bomrah
edd2c1f522
css minor changes.
2013-02-25 11:08:57 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
chris
3572856486
Fix selection of sub_menu for widget (the value wasn't set)
2013-02-25 10:35:59 +08:00
Fu Matthew
0be1c45c81
link to more
2013-02-23 18:29:50 +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
8592015b1b
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-23 15:19:04 +08:00
chris
ad9b91f792
Fix url with id in default widget
2013-02-23 12:20:45 +08:00
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
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
chris
c33a723a2a
Fix css bug when precompile
2013-02-04 18:01:00 +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
fea1726f6d
fix ajax error when edit new page
2013-01-24 13:39:08 +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
781a0ad96e
member roles edit
2013-01-18 11:25:11 +08:00
unknown
d0dcd71707
member roles edit
2013-01-18 11:25:11 +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
chris
91830f86aa
Fix bug for mobile app routes
2013-01-16 08:14:42 +08:00
chris
72e26fd92a
Fix css bug when precompile
2013-01-16 02:37:49 +08:00
Rueshyna
dca4f5d0be
mv gallery_uploader
2013-01-16 01:35:38 +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