72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +08:00
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
869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +08:00
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
c1bd135595
Fix sortable when there's no record
2013-06-14 15:26:12 +08:00
a468b69013
archive module: fix old data caused error
2013-06-06 23:11:24 +08:00
5b7ac1a22b
archive module: add sort feature to achive files
2013-06-06 22:20:27 +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
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
2806dd35a9
spen's fix for user
2013-05-23 14:03:18 +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
37aa950028
user action
2013-05-23 11:55:57 +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
aefd62da2a
Add tagged_ids to taggable
2013-05-03 12:12:19 +08:00
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
3e567223e3
fix for Spen's translation and Chris's tag error
2013-04-26 15:37:27 +08:00
d047a3d62a
chris tags update
2013-04-26 11:26:10 +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
b198b1a17b
system preference
2013-04-24 19:21:11 +08:00
5ff7dfbac6
fronted open switch and backend openness
2013-04-23 18:48:18 +08:00
41168f4c99
fix for fronted routing failed
2013-04-23 10:01:02 +08:00
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
Harry Bomrah
bc0477a5ed
widget and gridster fixes
2013-04-17 14:16:24 +08:00
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
0f6f5aafce
fix for both part and page part settings
...
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
2013-04-17 14:12:52 +08:00
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00
a9aa1dd150
Fix for path renaming
2013-02-19 18:09:55 +08:00
b049e16634
Create part and save pages when layout is edited
2013-02-19 17:48:06 +08:00
17ac564fbb
Fix sitemap nil
...
Fix namespace of role in subrole
2013-02-19 17:39:43 +08:00
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00
572e512a1d
fix link for default widget
2013-02-19 14:21:54 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +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
e1e003af6e
Complete new interface
2013-01-14 19:18:25 +08:00
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
84e4a558be
member roles edit
2013-01-14 17:02:51 +08:00
e24f7a7880
Put back some field so ad_image can work
2013-01-10 11:08:57 +08:00
1c1839fc00
Remove useless code in de_image.rb
2013-01-09 21:17:50 +08:00
81d4481797
Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config
2013-01-08 14:18:04 +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
e3d34263e3
Schedule job for tag_cloud
2013-01-08 12:36:50 +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
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
35e0011111
Merge remote-tracking branch 'remotes/origin/publication' into desktop
...
* remotes/origin/publication:
new desktop framework updates
2013-01-07 12:44:30 +08:00
6c6bda988d
Add mobile version in site settings
2013-01-07 03:57:36 +08:00
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
49e289e0fd
fixing default widget error when needs image
2013-01-03 20:07:05 +08:00
39f715319b
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
...
Conflicts:
lib/tasks/migrate.rake
2013-01-03 19:41:52 +08:00
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00
fa83dbf791
Fix order in structure
2013-01-03 19:15:08 +08:00
5587e83419
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:31:32 +08:00
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
37309a452d
Fix site map and menu order
2012-12-28 11:37:37 +08:00
bab8328029
Put back old tags (don't use the class ProtoTag)
2012-12-28 10:43:48 +08:00
Harry Bomrah
37f8c1637a
new desktop framework updates
2012-12-27 18:25:54 +08:00
269e5b033f
Fix for page_part and widget back-end
2012-12-27 16:20:40 +08:00
2d6b70b97f
regenerate pageparts
2012-12-27 15:50:05 +08:00
2dd0f9a9d2
fix disappear widget inter block
2012-12-27 15:06:01 +08:00
062ebecae3
fix serval bugs on sidebar.
2012-12-24 16:39:53 +08:00
5f712622ad
default widgets and sidebar.
2012-12-24 16:38:35 +08:00
6995bb1622
put module app json into init,making orbit app work with module app.
2012-12-24 16:23:16 +08:00
b4633a2ccb
.not_guest_user
2012-12-19 19:48:13 +08:00
3d39c2c3c3
hidden guest user
2012-12-19 19:48:13 +08:00
ec1fad9729
fixed empty name of member list
2012-12-19 19:48:13 +08:00
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
ff435a4af4
Change the design for the whole site form designs index
2012-12-07 12:14:31 +08:00
6f1748d2b3
- template list/show is loaded from central server
...
- buy a template downloads and creates it in DB
- changes in designs index
2012-12-06 23:20:27 +08:00
e0e1c30f68
delete onside widget in db
2012-12-06 07:59:42 +08:00
7d3c535e01
add info field
2012-12-06 07:58:39 +08:00
58e71c29b3
uniq relation
2012-12-04 00:31:46 +08:00
9759a32394
can display relation between author
2012-12-04 00:31:46 +08:00
e143f9a345
can select relection from relation db
2012-12-04 00:31:46 +08:00
7822ffc33d
can add relation between co-author
2012-12-04 00:31:06 +08:00
eb97d417bd
if coauthor not in coauthor db then it will be add in db
2012-12-04 00:31:06 +08:00
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
9254b9960d
Add timeout to user
2012-12-03 21:45:00 +08:00
4f9aa63045
Remove extra end
2012-12-03 18:45:32 +08:00
5c7f1aa164
Fix saving of page_part after layout change
2012-12-03 18:42:50 +08:00
2757044c32
Forgot to save the page_parts
2012-12-03 17:49:26 +08:00
bdcfb46294
Fix previous commit
2012-12-03 17:38:55 +08:00
6543491a53
Save pages to generate page_parts when a layout is updated
2012-12-03 17:25:27 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
d502f561ef
add co-author db and curd page, but it can't destory it...
2012-11-21 18:36:32 +08:00
97ffb5ff18
file view update
2012-11-21 07:37:42 +08:00
5643b0a528
delete demo db of journal and paper
2012-11-21 07:37:41 +08:00
c8bbb28d42
Fix wrong alias in design.rb for themes
2012-11-20 12:46:50 +08:00
84c284fa71
Fix wrong naming in theme.rb
2012-11-20 12:42:53 +08:00
d61621e198
Remove some pry and add address code
2012-11-20 10:05:38 +08:00
6789d44431
Fix design edit
2012-11-20 10:04:50 +08:00
2aa9a19deb
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-20 09:53:37 +08:00
17988f2fb2
address field and text field convert
2012-11-20 09:53:37 +08:00
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
saurabhbhatia
chris
Matt K. Fu
iCross
Spen
Matthew K. Fu JuYuan
Harry Bomrah
Fu Matthew
unknown
Rueshyna
Harry Bomrah