 Harry Bomrah
|
6ac600fb5c
|
brief added to desktop for all plugins
|
2013-09-26 09:33:18 +08:00 |
|
Harry Bomrah
|
a04155963d
|
all file things are fixed. delete and view and also names
|
2013-08-14 09:30:48 +08:00 |
|
Harry Bomrah
|
6d54dbd5f8
|
bilingual for files fixed and description added and also filename display after selecting filenames
Conflicts:
app/assets/javascripts/desktop/orbitdesktop.js
|
2013-08-13 17:22:09 +08:00 |
|
Harry Bomrah
|
9c7558847a
|
bilingual fixed for all the plugins in desktop
|
2013-08-12 12:28:58 +08:00 |
|
Harry Bomrah
|
e3d9966f76
|
bugs fixed for plugins. .. and also css fixed
|
2013-08-06 17:53:04 +08:00 |
|
Harry Bomrah
|
20521dc8b0
|
removing duplicate code from js file
|
2013-07-30 16:41:54 +08:00 |
devin chen
|
a458a50e97
|
publication's view update
|
2013-07-30 16:41:48 +08:00 |
|
Harry Bomrah
|
ae8033ea1b
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-07-30 16:41:44 +08:00 |
|
Harry Bomrah
|
78d6e33865
|
devin branch merge plus minor fixes
|
2013-07-30 16:41:32 +08:00 |
|
Harry Bomrah
|
b70310c6fe
|
tiny scrollbar update
|
2013-07-30 16:41:25 +08:00 |
devin
|
e7bffe4c0f
|
devin's new branch
|
2013-04-17 14:14:24 +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
|
52789fa032
|
all none fixed
|
2013-04-17 11:23:02 +08:00 |
Rueshyna
|
228dd1b767
|
fixed co author relation save button
|
2013-04-17 11:13:32 +08:00 |
|
Rueshyna
|
5178ce3bde
|
modify nil of email string and sort
|
2013-04-17 11:04:52 +08:00 |
|
Rueshyna
|
bdaef3af0f
|
add author filter for journal and fix some bug
|
2013-04-17 11:04:52 +08:00 |
|
Harry Bomrah
|
0189d1c2c0
|
all none fixed
|
2013-04-17 10:54: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 |