Commit Graph

60 Commits

Author SHA1 Message Date
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
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
manson 5eae7b8346 Fix some bugs 2014-04-14 11:27:09 +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 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