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

159 Commits

Author SHA1 Message Date
Harry Bomrah ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +08:00
JiangRu 487d84c1d1 help designer's to push code 2014-12-31 15:16:24 +08:00
Ray 380e2cd4f9 License Denied. 2014-12-30 20:40:45 +08:00
Harry Bomrah c8d395aca1 fixed tags and also some store commits 2014-12-28 14:43:34 +08:00
Harry Bomrah 4575fce2a9 counter added and also some changes for store 2014-12-26 16:55:28 +08:00
Harry Bomrah f19ce9b961 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	Gemfile
	app/controllers/pages_controller.rb
	app/views/orbit_bar/index.html.erb
 2014-12-19 16:41:15 +08:00
Harry Bomrah e21ad257ff some changes in sdk for ad_banner 2014-12-18 20:04:38 +08:00
Harry Bomrah 4b86270725 some category disable improvements 2014-12-10 18:13:51 +08:00
Harry Bomrah e521e1ea26 some category disable improvements 2014-12-09 21:25:51 +08:00
Harry Bomrah 96cf61f688 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-04 15:56:15 +08:00
Harry Bomrah a89e06087a store registration form changes 2014-12-02 21:10:15 +08:00
Harry Bomrah dd4c9fc587 Merge branch 'master' into nccu 
Conflicts:
	.gitignore
 2014-11-13 16:48:09 +08:00
Harry Bomrah f13312ddb6 mod for ad_banner 2014-11-13 16:31:10 +08:00
nccu e1a716f81d alert for page not available in language 2014-11-13 16:24:30 +08:00
nccu 7dd20cafa0 update css 2014-11-13 11:22:08 +08:00
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Harry Bomrah 9eebd2ff51 store for module store 2014-10-28 19:18:59 +08:00
Harry Bomrah 99305b19ca small fix store 2014-10-28 18:18:06 +08:00
Harry Bomrah eb6a48bc84 small fix 2014-10-28 18:15:10 +08:00
Harry Bomrah 59731acccf UX enhancement for module store 2014-10-28 18:08:23 +08:00
Harry Bomrah d65df694a5 fixed js for email resend button 2014-10-28 17:56:58 +08:00
Harry Bomrah 75d8c46576 module store 2014-10-28 16:46:11 +08:00
Harry Bomrah 5766c6355f orbit store integration 2014-10-27 19:07:01 +08:00
Harry Bomrah 24a07a5780 widget title and page title fixed for page 2014-10-13 18:04:51 +08:00
Harry Bomrah f3dd0b8295 modified select scss.. 2014-10-08 17:11:02 +08:00
Harry Bomrah 1467eb039d fixed filemanager.js for urls 2014-10-06 18:43:44 +08:00
Harry Bomrah c2fe693ceb date formating made easy for designers and also sitemap style changed 2014-10-01 16:12:38 +08:00
Harry Bomrah 23bead2b5d fixed problem of sitemap sorting and also import modules dont go back after importing. also added sitemap for google crawler. 2014-09-26 17:10:17 +08:00
Harry Bomrah e558b916fe fixed widget text image insert problem with chinese and also page import is changed to per page 2014-09-17 17:25:47 +08:00
Harry Bomrah b94f3ca2a1 fixed insert image problem in text for widget 2014-09-16 22:28:48 +08:00
Harry Bomrah 856b590e1b fixed delete and update user issue and also the language switch 2014-09-11 18:19:48 +08:00
manson 39cb82e83d fix site structure main-enable checkboxes 2014-08-15 12:08:43 +08:00
manson 04272588d3 hide html element with class name "ui-helper-hidden-accessible" 2014-08-12 12:18:22 +08:00
Harry Bomrah bbc171fc7c desktop mods with new layout stuff 2014-08-08 18:08:26 +08:00
Ray df934ae584 desktop mods 
Conflicts:
	config/routes.rb
 2014-08-08 18:08:26 +08:00
Harry Bomrah a52239b135 a small link click bug fixed 2014-08-06 18:37:02 +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
rulingcom 1681e6671b update design for authorization module 2014-07-31 20:50:06 +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
spen 0f4ea70943 remove <p> tags in CKEditor 2014-07-29 15:24:01 +08:00
Ray cc54f7f908 selecting interface for edit and add and module page is done. 2014-07-28 20:33:51 +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
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
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 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 03baa31648 Fix page edit form category_list tag_list stats_list 2014-07-17 15:16:02 +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
manson 63270e2a79 Added tag in site structure 2014-07-11 21:12:08 +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
manson e2add1bc06 Fix production setting and update Gemfile 2014-07-07 10:58:00 +08:00
manson ee70ac381d Upgrade CKeditor to 4.4.1 2014-06-19 09:55:49 +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 28aab34c95 fixed member infos,attribute sets, member values 2014-06-17 21:49:41 +08:00
Saurabh Bhatia 40aa1adbfc Role Fields working 2014-06-16 14:20:51 +08:00
Saurabh Bhatia 50b97efc46 Member Plugin personal plugins 2014-06-12 18:35:02 +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 bc4b687c42 Personal Plugin Registration 2014-06-04 16:46:29 +08:00
manson 0f58f39eb5 Fix filemanager js 2014-06-03 11:36:43 +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
manson 3c2260c158 Fix orbit-bar css 2014-05-29 17:21:55 +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
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
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 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 e0be8619d4 Fix some js files with old url 2014-05-21 12:02:06 +08:00
manson e9af4d4679 fix for production mode 2014-05-21 11:43:43 +08:00
manson 9243be1f21 Template loading & switching, Log user actions and more... 2014-05-20 10:31:44 +08:00
manson 1fe11bda6b Filemanager for CKeditor 2014-05-16 14:49:42 +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 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
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