alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
576 Commits 12 Branches 0 Tags 17 MiB
Commit Graph

269 Commits

Author SHA1 Message Date
manson 285335b0c3 fix member edit_privilege authorization 2014-08-08 18:41:49 +08:00
manson ced6643246 fix member check_aceess_rights 2014-08-08 18:37:33 +08:00
manson 4be2993a9a fix member edit_password authorization 2014-08-08 18:29:44 +08:00
manson c2c9bd4682 update dashboard for better performance 2014-08-08 14:16:03 +08:00
manson b4e5d36cc3 update backend search for modules 2014-08-07 18:44:23 +08:00
Harry Bomrah 56e18cd040 fixed authorization bug and also added select and deselect for member selection 2014-08-06 18:27:54 +08:00
Harry Bomrah e320fa848d authorization completed .. select all button for member select is left 2014-08-05 21:51:05 +08:00
manson 14bfbe2d8a update ModuleApp and OrbitWidget registration 2014-08-05 18:22:36 +08:00
manson 2ca408294e Add link_to_edit for modules frontend(Announcement, Archive, Faq, PageContent) 2014-08-05 14:45:52 +08:00
Harry Bomrah f44e6646f1 fixed some member stuff 2014-07-31 21:50:49 +08:00
manson c76b65d149 Add authorization for tag and category 2014-07-31 20:48:23 +08:00
Harry Bomrah 49900e9513 member authorizations done... plus layout thing fixed 2014-07-31 20:42:53 +08:00
Harry Bomrah 399b519bea authorizations for users done 2014-07-31 16:48:59 +08:00
Harry Bomrah 33edfd779c new authorization.. yet to complete in alpha.. 2014-07-31 16:48:59 +08:00
manson 69db2e2926 Rewrite member frontend, fix I18n.enforce_available_locales, update CKEditor setting 2014-07-31 15:41:28 +08:00
manson 4de07afb2a update member import,frontend,structure 
member frontend order is hard-coded
 2014-07-29 11:21:27 +08:00
Harry Bomrah 0095e41b46 changed orbit bar for backend ... added preview to layouts for widgets and index ... also fixed alot of bugs.. 2014-07-25 20:11:51 +08:00
manson e0a5798927 fix sit breadcrumb for page_type link 2014-07-25 12:24:58 +08:00
manson 96dd726981 Fix member frontend role status 2014-07-25 10:50:50 +08:00
manson d6287177a2 Update member frontend and fix member import missing fields 2014-07-24 20:12:35 +08:00
Harry Bomrah 8676e06c87 mobile view changed with live preview 2014-07-24 14:08:20 +08:00
Harry Bomrah 98efc38566 now page view shows realtime page...and allows you to edit it 2014-07-24 14:00:43 +08:00
manson c37976c62e update site structure for members and member frontend controller 2014-07-24 00:04:10 +08:00
manson 91e6b2385c Fix member import role status issue 2014-07-22 17:19:39 +08:00
manson af6d41bc4d fix structure page form and added missing module files in template 2014-07-22 16:48:46 +08:00
Harry Bomrah 3fae3327b3 implemented the feature of current working page not collapsed .. the pages are not collapsed if you are working under a page in site structure 2014-07-21 22:21:17 +08:00
manson 55bf9c4343 fix orbit bar edit password and profile link 2014-07-21 11:46:26 +08:00
manson a6cc379e7a Fix zh_cn language switching 2014-07-20 03:05:30 +08:00
Harry Bomrah 655e7d7d3f added method to model before create 2014-07-18 18:03:18 +08:00
Harry Bomrah 2ed5d10b9d added page number fix for new pages 2014-07-18 17:21:16 +08:00
manson a96fb661c8 Update mobile template and fix page module validation and scrolltop when validate failed 2014-07-18 16:32:17 +08:00
manson 118d70b7f6 Fix import bugs, routing keyword_constraint issue and template update for book and journal plugins 2014-07-18 15:14:02 +08:00
Harry Bomrah b1ed03b01c added validations to page create. and also now can make pages without assigning modules .. frontend will be blank 2014-07-18 14:43:02 +08:00
manson 03baa31648 Fix page edit form category_list tag_list stats_list 2014-07-17 15:16:02 +08:00
manson 3f285d9c1e Category and Tag validation 2014-07-17 11:54:40 +08:00
Saurabh Bhatia 62260147b1 fix for nil user in authorization 2014-07-17 11:50:41 +08:00
manson ccaede2f1d added validation feedback for memebr form 2014-07-16 19:39:23 +08:00
manson 0dccaacbaf Fix member module form issues 2014-07-16 19:13:54 +08:00
Harry Bomrah 6bb2708b82 now the external links open in new browser window and internal links open in same window. also now internal links are independent of the host 2014-07-16 18:49:38 +08:00
manson 2f3e60b0df Added ad_banner backend table sorting 2014-07-16 15:19:53 +08:00
manson f5bf50ef14 Fix session redirect and fix import language field 2014-07-16 11:42:10 +08:00
manson 6cccdbc9ab Handle execptions for import and fix plugin templates 2014-07-15 19:10:51 +08:00
Harry Bomrah 2e447476b3 member import with plugins are done. 2014-07-15 18:07:28 +08:00
manson d9bf2c7ddc Add import_journals, conferences 2014-07-15 17:43:22 +08:00
manson 23fdf6dc37 Fix member edit_privilege issue 2014-07-15 10:10:47 +08:00
Harry Bomrah f61efc2472 import methods for plugins honor, patent, research, books, diploma, project, experience 2014-07-14 21:33:46 +08:00
manson 63270e2a79 Added tag in site structure 2014-07-11 21:12:08 +08:00
Harry Bomrah e00ec26409 book import complete with mobile page enable and disable 2014-07-11 21:07:47 +08:00
Saurabh Bhatia e94ee50674 Fix role status issue 2014-07-11 12:17:43 +08:00
Harry Bomrah 9a4ef31352 modified zh_cn render method. removed extra code from page_controller show method 2014-07-10 15:51:00 +08:00
Saurabh Bhatia cbf1114c4f fixes for import, fixes for deletes 2014-07-10 14:50:59 +08:00
Harry Bomrah 1f1c040fe9 fixed reimport bug 2014-07-09 18:40:33 +08:00
Harry Bomrah 97d4a94583 modified gallery import for server timeout 2014-07-09 18:35:55 +08:00
Saurabh Bhatia 44adbf57b2 make users autoapproved once imported, orbit member accessible only to admin 2014-07-09 17:21:37 +08:00
Saurabh Bhatia e3e300b3cd fix for basic info 2014-07-09 16:53:12 +08:00
Saurabh Bhatia c6dd73a98e member import and some fixes in member backend 2014-07-09 11:22:21 +08:00
manson 1492e6e9e8 Add zh_cn, working but it's hard code 2014-07-09 10:05:02 +08:00
manson 9e5d0af3bd Add personal patent plugin 2014-07-04 11:50:08 +08:00
manson 5af7e681c1 Handle some exceptions 2014-07-03 18:22:05 +08:00
Saurabh Bhatia e524127242 fixes for member show page 2014-07-02 17:37:34 +08:00
manson 8d8bb6a1d5 Update personal plugin 2014-07-01 18:21:32 +08:00
Harry Bomrah d70b64299d changed widget title.. now from database 2014-07-01 14:36:15 +08:00
Harry Bomrah 823aafd819 fixed chinese issue of site title 2014-06-30 18:08:48 +08:00
Harry Bomrah d2b38cd0da fixed bug for member uid problem old site, fixed porgress bar bugs for import 2014-06-30 16:40:31 +08:00
Saurabh Bhatia 77b31482e5 Only the fields with a value will be displayed 2014-06-29 20:42:15 +08:00
Harry Bomrah 9cb35af4ad new widget breadcrumb and small bug fixed in import pages 2014-06-27 17:08:03 +08:00
Saurabh Bhatia a4110cf895 added role status to site settings and member index page. 2014-06-27 11:38:06 +08:00
Harry Bomrah 9b958354c2 added widget support for orbit.. now have the ability to install widgets from store 2014-06-26 19:14:46 +08:00
Saurabh Bhatia e11581c0ee fixes in member profile show page 2014-06-26 10:00:55 +08:00
Saurabh Bhatia 49f7d2192d Personal Plugin with brief intro 2014-06-25 21:40:13 +08:00
Saurabh Bhatia e8c9d6b036 member module fixes for frontend,personal plugin frontend 2014-06-25 13:27:34 +08:00
Saurabh Bhatia 91a431374f Member Module registration fixed, plugins registration fixed, member frontend 2014-06-24 14:07:59 +08:00
manson b571436f47 Fix import announcement image issue 2014-06-19 16:50:11 +08:00
Saurabh Bhatia 65c87ce778 fixed delete in member info 2014-06-18 21:57:57 +08:00
Saurabh Bhatia 8657977cd7 fixes in member info 2014-06-18 20:33:11 +08:00
Harry Bomrah a2774033a4 now data count works on engine setting of module 2014-06-18 19:39:24 +08:00
Saurabh Bhatia 48d66b18e7 member privilage 2014-06-18 17:03:50 +08:00
Saurabh Bhatia 710d1a1106 removed I18n variable 2014-06-18 15:50:59 +08:00
manson 0774dc2779 Add tag and category form validation 2014-06-18 14:49:19 +08:00
Saurabh Bhatia 251505e5cd fixed deletes 2014-06-18 10:12:30 +08:00
Saurabh Bhatia 28d43e9e27 Fixed redirects for attribute forms 2014-06-18 09:50:59 +08:00
Saurabh Bhatia 28aab34c95 fixed member infos,attribute sets, member values 2014-06-17 21:49:41 +08:00
manson 264e61df15 Update import announcement and archive 2014-06-17 11:45:08 +08:00
Harry Bomrah 5a88f5dd47 added some changes for import threading 2014-06-16 18:52:08 +08:00
Harry Bomrah e2dea41af7 web_resource import added... 2014-06-16 17:16:45 +08:00
Saurabh Bhatia 40aa1adbfc Role Fields working 2014-06-16 14:20:51 +08:00
Harry Bomrah d80c5eb0d8 rss2 gallery import is completed. 2014-06-13 16:17:07 +08:00
Saurabh Bhatia 50b97efc46 Member Plugin personal plugins 2014-06-12 18:35:02 +08:00
Harry Bomrah 043673e93e finished importing of pages 2014-06-11 15:16:32 +08:00
Harry Bomrah 2a6d9487ae added links for structure .. fixed a small bug for widget rendering 2014-06-09 18:58:44 +08:00
Harry Bomrah bc7e2f9514 now can select different layouts for different modules 2014-06-06 16:30:56 +08:00
manson 218e7f16df Import RSS2 UI 2014-06-06 12:22:55 +08:00
Saurabh Bhatia 94ad217259 Fixed queries for member plugin 2014-06-05 10:32:35 +08:00
Harry Bomrah 7f8b471180 added pagination for frontend .. directly embeded in kernel and backend n frontend 2014-06-04 20:37:58 +08:00
Saurabh Bhatia bc4b687c42 Personal Plugin Registration 2014-06-04 16:46:29 +08:00
Harry Bomrah 72a027c91c fixed ordering of widgets and also some widget layout problem 2014-06-04 16:22:48 +08:00
Harry Bomrah b55e4b654b fixed page_part rendering problem 2014-06-04 15:25:04 +08:00
manson b1fe5264ce Import Archive from RSS2 and basic Import UI 2014-06-03 19:27:34 +08:00
manson 0f58f39eb5 Fix filemanager js 2014-06-03 11:36:43 +08:00
Saurabh Bhatia 5c4ba2b0d5 member email validation, member can be created without an email 2014-06-03 11:01:03 +08:00
manson b9975fa7d5 Temporary fix for mongoid dependency issue with rails 4.1 and removed mongoid-grid_fs 2014-06-03 10:12:13 +08:00
manson f98dc053f0 Import Announcement from RSS2 2014-05-30 19:32:51 +08:00
Saurabh Bhatia ce9d1f327f Member Profile Custom Fields, Member Status Complete, Member Position Reordering 2014-05-30 18:36:29 +08:00
manson 1cdfc53b4d Mobile Web is ready 2014-05-29 18:33:54 +08:00
manson 01e02e4703 Fix page_parts_controller @widget_types and authorization for pages_controller 2014-05-29 12:08:56 +08:00
manson 8ced18ad01 Fix bugs for mobile page 2014-05-29 11:44:35 +08:00
manson cb69ea5c5c Mobile Web 2014-05-28 20:06:05 +08:00
Harry Bomrah 4cbf7f5015 approve users and role status in sign up added 2014-05-28 18:47:19 +08:00
manson e5e7a18bd8 Announcement email and log user login/logout and update orbit initialize script and some fixes 2014-05-28 15:57:58 +08:00
Saurabh Bhatia e63a027c2a Fixed Member Summary 2014-05-28 10:30:45 +08:00
Saurabh Bhatia bfc68ad313 Role Statuses and Roles in Member 2014-05-27 18:37:59 +08:00
Harry Bomrah 23aef52422 now names saved in all locales while signup. added orbit site logo and also now favicon is rendered and orbit bar logo rendered. 2014-05-27 18:18:23 +08:00
manson 2d54b50cf8 fix route patch and redirect path to sign in 2014-05-27 14:35:01 +08:00
Harry Bomrah b64385771a user sign up and facebook connection completed 2014-05-27 13:51:18 +08:00
Saurabh Bhatia 471cc0510a Role Status - UI work in progress 2014-05-26 18:53:53 +08:00
Harry Bomrah 791148ce1b sign up form and facebook connect 2014-05-26 16:43:51 +08:00
Saurabh Bhatia ab8b52e66f Changed signup form - RoleStatus work in progress 2014-05-26 15:26:25 +08:00
Saurabh Bhatia 619fef44f5 Member Module - User Signup Changed, Member Summary, Thumbnail 2014-05-26 11:02:13 +08:00
manson ba32ecbf88 Revert "Member Module - User Signup Changed, Member Summary, Thumbnail" 
This reverts commit 6a0ba3f6bc.
 2014-05-26 10:25:08 +08:00
Saurabh Bhatia 6a0ba3f6bc Member Module - User Signup Changed, Member Summary, Thumbnail 2014-05-26 09:45:46 +08:00
manson 4830a9a7b8 Orbit bar search done, fix site language seting for new checkbox js, fix orbit-boostrap template memu, translations 2014-05-25 20:47:44 +08:00
Harry Bomrah f220130f88 finished widget more and item links .. made method in orbit helper.. now the method finds best suitable page for the item in widget. 2014-05-24 19:35:06 +08:00
Harry Bomrah d7107f02f4 change in parser and widget rendering completed with also lot of changes in kernel 
Conflicts:
	app/helpers/orbit_helper.rb
 2014-05-22 19:26:50 +08:00
manson 40a0dbb555 fix page_id and add Sitemap when orbit initialize 2014-05-22 17:57:58 +08:00
manson dda3a78c81 removed pagination in categories controller 2014-05-21 16:16:34 +08:00
manson 0ce1918974 remove duplicate pagination in dashboard 2014-05-21 16:10:27 +08:00
manson e9af4d4679 fix for production mode 2014-05-21 11:43:43 +08:00
manson e5f7bd4cac Mailer 2014-05-20 19:29:51 +08:00
manson cd86433abf rescue nil for site in_use_locales 2014-05-20 12:14:52 +08:00
manson c2a820ca4b fix site in_use_locales setting 2014-05-20 11:44:27 +08:00
manson 9243be1f21 Template loading & switching, Log user actions and more... 2014-05-20 10:31:44 +08:00
manson 460e6c82a7 fix form language tab order 2014-05-16 17:25:43 +08:00
manson 1fe11bda6b Filemanager for CKeditor 2014-05-16 14:49:42 +08:00
manson b057a4ce74 Dashboard 2014-05-15 19:32:51 +08:00
Harry Bomrah 2fdc99dfbd brand new parser for orbit 4.5 and some other changes 2014-05-14 19:47:25 +08:00
manson f168ce7516 Set locale to session 2014-05-14 12:07:51 +08:00
manson 45288d8bfb moved sort and filters to OrbitAdminController 2014-05-14 10:59:36 +08:00
manson 64197e29da ModuleApp registration frontend enable and data count 2014-05-13 18:41:29 +08:00
manson 0f0e17ef00 Tags & Categories 2014-05-12 16:18:35 +08:00
Saurabh Bhatia 745790244a Reset password, member roles 2014-05-09 14:03:55 +08:00
Saurabh Bhatia 1aec0eff4c Fixes user display. 2014-05-05 14:20:58 +08:00
Saurabh Bhatia 9822699854 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2014-05-05 14:18:10 +08:00
Harry Bomrah 7f921e6f21 modified parser and also rendering of 404 not found page .. also added force method for frontend and also to disbale layout in frontend 2014-05-05 14:04:50 +08:00
Saurabh Bhatia 82ebb0bc01 Fixed display of users who are not authorized 2014-05-05 13:59:38 +08:00
Saurabh Bhatia 51b287fb4e Updated Authorization with modal working 
Conflicts:
	app/controllers/admin/sites_controller.rb
 2014-05-05 12:32:07 +08:00
Harry Bomrah a72d5fbb48 change in parser and new template for 4.5 
Conflicts:
	app/controllers/admin/dashboards_controller.rb
	config/application.rb
 2014-05-02 18:26:21 +08:00
manson c627429b92 Update Announcement module 2014-05-01 16:44:01 +08:00
Saurabh Bhatia 06bd380162 authorization, module auth, category auth, member roles 2014-05-01 15:14:16 +08:00
Harry Bomrah 2e98e02609 partial widget adding is completed. and some other changes in parser 2014-04-30 18:57:09 +08:00
Harry Bomrah a923745cf1 solved the page part rendering for new empty database 2014-04-21 16:30:27 +08:00