Commit Graph

492 Commits

Author SHA1 Message Date
saurabhbhatia d226b34de5 Added Automatic Synchronize
Conflicts:
	Gemfile
	app/controllers/admin/import_data_controller.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb

Conflicts:
	Gemfile
	app/controllers/admin/import_data_controller.rb
2014-01-13 15:57:48 +08:00
Spen 3cd3a8bd73 old ui gallery change to new ui need to run
rake gallery_album:gallery_album_to_new
2014-01-07 15:53:27 +08:00
saurabhbhatia d90351b82c Changed production settings for sendgrid 2014-01-03 09:44:46 +08:00
saurabhbhatia 684f2c75be Fix for tags 2013-12-31 12:01:11 +08:00
RulingDigital a1a15775e9 Upload Desktop themes 2013-12-26 14:13:34 +08:00
saurabhbhatia 9a91b2ab27 Rake task for indexing existing announcements 2013-12-23 12:47:18 +08:00
thomaschen f51e9f3a3a fix the terms of use into html style (both chinese and english) 2013-12-23 09:56:52 +08:00
thomaschen c1114b89bd add default value for terms of use in site.rake(need to find a way to break line in the terms) 2013-12-23 09:56:43 +08:00
manson666 2a5aef4362 Fixed site build rake and added default design package 2013-12-21 16:06:08 +08:00
saurabhbhatia 6c01d517d2 Fixed page data count 2013-12-12 12:49:20 +08:00
Harry Bomrah 800f108be3 added enabling and disabling feature of widget count in module init 2013-12-10 17:43:31 +08:00
saurabhbhatia 62bc66ab07 Added Rake task to update announcement category field 2013-12-04 17:54:47 +08:00
saurabhbhatia 9defe109fd Removed Default Locale rake task 2013-11-29 21:41:31 +08:00
saurabhbhatia ee1246caa4 Added rake for default locale 2013-11-29 18:51:18 +08:00
saurabhbhatia 9347cd0463 Rake task for confirming and approving existing users 2013-11-29 13:06:36 +08:00
Harry Bomrah 91d5ab6352 gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now.. 2013-11-19 09:32:08 +08:00
Harry Bomrah 16b695200a gallery_album to album 2013-11-19 09:31:49 +08:00
Harry Bomrah 369bbe4d72 category click, event click and more button fix 2013-11-18 17:15:36 +08:00
Harry Bomrah 4888195566 more button works according to categories 2013-11-15 22:35:20 +08:00
saurabhbhatia ce8e9c0a5f Revert "more button fix and also new way to select more page."
This reverts commit e129b25554.
2013-11-15 16:58:27 +08:00
Harry Bomrah e129b25554 more button fix and also new way to select more page. 2013-11-15 15:13:58 +08:00
saurabhbhatia 6d5b3a35e9 Alternative fix in parser frontend 2013-11-13 13:23:12 +08:00
saurabhbhatia 2e5b3e8ef7 Fix for Reloading bug 2013-11-13 13:02:20 +08:00
saurabhbhatia 5e0696890a Updated Remember me, and Homepage widget more link 2013-11-11 17:23:03 +08:00
saurabhbhatia 82ce516d7a Fix for more link 2013-11-08 18:28:09 +08:00
Manson Wang 7401a6ae59 Update for dashboard and Fix site.rake,new_site.rake for missing "menu_enabled_for" 2013-11-05 19:38:47 +08:00
saurabhbhatia 1945921fcb authorized user now able edit page context 2013-11-05 13:01:58 +08:00
saurabhbhatia 3d758cabb3 Updated orbit core lib for module app 2013-11-05 11:25:35 +08:00
chris 49bb8304c0 Fix approval authorized_users_by_title and get_authorization_by_title 2013-10-31 16:15:08 +08:00
chris 778f7c7863 Delete Archive folder in assets and useless files in lib 2013-10-31 14:13:24 +08:00
chris 62c663d699 Fix for togglebox and menu_enabled_for 2013-10-30 17:26:31 +08:00
rulingcom dfd0b5c1fb Add authorization rake tasks 2013-10-30 16:36:21 +08:00
saurabhbhatia fead457616 Updated path for theme 2013-10-29 12:21:55 +08:00
saurabhbhatia b55a9ce535 Added email as argument in the rake task 2013-10-29 11:40:10 +08:00
saurabhbhatia 976c047a7f New Site rake task path 2013-10-29 11:27:08 +08:00
saurabhbhatia 49c1bff005 Updated new_site rake task with upload package 2013-10-29 11:13:47 +08:00
chris a14d69211b PagePart widgets for "system widget"
Delete useless code
2013-10-28 16:29:23 +08:00
chris 218cb03641 PagePart widgets except "system widget" 2013-10-28 16:29:23 +08:00
saurabhbhatia 2f41828abd Rake task fix args 2013-10-28 12:17:12 +08:00
saurabhbhatia f396493e44 Updated rake task to accept right attrbites and generate site 2013-10-28 11:54:14 +08:00
chris f3b3c94b42 Item control iframe dom
Css for preview
2013-10-26 18:58:53 +08:00
saurabhbhatia 13da6fc6a1 Added a new rake task with arguments 2013-10-25 21:59:03 +08:00
chris 8ebfac2b99 Structure link with json 2013-10-23 18:39:40 +08:00
chris a4d1c68299 Structure page with json 2013-10-23 18:39:35 +08:00
chris 94c1d7d5a0 Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js 2013-10-23 18:39:21 +08:00
chris a9343e9a82 Fix new_ui:save_pages 2013-10-20 19:05:19 +08:00
chris 2530dace02 Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run 2013-10-20 18:44:04 +08:00
chris 1ea8d9faf9 Fix typo for ad_banner 2013-10-20 16:31:34 +08:00
chris 9f5bce9351 Review of the uploaders
Rake task to recreate version: uploader:recreate or uploader:recreate name1 name2 ...
2013-10-20 16:07:20 +08:00
chris cce8f1be9b Add migration task for ad_banner 2013-10-19 20:20:40 +08:00