869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +08:00
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
d3f0a10187
fix default setting for partial category selection error,due to API changing.
2013-06-17 15:26:43 +08:00
c1bd135595
Fix sortable when there's no record
2013-06-14 15:26:12 +08:00
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
e68793afc3
Fix tag delete
2013-06-14 15:23:45 +08:00
f3e1f4057d
ask module update css
2013-06-07 13:04:00 +08:00
e353961b21
ask moudule: add ask.css
2013-06-07 13:04:00 +08:00
dcc5fc39a7
ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
2013-06-07 13:03:59 +08:00
0904978292
Remove non resolved conflict
2013-06-07 13:02:47 +08:00
ddd9a9668e
Merge branch 'lukas/picked_archive' into development
2013-06-06 23:12:30 +08:00
a468b69013
archive module: fix old data caused error
2013-06-06 23:11:24 +08:00
b6c8a88b73
Merge branch 'lukas/picked_archive' into development
2013-06-06 22:27:08 +08:00
5b7ac1a22b
archive module: add sort feature to achive files
2013-06-06 22:20:27 +08:00
d5109c837c
Merge branch 'lukas/picked_ques' into development
2013-06-06 19:59:30 +08:00
c63ac751ea
archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb
2013-06-06 19:20:21 +08:00
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
d2f131d160
survey module: update css
...
Conflicts:
app/assets/stylesheets/questionnaire.css
2013-06-06 18:43:28 +08:00
8d71c377f2
fix datepicker helper hidden field value
2013-06-06 18:42:26 +08:00
21bf3a0ccd
standalone css and icon
2013-06-06 18:41:27 +08:00
443d1c4fbe
csv stats & required start
2013-06-06 18:38:47 +08:00
531cee70d2
fix
2013-06-06 18:31:28 +08:00
adc15951bb
questionnaire stuff
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
51640423a7
survey module initial
2013-06-06 18:26:41 +08:00
dd206437d8
apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.
2013-06-06 17:39:36 +08:00
7729161123
fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
2013-06-06 17:38:17 +08:00
5c94200b77
fix argument passing problem for more link and tag cloud, incomplete code.
2013-06-06 17:21:27 +08:00
6b8b749b0f
fix chris tag cloud
2013-06-06 17:18:42 +08:00
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
30824d1620
add search to archive
2013-06-05 18:03:09 +08:00
704db56925
fix bulletin data having 8 hours difference.
2013-06-05 18:01:57 +08:00
06fd305bf9
default widget show search
2013-06-05 13:00:21 +08:00
c0f1614cb9
fix uploading error due to user action decoder can not handle uploading file
2013-05-30 10:17:28 +08:00
3e0b7d81ae
clean 403 404 500
2013-05-27 16:46:49 +08:00
2806dd35a9
spen's fix for user
2013-05-23 14:03:18 +08:00
54a35b30be
fix design index bug when start start from blank DB.
...
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
37aa950028
user action
2013-05-23 11:55:57 +08:00
5b368235e8
ntu dropdown fix list sort
2013-05-14 14:19:55 +08:00
b8da40b4ae
ntu_dropdown_fix
2013-05-14 14:19:55 +08:00
287e77836d
fix css compiling error
2013-05-14 14:19:20 +08:00
3e6c2b1ec2
fix member error with blank database
2013-05-14 11:48:13 +08:00
f2247aab32
ray's css fix
2013-05-14 11:27:15 +08:00
ef2c732d2e
make blank site working better
2013-05-14 11:26:35 +08:00
1096db79b6
blank site now can be start from rake site:build
2013-05-14 10:32:53 +08:00
88d55989de
change logger
2013-05-14 10:29:11 +08:00
c2331695cd
Set order of page context to match the order of structure
...
Add some params to keep the sorting
2013-05-07 11:15:30 +08:00
127ab3845c
Changes for queries
2013-05-03 12:12:19 +08:00
aefd62da2a
Add tagged_ids to taggable
2013-05-03 12:12:19 +08:00
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
7d077a92a5
system preference
2013-04-29 15:23:15 +08:00
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
3e567223e3
fix for Spen's translation and Chris's tag error
2013-04-26 15:37:27 +08:00
79ef86f2c9
member translation fix
2013-04-26 11:26:11 +08:00
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
697944a029
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
2013-04-25 19:59:59 +08:00
a0478f2a8f
fix page name repeated error when page creating
2013-04-25 12:19:25 +08:00
b198b1a17b
system preference
2013-04-24 19:21:11 +08:00
62fa589e8a
add msg when user session expired at page admin
2013-04-24 11:58:48 +08:00
5ff7dfbac6
fronted open switch and backend openness
2013-04-23 18:48:18 +08:00
41168f4c99
fix for fronted routing failed
2013-04-23 10:01:02 +08:00
7e9fce0c2d
clean Harry's code
2013-04-17 14:31:10 +08:00
Harry Bomrah
38d5a193e0
tiny scrollbar trigger fixed and devin branch merged
2013-04-17 14:31:09 +08:00
989e5aa974
minor update
2013-04-17 14:29:56 +08:00
aedab01ae6
minor update
2013-04-17 14:29:04 +08:00
e3782c9cf7
minor update
2013-04-17 14:29:04 +08:00
Harry Bomrah
e2802d94d0
rake task added
2013-04-17 14:28:13 +08:00
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
a4ebe31ada
fix for widget edit js missing
2013-04-17 14:19:32 +08:00
3098496083
widget link followed by setting
2013-04-17 14:19:32 +08:00
28f0df5da8
fix default widget link failed
2013-04-17 14:19:32 +08:00
3de4591413
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-17 14:19:32 +08:00
d177fe0369
minor update
2013-04-17 14:19:32 +08:00
Harry Bomrah
c6868bf2e0
small fix in select2.js
2013-04-17 14:18:49 +08:00
95e308e046
minor update
2013-04-17 14:18:49 +08:00
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
dc5f24ab22
starting new branch ( add rules in .gitignore for SASS cache folder )
2013-04-17 14:16:24 +08:00
Harry Bomrah
bc0477a5ed
widget and gridster fixes
2013-04-17 14:16:24 +08:00
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +08:00
dd10b3147c
Fix js bug and asset url after merge
2013-04-17 14:14:24 +08:00
cae43e8acd
recover .gitignore file
...
Conflicts:
.gitignore
2013-04-17 14:14:23 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
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
0f6f5aafce
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-04-17 14:12:52 +08:00
f6b600df59
deliver API
2013-04-17 14:09:01 +08:00
6af375efa4
Fix bug in setup_app_frontend_and_style
2013-04-17 14:09:00 +08:00
1709773b0a
style for front end
2013-04-17 14:08:01 +08:00
Harry Bomrah
764f83d58c
app manager changed plus some changes
2013-04-17 14:01:14 +08:00
Harry Bomrah
8dee211ab4
section page fixed..
2013-04-17 14:01:14 +08:00
Harry Bomrah
f9e7cefc94
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 13:59:16 +08:00
Harry Bomrah
41643d1f61
tinyscrollbar pagination fixed
2013-04-17 12:11:33 +08:00
Harry Bomrah
54af5e8bd4
insert and remove columns
2013-04-17 12:06:33 +08:00
Harry Bomrah
6db9e70132
Major tinyscrollbar update
2013-04-17 12:04:22 +08:00
Harry Bomrah
dae3f069ff
app manager changed plus some changes
2013-04-17 11:09:56 +08:00
Harry Bomrah
b1d7d5345e
section page fixed..
2013-04-17 11:08:58 +08:00
6efef253a6
add conditions for making multi cates and tags more stable
2013-04-17 11:08:57 +08:00
0d5ab20efa
add browser compatibility page
2013-04-17 11:07:45 +08:00
9815950083
now default options can be chosen by developer at init
2013-04-17 11:07:45 +08:00
Harry Bomrah
b8ee2fd559
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 11:07:20 +08:00
Harry Bomrah
323fadc210
tinyscrollbar pagination fixed
2013-04-17 11:05:57 +08:00
69a49a69aa
style for front end
2013-04-17 11:05:57 +08:00
625f2e9ad6
have done conference author filter, journal haven't been done, yet
2013-04-17 11:04:52 +08:00
Harry Bomrah
d840b82fa9
insert and remove columns
2013-04-17 10:56:15 +08:00
84dfb44e78
tinyscrollbar css minor update
2013-04-17 10:56:15 +08:00
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
Harry Bomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
8e98cb3ec9
put add admin pages using orbit back end controller
2013-04-17 10:54:38 +08:00
Harry Bomrah
0189d1c2c0
all none fixed
2013-04-17 10:54:38 +08:00
3e96cfe514
Changes for FAQ to work with not latest but stable code
2013-03-28 15:05:52 +08:00
da8a5123c2
Change in announcement init for query
...
Change in default widget query
2013-03-27 16:31:42 +08:00
d01968dcd0
Changes in query for default widget
2013-03-21 02:29:56 +08:00
617ebfd43a
Revert "Fix query for top in bulletin"
...
This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f.
2013-03-19 23:44:02 +08:00
b55988af33
Fix query for top in bulletin
2013-03-19 23:44:02 +08:00
9684189258
Fix query for date in bulletin
2013-03-19 23:43:59 +08:00
8374bc8d12
Set I18n from browser
2013-03-19 23:43:31 +08:00
9cf8c2b72b
Revert "Page front end stay in the same page when a link is clicked (category)"
...
This reverts commit 14d856b4d6
2013-03-19 20:00:16 +08:00
14d856b4d6
Page front end stay in the same page when a link is clicked (category)
2013-03-19 19:44:04 +08:00
37a38369e7
Fix typo in default widget not showing objects in front end
2013-03-19 18:41:03 +08:00
ff30b3d05e
Fix link not showing for default front end
2013-03-19 18:23:35 +08:00
f3c809fd58
Fix link switch not showing for default front end
2013-03-19 17:49:46 +08:00
5e4e3ac560
Fix link for default widget
...
Convert single id to array to find item
2013-03-19 17:14:01 +08:00
7dcea95dd4
Fix query for multi categories and tags (empty array)
2013-03-19 15:10:31 +08:00
ef2a32be4c
Fix query for multi categories and tags
2013-03-18 22:01:08 +08:00
157935e7eb
Page front end stay in the same page when a link is clicked (title or pagination)
2013-03-18 21:54:06 +08:00
e208e99a73
Fix page part update when no tag or category
2013-03-13 15:45:30 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +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
147b7b9292
Fix update when no tag or category
2013-03-07 17:30:49 +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
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +08:00
d5f1d13670
Merge remote-tracking branch 'origin/desktop_work' into desktop
...
* origin/desktop_work:
simple layout tinyscrollbar fixed
highlighting fixed…
fixed adding.
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 17:34:28 +08:00
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
db2b371744
tinyscrollbar minor update
2013-03-05 17:22:53 +08:00
626b2a7bca
fix default failed when cate or tags set to empty
2013-03-05 11:48:20 +08:00
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
Harry Bomrah
dc92ef9f42
simple layout tinyscrollbar fixed
2013-03-05 11:04:18 +08:00
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
285119a5f3
fix for multi select cates and tags
2013-03-04 19:29:45 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
15b9839b76
fix archive category
...
fix page adding failed
2013-03-04 14:40:29 +08:00
Harry Bomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
0f12314213
some changes for gridster
2013-03-04 12:37:29 +08:00
Harry Bomrah
b8ee748723
Lot of changes in gridster
2013-03-04 12:37:29 +08:00
ee4b94ace0
Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop
...
* 'desktop' of https://github.com/Rulingcom/orbit :
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
2013-03-04 12:17:14 +08:00
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Matt K. Fu
Matthew K. Fu JuYuan
chris
iCross
Spen
Harry Bomrah
devin chen
devin
Fu Matthew
Rueshyna