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 |
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 |
Rueshyna
|
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 |
Fu Matthew
|
0a115906f1
|
fix i18n,reload problems
|
2013-02-19 14:21:54 +08:00 |
Fu Matthew
|
b7d797f9dd
|
fix member sidebar
add i18n for modules and default_widgets
|
2013-02-19 14:21:54 +08:00 |
Fu Matthew
|
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 |
Fu Matthew
|
a6f6dc271c
|
fix i18n,reload problems
|
2013-02-18 15:13:31 +08:00 |
Fu Matthew
|
29bb92f841
|
fix member sidebar
add i18n for modules and default_widgets
|
2013-02-06 17:44:38 +08:00 |
Fu Matthew
|
8e7e601845
|
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
|
2013-02-04 18:19:47 +08:00 |
Fu Matthew
|
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 |
chris
|
2b3cbc50b3
|
Fix location namespace
|
2013-02-04 18:06:45 +08:00 |
chris
|
3791046e5a
|
Add missing link to writing conference index
|
2013-02-04 18:01:42 +08:00 |
unknown
|
e244493b55
|
member plugin edit
|
2013-02-04 18:01:42 +08:00 |
Rueshyna
|
8e98aa10bc
|
modularize factories
|
2013-02-04 18:01:42 +08:00 |
Rueshyna
|
8f334f6948
|
modularize conference
|
2013-02-04 18:01:42 +08:00 |
Rueshyna
|
d4df7c82d3
|
relpace seminar to conference
|
2013-02-04 18:01:38 +08:00 |
Rueshyna
|
e0fedb4454
|
change textfiled to bilingual for co_author
|
2013-02-04 18:01:03 +08:00 |
Rueshyna
|
85ca196dec
|
add bilingual for personal journal
|
2013-02-04 18:01:03 +08:00 |
unknown
|
0b18cf48e3
|
member roles edit
|
2013-02-04 18:01:03 +08:00 |
Fu Matthew
|
71d5abae2e
|
first version of app config and modified inits.
|
2013-01-29 20:33:40 +08:00 |
unknown
|
8bf7d0f6f3
|
member plugin edit
|
2013-01-28 16:19:36 +08:00 |
Fu Matthew
|
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 |
Fu Matthew
|
979df9ac80
|
daily commit
|
2013-01-23 18:51:18 +08:00 |
unknown
|
781a0ad96e
|
member roles edit
|
2013-01-18 11:25:11 +08:00 |
Rueshyna
|
dca4f5d0be
|
mv gallery_uploader
|
2013-01-16 01:35:38 +08:00 |