6d5dd4a80f
Changed Site Valid Locales to In Use Locales
2013-11-27 17:51:48 +08:00
f702410c9f
fix new ui member plugins and member frontend page
2013-11-21 12:10:01 +08:00
Harry Bomrah
caca264b50
isotope fixed for all plugins for list and form.
2013-10-01 15:06:49 +08:00
9f490c87d2
Fixed issue with member plugin delete label
2013-10-01 10:43:37 +08:00
Harry Bomrah
52c896d8c5
some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.
2013-09-26 20:11:45 +08:00
Harry Bomrah
1d0ea6718f
brief added to desktop for all plugins
2013-09-25 18:23:44 +08:00
a067bcd304
Add Brief intro. for all personal plugins
...
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
b487740035
Fixed Pagination Errors in member module
2013-09-18 16:11:17 +08:00
7216676c40
Updated Sidebar and Preferences
2013-09-09 10:18:14 +08:00
4078d426a6
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
2013-08-21 14:13:36 +08:00
Harry Bomrah
bbb765c88d
small fix for file link inside edit form for desktop
2013-08-16 15:49:12 +08:00
Harry Bomrah
6577885761
docx xlsx and pptx file types fixed plus icon provided in edit form for files
2013-08-16 15:49:04 +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
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
Harry Bomrah
9c7558847a
bilingual fixed for all the plugins in desktop
2013-08-12 12:28:58 +08:00
Harry Bomrah
d0ef862f85
language changes and conferences add/edit bug fixed
2013-08-12 12:28:46 +08:00
Harry Bomrah
cff77fbee5
new search for app manager and few javascript fixes
2013-07-30 16:42:11 +08:00
ad68f63a7a
style for checkbox, radio button
2013-07-30 16:41:58 +08:00
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
b70310c6fe
tiny scrollbar update
2013-07-30 16:41:25 +08:00
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +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
Harry Bomrah
6db9e70132
Major tinyscrollbar update
2013-04-17 12:04:22 +08:00
Harry Bomrah
52789fa032
all none fixed
2013-04-17 11:23:02 +08:00
228dd1b767
fixed co author relation save button
2013-04-17 11:13:32 +08:00
50449b55e8
one abstract one column for personal plugin
2013-04-17 11:07:20 +08:00
00db66b8c4
add pagination for every controller and view in personal plugin
2013-04-17 11:07:20 +08:00
8783b8e5fe
make index of list can be hightline list when click cancel button
2013-04-17 11:04:52 +08:00
625f2e9ad6
have done conference author filter, journal haven't been done, yet
2013-04-17 11:04:52 +08:00
Harry Bomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
Harry Bomrah
6cd97adf21
all none for conf done
2013-04-17 10:54:38 +08:00
Harry Bomrah
0189d1c2c0
all none fixed
2013-04-17 10:54:38 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
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
74900ac048
Merge branch 'desktop_work' into desktop_work_devin
...
* desktop_work:
tinyscrollbar minor update
desktop CSS update
Conflicts:
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 18:35:17 +08:00
924ecc3b1f
desktop CSS update
2013-03-05 17:48:28 +08:00
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
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
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
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
80b6a9ab48
Merge branch 'desktop' into desktop_work
...
* desktop:
highlighting fixed…
add Devin's css file for gallery
using refine tiny scroll bar js for personal plugin
fixed adding.
layout fix
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
authors auto-complete
fixed paper title and journal title bug
Conflicts:
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_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_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.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/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-03-04 18:03:59 +08:00
a6ca308a5e
using refine tiny scroll bar js for personal plugin
2013-03-04 16:35:09 +08:00
Harry Bomrah
0c659e5a9b
layout fix
2013-03-04 16:31:37 +08:00
Harry Bomrah
6ae4e4d0ef
layout fix
2013-03-04 15:48:24 +08:00
Harry Bomrah
9a32732ae4
layout fix
2013-03-04 14:57:36 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
saurabhbhatia
Spen
Harry Bomrah
devin chen
Matthew K. Fu JuYuan
devin
Rueshyna
chris