Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								59fe175ede 
								
							 
						 
						
							
							
								
								Fix merge conflict for cherry picking 11833e9880257fe8164331689f77f8aa11df6a2a  
							
							
							
						 
						
							2020-03-03 14:45:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								09e403facf 
								
							 
						 
						
							
							
								
								change file limit to 250 mb 1000 bytes was for testin  
							
							
							
						 
						
							2020-03-03 14:43:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								0cde29e56d 
								
							 
						 
						
							
							
								
								re  #168 , get asset deletion route to work, update options dropdown on asset list  
							
							
							
						 
						
							2020-03-03 14:43:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1aa2e589 
								
							 
						 
						
							
							
								
								Fix merge conflicts for cherry picking 0bac332a9eb360978e686d6be8bff92f0fa1740c  
							
							
							
						 
						
							2020-03-03 14:42:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								b8fb51d283 
								
							 
						 
						
							
							
								
								Fix merge conflict for cherry-picking 0b8e78df3a0c49d5dcf706b1c26346da3dcc0bc4  
							
							
							
						 
						
							2020-03-03 14:04:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								5654ed1922 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/public-api  
							
							
							
						 
						
							2020-03-03 12:49:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nik72619c 
								
							 
						 
						
							
							
							
							
								
							
							
								ab673fe771 
								
							 
						 
						
							
							
								
								Fix focus not coming on clicking on the rename option for a sketch, inside the Sketch Modal  
							
							
							
						 
						
							2020-02-28 01:57:28 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								e776bc0ac0 
								
							 
						 
						
							
							
								
								Upgrade node version to 12.16.1, update Node installatino docs  
							
							
							
						 
						
							2020-02-25 17:14:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shakti97 
								
							 
						 
						
							
							
							
							
								
							
							
								f13b9dcbbc 
								
							 
						 
						
							
							
								
								fix redundant search button issue  
							
							
							
						 
						
							2020-02-25 23:22:52 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									shakti97 
								
							 
						 
						
							
							
							
							
								
							
							
								9d0603b6d5 
								
							 
						 
						
							
							
								
								Feature sidebar toggle shortcut  
							
							
							
						 
						
							2020-02-24 00:18:16 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								36f7be60da 
								
							 
						 
						
							
							
								
								Close Collection Share dropdown when clicking outside of it  
							
							
							
						 
						
							2020-02-11 17:29:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								7ae02beb2d 
								
							 
						 
						
							
							
								
								Update styling of Github and Google Buttons, updating styling of Account Settings  
							
							
							
						 
						
							2020-02-11 16:58:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								2ce36bef6f 
								
							 
						 
						
							
							
								
								Update UX of Quick Add List: when clicking on row/hovering on row, can add/remove sketch/collection  
							
							
							
						 
						
							2020-02-11 16:16:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								1ef4b66727 
								
							 
						 
						
							
							
								
								Fix PropType Errors  
							
							
							
						 
						
							2020-02-04 18:40:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								01665fde54 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/public-api  
							
							
							
						 
						
							2020-02-04 18:04:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69f26c12ea 
								
							 
						 
						
							
							
								
								Merge pull request  #1240  from ashu8912/cursor-pos-final  
							
							... 
							
							
							
							fixed cursor position on tidy 
							
						 
						
							2020-02-03 18:00:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								294b297d49 
								
							 
						 
						
							
							
								
								Fix linting and prop type errors  
							
							
							
						 
						
							2020-01-29 12:31:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashu8912 
								
							 
						 
						
							
							
							
							
								
							
							
								5891b3b77a 
								
							 
						 
						
							
							
								
								removed console.log  
							
							
							
						 
						
							2020-01-29 16:12:08 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								954d632276 
								
							 
						 
						
							
							
								
								Merge master  
							
							
							
						 
						
							2020-01-28 18:07:07 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								737522dc7c 
								
							 
						 
						
							
							
								
								Run npm upgrade to update many outdated packages  
							
							
							
						 
						
							2020-01-28 17:47:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4a9f58d2 
								
							 
						 
						
							
							
								
								Merge in master  
							
							
							
						 
						
							2020-01-28 17:31:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								66053e5c94 
								
							 
						 
						
							
							
								
								Fixes   #1192 , adds lang=en to all html files  
							
							
							
						 
						
							2020-01-28 17:25:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									amitch6097 
								
							 
						 
						
							
							
							
							
								
							
							
								b02eef0a88 
								
							 
						 
						
							
							
								
								Fix p5 console being cleared on pause  
							
							... 
							
							
							
							The p5 console was being cleared on pause
not allowing a user to view what was outputed
on the last run.  To fix clearConsole function
is now only called if playing. 
							
						 
						
							2020-01-28 16:56:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Sroka 
								
							 
						 
						
							
							
							
							
								
							
							
								f3e8b81cb7 
								
							 
						 
						
							
							
								
								Update IDEView.jsx  
							
							... 
							
							
							
							`<Overlay...` has a default `title` of `'Modal'`
https://github.com/processing/p5.js-web-editor/blob/master/client/modules/App/components/Overlay.jsx#L102 
many modals are missing a title, so i added some. i made them basically the same as the `ariaLabel` (but capitalized, changed `-` to ` `, etc) 
							
						 
						
							2020-01-28 16:56:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								4714af9899 
								
							 
						 
						
							
							
								
								Fixes   #914 , aligns project name and autorefresh on Mac and Windows  
							
							
							
						 
						
							2020-01-28 16:56:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								37b9901bfd 
								
							 
						 
						
							
							
								
								remove p5.dom from default files as it's been integrated into p5 core library  
							
							
							
						 
						
							2020-01-28 16:56:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								942a27da6e 
								
							 
						 
						
							
							
								
								update default version of p5.js to 0.10.2  
							
							
							
						 
						
							2020-01-28 16:56:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashu8912 
								
							 
						 
						
							
							
							
							
								
							
							
								8545a3b7ce 
								
							 
						 
						
							
							
								
								removed console.log  
							
							
							
						 
						
							2020-01-26 12:47:37 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashu8912 
								
							 
						 
						
							
							
							
							
								
							
							
								5937af22f3 
								
							 
						 
						
							
							
								
								changed setImmediate with setTimeout  
							
							
							
						 
						
							2020-01-26 02:55:07 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashu8912 
								
							 
						 
						
							
							
							
							
								
							
							
								08f1c52f96 
								
							 
						 
						
							
							
								
								Fixed Indentation on setCursor  
							
							
							
						 
						
							2020-01-25 18:30:17 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								8087a3fcb3 
								
							 
						 
						
							
							
								
								Revert "Make navigation back to Collection List more obvious"  
							
							... 
							
							
							
							This reverts commit 740401d18b 
							
						 
						
							2020-01-15 18:10:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashu8912 
								
							 
						 
						
							
							
							
							
								
							
							
								5abb3a5586 
								
							 
						 
						
							
							
								
								fixed cursor position on tidy  
							
							
							
						 
						
							2020-01-15 17:50:00 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								ed481b9a89 
								
							 
						 
						
							
							
								
								Don't allow Collection name to be empty  
							
							
							
						 
						
							2020-01-15 12:07:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								811c88fc83 
								
							 
						 
						
							
							
								
								Description should be inactive color if a collection doesn't have one  
							
							
							
						 
						
							2020-01-15 11:45:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								0660031a0c 
								
							 
						 
						
							
							
								
								Make "Add sketch" copy consistent  
							
							... 
							
							
							
							Buttons and menu items should say "Add sketch" (singular) and titles
should say "Add to collection" as it's implied by context that it's
a sketch. 
							
						 
						
							2020-01-15 10:50:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								903550b41c 
								
							 
						 
						
							
							
								
								Collection owner's username links to their sketches page  
							
							
							
						 
						
							2020-01-15 10:45:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ec7c2d1ae9 
								
							 
						 
						
							
							
								
								Merge pull request  #1232  from  amitch6097/Issue#1231  
							
							... 
							
							
							
							Fix p5 console being cleared on pause 
							
						 
						
							2020-01-09 13:37:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8d47c60b7 
								
							 
						 
						
							
							
								
								Merge pull request  #1230  from gabrielsroka/patch-2  
							
							... 
							
							
							
							Update IDEView.jsx 
							
						 
						
							2020-01-09 13:09:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								df27b36b0b 
								
							 
						 
						
							
							
								
								Fixes   #914 , aligns project name and autorefresh on Mac and Windows  
							
							
							
						 
						
							2020-01-08 12:33:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									amitch6097 
								
							 
						 
						
							
							
							
							
								
							
							
								a1cd362780 
								
							 
						 
						
							
							
								
								Fix p5 console being cleared on pause  
							
							... 
							
							
							
							The p5 console was being cleared on pause
not allowing a user to view what was outputed
on the last run.  To fix clearConsole function
is now only called if playing. 
							
						 
						
							2020-01-04 23:24:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Sroka 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dabcccc494 
								
							 
						 
						
							
							
								
								Update IDEView.jsx  
							
							... 
							
							
							
							`<Overlay...` has a default `title` of `'Modal'`
https://github.com/processing/p5.js-web-editor/blob/master/client/modules/App/components/Overlay.jsx#L102 
many modals are missing a title, so i added some. i made them basically the same as the `ariaLabel` (but capitalized, changed `-` to ` `, etc) 
							
						 
						
							2019-12-29 15:43:06 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								a5b62567ef 
								
							 
						 
						
							
							
								
								Fix linter warnings  
							
							
							
						 
						
							2019-12-11 15:56:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								4d0aa23bb8 
								
							 
						 
						
							
							
								
								Display Add Sketches Overlay from Collection List  
							
							
							
						 
						
							2019-12-11 15:50:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								a2da26da69 
								
							 
						 
						
							
							
								
								Better min-width for QuickAdd views  
							
							
							
						 
						
							2019-12-11 15:12:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								0c68327690 
								
							 
						 
						
							
							
								
								Fixed-height Overlay for QuickAdd views  
							
							
							
						 
						
							2019-12-11 15:12:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								740401d18b 
								
							 
						 
						
							
							
								
								Make navigation back to Collection List more obvious  
							
							
							
						 
						
							2019-12-11 14:57:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								20c2c6c38b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/sketch-collections' of  https://github.com/andrewn/p5.js-web-editor  into feature/sketch-collections  
							
							
							
						 
						
							2019-12-11 11:37:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								001a30f140 
								
							 
						 
						
							
							
								
								potentional option for collection sharing  
							
							
							
						 
						
							2019-12-10 18:34:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								91511aa460 
								
							 
						 
						
							
							
								
								remove p5.dom from default files as it's been integrated into p5 core library  
							
							
							
						 
						
							2019-12-05 14:08:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								03fde3f0b5 
								
							 
						 
						
							
							
								
								update default version of p5.js to 0.10.2  
							
							
							
						 
						
							2019-12-04 14:46:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								387cec1988 
								
							 
						 
						
							
							
								
								Merge branch 'feature/sketch-collections' of  https://github.com/andrewn/p5.js-web-editor  into feature/sketch-collections  
							
							
							
						 
						
							2019-11-25 21:51:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								4f7c9f24b8 
								
							 
						 
						
							
							
								
								Rename import to match file name  
							
							
							
						 
						
							2019-11-25 21:19:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								ce1c389505 
								
							 
						 
						
							
							
								
								Use same remove icon as in QuickAdd panel  
							
							
							
						 
						
							2019-11-25 19:55:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								5319bbbeb7 
								
							 
						 
						
							
							
								
								merge master into sketch collections, to include updating theming  
							
							
							
						 
						
							2019-11-25 10:46:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								df44a6223f 
								
							 
						 
						
							
							
								
								Remove sketch from collection via icon button  
							
							
							
						 
						
							2019-11-25 14:53:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4771e10f 
								
							 
						 
						
							
							
								
								Show placeholder label when Collection has no description  
							
							
							
						 
						
							2019-11-25 14:53:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								0d1a4d25f6 
								
							 
						 
						
							
							
								
								Keep theme in sync with state across the app  
							
							
							
						 
						
							2019-11-25 13:38:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								8132a029f5 
								
							 
						 
						
							
							
								
								Improve progress bar layout  
							
							
							
						 
						
							2019-11-25 11:15:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								8adb1347ba 
								
							 
						 
						
							
							
								
								Merge branch 'feature/sketch-collections' of  https://github.com/andrewn/p5.js-web-editor  into feature/sketch-collections  
							
							
							
						 
						
							2019-11-25 10:55:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								1056005eb6 
								
							 
						 
						
							
							
								
								"View" should link to sketch  
							
							
							
						 
						
							2019-11-25 10:55:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								b751353243 
								
							 
						 
						
							
							
								
								collections: add styling changes for dashboard pages  
							
							
							
						 
						
							2019-11-14 16:01:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								13c45490a2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/public-api' into feature/sketch-collections  
							
							
							
						 
						
							2019-11-10 22:12:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								212ad64bae 
								
							 
						 
						
							
							
								
								Implement CollectionSearchbar in addition to SketchSearchbar  
							
							
							
						 
						
							2019-11-10 21:57:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								ed1945ab4b 
								
							 
						 
						
							
							
								
								Rename collection from collection list view  
							
							
							
						 
						
							2019-11-10 20:28:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								b6e60185f7 
								
							 
						 
						
							
							
								
								Remove addMode code  
							
							
							
						 
						
							2019-11-10 19:50:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								9ac0cc1482 
								
							 
						 
						
							
							
								
								Use bar chart for current size of used assets  
							
							
							
						 
						
							2019-11-10 19:42:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								ff86e45e0a 
								
							 
						 
						
							
							
								
								Put border around lists  
							
							
							
						 
						
							2019-11-10 19:35:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								161725cb28 
								
							 
						 
						
							
							
								
								Remove popover and "add to collection" code from SketchList  
							
							
							
						 
						
							2019-11-10 17:08:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								ad13684fe3 
								
							 
						 
						
							
							
								
								New simplified sketch list when adding from Collection view  
							
							
							
						 
						
							2019-11-10 17:08:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								0d061a9dea 
								
							 
						 
						
							
							
								
								merge in master  
							
							
							
						 
						
							2019-11-07 15:03:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								08fd6b826d 
								
							 
						 
						
							
							
								
								New simplfied collection list when adding a sketch  
							
							
							
						 
						
							2019-11-05 18:23:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								18af6aed3a 
								
							 
						 
						
							
							
								
								Show add/remove/in collection icon in SketchList  
							
							
							
						 
						
							2019-11-04 22:04:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Nicolaou 
								
							 
						 
						
							
							
							
							
								
							
							
								e738221be6 
								
							 
						 
						
							
							
								
								Style DashboardActions below tabs  
							
							
							
						 
						
							2019-11-04 20:30:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								57ecfb7e1e 
								
							 
						 
						
							
							
								
								fixes   #1206 , removes titles where it is unnecesary  
							
							
							
						 
						
							2019-10-31 17:27:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								846d2bb7db 
								
							 
						 
						
							
							
								
								Merge branch 'feature/public-api' into feature/sketch-collections  
							
							
							
						 
						
							2019-10-31 15:02:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								28356a9318 
								
							 
						 
						
							
							
								
								remove view column from asset list, add when clicking on asset row, opens asset in new tab  
							
							
							
						 
						
							2019-10-31 14:21:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								3d2a7beeb9 
								
							 
						 
						
							
							
								
								merge master to feature/public-api branch  
							
							
							
						 
						
							2019-10-22 17:35:20 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									plxity 
								
							 
						 
						
							
							
							
							
								
							
							
								01e5c1f7bb 
								
							 
						 
						
							
							
								
								changes  
							
							
							
						 
						
							2019-10-09 02:46:21 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a29bd4ce9 
								
							 
						 
						
							
							
								
								Revert "fixes  #963 : fixes bug in which files/folders would get added to"  
							
							
							
						 
						
							2019-10-07 18:23:58 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cassie Tarakajian 
								
							 
						 
						
							
							
							
							
								
							
							
								3d9507b7ef 
								
							 
						 
						
							
							
								
								re  #1177 : increase autorefresh time period to 1000ms  
							
							
							
						 
						
							2019-10-03 16:16:54 -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