This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

harrybomrah 5de7fcfaf6 added sync for journal paper books and conference.. and also disabled the icons ...

Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
	app/controllers/admin/import_data_controller.rb

Conflicts:
	vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb
	vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
	vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
	vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb

2014-01-23 11:59:58 +08:00

..

admin

added sync for journal paper books and conference.. and also disabled the icons

2014-01-23 11:59:58 +08:00

desktop

Changes in Registration Process

2013-11-25 17:05:36 +08:00

application_controller.rb

Added multi-phone numbers in mobile setting page and fixed language setting

2013-12-12 16:07:27 +08:00

basic_infos_controller.rb

redirects are ok now

2013-11-29 18:52:57 +08:00

confirmations_controller.rb

Fixed Forgot password

2014-01-02 17:53:05 +08:00

default_widget_controller.rb

gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now..

2013-11-19 09:32:08 +08:00

desktop_apps_controller.rb

Updated Desktop Inheritence class

2013-10-07 17:47:13 +08:00

desktop_appstore_controller.rb

new page add and timeline changes

2012-06-28 17:31:48 +08:00

desktop_controller.rb

new stuff for gmail and fb

2013-12-27 10:16:29 +08:00

desktop_orbit_controller.rb

design update

2012-09-12 01:58:23 +08:00

desktop_themes_controller.rb

Updated Desktop Themes controller

2013-08-22 14:14:19 +08:00

desktop_widgets_controller.rb

Updated desktop widgets controller

2013-10-07 18:13:55 +08:00

facebook_controller.rb

facebook feed for desktop

2013-12-27 10:16:32 +08:00

front_controller.rb

add sitmap submenu chinese translation as well

2013-12-24 17:47:55 +08:00

gridfs_controller.rb

Multi language and side bar update

2012-08-20 23:14:11 +08:00

mobile_controller.rb

now we can set two colors gradient for orbit bar

2013-12-10 09:58:58 +08:00

orbit_backend_controller.rb

Updated Approvable to work for submanager role also

2013-11-13 10:35:03 +08:00

orbit_frontend_component_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

orbit_frontend_controller.rb

default widgets and sidebar.

2012-12-24 16:38:35 +08:00

orbit_member_controller.rb

Updated Approvable to work for submanager role also

2013-11-13 10:35:03 +08:00

orbit_widget_controller.rb

apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.

2013-06-06 17:39:36 +08:00

otheraccounts_controller.rb

new stuff for gmail and fb

2013-12-27 10:16:29 +08:00

pages_controller.rb

fix new ui page get_item search and back_end_helper can add args option

2014-01-14 11:26:16 +08:00

passwords_controller.rb

Fixed Forgot password

2014-01-02 17:53:05 +08:00

registrations_controller.rb

correct signup workflow

2013-11-29 19:00:32 +08:00