Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								3d2a7beeb9 
								
							 
						 
						
							
							
								
								merge master to feature/public-api branch  
							
							
							
						 
						
							2019-10-22 17:35:20 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d5dfe3937f 
								
							 
						 
						
							
							
								
								Merge pull request  #1200  from stalgiag/contentTypeMetaAssetUpload  
							
							... 
							
							
							
							Add content-type to assets uploaded to s3 
							
						 
						
							2019-10-22 17:24:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stalgia Grigg 
								
							 
						 
						
							
							
							
							
								
							
							
								e79ab18a0c 
								
							 
						 
						
							
							
								
								Add content-type to assets uploaded to s3  
							
							
							
						 
						
							2019-10-21 12:54:56 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								14a8f48fd5 
								
							 
						 
						
							
							
								
								Fix all linting errors/warnings  
							
							
							
						 
						
							2019-10-21 10:35:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								59469d9f85 
								
							 
						 
						
							
							
								
								Remove unused code  
							
							
							
						 
						
							2019-10-21 10:14:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								935dd12520 
								
							 
						 
						
							
							
								
								Add sketch Searchbar when displaying modal in Collection view  
							
							
							
						 
						
							2019-10-21 02:06:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								5611d32653 
								
							 
						 
						
							
							
								
								Allow extra elements to be injected into Overlay header  
							
							
							
						 
						
							2019-10-21 02:05:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								126bdcab72 
								
							 
						 
						
							
							
								
								Entire SketchList row adds/removes sketch to collection  
							
							
							
						 
						
							2019-10-21 01:51:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								f928665737 
								
							 
						 
						
							
							
								
								Show empty state when no collections  
							
							
							
						 
						
							2019-10-21 01:13:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								7137c7bd73 
								
							 
						 
						
							
							
								
								Increase hit area of dashboard switcher tabs  
							
							
							
						 
						
							2019-10-21 00:49:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								7e5613b2b4 
								
							 
						 
						
							
							
								
								Show if sketch is in collection and allow removal  
							
							
							
						 
						
							2019-10-21 00:37:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								ad09ce15ab 
								
							 
						 
						
							
							
								
								Filter collections using Searchbar  
							
							
							
						 
						
							2019-10-20 23:30:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								48c4183b97 
								
							 
						 
						
							
							
								
								Add missing check image  
							
							
							
						 
						
							2019-10-20 21:59:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								af8d25f142 
								
							 
						 
						
							
							
								
								Popover component to add sketches to collection from SketchList  
							
							
							
						 
						
							2019-10-20 21:59:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								edfddcc75f 
								
							 
						 
						
							
							
								
								Export unconnected Searchbar for use elsewhere (with sketch search)  
							
							
							
						 
						
							2019-10-20 21:58:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								3554fe9eb4 
								
							 
						 
						
							
							
								
								Show Searchbar clear button only when text is entered  
							
							
							
						 
						
							2019-10-20 21:55:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								66704e3788 
								
							 
						 
						
							
							
								
								Dashboard tabs should match other tabs on the site  
							
							
							
						 
						
							2019-10-20 17:38:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								36f305e2e7 
								
							 
						 
						
							
							
								
								Fix bug where "empty" view is shown when loading  
							
							
							
						 
						
							2019-10-20 17:21:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								45dbb8ec8b 
								
							 
						 
						
							
							
								
								Remove sketch from collection view page  
							
							
							
						 
						
							2019-10-20 15:50:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5e62bce8 
								
							 
						 
						
							
							
								
								Remove "Add sketches" link as it have been replaced by primary button  
							
							
							
						 
						
							2019-10-20 15:33:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								a82e079782 
								
							 
						 
						
							
							
								
								Delete collection from list  
							
							
							
						 
						
							2019-10-20 15:31:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								3573253504 
								
							 
						 
						
							
							
								
								Add/Remove sketch to collection by clicking on entire row  
							
							
							
						 
						
							2019-10-20 15:02:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f2b3cd15d 
								
							 
						 
						
							
							
								
								Merge pull request  #1197  from processing/update-jshint  
							
							... 
							
							
							
							re #1193 : update jshint 
							
						 
						
							2019-10-17 14:34:35 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								2c76c84fef 
								
							 
						 
						
							
							
								
								re  #1193 : update jshint  
							
							
							
						 
						
							2019-10-17 14:33:58 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Apoorv Taneja 
								
							 
						 
						
							
							
							
							
								
							
							
								5fa806d33e 
								
							 
						 
						
							
							
								
								Password limit ( #1191 )  
							
							... 
							
							
							
							* changes
* changes
* changes
* changes
* changes
* changez 
							
						 
						
							2019-10-17 12:53:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								dd2094f7a3 
								
							 
						 
						
							
							
								
								update travis config to fix CD  
							
							
							
						 
						
							2019-10-08 18:14:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d9c7d6a1f 
								
							 
						 
						
							
							
								
								Merge pull request  #1187  from plxity/add-limit-input  
							
							... 
							
							
							
							Added limit in file name 
							
						 
						
							2019-10-08 17:58:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a82ac1e113 
								
							 
						 
						
							
							
								
								Merge pull request  #1185  from processing/welcome-bot  
							
							... 
							
							
							
							add config for welcome bot 
							
						 
						
							2019-10-08 17:54:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd9b7f7b56 
								
							 
						 
						
							
							
								
								Merge pull request  #1190  from processing/nav-tests  
							
							... 
							
							
							
							fixes  #1189 , fixes nav tests so that the app will actually redeploy 
						
							2019-10-08 17:47:14 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								f1bcccb1b2 
								
							 
						 
						
							
							
								
								fixes   #1189 , fixes nav tests so that the app will actually redeploy  
							
							
							
						 
						
							2019-10-08 17:46:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									plxity 
								
							 
						 
						
							
							
							
							
								
							
							
								01e5c1f7bb 
								
							 
						 
						
							
							
								
								changes  
							
							
							
						 
						
							2019-10-09 02:46:21 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								0950ef29ec 
								
							 
						 
						
							
							
								
								add config for welcome bot  
							
							
							
						 
						
							2019-10-08 16:53:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								560659e76a 
								
							 
						 
						
							
							
								
								Merge pull request  #1183  from processing/bug/add-file  
							
							... 
							
							
							
							fixes  #1180  
						
							2019-10-08 16:40:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61390301fb 
								
							 
						 
						
							
							
								
								Merge pull request  #1184  from processing/revert-1181-revert-1176-bug/add-file  
							
							... 
							
							
							
							Revert "Revert "fixes #963 : fixes bug in which files/folders would get added to"" 
							
						 
						
							2019-10-08 16:40:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d8be89df7 
								
							 
						 
						
							
							
								
								Revert "Revert "fixes  #963 : fixes bug in which files/folders would get added to""  
							
							
							
						 
						
							2019-10-08 16:39:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								53241c9180 
								
							 
						 
						
							
							
								
								fixes   #1180  
							
							
							
						 
						
							2019-10-08 16:36:38 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25e89b1172 
								
							 
						 
						
							
							
								
								Merge pull request  #1181  from processing/revert-1176-bug/add-file  
							
							... 
							
							
							
							Revert "fixes #963 : fixes bug in which files/folders would get added to" 
							
						 
						
							2019-10-07 18:24:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a29bd4ce9 
								
							 
						 
						
							
							
								
								Revert "fixes  #963 : fixes bug in which files/folders would get added to"  
							
							
							
						 
						
							2019-10-07 18:23:58 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29ac16acfa 
								
							 
						 
						
							
							
								
								Merge pull request  #1178  from processing/autorefresh-tweaks  
							
							... 
							
							
							
							re #1177 : increase autorefresh time period to 1000ms 
							
						 
						
							2019-10-03 16:18:08 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								3d9507b7ef 
								
							 
						 
						
							
							
								
								re  #1177 : increase autorefresh time period to 1000ms  
							
							
							
						 
						
							2019-10-03 16:16:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61f1f039af 
								
							 
						 
						
							
							
								
								Merge pull request  #1176  from processing/bug/add-file  
							
							... 
							
							
							
							fixes  #963 : fixes bug in which files/folders would get added to 
						
							2019-10-03 15:54:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								3360c7c799 
								
							 
						 
						
							
							
								
								fixes   #963 : fixes bug in which files/folders would get added to selected file (or root), rather than the file that you opened the popover from  
							
							
							
						 
						
							2019-10-03 15:51:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b251b12493 
								
							 
						 
						
							
							
								
								Merge pull request  #1174  from processing/indenting-updates  
							
							... 
							
							
							
							re #1067 , when a line or lines are highlighted, tab will indent them 
							
						 
						
							2019-10-03 14:51:06 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								c981bc8b04 
								
							 
						 
						
							
							
								
								Fixes collection metadata spacing when user is not the owner  
							
							
							
						 
						
							2019-10-03 19:39:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								cf9a6013a4 
								
							 
						 
						
							
							
								
								Share and Add Sketch button copy  
							
							
							
						 
						
							2019-10-03 19:39:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								bcebc070a6 
								
							 
						 
						
							
							
								
								Collection Add Sketch and Share buttons  
							
							
							
						 
						
							2019-10-03 07:41:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								c925da8c17 
								
							 
						 
						
							
							
								
								re  #1067 , remove lingering commented-out code  
							
							
							
						 
						
							2019-10-02 16:48:33 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								81a76a1529 
								
							 
						 
						
							
							
								
								re  #1067 , when a line or lines are highlighted, tab will indent them  
							
							
							
						 
						
							2019-10-02 16:40:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Frank Winter 
								
							 
						 
						
							
							
							
							
								
							
							
								0b36126854 
								
							 
						 
						
							
							
								
								Change DELETE request for projects  Fixes   #1165  ( #1172 )  
							
							... 
							
							
							
							* Change DELETE request for projects
* fixes  #1165 , by updating requestsOfType to check for null or undefined values
* remove unnecessary whitespace changes 
							
						 
						
							2019-10-02 16:18:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								fc02f49d93 
								
							 
						 
						
							
							
								
								Fix layout of Searchbar in IDEView  
							
							
							
						 
						
							2019-10-02 18:17:52 +03:00