chris
|
bf3d20ea46
|
Tag functionalities for new UI
|
2013-04-23 20:18:03 +08:00 |
chris
|
24523640a7
|
New tags but still without global tag management
|
2013-04-23 20:18:03 +08:00 |
chris
|
5b2f653b5a
|
Change in announcement init for query
Change in default widget query
|
2013-04-03 12:05:59 +08:00 |
Fu Matthew
|
9e33bdadc3
|
now default options can be chosen by developer at init
|
2013-03-21 18:46:57 +08:00 |
Fu Matthew
|
54acaebc98
|
style for front end
|
2013-03-21 18:46:56 +08:00 |
Fu Matthew
|
7f7e21b4f2
|
1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
|
2013-03-21 18:45:28 +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
|
b864cc0268
|
Changes in I18n (except personal_conference and personal_journal)
|
2013-03-12 18:13:48 +08:00 |
Fu Matthew
|
071e8a349c
|
link to more
|
2013-02-27 10:50:50 +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 |
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
|
71d5abae2e
|
first version of app config and modified inits.
|
2013-01-29 20:33:40 +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 |
unknown
|
504f5027cc
|
member role edit
|
2013-01-14 19:00:08 +08:00 |
Matthew K. Fu JuYuan
|
49e6c33b57
|
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/routes.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/archive/init.rb
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
|
2012-12-25 11:01:36 +08:00 |
Matthew K. Fu JuYuan
|
41bcbdd2f0
|
missing file?
|
2012-12-24 16:39:53 +08:00 |
Matthew K. Fu JuYuan
|
53afb6ea0c
|
sidebar rewrited
|
2012-12-24 16:39:53 +08:00 |
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
Matthew K. Fu JuYuan
|
6995bb1622
|
put module app json into init,making orbit app work with module app.
|
2012-12-24 16:23:16 +08:00 |
Matthew K. Fu JuYuan
|
36f6a6fdd6
|
first version of confined sidebar render
|
2012-12-24 16:17:00 +08:00 |
Matthew K. Fu JuYuan
|
99f28a0cba
|
sidebar rewrited
|
2012-12-05 18:35:58 +08:00 |
Matthew K. Fu JuYuan
|
ca290f3519
|
Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
|
2012-12-05 11:36:32 +08:00 |
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
Matthew K. Fu JuYuan
|
4bc80f2bd3
|
default widgets and sidebar.
|
2012-12-03 18:52:36 +08:00 |
Matthew K. Fu JuYuan
|
f9bcb27efc
|
put module app json into init,making orbit app work with module app.
|
2012-11-29 14:21:46 +08:00 |
Matthew K. Fu JuYuan
|
c6894be962
|
first version of confined sidebar render
|
2012-11-20 15:56:52 +08:00 |
Matthew K. Fu JuYuan
|
3a65f599e6
|
first version app config for Spen durning Chris's leave.
|
2012-09-24 11:43:48 +08:00 |
Matthew K. Fu JuYuan
|
f009a1c942
|
startup for config
|
2012-09-13 18:31:44 +08:00 |