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
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
6f599bb95d
sort conference and type
2013-02-25 12:01:59 +08:00
522e0481e1
add conferene list order function
2013-02-25 12:01:59 +08:00
8b0ffe747c
sort conference and type
2013-02-25 11:46:20 +08:00
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
cd98f9c889
member plugin init add frontend
2013-02-22 18:21:11 +08:00
8704fb30d5
Fix init name/key
2013-02-22 14:46:22 +08:00
9a63adedde
Remove seminar from conference init
2013-02-22 11:57:10 +08:00
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
79f0fc1a3b
add announcement header translation file
2013-02-21 14:10:42 +08:00
4ee85a8c09
add coauthor and coauthor relation function
2013-02-21 13:58:47 +08:00
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
16fda25ace
done personal conference add/edit page
2013-02-21 13:53:50 +08:00
6d65af0312
done personal conference list page, but it need to js.
2013-02-21 13:53:50 +08:00
2afbae7c08
make a fake data for personal conference plugin
2013-02-21 13:53:50 +08:00
1c4b696052
add add/edit form page and controller
2013-02-21 13:53:50 +08:00
54b12a193a
add translation configuration
2013-02-21 13:53:47 +08:00
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
f1db7be14e
remove test and change for personal journal
2013-02-21 13:51:37 +08:00
a61ec183c9
change add/edit url of personal_conference
2013-02-21 13:50:12 +08:00
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
bc44d38948
member plugin edit
2013-02-20 17:25:20 +08:00
a7bc19768e
member list edit
2013-02-20 11:12:08 +08:00
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
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
236f68ba84
Fix archive module back end pagination and front end html
2013-02-19 17:39:43 +08:00
61648d23e1
Change delete_all to destroy_all
2013-02-19 17:39:42 +08:00
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00
f3bfe67e68
breadcrumb widget of back-end has done, front-end has bug...
...
Conflicts:
app/controllers/front_controller.rb
app/views/front/show_breadcrumb.html.erb
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-02-19 17:39:41 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
b7d797f9dd
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-19 14:21:54 +08:00
fcb49723b4
fix sidebar icon for page.
...
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
2013-02-19 14:21:53 +08:00
a6f6dc271c
fix i18n,reload problems
2013-02-18 15:13:31 +08:00
29bb92f841
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-06 17:44:38 +08:00
8e7e601845
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
2013-02-04 18:19:47 +08:00
eed7a22dbe
fix sidebar icon for page.
...
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
2013-02-04 18:14:00 +08:00
2b3cbc50b3
Fix location namespace
2013-02-04 18:06:45 +08:00
3791046e5a
Add missing link to writing conference index
2013-02-04 18:01:42 +08:00
e244493b55
member plugin edit
2013-02-04 18:01:42 +08:00
8e98aa10bc
modularize factories
2013-02-04 18:01:42 +08:00
8f334f6948
modularize conference
2013-02-04 18:01:42 +08:00
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
e0fedb4454
change textfiled to bilingual for co_author
2013-02-04 18:01:03 +08:00
85ca196dec
add bilingual for personal journal
2013-02-04 18:01:03 +08:00
0b18cf48e3
member roles edit
2013-02-04 18:01:03 +08:00
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
8bf7d0f6f3
member plugin edit
2013-01-28 16:19:36 +08:00
bfaa22052f
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
2013-01-24 16:30:02 +08:00
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
781a0ad96e
member roles edit
2013-01-18 11:25:11 +08:00
dca4f5d0be
mv gallery_uploader
2013-01-16 01:35:38 +08:00
c44b4163e4
gprs byebye, location have two language, must have picture, long, lang have limit
2013-01-16 01:35:38 +08:00
91afad23ba
Merge branch 'new_widget_setting_interface'
2013-01-15 12:03:56 +08:00
8413e31048
add i18n
2013-01-15 10:25:55 +08:00
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
da283e136b
correct personal journal language, but now hava no language config
2013-01-14 17:54:53 +08:00
1b6bfdb80f
modularize personal journal and pull relational setting in desktop/index.rb
2013-01-14 17:54:52 +08:00
68e14a7898
move js file to relational module but have js require problem
2013-01-14 17:54:52 +08:00
919f951981
restore js,journal_pages.js,
2013-01-14 17:54:52 +08:00
a183ac6041
fixed journal type page
2013-01-14 17:54:52 +08:00
bf31d0c3dd
modularized personal journal
2013-01-14 17:54:52 +08:00
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
de39bce4ce
Fix the tooltips
2013-01-11 12:13:16 +08:00
b90e8efb1f
Fix filter not collapsing
...
Fix icon size for button
2013-01-11 11:37:11 +08:00
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
614b6fde71
fix wrong html structure for announcement frontend
2013-01-09 12:13:55 +08:00
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
76296ab29b
Merge branch 'sidebar_config' into ntu
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
be00cec4d7
Fix link for ad_banner
...
Add missing helper for web_link_category
Show design's js in front-end
2013-01-07 00:36:48 +08:00
Rueshyna
Harry Bomrah
Fu Matthew
chris
Spen
devin
spen
unknown