Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								428e558108 
								
							 
						 
						
							
							
								
								Merge pull request  #950  from elitzer2/fix-premailer-api  
							
							... 
							
							
							
							Fix plaintext rendering 
							
						 
						
							2020-08-31 07:21:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								902f9995d5 
								
							 
						 
						
							
							
								
								Merge pull request  #949  from elitzer2/fix-channel-template-autofill  
							
							... 
							
							
							
							Fixes the autofill of campaign from cloned template when created via channel 
							
						 
						
							2020-08-31 07:18:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								630ec0bae4 
								
							 
						 
						
							
							
								
								Remove premailer package  
							
							
							
						 
						
							2020-08-30 23:44:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								d47159d47b 
								
							 
						 
						
							
							
								
								Update API call to remove premailer  
							
							
							
						 
						
							2020-08-30 23:43:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								1b8eb33979 
								
							 
						 
						
							
							
								
								Update display text for html to text link  
							
							
							
						 
						
							2020-08-30 23:43:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								2e308b2f69 
								
							 
						 
						
							
							
								
								Fixes the autofill of campaign from cloned template when created via channel  
							
							
							
						 
						
							2020-08-30 19:34:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0f8682087e 
								
							 
						 
						
							
							
								
								Merge pull request  #948  from elitzer2/fix-subscription-widget  
							
							... 
							
							
							
							(v2) Fix subscription widget 
							
						 
						
							2020-08-30 07:50:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								43837210ed 
								
							 
						 
						
							
							
								
								Don't reveal to the API the list of subscribers  
							
							
							
						 
						
							2020-08-30 00:48:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								e3c11476fb 
								
							 
						 
						
							
							
								
								Add template rendering to widget  
							
							
							
						 
						
							2020-08-29 09:04:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lawrence Elitzer 
								
							 
						 
						
							
							
							
							
								
							
							
								7a765018f2 
								
							 
						 
						
							
							
								
								Fix subscription widget  
							
							
							
						 
						
							2020-08-29 07:49:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								490031c8b5 
								
							 
						 
						
							
							
								
								Merge pull request  #945  from dlecan/feat-docker-loglevel  
							
							... 
							
							
							
							Allow to configure log level of Docker containers (v2) 
							
						 
						
							2020-08-28 15:30:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Damien Lecan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								520886b3b4 
								
							 
						 
						
							
							
								
								Allow to configure log level of Docker containers  
							
							
							
						 
						
							2020-08-28 15:11:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a42756b12 
								
							 
						 
						
							
							
								
								Merge pull request  #929  from Britaliope/fix-enum-fields  
							
							... 
							
							
							
							(v2) fix: "Enum" fields (drowdown and radio) does not render correctly 
							
						 
						
							2020-08-28 08:22:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								613a6fb1f0 
								
							 
						 
						
							
							
								
								Merge pull request  #935  from podemos-info/api  
							
							... 
							
							
							
							API Improvements (v2) 
							
						 
						
							2020-08-26 11:58:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90fb72fc6f 
								
							 
						 
						
							
							
								
								Merge pull request  #934  from podemos-info/development  
							
							... 
							
							
							
							Added DataTable translations from aplication locales (V2) 
							
						 
						
							2020-08-26 00:54:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef66108cf7 
								
							 
						 
						
							
							
								
								Merge pull request  #938  from podemos-info/shortid  
							
							... 
							
							
							
							Reemplace shortid with nanoid (v2) 
							
						 
						
							2020-08-26 00:09:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								543f05028e 
								
							 
						 
						
							
							
								
								Fix path  
							
							
							
						 
						
							2020-08-25 23:09:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								62f6ef4559 
								
							 
						 
						
							
							
								
								Use the new module and uninstall shortid  
							
							
							
						 
						
							2020-08-25 23:03:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								8b900c94ba 
								
							 
						 
						
							
							
								
								Reemplace shortid with nanoid in background with alphabet and length configurable  #810  
							
							
							
						 
						
							2020-08-25 22:53:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								844b46e309 
								
							 
						 
						
							
							
								
								Added basic documentation to /api/subscriptions/:listCid  #839  
							
							
							
						 
						
							2020-08-22 08:13:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								bec0660d02 
								
							 
						 
						
							
							
								
								Add accordion to API documentation  
							
							
							
						 
						
							2020-08-22 07:41:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								de065f9db7 
								
							 
						 
						
							
							
								
								clean  
							
							
							
						 
						
							2020-08-22 06:31:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								0cf931429a 
								
							 
						 
						
							
							
								
								clean  
							
							
							
						 
						
							2020-08-22 06:13:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								cc794d4e52 
								
							 
						 
						
							
							
								
								Return cid instead of id when exists and fix documentation api  
							
							
							
						 
						
							2020-08-22 06:09:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								5e77e3c98a 
								
							 
						 
						
							
							
								
								Added description and status:{SUBSCRIBED: 1, UNSUBSCRIBED: 2, BOUNCED: 3, COMPLAINED: 4} to response of the GET /lists/:email API Call ( Fix   #903 )  
							
							
							
						 
						
							2020-08-20 17:09:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								06879bca7a 
								
							 
						 
						
							
							
								
								Add translation marks in Users  
							
							
							
						 
						
							2020-08-19 08:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								540c55515f 
								
							 
						 
						
							
							
								
								Improve Spanish translation  
							
							
							
						 
						
							2020-08-18 16:14:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								9e2bd4a951 
								
							 
						 
						
							
							
								
								Add Channels translations  
							
							
							
						 
						
							2020-08-17 05:11:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								adf1e0d083 
								
							 
						 
						
							
							
								
								Add Channels translations  
							
							
							
						 
						
							2020-08-17 05:04:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									joker-x 
								
							 
						 
						
							
							
							
							
								
							
							
								8e270e2ef7 
								
							 
						 
						
							
							
								
								Added DataTable translations  
							
							
							
						 
						
							2020-08-16 20:28:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Iván Eixarch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebd5265997 
								
							 
						 
						
							
							
								
								Translate to spanish  
							
							
							
						 
						
							2020-08-16 17:38:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bruno MATEU 
								
							 
						 
						
							
							
							
							
								
							
							
								8622208d44 
								
							 
						 
						
							
							
								
								fix enum fields not rendering correctly  
							
							
							
						 
						
							2020-08-03 12:01:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								aed115a64b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/development' into development  
							
							
							
						 
						
							2020-08-02 15:19:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								87c6cfa656 
								
							 
						 
						
							
							
								
								Fixes  
							
							... 
							
							
							
							- Mailtrain would not start if built-in ZoneMTA had to retry the startup
- Campaign list showed "Sending" instead of "Scheduled" for scheduled campaigns 
							
						 
						
							2020-08-02 15:19:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2d3781ae2 
								
							 
						 
						
							
							
								
								Merge pull request  #922  from Treora/patch-1  
							
							... 
							
							
							
							Fix plain text generation 
							
						 
						
							2020-07-28 17:55:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gerben 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a92b08ddb4 
								
							 
						 
						
							
							
								
								Fix plain text generation  
							
							
							
						 
						
							2020-07-28 17:26:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								8dab13d903 
								
							 
						 
						
							
							
								
								Updated version in Home  
							
							
							
						 
						
							2020-07-25 10:24:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								4e8cbf8419 
								
							 
						 
						
							
							
								
								Added Save & Leave button to Channel create.  
							
							
							
						 
						
							2020-07-25 10:20:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								676f20bfa9 
								
							 
						 
						
							
							
								
								Some more options for mj-mosaico-property element in Mosaico Templates.  
							
							
							
						 
						
							2020-07-24 22:38:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								ca615a86a5 
								
							 
						 
						
							
							
								
								Various fixes in RSS campaigns including  #916  and  #915 .  
							
							
							
						 
						
							2020-07-24 12:08:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								564c83720b 
								
							 
						 
						
							
							
								
								- Fix - A non-admin user would get permission denied on all pages.  
							
							
							
						 
						
							2020-07-18 09:48:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								3828411faf 
								
							 
						 
						
							
							
								
								- Fix - The choice of order column in tables has not been reset when going to another page. This caused crashes if the table in the other page did not have enough columns.  
							
							
							
						 
						
							2020-07-18 08:14:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								8eac78aa3a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/development' into development  
							
							
							
						 
						
							2020-07-17 14:54:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								d170548cfa 
								
							 
						 
						
							
							
								
								- Fix for  #890  
							
							... 
							
							
							
							- "Channels" feature
- Shoutout config param rendered on the homepage
- "Clone" feature for campaigns 
							
						 
						
							2020-07-17 14:53:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
							
							
								
							
							
								00432e6cfe 
								
							 
						 
						
							
							
								
								- Fix for  #890  
							
							... 
							
							
							
							- "Channels" feature
- Shoutout config param rendered on the homepage
- "Clone" feature for campaigns 
							
						 
						
							2020-07-16 20:37:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomas Bures 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								186a4ff4d6 
								
							 
						 
						
							
							
								
								Merge pull request  #907  from wschopohl/development  
							
							... 
							
							
							
							Docker Development Container 
							
						 
						
							2020-07-01 17:56:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wieland Schopohl 
								
							 
						 
						
							
							
							
							
								
							
							
								6a7029bc3e 
								
							 
						 
						
							
							
								
								removed package-lock files  
							
							
							
						 
						
							2020-07-01 17:38:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wieland Schopohl 
								
							 
						 
						
							
							
							
							
								
							
							
								0a4b835890 
								
							 
						 
						
							
							
								
								Merge branch 'docker-dev-server' into development  
							
							
							
						 
						
							2020-07-01 16:51:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wieland Schopohl 
								
							 
						 
						
							
							
							
							
								
							
							
								41ff51700e 
								
							 
						 
						
							
							
								
								shouldn't exclude package-lock files, I guess  
							
							
							
						 
						
							2020-07-01 16:51:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wieland Schopohl 
								
							 
						 
						
							
							
							
							
								
							
							
								8cfd8a4f94 
								
							 
						 
						
							
							
								
								'docker-dev-server' branch adds files and README description to easily start a development server  
							
							
							
						 
						
							2020-07-01 16:47:10 +02:00