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

265 Commits

Author SHA1 Message Date
manson 1fe11bda6b Filemanager for CKeditor 2014-05-16 14:49:42 +08:00
manson b057a4ce74 Dashboard 2014-05-15 19:32:51 +08:00
manson a13182d73e Fix loading assets from template folder 2014-05-15 17:55:21 +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 d8f423de07 Unicorn 2014-05-14 16:22:07 +08:00
manson 823231132c Fix sidebar registration 2014-05-14 15:45:23 +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 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
Harry Bomrah 63fcca1a90 added template for faq 2014-05-08 15:40:16 +08:00
Harry Bomrah 48e7a2e67b some changes for page model 2014-05-06 17:18:41 +08:00
manson c48ecd093e Web Resource module 2014-05-05 19:40:31 +08:00
manson a4e2dc4f94 Update Announcement 2014-05-05 16:33:11 +08:00
manson 757eb4e527 Display bulletin files and links 2014-05-05 15:52:05 +08:00
Saurabh Bhatia c94c4fc928 Workgroup fix in authorization model 2014-05-05 14:22:54 +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 751b6ab2ea Changed built in extensions 2014-05-05 12:50:59 +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
manson 4621ba8e9d Update Announcement module 2014-05-02 19:04:20 +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 1a838e8feb Update Announcement frontend 2014-05-01 17:27:35 +08:00
manson c627429b92 Update Announcement module 2014-05-01 16:44:01 +08:00
Saurabh Bhatia 824b484e67 Fixes en.yml conflicts 2014-05-01 15:55:10 +08:00
Saurabh Bhatia 03f5c0182e Corrected built in extensions 2014-05-01 15:48:32 +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
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 08aa3ec753 Fixded context link renderer 2014-04-15 10:45:55 +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 e07026545f added support for context links 2014-04-11 18:44:45 +08:00
Saurabh Bhatia b611ffcae3 Added Image Uploading 2014-04-11 16:56:58 +08:00
manson f6c6efcdc0 Added category and fix routing 2014-04-10 18:00:00 +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