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

122 Commits

Author SHA1 Message Date
Harry Bomrah babf12c777 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-21 17:44:39 +08:00
Harry Bomrah 449d809b35 debug added for modules and widgets frontend 2015-04-17 15:55:58 +08:00
Harry Bomrah 4ecfb9bf80 fix error for page submit 2015-04-10 18:41:22 +08:00
Harry Bomrah b2a5e361e8 fix for cache clear on page part submit 2015-04-10 16:35:18 +08:00
Harry Bomrah 3362601b1f Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	lib/orbit_model/impression.rb
 2015-03-30 15:22:03 +08:00
Harry Bomrah 27222ab6cd small fix for cache 2015-03-30 15:13:37 +08:00
Harry Bomrah 8b2281ca17 now the caching initialized with engine 
Conflicts:
	Gemfile
 2015-03-30 15:12:41 +08:00
manson 3262359911 update impression and add cache for page sub-parts, main-menu 2015-03-30 15:11:26 +08:00
Harry Bomrah b290d3653f groups commit 2015-03-25 15:46:11 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +08:00
Harry Bomrah 366876ae29 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
 2015-03-13 17:10:52 +08:00
Harry Bomrah 9be667d405 removed desktop 2015-03-06 18:03:43 +08:00
Harry Bomrah dfd7865bd5 new error and success pages for google auth and also spinner fixed for update manager 2015-03-06 17:13:09 +08:00
Harry Bomrah ed3308abbb google oauth added and also preferences 2015-03-04 18:31:36 +08:00
Harry Bomrah ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +08:00
Harry Bomrah 6e27bbd483 module store changes 2014-12-30 18:38:11 +08:00
Harry Bomrah b9a6e6fe05 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-08 15:54:03 +08:00
Harry Bomrah 075ae1b135 site type added 2014-12-08 15:08:59 +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 ed36c3a48f added category to page model 2014-12-01 18:07:23 +08:00
Harry Bomrah 0623541d94 now only registered websites can update via update manager 2014-11-24 18:21:00 +08:00
Harry Bomrah a1df9c5af3 some changes for desktop 2014-11-18 19:08:17 +08:00
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Harry Bomrah 9da0c9f380 small member fix 2014-10-29 21:27:53 +08:00
Harry Bomrah 5766c6355f orbit store integration 2014-10-27 19:07:01 +08:00
Harry Bomrah 384cc4d6f4 fix for chinese simplified and also new user added 2014-10-21 15:27:43 +08:00
Harry Bomrah 3ca0f399ec fixed username and password to be blank, user cant edit username and also the page setting options 2014-10-15 15:57:58 +08:00
Harry Bomrah fe1a87aae4 important update with some fixes in member import and also site preferences and page imports 2014-09-25 17:57:46 +08:00
Harry Bomrah 5b3b009f65 fix for high security bugs in report and plus some other member area fixes 2014-09-23 17:06:17 +08:00
manson 424d3fa559 fix member first/last name display order for zh_tw 2014-09-12 14:39:38 +08:00
Harry Bomrah 856b590e1b fixed delete and update user issue and also the language switch 2014-09-11 18:19:48 +08:00
Harry Bomrah 883fb31966 added desktop to user 2014-09-02 21:20:13 +08:00
manson 3f15d8102c fix page model assign_page_number method for empty database 2014-08-19 12:17:00 +08:00
manson c2c9bd4682 update dashboard for better performance 2014-08-08 14:16:03 +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
manson 14bfbe2d8a update ModuleApp and OrbitWidget registration 2014-08-05 18:22:36 +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 c37976c62e update site structure for members and member frontend controller 2014-07-24 00:04:10 +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
Harry Bomrah 655e7d7d3f added method to model before create 2014-07-18 18:03:18 +08:00
Harry Bomrah 2ed5d10b9d added page number fix for new pages 2014-07-18 17:21:16 +08:00
manson 3f285d9c1e Category and Tag validation 2014-07-17 11:54:40 +08:00
spen a1ab533b43 Fix orbit_mailer file read and _right_menu login issue 2014-07-17 11:07:45 +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 cbf1114c4f fixes for import, fixes for deletes 2014-07-10 14:50:59 +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