devin
|
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 |
Rueshyna
|
ddf61e5606
|
fixed co author relation save button
|
2013-03-21 18:25:37 +08:00 |
|
Rueshyna
|
811b30791b
|
modify nil of email string and sort
|
2013-03-21 18:24:20 +08:00 |
|
Rueshyna
|
3c6ca3c254
|
add author filter for journal and fix some bug
|
2013-03-21 18:24:20 +08:00 |
 Harry Bomrah
|
df83c6fff7
|
all none fixed
|
2013-03-21 18:09:38 +08:00 |
|
Rueshyna
|
806ffe0a1e
|
fixed desktop several bug
|
2013-03-05 17:31:57 +08:00 |
|
Rueshyna
|
430981a534
|
checked back and cancel button of personal plugin and fixed journal co author save and update bug
|
2013-03-05 12:14:10 +08:00 |
|
Harry Bomrah
|
8ade2c5949
|
fixed adding.
|
2013-03-04 16:31:37 +08:00 |
|
Harry Bomrah
|
23c8c28b52
|
tinyscrollbar fixed
|
2013-03-04 12:37:29 +08:00 |
|
Harry Bomrah
|
9f362d9ae6
|
gridster, url code fixed, views removed.
|
2013-02-25 11:08:56 +08:00 |
|
Rueshyna
|
1b6bfdb80f
|
modularize personal journal and pull relational setting in desktop/index.rb
|
2013-01-14 17:54:52 +08:00 |
|
Rueshyna
|
68e14a7898
|
move js file to relational module but have js require problem
|
2013-01-14 17:54:52 +08:00 |
|
Rueshyna
|
919f951981
|
restore js,journal_pages.js,
|
2013-01-14 17:54:52 +08:00 |
|
Rueshyna
|
a183ac6041
|
fixed journal type page
|
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 |
unknown
|
42d50ae534
|
Plugins
|
2012-09-14 00:05:31 +08:00 |