67bb08c338
Fix a bug when setting the site
...
Fix devise login
2013-04-29 20:17:44 +08:00
e028791d68
Tag management module completed
2013-04-26 18:34:46 +08:00
3714403f85
Now default tags can be removed from module
2013-04-25 19:20:37 +08:00
19405cf006
Tag management working but can't remove default tag from module
2013-04-25 12:34:06 +08:00
bf3d20ea46
Tag functionalities for new UI
2013-04-23 20:18:03 +08:00
ff03d66439
Fix missing values in tag form when editing
2013-04-23 20:18:03 +08:00
24523640a7
New tags but still without global tag management
2013-04-23 20:18:03 +08:00
a9d25dcdec
Orbit bar
...
Structure: page, link, edit and new, page view, edit page parts
Temporary disable authentication in items controller
2013-04-12 03:13:03 +08:00
a85d1f938c
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-03 17:49:59 +08:00
20bdeb3c2d
fix widget and fronted setting interface. checked with Spen
2013-04-02 18:39:46 +08:00
3476237fa7
solved conflicts
2013-04-01 17:18:41 +08:00
Harry Bomrah
78205d8b00
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-03-29 12:04:21 +08:00
a62ff9308f
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-03-29 12:03:15 +08:00
474e8b9b57
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-03-29 11:12:52 +08:00
9e02011956
deliver API
2013-03-29 11:08:22 +08:00
9e33bdadc3
now default options can be chosen by developer at init
2013-03-21 18:46:57 +08:00
54acaebc98
style for front end
2013-03-21 18:46:56 +08:00
8609c8dec0
put add admin pages using orbit back end controller
2013-03-21 18:45:27 +08:00
Harry Bomrah
5685e11511
app manager changed plus some changes
2013-03-21 18:25:37 +08:00
Harry Bomrah
0e39de56e2
section page fixed..
2013-03-21 18:25:36 +08:00
677faf1811
add browser compatibility page
2013-03-21 18:25:36 +08:00
Harry Bomrah
6c58a0f773
compatibility page added and tinyscrollbar drag event fixed..
2013-03-21 18:25:33 +08:00
Harry Bomrah
7b2e7f5297
Major tinyscrollbar update
2013-03-21 18:09:39 +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
chris
Matt K. Fu
Harry Bomrah
devin
Fu Matthew
Spen
Rueshyna
unknown