75e27ed849
ask module: default status
2013-06-07 13:04:00 +08:00
8541033ba9
ask module: send mail on development
2013-06-07 13:04:00 +08:00
467c2e8a3c
ask module: fix
2013-06-07 13:04:00 +08:00
b0640f925b
ask module: fix some
2013-06-07 13:04:00 +08:00
841fa10c55
ask module: add rescue ackknowledgement
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
97df100c64
remove department
2013-06-07 13:03:59 +08:00
ce180839f0
finish ask module
2013-06-07 13:03:59 +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
f9a148c901
survey module: move down/up i18n
...
Conflicts:
vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
2013-06-06 18:46:52 +08:00
5ea0c5bd5c
survey module: result chart display only other
...
Conflicts:
config/environments/production.rb
2013-06-06 18:45:29 +08:00
ec173c4ce1
fix
2013-06-06 18:42:12 +08:00
ba7d6558ee
fix
2013-06-06 18:42:00 +08:00
88c57e0b0c
fix
2013-06-06 18:41:48 +08:00
d4962d20b3
fix
2013-06-06 18:41:36 +08:00
21bf3a0ccd
standalone css and icon
2013-06-06 18:41:27 +08:00
cf0d7cfc64
new export csv table
...
Conflicts:
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
2013-06-06 18:40:28 +08:00
15347f25dc
fix
2013-06-06 18:38:59 +08:00
443d1c4fbe
csv stats & required start
2013-06-06 18:38:47 +08:00
7ba0977e16
stuff
...
Conflicts:
vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/show.html.erb
2013-06-06 18:38:22 +08:00
b659c7021d
bug fix and add feature
2013-06-06 18:31:09 +08:00
515185d87c
ques: fix submit
2013-06-06 18:30:54 +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
32c259ac9e
survey: remain stuff
2013-06-06 18:27:05 +08:00
51640423a7
survey module initial
2013-06-06 18:26:41 +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
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
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
3d0a1cef56
1.fix for syntax error.
...
2.Making production console works.
3.Making blank site member no errors.
2013-05-22 16:25:12 +08:00
4a5256bf4f
ntu dropdown fix member staff css
2013-05-14 14:19:56 +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
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
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
caf0426bd4
bulletin search
2013-05-01 12:16:28 +08:00
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
c68c563fb0
fix qa problem
2013-04-25 20:37:13 +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
Harry Bomrah
11067ef34f
english mandatory removed from albums
2013-04-23 11:09:43 +08:00
536f0d30af
apps_translate_fix
2013-04-23 11:09:20 +08:00
Harry Bomrah
38d5a193e0
tiny scrollbar trigger fixed and devin branch merged
2013-04-17 14:31:09 +08:00
c94a86c3a4
web_resource rake web_link_url:web_link_url_i18n
2013-04-17 14:29:04 +08:00
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
0734f73291
faq show fix
2013-04-17 14:25:05 +08:00
Harry Bomrah
d288972035
stupid commit
2013-04-17 14:19:32 +08:00
Harry Bomrah
bc0477a5ed
widget and gridster fixes
2013-04-17 14:16:24 +08:00
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +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
95805cfdee
correct model method
2013-04-17 14:07:24 +08:00
Harry Bomrah
84afbfa86c
section page fixed..
2013-04-17 14:01:48 +08:00
44fede2b71
fixed co author relation save button
2013-04-17 14:01:48 +08:00
Harry Bomrah
8dee211ab4
section page fixed..
2013-04-17 14:01:14 +08:00
27ad25ccca
add pagination for every controller and view in personal plugin
2013-04-17 14:00:37 +08:00
df220397b2
make index of list can be hightline list when click cancel button
2013-04-17 12:22:04 +08:00
b5fd6c7a1a
fixed author sample data generation and model method
2013-04-17 12:21:21 +08:00
Harry Bomrah
41643d1f61
tinyscrollbar pagination fixed
2013-04-17 12:11:33 +08:00
aad4119892
fixed bug
2013-04-17 12:07:11 +08:00
Harry Bomrah
6db9e70132
Major tinyscrollbar update
2013-04-17 12:04:22 +08:00
Harry Bomrah
dabceec3ea
all none for conf done
2013-04-17 11:23:03 +08:00
Harry Bomrah
52789fa032
all none fixed
2013-04-17 11:23:02 +08:00
dc68f40cb4
correct model method
2013-04-17 11:13:32 +08:00
228dd1b767
fixed co author relation save button
2013-04-17 11:13:32 +08:00
Harry Bomrah
dae3f069ff
app manager changed plus some changes
2013-04-17 11:09:56 +08:00
5f2c669568
fixed checkout and start in personal plugin
2013-04-17 11:08:58 +08:00
1b12412596
correct factoried girl for journal
2013-04-17 11:08:58 +08:00
Harry Bomrah
b1d7d5345e
section page fixed..
2013-04-17 11:08:58 +08:00
9815950083
now default options can be chosen by developer at init
2013-04-17 11:07:45 +08:00
50449b55e8
one abstract one column for personal plugin
2013-04-17 11:07:20 +08:00
00db66b8c4
add pagination for every controller and view in personal plugin
2013-04-17 11:07:20 +08:00
Harry Bomrah
401c75c0de
Major tinyscrollbar update
2013-04-17 11:06:28 +08:00
1ebae504dc
modify translation for journal_co_author_relation button
2013-04-17 11:05:57 +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
5178ce3bde
modify nil of email string and sort
2013-04-17 11:04:52 +08:00
95128a3465
remove redundant space of co_author sample data
2013-04-17 11:04:52 +08:00
8783b8e5fe
make index of list can be hightline list when click cancel button
2013-04-17 11:04:52 +08:00
a3de4cc2d4
fixed author sample data generation and model method
2013-04-17 11:04:52 +08:00
bdaef3af0f
add author filter for journal and fix some bug
2013-04-17 11:04:52 +08:00
625f2e9ad6
have done conference author filter, journal haven't been done, yet
2013-04-17 11:04:52 +08:00
Harry Bomrah
db60a3bcfa
insert and remove columns
2013-04-17 11:04:37 +08:00
Harry Bomrah
a7667d586a
Major tinyscrollbar update
2013-04-17 11:04:36 +08:00
e9ddb85734
add pagination for personal plugin
2013-04-17 10:56:49 +08:00
Harry Bomrah
d840b82fa9
insert and remove columns
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
15be80a35f
fixed bug
2013-04-17 10:56:14 +08:00
Harry Bomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
Harry Bomrah
6cd97adf21
all none for conf done
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
468555a037
faq app
2013-03-28 14:09:29 +08:00
da8a5123c2
Change in announcement init for query
...
Change in default widget query
2013-03-27 16:31:42 +08:00
ec1605358b
Fix sorting for archive
2013-03-27 06:30:22 +08:00
41311c74d0
Spen's changes in archive
2013-03-21 14:38:04 +08:00
04d3e177d5
Fix typo in core lib
...
Change i18n for more link in announcement init
2013-03-20 17:45:08 +08:00
031cf927d5
Sort archive by top and creation date
2013-03-20 17:22:40 +08:00
e71b002438
Fix archive front end query for multiple categories
2013-03-20 15:37:34 +08:00
90f08c96fc
Fix merge error: add missing delete route
2013-03-20 02:11:29 +08:00
6abf53f34d
change page number of archive
2013-03-19 23:43:28 +08:00
4e151690e9
fixed archive bug, make it have page and category
2013-03-19 23:42:39 +08:00
f3c809fd58
Fix link switch not showing for default front end
2013-03-19 17:49:46 +08:00
f29ad27b56
Fix pagination in archive back end
2013-03-18 21:53:31 +08:00
aacfcf1997
Fix typo in translations
2013-03-18 21:52:52 +08:00
2427bc5b69
Update CSS for archive and put the call in widget index
2013-03-13 17:21:39 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +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
924ecc3b1f
desktop CSS update
2013-03-05 17:48:28 +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
f6272728d5
fixed delete co author relation bug
2013-03-05 12:41:42 +08:00
430981a534
checked back and cancel button of personal plugin and fixed journal co author save and update bug
2013-03-05 12:14:10 +08:00
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
80b6a9ab48
Merge branch 'desktop' into desktop_work
...
* desktop:
highlighting fixed…
add Devin's css file for gallery
using refine tiny scroll bar js for personal plugin
fixed adding.
layout fix
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
authors auto-complete
fixed paper title and journal title bug
Conflicts:
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_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_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.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/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-03-04 18:03:59 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
Harry Bomrah
ee5fd18b64
highlighting fixed…
2013-03-04 17:44:55 +08:00
874648eacf
add Devin's css file for gallery
2013-03-04 17:27:36 +08:00
a6ca308a5e
using refine tiny scroll bar js for personal plugin
2013-03-04 16:35:09 +08:00
Harry Bomrah
8ade2c5949
fixed adding.
2013-03-04 16:31:37 +08:00
Harry Bomrah
0c659e5a9b
layout fix
2013-03-04 16:31:37 +08:00
Harry Bomrah
d4392c8d56
fixed adding.
2013-03-04 16:21:35 +08:00
Harry Bomrah
6ae4e4d0ef
layout fix
2013-03-04 15:48:24 +08:00
Harry Bomrah
9a32732ae4
layout fix
2013-03-04 14:57:36 +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
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
e99fef9404
fixed paper title and journal title bug
2013-03-04 11:45:39 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Harry Bomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
4bc3a57862
give back and cancel button a link for personal conference
2013-02-26 18:37:58 +08:00
f431ab9ab5
give back and cancel button a link for personal journal
2013-02-26 18:37:33 +08:00
fb931b0a4a
Merge remote-tracking branch 'origin/desktop' into desktop
...
* origin/desktop:
Remove Gemfile.lock
sort conference and type
add conferene list order function
css minor changes.
gridster, url code fixed, views removed.
Fix selection of sub_menu for widget (the value wasn't set)
Fix bug in widget selection
css minor changes.
Fix public_r_tag selection
gridster, url code fixed, views removed.
2013-02-26 17:02:01 +08:00
6c9e2a7249
fixed journal co author bug
2013-02-26 16:57:08 +08:00
d0b54a4d6c
done conferece seeds
2013-02-26 15:52:42 +08:00
81725ed942
split db/seeds.rb file to local plugin and done journal
2013-02-26 15:52:20 +08:00
c55f64f3c6
correct view permission of conference
2013-02-26 15:17:09 +08:00
iCross
Matt K. Fu
chris
Spen
Matthew K. Fu JuYuan
Harry Bomrah
devin chen
devin
Rueshyna
Fu Matthew