e4c33b443f
Put new assets and use some old ones
2013-04-12 03:09:40 +08:00
76b4356bc0
Move the old assets to Archive
2013-04-12 03:07:01 +08:00
e3666acdeb
Merge commit '0a7c43bbb96e7f91bd6ecb76f60733093473feaa' into development
2013-04-08 10:53:10 +08:00
a85d1f938c
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-03 17:49:59 +08:00
74f9dea6b9
Merge commit '20bdeb3c2d55f6c0404ae604108c4c23c3d4aa67' into development
2013-04-02 18:40:48 +08:00
20bdeb3c2d
fix widget and fronted setting interface. checked with Spen
2013-04-02 18:39:46 +08:00
695d712843
Merge commit '8b44f930f38d70098da5793bd795400eb088a052' into development
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-02 18:05:30 +08:00
Harry Bomrah
8b44f930f3
widget and gridster fixes
2013-04-01 18:00:47 +08:00
3476237fa7
solved conflicts
2013-04-01 17:18:41 +08:00
bd3e9fe4f6
Fix js bug and asset url after merge
2013-03-29 17:50:21 +08:00
4bb5e18f44
recover .gitignore file
...
Conflicts:
.gitignore
2013-03-29 12:33:35 +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
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
12fdb5a0ca
have done conference author filter, journal haven't been done, yet
2013-03-21 18:24:16 +08:00
Harry Bomrah
7df0be3826
tinyscrollbar pagination fixed
2013-03-21 18:22:28 +08:00
Harry Bomrah
9963c9fb68
insert and remove columns
2013-03-21 18:09:39 +08:00
80a2f67dda
tinyscrollbar css minor update
2013-03-21 18:09:39 +08:00
Harry Bomrah
7b2e7f5297
Major tinyscrollbar update
2013-03-21 18:09:39 +08:00
Harry Bomrah
df83c6fff7
all none fixed
2013-03-21 18:09:38 +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
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +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
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
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
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +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
Harry Bomrah
e9c0f443b7
Lot of changes in gridster
2013-02-26 11:47:39 +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
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
chris
Matt K. Fu
Harry Bomrah
devin
Rueshyna
Fu Matthew
unknown