 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 |
|
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 |
|
devin
|
0d5ab20efa
|
add browser compatibility page
|
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
|
1d06bcaae7
|
Major tinyscrollbar update
|
2013-04-17 10:54:38 +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 |
|
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 |
|
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 |
|
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 |
|
Rueshyna
|
4ac0f19011
|
generate journal page by rails side and fixed model name bug
|
2013-02-26 15:15:09 +08:00 |
|
Rueshyna
|
158fd8ffff
|
fixed conference icon and rename _p to _window of conference view
|
2013-02-21 13:51: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
|
1b6bfdb80f
|
modularize personal journal and pull relational setting in desktop/index.rb
|
2013-01-14 17:54:52 +08:00 |
|
Rueshyna
|
bf31d0c3dd
|
modularized personal journal
|
2013-01-14 17:54:52 +08:00 |
|
Rueshyna
|
758cab5ecd
|
move journal code to persional_journal modulaar
|
2013-01-14 17:53:59 +08:00 |
|
Harry Bomrah
|
37f8c1637a
|
new desktop framework updates
|
2012-12-27 18:25:54 +08:00 |
|
Harry Bomrah
|
08b99011d0
|
all sections and sections megerd
|
2012-12-07 10:10:38 +08:00 |
|
Rueshyna
|
633a68675a
|
make factory girl file clean
|
2012-12-06 22:37:42 +08:00 |
|
Harry Bomrah
|
8094ddc967
|
section fixed and some other fixes
|
2012-12-06 17:43:19 +08:00 |
|
Rueshyna
|
54de86eeb4
|
fixed bug about co-author-relation
|
2012-12-06 15:20:06 +08:00 |
|
devin
|
6a47fc8d62
|
view update
|
2012-12-06 11:43:40 +08:00 |
|
devin
|
5d76600154
|
view update
|
2012-12-06 07:59:44 +08:00 |
|
devin
|
756bfa563b
|
view update
|
2012-12-06 07:59:44 +08:00 |
|
devin
|
22c0eabca5
|
view update
|
2012-12-06 07:59:44 +08:00 |
|
Harry Bomrah
|
3d1fb48489
|
edit coauthor relation done
|
2012-12-06 07:59:44 +08:00 |
|
Rueshyna
|
6d08ca996f
|
add back buton in relation page
|
2012-12-06 07:59:44 +08:00 |
|
devin
|
59c0cdd761
|
view update
not finish all required pages yet
|
2012-12-06 07:59:43 +08:00 |
|
Rueshyna
|
b89e371393
|
can update co-author relation
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
a0cce2ae0d
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
Rueshyna
|
e7fdac1d23
|
make coauthor relation can be edit
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
8d110cce91
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
d413f705a4
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
363ccdde4d
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
936101358c
|
journal update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
2aa077bc85
|
journal list
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
d03f5dc1ff
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
Rueshyna
|
6c33d353ba
|
make journal list easy to read
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
05027afa63
|
make journal list easy to read
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
4f31b1362b
|
fixed new co-author relation bug....
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
1289ad9f9d
|
fixed co-author relation bug....
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
09c59c4e03
|
midify button type
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
21b1432f7f
|
change settings table default display
|
2012-12-06 07:59:42 +08:00 |