chris
|
f3e40c1405
|
Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop
Conflicts:
Gemfile.lock
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/index.html.erb
|
2013-03-21 18:39:09 +08:00 |
Rueshyna
|
42aca64dc3
|
correct model method
|
2013-03-21 18:29:25 +08:00 |
 Harry Bomrah
|
6ba840de4a
|
app manager changed plus some changes
|
2013-03-21 18:29:22 +08:00 |
|
Rueshyna
|
ddf61e5606
|
fixed co author relation save button
|
2013-03-21 18:25:37 +08:00 |
|
Harry Bomrah
|
5685e11511
|
app manager changed plus some changes
|
2013-03-21 18:25:37 +08:00 |
|
Rueshyna
|
f0fbd50261
|
fixed checkout and start in personal plugin
|
2013-03-21 18:25:36 +08:00 |
|
Rueshyna
|
573270c98c
|
correct factoried girl for journal
|
2013-03-21 18:25:36 +08:00 |
|
Rueshyna
|
f61b786e90
|
one abstract one column for personal plugin
|
2013-03-21 18:25:36 +08:00 |
|
Rueshyna
|
d085197635
|
add pagination for every controller and view in personal plugin
|
2013-03-21 18:25:36 +08:00 |
|
Harry Bomrah
|
478b54da26
|
tinyscrollbar pagination fixed
|
2013-03-21 18:25:05 +08:00 |
|
Harry Bomrah
|
e799ac4395
|
insert and remove columns
|
2013-03-21 18:25:05 +08:00 |
|
Harry Bomrah
|
c101413d32
|
Major tinyscrollbar update
|
2013-03-21 18:25:02 +08:00 |
|
Rueshyna
|
50a09763ec
|
modify translation for journal_co_author_relation button
|
2013-03-21 18:24:20 +08:00 |
|
Rueshyna
|
811b30791b
|
modify nil of email string and sort
|
2013-03-21 18:24:20 +08:00 |
|
Rueshyna
|
4b8c68500a
|
remove redundant space of co_author sample data
|
2013-03-21 18:24:20 +08:00 |
|
Rueshyna
|
e5e45f3ada
|
make index of list can be hightline list when click cancel button
|
2013-03-21 18:24:20 +08:00 |
|
Rueshyna
|
f619c5e389
|
fixed author sample data generation and model method
|
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 |
|
Rueshyna
|
12fdb5a0ca
|
have done conference author filter, journal haven't been done, yet
|
2013-03-21 18:24:16 +08:00 |
|
Harry Bomrah
|
7df0be3826
|
tinyscrollbar pagination fixed
|
2013-03-21 18:22:28 +08:00 |
|
Harry Bomrah
|
80be9e63ef
|
insert and remove columns
|
2013-03-21 18:22:28 +08:00 |
|
Harry Bomrah
|
0444b1f5e5
|
Major tinyscrollbar update
|
2013-03-21 18:22:06 +08:00 |
|
Rueshyna
|
91d3e1d92c
|
add pagination for personal plugin
|
2013-03-21 18:16:08 +08:00 |
|
Rueshyna
|
fb8407dbe3
|
fixed bug
|
2013-03-21 18:10:55 +08:00 |
|
Harry Bomrah
|
9963c9fb68
|
insert and remove columns
|
2013-03-21 18:09:39 +08:00 |
|
Harry Bomrah
|
7b2e7f5297
|
Major tinyscrollbar update
|
2013-03-21 18:09:39 +08:00 |
|
Harry Bomrah
|
df83c6fff7
|
all none fixed
|
2013-03-21 18:09:38 +08:00 |
|
Rueshyna
|
adec8c8938
|
correct model method
|
2013-03-15 15:10:14 +08:00 |
|
Rueshyna
|
2746616610
|
Merge branch 'desktop_work' into desktop
* desktop_work:
app manager changed plus some changes
section page fixed..
section page fixed..
add browser compatibility page
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
|
2013-03-14 19:00:06 +08:00 |
|
Rueshyna
|
61cc8f0f54
|
fixed co author relation save button
|
2013-03-14 18:29:24 +08:00 |
|
Harry Bomrah
|
31476bb813
|
app manager changed plus some changes
|
2013-03-14 17:55:33 +08:00 |
|
Harry Bomrah
|
8ab4e90a06
|
app manager changed plus some changes
|
2013-03-14 17:48:45 +08:00 |
|
Rueshyna
|
7a78594594
|
fixed checkout and start in personal plugin
|
2013-03-14 17:43:29 +08:00 |
|
Rueshyna
|
b50548c538
|
correct factoried girl for journal
|
2013-03-14 17:43:01 +08:00 |
|
Rueshyna
|
4a2c994401
|
one abstract one column for personal plugin
|
2013-03-13 14:05:06 +08:00 |
|
chris
|
b864cc0268
|
Changes in I18n (except personal_conference and personal_journal)
|
2013-03-12 18:13:48 +08:00 |
|
Rueshyna
|
af6813480a
|
add pagination for every controller and view in personal plugin
|
2013-03-12 17:00:42 +08:00 |
|
Harry Bomrah
|
8e369fe819
|
tinyscrollbar pagination fixed
|
2013-03-12 11:42:17 +08:00 |
|
Harry Bomrah
|
2b4e53ed1b
|
insert and remove columns
|
2013-03-12 11:42:17 +08:00 |
|
Harry Bomrah
|
6d194759fa
|
Major tinyscrollbar update
|
2013-03-12 11:42:16 +08:00 |
|
Rueshyna
|
d20081157a
|
modify translation for journal_co_author_relation button
|
2013-03-12 11:22:11 +08:00 |
|
Rueshyna
|
8e0632236b
|
modify nil of email string and sort
|
2013-03-11 17:21:02 +08:00 |
|
Rueshyna
|
78abcac1cb
|
remove redundant space of co_author sample data
|
2013-03-11 17:20:24 +08:00 |
|
Rueshyna
|
385e043809
|
make index of list can be hightline list when click cancel button
|
2013-03-11 17:18:58 +08:00 |
|
Rueshyna
|
8d5a2d71b7
|
fixed author sample data generation and model method
|
2013-03-11 14:53:21 +08:00 |
|
Rueshyna
|
1880ed11ca
|
add author filter for journal and fix some bug
|
2013-03-11 10:41:07 +08:00 |
|
Rueshyna
|
96602842a3
|
have done conference author filter, journal haven't been done, yet
|
2013-03-08 19:16:01 +08:00 |
|
Harry Bomrah
|
4f64ff3568
|
insert and remove columns
|
2013-03-08 12:23:15 +08:00 |
|
Harry Bomrah
|
196030b4b4
|
Major tinyscrollbar update
|
2013-03-08 12:23:15 +08:00 |
|
Rueshyna
|
75a5e74bc0
|
add pagination for personal plugin
|
2013-03-08 12:01:13 +08:00 |