chris
|
0a01faedc9
|
Fix merge error
|
2013-03-26 16:16:19 +08:00 |
|
chris
|
8e0331449f
|
Merge branch 'patrial_Select_for_default_widget_style' of github.com:Rulingcom/orbit into patrial_Select_for_default_widget_style
Conflicts:
app/controllers/admin/pages_controller.rb
app/helpers/admin/page_parts_helper.rb
|
2013-03-21 18:51:16 +08:00 |
Fu Matthew
|
635d3f1690
|
add conditions for making multi cates and tags more stable
|
2013-03-21 18:49:53 +08:00 |
|
Fu Matthew
|
9e33bdadc3
|
now default options can be chosen by developer at init
|
2013-03-21 18:46:57 +08:00 |
|
Fu Matthew
|
54acaebc98
|
style for front end
|
2013-03-21 18:46:56 +08:00 |
|
Fu Matthew
|
7f7e21b4f2
|
1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
|
2013-03-21 18:45:28 +08:00 |
|
Fu Matthew
|
8609c8dec0
|
put add admin pages using orbit back end controller
|
2013-03-21 18:45:27 +08:00 |
|
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 |
|
Harry Bomrah
|
53953e57db
|
section page fixed..
|
2013-03-21 18:27:23 +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 |
|
Harry Bomrah
|
0e39de56e2
|
section page fixed..
|
2013-03-21 18:25:36 +08:00 |
devin
|
677faf1811
|
add browser compatibility page
|
2013-03-21 18:25:36 +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
|
6c58a0f773
|
compatibility page added and tinyscrollbar drag event fixed..
|
2013-03-21 18:25:33 +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 |
|
devin
|
80a2f67dda
|
tinyscrollbar css minor update
|
2013-03-21 18:09:39 +08:00 |
|
Harry Bomrah
|
7b2e7f5297
|
Major tinyscrollbar update
|
2013-03-21 18:09:39 +08:00 |
|
Harry Bomrah
|
38a695d8a9
|
all none for conf done
|
2013-03-21 18:09:38 +08:00 |
|
Harry Bomrah
|
df83c6fff7
|
all none fixed
|
2013-03-21 18:09:38 +08:00 |
|
chris
|
41311c74d0
|
Spen's changes in archive
|
2013-03-21 14:38:04 +08:00 |
|
chris
|
ee8a78621a
|
Add task to flatten category and tag for page and page_part
|
2013-03-21 14:15:58 +08:00 |
|
chris
|
d01968dcd0
|
Changes in query for default widget
|
2013-03-21 02:29:56 +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
|
91afd49f75
|
Fix for scope
|
2013-03-20 17:20:17 +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 |
|
chris
|
43f7711433
|
Put back Gemfile.lock
|
2013-03-20 00:30:58 +08:00 |
|
chris
|
b92f6d2274
|
Update Gemfile.lock
|
2013-03-19 23:59:40 +08:00 |