saurabhbhatia
b642072cbe
Removed the category reference for now
2013-07-19 17:38:43 +08:00
Harry Bomrah
0921d7731b
my favorite update :) lazy loading for theater view plus a very smooth navigation of images.
2013-07-19 17:38:41 +08:00
Harry Bomrah
3c0d2da9a7
description fixed for gallery
2013-07-19 17:38:38 +08:00
saurabhbhatia
e6c411b8e1
Updated tagging with galleries in new ui
2013-07-19 17:38:33 +08:00
saurabhbhatia
1c558a1783
added tags to index page, added html safe for show
2013-07-19 17:38:30 +08:00
Harry Bomrah
3287a2ef17
gallery migrated to new ui
2013-07-19 17:38:27 +08:00
chris
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
chris
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
chris
856898016b
New UI changes(tags, categories, authorisations, module index…)
...
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00
Spen
07b3857465
archive app Category Authorization fix
2013-06-26 17:44:31 +08:00
Spen
8751b15385
archive app add Module Authorization & Category Authorization
2013-06-26 15:35:35 +08:00
Harry Bomrah
465d417c35
fixed updated method of events.. was having week error when updating events
2013-06-26 12:27:23 +08:00
Harry Bomrah
eaf7577810
small syntax error missed out yesterday fixed.
2013-06-26 12:26:52 +08:00
Harry Bomrah
22358bd862
Small change for creating events when calendar is not selected
2013-06-26 12:26:24 +08:00
Harry Bomrah
300de76c3a
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
2013-06-26 12:25:58 +08:00
iCross
96fc5ceea3
survey module: ensure the commit
2013-06-14 15:25:58 +08:00
iCross
e48a1ffece
archive module: add sort to frontend module
...
Conflicts:
vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
2013-06-14 15:25:49 +08:00
iCross
2f7389ae24
ask module change mail view: <p>此為系統自動發信,請勿直接回覆</p>
2013-06-07 13:04:00 +08:00
iCross
c7effcc96c
ask module: create.js.erb
2013-06-07 13:04:00 +08:00
iCross
e353961b21
ask moudule: add ask.css
2013-06-07 13:04:00 +08:00
iCross
75e27ed849
ask module: default status
2013-06-07 13:04:00 +08:00
iCross
8541033ba9
ask module: send mail on development
2013-06-07 13:04:00 +08:00
iCross
467c2e8a3c
ask module: fix
2013-06-07 13:04:00 +08:00
iCross
b0640f925b
ask module: fix some
2013-06-07 13:04:00 +08:00
iCross
841fa10c55
ask module: add rescue ackknowledgement
2013-06-07 13:04:00 +08:00
iCross
dcc5fc39a7
ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
2013-06-07 13:03:59 +08:00
iCross
97df100c64
remove department
2013-06-07 13:03:59 +08:00
iCross
ce180839f0
finish ask module
2013-06-07 13:03:59 +08:00
iCross
b6c8a88b73
Merge branch 'lukas/picked_archive' into development
2013-06-06 22:27:08 +08:00
iCross
5b7ac1a22b
archive module: add sort feature to achive files
2013-06-06 22:20:27 +08:00
Matt K. Fu
d5109c837c
Merge branch 'lukas/picked_ques' into development
2013-06-06 19:59:30 +08:00
iCross
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
iCross
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
iCross
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
iCross
5ea0c5bd5c
survey module: result chart display only other
...
Conflicts:
config/environments/production.rb
2013-06-06 18:45:29 +08:00
iCross
ec173c4ce1
fix
2013-06-06 18:42:12 +08:00
iCross
ba7d6558ee
fix
2013-06-06 18:42:00 +08:00
iCross
88c57e0b0c
fix
2013-06-06 18:41:48 +08:00
iCross
d4962d20b3
fix
2013-06-06 18:41:36 +08:00
iCross
21bf3a0ccd
standalone css and icon
2013-06-06 18:41:27 +08:00
iCross
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
iCross
15347f25dc
fix
2013-06-06 18:38:59 +08:00
iCross
443d1c4fbe
csv stats & required start
2013-06-06 18:38:47 +08:00
iCross
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
Lukas
b659c7021d
bug fix and add feature
2013-06-06 18:31:09 +08:00
Lukas
515185d87c
ques: fix submit
2013-06-06 18:30:54 +08:00
Lukas
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
Lukas
32c259ac9e
survey: remain stuff
2013-06-06 18:27:05 +08:00
Lukas
51640423a7
survey module initial
2013-06-06 18:26:41 +08:00
Matt K. Fu
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
chris
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
Matt K. Fu
30824d1620
add search to archive
2013-06-05 18:03:09 +08:00
Matt K. Fu
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
Matt K. Fu
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
Spen
4a5256bf4f
ntu dropdown fix member staff css
2013-05-14 14:19:56 +08:00
Spen
5b368235e8
ntu dropdown fix list sort
2013-05-14 14:19:55 +08:00
Spen
b8da40b4ae
ntu_dropdown_fix
2013-05-14 14:19:55 +08:00
chris
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
chris
127ab3845c
Changes for queries
2013-05-03 12:12:19 +08:00
chris
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
Matt K. Fu
caf0426bd4
bulletin search
2013-05-01 12:16:28 +08:00
Matt K. Fu
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
Matthew K. Fu JuYuan
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
Matt K. Fu
c68c563fb0
fix qa problem
2013-04-25 20:37:13 +08:00
Spen
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
Spen
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
Spen
c94a86c3a4
web_resource rake web_link_url:web_link_url_i18n
2013-04-17 14:29:04 +08:00
devin chen
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
Spen
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
devin
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +08:00
devin
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
Rueshyna
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
Rueshyna
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
Rueshyna
27ad25ccca
add pagination for every controller and view in personal plugin
2013-04-17 14:00:37 +08:00
Rueshyna
df220397b2
make index of list can be hightline list when click cancel button
2013-04-17 12:22:04 +08:00
Rueshyna
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
Rueshyna
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
Rueshyna
dc68f40cb4
correct model method
2013-04-17 11:13:32 +08:00
Rueshyna
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
Rueshyna
5f2c669568
fixed checkout and start in personal plugin
2013-04-17 11:08:58 +08:00
Rueshyna
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
Fu Matthew
9815950083
now default options can be chosen by developer at init
2013-04-17 11:07:45 +08:00
Rueshyna
50449b55e8
one abstract one column for personal plugin
2013-04-17 11:07:20 +08:00
Rueshyna
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
Rueshyna
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
Fu Matthew
69a49a69aa
style for front end
2013-04-17 11:05:57 +08:00
Rueshyna
5178ce3bde
modify nil of email string and sort
2013-04-17 11:04:52 +08:00
Rueshyna
95128a3465
remove redundant space of co_author sample data
2013-04-17 11:04:52 +08:00
Rueshyna
8783b8e5fe
make index of list can be hightline list when click cancel button
2013-04-17 11:04:52 +08:00
Rueshyna
a3de4cc2d4
fixed author sample data generation and model method
2013-04-17 11:04:52 +08:00
Rueshyna
bdaef3af0f
add author filter for journal and fix some bug
2013-04-17 11:04:52 +08:00
Rueshyna
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
Rueshyna
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
Fu Matthew
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
Rueshyna
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
chris
3e96cfe514
Changes for FAQ to work with not latest but stable code
2013-03-28 15:05:52 +08:00
Spen
468555a037
faq app
2013-03-28 14:09:29 +08:00
chris
da8a5123c2
Change in announcement init for query
...
Change in default widget query
2013-03-27 16:31:42 +08:00
chris
ec1605358b
Fix sorting for archive
2013-03-27 06:30:22 +08:00
chris
41311c74d0
Spen's changes in archive
2013-03-21 14:38:04 +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
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
Rueshyna
6abf53f34d
change page number of archive
2013-03-19 23:43:28 +08:00
Rueshyna
4e151690e9
fixed archive bug, make it have page and category
2013-03-19 23:42:39 +08:00
chris
f3c809fd58
Fix link switch not showing for default front end
2013-03-19 17:49:46 +08:00
chris
f29ad27b56
Fix pagination in archive back end
2013-03-18 21:53:31 +08:00
chris
aacfcf1997
Fix typo in translations
2013-03-18 21:52:52 +08:00
chris
2427bc5b69
Update CSS for archive and put the call in widget index
2013-03-13 17:21:39 +08:00
chris
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
Spen
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
chris
27686a5d04
Merge branch 'development' into desktop
2013-03-05 19:07:58 +08:00
Rueshyna
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
Rueshyna
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
devin
924ecc3b1f
desktop CSS update
2013-03-05 17:48:28 +08:00
Rueshyna
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
Rueshyna
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
Rueshyna
f6272728d5
fixed delete co author relation bug
2013-03-05 12:41:42 +08:00
Rueshyna
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
devin
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
Rueshyna
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
Rueshyna
874648eacf
add Devin's css file for gallery
2013-03-04 17:27:36 +08:00
Rueshyna
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
Fu Matthew
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
Rueshyna
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
Rueshyna
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Rueshyna
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
Fu Matthew
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
Rueshyna
4bc3a57862
give back and cancel button a link for personal conference
2013-02-26 18:37:58 +08:00
Rueshyna
f431ab9ab5
give back and cancel button a link for personal journal
2013-02-26 18:37:33 +08:00
Rueshyna
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
Rueshyna
6c9e2a7249
fixed journal co author bug
2013-02-26 16:57:08 +08:00
Rueshyna
d0b54a4d6c
done conferece seeds
2013-02-26 15:52:42 +08:00
Rueshyna
81725ed942
split db/seeds.rb file to local plugin and done journal
2013-02-26 15:52:20 +08:00
Rueshyna
c55f64f3c6
correct view permission of conference
2013-02-26 15:17:09 +08:00
Rueshyna
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
Rueshyna
6f599bb95d
sort conference and type
2013-02-25 12:01:59 +08:00
Rueshyna
522e0481e1
add conferene list order function
2013-02-25 12:01:59 +08:00
Rueshyna
8b0ffe747c
sort conference and type
2013-02-25 11:46:20 +08:00
Rueshyna
6929d30b5d
add conferene list order function
2013-02-25 11:46:11 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
spen
cd98f9c889
member plugin init add frontend
2013-02-22 18:21:11 +08:00
chris
8704fb30d5
Fix init name/key
2013-02-22 14:46:22 +08:00
chris
9a63adedde
Remove seminar from conference init
2013-02-22 11:57:10 +08:00
chris
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
unknown
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
Rueshyna
79f0fc1a3b
add announcement header translation file
2013-02-21 14:10:42 +08:00
Rueshyna
4ee85a8c09
add coauthor and coauthor relation function
2013-02-21 13:58:47 +08:00
Rueshyna
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
Rueshyna
16fda25ace
done personal conference add/edit page
2013-02-21 13:53:50 +08:00
Rueshyna
6d65af0312
done personal conference list page, but it need to js.
2013-02-21 13:53:50 +08:00
Rueshyna
2afbae7c08
make a fake data for personal conference plugin
2013-02-21 13:53:50 +08:00
Rueshyna
1c4b696052
add add/edit form page and controller
2013-02-21 13:53:50 +08:00
Rueshyna
54b12a193a
add translation configuration
2013-02-21 13:53:47 +08:00
Rueshyna
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
Rueshyna
f1db7be14e
remove test and change for personal journal
2013-02-21 13:51:37 +08:00
Rueshyna
a61ec183c9
change add/edit url of personal_conference
2013-02-21 13:50:12 +08:00
unknown
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
unknown
bc44d38948
member plugin edit
2013-02-20 17:25:20 +08:00
unknown
a7bc19768e
member list edit
2013-02-20 11:12:08 +08:00
chris
bc21840262
Comment out delete link for archive category
...
Modify the import:
- hot_news to announcement
- iso_zone of 20000 to 21100
2013-02-19 17:49:20 +08:00
chris
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
chris
236f68ba84
Fix archive module back end pagination and front end html
2013-02-19 17:39:43 +08:00
chris
61648d23e1
Change delete_all to destroy_all
2013-02-19 17:39:42 +08:00
chris
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00