980e63d830
isotope experiment for form
...
1. This is only for DEMO, please don't merge this commit into any branch
2. This demo is only inside the Journal Paper > Add/Edit page
3. Please check the Diff from the original HTML
4. Please update the 'desktop-main.scss', 'desktop-main.css',
'desktop-component.scss', 'desktop-component.css' for update and mistake
2013-08-23 10:23:40 +08:00
9fff3b9405
Minimize bar update
2013-08-19 06:56:58 +08:00
Harry Bomrah
1e73c64ea9
new themes added to desktop plus theme uploader created
2013-07-25 17:18:24 +08:00
Harry Bomrah
0354bf5b15
few updates with fb integration and some other changes in user and supports data to android
2013-06-18 15:59:11 +08:00
c4db6e5830
simple component update
...
minor update
2013-06-18 15:57:28 +08:00
b3c750eade
Various view update and change #thmbackground tag
2013-06-18 15:57:18 +08:00
1b5d099fda
fix loading Section page for Chrome
2013-06-18 15:57:08 +08:00
6e9effdb9f
minor update
2013-06-18 15:56:49 +08:00
e1f161cc5d
gridster update
2013-06-18 15:28:51 +08:00
Harry Bomrah
d61ff5f91c
apps update -- app upload and activation
2013-06-18 15:27:53 +08:00
c9747f9fc6
app manager's view update
2013-06-18 15:26:53 +08:00
269264d232
'select2' minor update
2013-06-18 15:26:36 +08:00
Harry Bomrah
8b53ad6cc6
fixed saving of positions of the tiles again
2013-06-18 15:26:15 +08:00
41afb46bf6
app manager view update
2013-06-18 15:25:49 +08:00
Harry Bomrah
7e6433f71c
solved desktop conflict during cherry pick
2013-06-18 15:24:41 +08:00
1a7a199504
minor update
2013-06-18 15:23:18 +08:00
d02806fa58
apps setting view
2013-06-18 15:22:47 +08:00
Harry Bomrah
3f44804717
search fixed again according to devin requirements
2013-06-18 15:22:22 +08:00
Harry Bomrah
5b1f5aa64c
new search for app manager and few javascript fixes
2013-06-18 15:20:40 +08:00
1851ebb6f7
style for checkbox, radio button
2013-06-18 15:20:33 +08:00
Harry Bomrah
93e755b619
removing duplicate code from js file
2013-06-18 15:20:19 +08:00
Harry Bomrah
4a6313424b
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-06-18 15:19:09 +08:00
Harry Bomrah
d752af8549
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-06-18 15:17:07 +08:00
Harry Bomrah
d651669d5c
tiny scrollbar update
2013-06-18 15:13:52 +08:00
ead749cfed
minor update
2013-06-18 15:12:52 +08:00
51640423a7
survey module initial
2013-06-06 18:26:41 +08:00
3e0b7d81ae
clean 403 404 500
2013-05-27 16:46:49 +08:00
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
989e5aa974
minor update
2013-04-17 14:29:56 +08:00
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
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
a4ebe31ada
fix for widget edit js missing
2013-04-17 14:19:32 +08:00
3de4591413
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-17 14:19:32 +08:00
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
95e308e046
minor update
2013-04-17 14:18:49 +08:00
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
Harry Bomrah
bc0477a5ed
widget and gridster fixes
2013-04-17 14:16:24 +08:00
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +08:00
dd10b3147c
Fix js bug and asset url after merge
2013-04-17 14:14:24 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
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
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
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
devin chen
Harry Bomrah
Lukas
Matt K. Fu
devin
chris