Harry Bomrah
8ab4e90a06
app manager changed plus some changes
2013-03-14 17:48:45 +08:00
7a78594594
fixed checkout and start in personal plugin
2013-03-14 17:43:29 +08:00
b50548c538
correct factoried girl for journal
2013-03-14 17:43:01 +08:00
Harry Bomrah
84f255173c
Merge branch 'desktop_work_devin' into desktop_work
2013-03-14 14:17:13 +08:00
Harry Bomrah
b4ba4149d4
section page fixed..
2013-03-14 14:16:38 +08:00
Harry Bomrah
3830fddfe0
section page fixed..
2013-03-14 14:00:04 +08:00
66633443de
add conditions for making multi cates and tags more stable
2013-03-13 17:53:11 +08:00
2427bc5b69
Update CSS for archive and put the call in widget index
2013-03-13 17:21:39 +08:00
3d7fbd9711
add browser compatibility page
2013-03-13 15:49:20 +08:00
e208e99a73
Fix page part update when no tag or category
2013-03-13 15:45:30 +08:00
aa851cad76
now default options can be chosen by developer at init
2013-03-13 14:09:10 +08:00
4a2c994401
one abstract one column for personal plugin
2013-03-13 14:05:06 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
af6813480a
add pagination for every controller and view in personal plugin
2013-03-12 17:00:42 +08:00
Harry Bomrah
4a83521b84
compatibility page added and tinyscrollbar drag event fixed..
2013-03-12 15:23:38 +08:00
470dbea22d
Merge branch 'desktop' into desktop_work
...
* desktop:
tinyscrollbar pagination fixed
insert and remove columns
Major tinyscrollbar update
modify translation for journal_co_author_relation button
modify nil of email string and sort
remove redundant space of co_author sample data
make index of list can be hightline list when click cancel button
fixed author sample data generation and model method
add author filter for journal and fix some bug
have done conference author filter, journal haven't been done, yet
2013-03-12 14:16:25 +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
d20081157a
modify translation for journal_co_author_relation button
2013-03-12 11:22:11 +08:00
Harry Bomrah
e88487bc9f
tinyscrollbar pagination fixed
2013-03-12 11:18:32 +08:00
311d741f92
style for front end
2013-03-11 18:21:17 +08:00
8e0632236b
modify nil of email string and sort
2013-03-11 17:21:02 +08:00
78abcac1cb
remove redundant space of co_author sample data
2013-03-11 17:20:24 +08:00
385e043809
make index of list can be hightline list when click cancel button
2013-03-11 17:18:58 +08:00
8d5a2d71b7
fixed author sample data generation and model method
2013-03-11 14:53:21 +08:00
1880ed11ca
add author filter for journal and fix some bug
2013-03-11 10:41:07 +08:00
96602842a3
have done conference author filter, journal haven't been done, yet
2013-03-08 19:16:01 +08:00
Harry Bomrah
ca64cba9ad
updated
2013-03-08 12:54:58 +08:00
Harry Bomrah
4f64ff3568
insert and remove columns
2013-03-08 12:23:15 +08:00
a22c0c46e0
tinyscrollbar css minor update
2013-03-08 12:23:15 +08:00
Harry Bomrah
196030b4b4
Major tinyscrollbar update
2013-03-08 12:23:15 +08:00
75a5e74bc0
add pagination for personal plugin
2013-03-08 12:01:13 +08:00
73e9a60212
Pagination or more link for default widget
2013-03-07 21:21:48 +08:00
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
Harry Bomrah
39a20f6cc9
Merge branch 'desktop_work' into desktop_work_devin
2013-03-07 19:16:41 +08:00
Harry Bomrah
32d56232bc
insert and remove columns
2013-03-07 19:15:30 +08:00
b7beadfc04
tinyscrollbar css minor update
2013-03-07 17:44:02 +08:00
147b7b9292
Fix update when no tag or category
2013-03-07 17:30:49 +08:00
e53ad9f5d1
1.make module app forbid unearthed access except from admin
...
2.override sidebar link when it's object_auth or app_auth.
2013-03-07 16:51:47 +08:00
b2cbcf6629
fixed bug
2013-03-07 10:50:43 +08:00
Harry Bomrah
906e522a6a
Major tinyscrollbar update
2013-03-06 19:04:33 +08:00
4f7928ad1b
Merge branch 'development' of github.com:Rulingcom/orbit into development
2013-03-06 15:17:06 +08:00
77c7053bf1
put add admin pages using orbit back end controller
2013-03-06 15:16:20 +08:00
Harry Bomrah
20ac4f1ac0
all none for conf done
2013-03-06 12:08:08 +08:00
Harry Bomrah
9931eb7f61
all none fixed
2013-03-06 11:32:53 +08:00
27686a5d04
Merge branch 'development' into desktop
2013-03-05 19:07:58 +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
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +08:00
Harry Bomrah
Rueshyna
Fu Matthew
chris
devin
Spen