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 |
Rueshyna
|
95805cfdee
|
correct model method
|
2013-04-17 14:07:24 +08:00 |
 Harry Bomrah
|
84afbfa86c
|
section page fixed..
|
2013-04-17 14:01:48 +08:00 |
|
Rueshyna
|
44fede2b71
|
fixed co author relation save button
|
2013-04-17 14:01:48 +08:00 |
|
Harry Bomrah
|
8dee211ab4
|
section page fixed..
|
2013-04-17 14:01:14 +08:00 |
|
Rueshyna
|
27ad25ccca
|
add pagination for every controller and view in personal plugin
|
2013-04-17 14:00:37 +08:00 |
|
Rueshyna
|
df220397b2
|
make index of list can be hightline list when click cancel button
|
2013-04-17 12:22:04 +08:00 |
|
Rueshyna
|
b5fd6c7a1a
|
fixed author sample data generation and model method
|
2013-04-17 12:21:21 +08:00 |
|
Harry Bomrah
|
41643d1f61
|
tinyscrollbar pagination fixed
|
2013-04-17 12:11:33 +08:00 |
|
Rueshyna
|
aad4119892
|
fixed bug
|
2013-04-17 12:07:11 +08:00 |
|
Harry Bomrah
|
6db9e70132
|
Major tinyscrollbar update
|
2013-04-17 12:04:22 +08:00 |
|
Harry Bomrah
|
dabceec3ea
|
all none for conf done
|
2013-04-17 11:23:03 +08:00 |
|
Harry Bomrah
|
52789fa032
|
all none fixed
|
2013-04-17 11:23:02 +08:00 |
|
Rueshyna
|
dc68f40cb4
|
correct model method
|
2013-04-17 11:13:32 +08:00 |
|
Rueshyna
|
228dd1b767
|
fixed co author relation save button
|
2013-04-17 11:13:32 +08:00 |
|
Harry Bomrah
|
dae3f069ff
|
app manager changed plus some changes
|
2013-04-17 11:09:56 +08:00 |
|
Rueshyna
|
5f2c669568
|
fixed checkout and start in personal plugin
|
2013-04-17 11:08:58 +08:00 |
|
Rueshyna
|
1b12412596
|
correct factoried girl for journal
|
2013-04-17 11:08:58 +08:00 |
|
Harry Bomrah
|
b1d7d5345e
|
section page fixed..
|
2013-04-17 11:08:58 +08:00 |
Fu Matthew
|
9815950083
|
now default options can be chosen by developer at init
|
2013-04-17 11:07:45 +08:00 |
|
Rueshyna
|
50449b55e8
|
one abstract one column for personal plugin
|
2013-04-17 11:07:20 +08:00 |
|
Rueshyna
|
00db66b8c4
|
add pagination for every controller and view in personal plugin
|
2013-04-17 11:07:20 +08:00 |
|
Harry Bomrah
|
401c75c0de
|
Major tinyscrollbar update
|
2013-04-17 11:06:28 +08:00 |
|
Rueshyna
|
1ebae504dc
|
modify translation for journal_co_author_relation button
|
2013-04-17 11:05:57 +08:00 |
|
Harry Bomrah
|
323fadc210
|
tinyscrollbar pagination fixed
|
2013-04-17 11:05:57 +08:00 |
|
Fu Matthew
|
69a49a69aa
|
style for front end
|
2013-04-17 11:05:57 +08:00 |
|
Rueshyna
|
5178ce3bde
|
modify nil of email string and sort
|
2013-04-17 11:04:52 +08:00 |
|
Rueshyna
|
95128a3465
|
remove redundant space of co_author sample data
|
2013-04-17 11:04:52 +08:00 |
|
Rueshyna
|
8783b8e5fe
|
make index of list can be hightline list when click cancel button
|
2013-04-17 11:04:52 +08:00 |
|
Rueshyna
|
a3de4cc2d4
|
fixed author sample data generation and model method
|
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 |
|
Rueshyna
|
625f2e9ad6
|
have done conference author filter, journal haven't been done, yet
|
2013-04-17 11:04:52 +08:00 |
|
Harry Bomrah
|
db60a3bcfa
|
insert and remove columns
|
2013-04-17 11:04:37 +08:00 |
|
Harry Bomrah
|
a7667d586a
|
Major tinyscrollbar update
|
2013-04-17 11:04:36 +08:00 |
|
Rueshyna
|
e9ddb85734
|
add pagination for personal plugin
|
2013-04-17 10:56:49 +08:00 |
|
Harry Bomrah
|
d840b82fa9
|
insert and remove columns
|
2013-04-17 10:56:15 +08:00 |
|
Fu Matthew
|
4a08a1992b
|
1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
|
2013-04-17 10:56:15 +08:00 |
|
Rueshyna
|
15be80a35f
|
fixed bug
|
2013-04-17 10:56:14 +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 |
chris
|
3e96cfe514
|
Changes for FAQ to work with not latest but stable code
|
2013-03-28 15:05:52 +08:00 |
Spen
|
468555a037
|
faq app
|
2013-03-28 14:09:29 +08:00 |
|
chris
|
da8a5123c2
|
Change in announcement init for query
Change in default widget query
|
2013-03-27 16:31:42 +08:00 |
|
chris
|
ec1605358b
|
Fix sorting for archive
|
2013-03-27 06:30:22 +08:00 |
|
chris
|
41311c74d0
|
Spen's changes in archive
|
2013-03-21 14:38:04 +08:00 |
|
chris
|
04d3e177d5
|
Fix typo in core lib
Change i18n for more link in announcement init
|
2013-03-20 17:45:08 +08:00 |
|
chris
|
031cf927d5
|
Sort archive by top and creation date
|
2013-03-20 17:22:40 +08:00 |
|
chris
|
e71b002438
|
Fix archive front end query for multiple categories
|
2013-03-20 15:37:34 +08:00 |
|
chris
|
90f08c96fc
|
Fix merge error: add missing delete route
|
2013-03-20 02:11:29 +08:00 |