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

349 Commits

Author SHA1 Message Date
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
Saurabh Bhatia 47da9ac309 Added Backend CSS, Fonts, Sidebar Registration, unfinished sidebar rendering 2014-04-07 17:26:43 +08:00
Harry Bomrah 5a5107a152 completed home page rendering... 2014-04-07 15:57:06 +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 d173ed28b5 added ignore file for frontend 2014-04-02 15:39:25 +08:00
Harry Bomrah 24f15db2fa added frontend folder and revert back .gitignore file 2014-04-02 15:29:37 +08:00
Harry Bomrah 5f22c279d4 gemfile update 2014-04-02 14:41:22 +08:00
Harry Bomrah 9b008b4ead new parser for pages and widgets.. 2014-04-02 14:07:04 +08:00
Manson Wang f178fd963a Slug 2014-04-01 23:38:17 +08:00
Manson Wang df5c4fcec3 Add ignore for frontend files and change database name 2014-04-01 20:50:52 +08:00
Manson Wang ddba41ce06 Fix route 2014-04-01 20:40:03 +08:00
Saurabh Bhatia 05f0900621 fixed the route to work with all levels of page nesting 2014-04-01 16:55:20 +08:00
Manson Wang e3b25c1ae5 Fix routes and url schema and UTF-8 2014-04-01 16:37:43 +08:00
Harry Bomrah a54e19ea18 page rendering almost done .. 2014-04-01 15:10:21 +08:00
Harry Bomrah 8d94fed6f3 first version of theme development sdk 
s Please enter the commit message for your changes. Lines starting
 2014-03-12 12:42:59 +08:00