Lukas
51640423a7
survey module initial
2013-06-06 18:26:41 +08:00
Matt K. Fu
3e0b7d81ae
clean 403 404 500
2013-05-27 16:46:49 +08:00
Matt K. Fu
7e9fce0c2d
clean Harry's code
2013-04-17 14:31:10 +08:00
harrybomrah
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
e3782c9cf7
minor update
2013-04-17 14:29:04 +08:00
harrybomrah
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
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
harrybomrah
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
harrybomrah
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
harrybomrah
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
harrybomrah
764f83d58c
app manager changed plus some changes
2013-04-17 14:01:14 +08:00
harrybomrah
8dee211ab4
section page fixed..
2013-04-17 14:01:14 +08:00
harrybomrah
f9e7cefc94
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 13:59:16 +08:00
harrybomrah
41643d1f61
tinyscrollbar pagination fixed
2013-04-17 12:11:33 +08:00
harrybomrah
54af5e8bd4
insert and remove columns
2013-04-17 12:06:33 +08:00
harrybomrah
6db9e70132
Major tinyscrollbar update
2013-04-17 12:04:22 +08:00
harrybomrah
dae3f069ff
app manager changed plus some changes
2013-04-17 11:09:56 +08:00
harrybomrah
b1d7d5345e
section page fixed..
2013-04-17 11:08:58 +08:00
harrybomrah
b8ee2fd559
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 11:07:20 +08:00
harrybomrah
323fadc210
tinyscrollbar pagination fixed
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
harrybomrah
d840b82fa9
insert and remove columns
2013-04-17 10:56:15 +08:00
harrybomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
harrybomrah
0189d1c2c0
all none fixed
2013-04-17 10:54:38 +08:00
devin
db2b371744
tinyscrollbar minor update
2013-03-05 17:22:53 +08:00
harrybomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
harrybomrah
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
harrybomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
harrybomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
harrybomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
harrybomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
harrybomrah
0f12314213
some changes for gridster
2013-03-04 12:37:29 +08:00
harrybomrah
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
harrybomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
harrybomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
harrybomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00