chris
|
49d0d83810
|
Remove old code for object auth and module app
|
2013-05-06 18:45:46 +08:00 |
chris
|
82baa809ea
|
Remove useless 'taggable'
|
2013-05-06 18:44:50 +08:00 |
chris
|
5de39dd0a6
|
Refactor common code for models (approval, language restriction, status, time frame)
|
2013-05-06 17:04:05 +08:00 |
chris
|
36da89f93e
|
Add tagged_ids to taggable
Changes for queries
|
2013-05-03 16:15:37 +08:00 |
chris
|
a4aef30a9c
|
Side bar icons
Dashboard completed with pagination
|
2013-05-03 14:58:45 +08:00 |
chris
|
f9fda13879
|
Side bar for dashboard
|
2013-05-02 11:35:48 +08:00 |
chris
|
67bb08c338
|
Fix a bug when setting the site
Fix devise login
|
2013-04-29 20:17:44 +08:00 |
chris
|
e028791d68
|
Tag management module completed
|
2013-04-26 18:34:46 +08:00 |
chris
|
218592c1f9
|
Temporary open tags to allTemporary open tags to all
|
2013-04-25 19:45:46 +08:00 |
chris
|
73a0234330
|
Temporary open tags to allTemporary open tags to all
|
2013-04-25 19:41:40 +08:00 |
chris
|
3e0822336e
|
Put back deleted code in items helper
|
2013-04-25 19:37:00 +08:00 |
chris
|
3714403f85
|
Now default tags can be removed from module
|
2013-04-25 19:20:37 +08:00 |
chris
|
19405cf006
|
Tag management working but can't remove default tag from module
|
2013-04-25 12:34:06 +08:00 |
chris
|
bf3d20ea46
|
Tag functionalities for new UI
|
2013-04-23 20:18:03 +08:00 |
chris
|
ff03d66439
|
Fix missing values in tag form when editing
|
2013-04-23 20:18:03 +08:00 |
chris
|
24523640a7
|
New tags but still without global tag management
|
2013-04-23 20:18:03 +08:00 |
chris
|
12df0e7f85
|
Remove ckeditor
|
2013-04-12 04:22:36 +08:00 |
chris
|
a9d25dcdec
|
Orbit bar
Structure: page, link, edit and new, page view, edit page parts
Temporary disable authentication in items controller
|
2013-04-12 03:13:03 +08:00 |
chris
|
e4c33b443f
|
Put new assets and use some old ones
|
2013-04-12 03:09:40 +08:00 |
chris
|
76b4356bc0
|
Move the old assets to Archive
|
2013-04-12 03:07:01 +08:00 |
Matt K. Fu
|
b58e08b872
|
Merge commit 'fb800b488b2e81eec259554e9e6a9ac4ffc4f231' into development
|
2013-04-08 11:53:20 +08:00 |
Matt K. Fu
|
e3666acdeb
|
Merge commit '0a7c43bbb96e7f91bd6ecb76f60733093473feaa' into development
|
2013-04-08 10:53:10 +08:00 |
Matt K. Fu
|
fb800b488b
|
widget link followed by setting
|
2013-04-03 19:03:16 +08:00 |
Matt K. Fu
|
0a7c43bbb9
|
fix default widget link failed
|
2013-04-03 18:05:12 +08:00 |
Matt K. Fu
|
a85d1f938c
|
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
|
2013-04-03 17:49:59 +08:00 |
chris
|
5b2f653b5a
|
Change in announcement init for query
Change in default widget query
|
2013-04-03 12:05:59 +08:00 |
Matt K. Fu
|
74f9dea6b9
|
Merge commit '20bdeb3c2d55f6c0404ae604108c4c23c3d4aa67' into development
|
2013-04-02 18:40:48 +08:00 |
Matt K. Fu
|
20bdeb3c2d
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-02 18:39:46 +08:00 |
Matt K. Fu
|
695d712843
|
Merge commit '8b44f930f38d70098da5793bd795400eb088a052' into development
Conflicts:
app/assets/javascripts/orbitdesktop.js
|
2013-04-02 18:05:30 +08:00 |
Harry Bomrah
|
8b44f930f3
|
widget and gridster fixes
|
2013-04-01 18:00:47 +08:00 |
Matt K. Fu
|
3476237fa7
|
solved conflicts
|
2013-04-01 17:18:41 +08:00 |
chris
|
bd3e9fe4f6
|
Fix js bug and asset url after merge
|
2013-03-29 17:50:21 +08:00 |
devin
|
4bb5e18f44
|
recover .gitignore file
Conflicts:
.gitignore
|
2013-03-29 12:33:35 +08:00 |
Harry Bomrah
|
78205d8b00
|
features and widgets added
Conflicts:
app/assets/javascripts/orbitdesktop.js
|
2013-03-29 12:04:21 +08:00 |
devin
|
a62ff9308f
|
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-03-29 12:03:15 +08:00 |
Matt K. Fu
|
474e8b9b57
|
fix for both part and page part settings
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
|
2013-03-29 11:12:52 +08:00 |
Spen
|
a8f7422c25
|
faq app
|
2013-03-29 11:09:56 +08:00 |
Fu Matthew
|
9e02011956
|
deliver API
|
2013-03-29 11:08:22 +08:00 |
chris
|
3f0addf04d
|
Fix bug in setup_app_frontend_and_style
|
2013-03-26 16:29:35 +08:00 |
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 |