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

251 Commits

Author SHA1 Message Date
manson 36648d51a2 fix language order in structure page_part form 2014-08-01 20:11:43 +08:00
rulingcom 1681e6671b update design for authorization module 2014-07-31 20:50:06 +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 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 58bcf69940 fixed layout structure in signup layout 2014-07-28 21:46:36 +08:00
Ray cc54f7f908 selecting interface for edit and add and module page is done. 2014-07-28 20:33:51 +08:00
manson 5182dbdaf9 fix member layout for new orbit-bar 2014-07-28 15:54:14 +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 96dd726981 Fix member frontend role status 2014-07-25 10:50:50 +08:00
manson d6085ad13e Added import plugin back to index js 2014-07-24 20:19:30 +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 af6d41bc4d fix structure page form and added missing module files in template 2014-07-22 16:48:46 +08:00
manson a8f2112e39 Add edit_password button and member_profile button for frontend orbit bar 2014-07-22 09:58:41 +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 bbb537f7bb update backend index table filter js 2014-07-21 14:11:10 +08:00
manson 55bf9c4343 fix orbit bar edit password and profile link 2014-07-21 11:46:26 +08:00
manson 562a7a79b8 Fix member side_bar personal_plugin link 2014-07-18 19:49:44 +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
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 747f794a18 Update RWD for dashboard and OrbitBar 2014-07-17 18:38:08 +08:00
manson 8ab1a5f753 Fix RWD for dashboard 2014-07-17 17:40:54 +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 df91ad152c added back modal select for authorization 2014-07-17 11:53:37 +08:00
spen a1ab533b43 Fix orbit_mailer file read and _right_menu login issue 2014-07-17 11:07:45 +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 ce525719b7 Rescue nil for page_parts 2014-07-16 17:13:42 +08:00
Harry Bomrah 8c0d4f53b0 added expanding and collapsing feature to the site structure.. collapsed by default 2014-07-16 15:04:52 +08:00
Harry Bomrah 2e447476b3 member import with plugins are done. 2014-07-15 18:07:28 +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 f9dcd32252 fixed edit page and add page bug after adding new page 2014-07-09 19:45:53 +08:00
Harry Bomrah 97d4a94583 modified gallery import for server timeout 2014-07-09 18:35:55 +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 60aef1426a Render google analytics 2014-07-07 16:18:52 +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
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 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
manson 10567f1c74 Fix email select box and update slug for ammouncement AGAIN 2014-06-24 16:50:44 +08:00
Saurabh Bhatia 91a431374f Member Module registration fixed, plugins registration fixed, member frontend 2014-06-24 14:07:59 +08:00
Saurabh Bhatia a437a3ba57 removed logger 2014-06-18 21:58:38 +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 a65d035f05 fixed links in member summary and thumbnail 2014-06-18 18:14:48 +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
manson f3d9368728 Removed pagination in dashboard 2014-06-18 14:48:48 +08:00
Saurabh Bhatia 7adc884844 reverted back button names in forms 2014-06-18 09:52:08 +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 4f0b05fcc7 completed pagination with first and last and also next and previous 2014-06-11 17:52:29 +08:00
Harry Bomrah fbbd75cdce fixed a little bug in import pages javascript 2014-06-11 16:25:39 +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
Saurabh Bhatia c7277bb663 fixed side bar for personal plugins 2014-06-04 17:22:01 +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
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
Saurabh Bhatia b412239f3c small fix in member approval 2014-05-30 18:42:53 +08:00
Saurabh Bhatia ce9d1f327f Member Profile Custom Fields, Member Status Complete, Member Position Reordering 2014-05-30 18:36:29 +08:00
manson 41cdabb5d3 Update mobile view in structure 2014-05-30 15:57:12 +08:00
manson 234a75e425 Fix mobile web in structure 2014-05-29 19:14:30 +08:00
manson 1cdfc53b4d Mobile Web is ready 2014-05-29 18:33:54 +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 88696bd03a approve users created by admin 2014-05-27 18:43:55 +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 53ab9e4e9c fix model name and user form 2014-05-27 14:13:58 +08:00
Harry Bomrah b64385771a user sign up and facebook connection completed 2014-05-27 13:51:18 +08:00
Saurabh Bhatia 5d10c13e2a Changed User Gender to Sex 2014-05-26 18:57:13 +08:00
Saurabh Bhatia 471cc0510a Role Status - UI work in progress 2014-05-26 18:53:53 +08:00
Harry Bomrah 5773a826e4 changed name method of member profile and also changed name in orbit bar 2014-05-26 16:48:06 +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
manson 1f9ab39a09 Update orbit-bar design by Ray 2014-05-26 14:23:12 +08:00
manson f6adbaa4e0 Update sit initialize 2014-05-26 12:57:47 +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 6eabe36cb3 added orbit bar in frontend .. orbit bar for frontend completely working for frontend except search 2014-05-24 17:12:19 +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 789003b88b Email cron job, to install contab job: rake orbit_cron:install 2014-05-22 16:08:32 +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 ac0460109e translations for filemanager 2014-05-20 10:54:37 +08:00
manson e95543872c rescue nil when site search field is empty 2014-05-20 10:41:13 +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 9987e4290b Update category, tag and some translations 2014-05-13 15:07:50 +08:00
manson 48f3f96528 Display enabled categories only 2014-05-12 16:29:20 +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 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
manson 21245a4a86 Fix Gemfile and OrbitBar language switching 2014-04-21 15:49:32 +08:00
Harry Bomrah 2154edea9e completed site structure with categories, data count, menu and link enabling and also re organizing the pages 
Conflicts:
	app/helpers/orbit_helper.rb
 2014-04-21 15:38:30 +08:00
manson 7f32588551 Tag 2014-04-21 15:08:05 +08:00
Harry Bomrah a3f5977b74 change in rendering .. added working ad banner module and also changed the rendering of widgets and fixed the js problem in items page. 2014-04-15 12:49:38 +08:00
Saurabh Bhatia 3bbb6a482c Added Login, authenticate_user, current_user 2014-04-14 18:40:17 +08:00
Harry Bomrah 3c8f4bcb53 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2014-04-11 19:48:43 +08:00
Harry Bomrah ec27f3f0e3 site structure now functional with create delete and edit page 2014-04-11 19:47:43 +08:00
Saurabh Bhatia b611ffcae3 Added Image Uploading 2014-04-11 16:56:58 +08:00
Saurabh Bhatia 2147d87dfe added stylesto signup 2014-04-10 17:13:42 +08:00
Saurabh Bhatia 30ab17eb82 Added Signup 2014-04-10 12:01:34 +08:00
Saurabh Bhatia 0ee2820cbd Sidebar registration working,admin items with corrected translation 2014-04-09 18:30:13 +08:00
Saurabh Bhatia 0ff748acc4 Added Items,Pages, Some UI for backend 2014-04-08 18:46:27 +08:00
Saurabh Bhatia 47da9ac309 Added Backend CSS, Fonts, Sidebar Registration, unfinished sidebar rendering 2014-04-07 17:26:43 +08:00
Saurabh Bhatia 3ca008e041 Route Constraint for admin, Slug refactored to a concern 2014-04-03 11:17:07 +08:00
Harry Bomrah e5d3d10263 fixed registration for module apps. now widget methods are set by module initializer and also widget select and also changed the rendering to html instead of file 2014-04-02 20:08:27 +08:00
Harry Bomrah 24f15db2fa added frontend folder and revert back .gitignore file 2014-04-02 15:29:37 +08:00
Manson Wang f178fd963a Slug 2014-04-01 23:38:17 +08:00
Harry Bomrah a54e19ea18 page rendering almost done .. 2014-04-01 15:10:21 +08:00