Commit graph

1475 commits

Author SHA1 Message Date
Cassie Tarakajian
0d061a9dea merge in master 2019-11-07 15:03:01 -05:00
Cassie Tarakajian
1afd2aaaf4
Merge pull request #1207 from processing/dependabot/npm_and_yarn/mongoose-5.7.5
Bump mongoose from 4.13.18 to 5.7.5
2019-11-07 13:42:32 -05:00
Cassie Tarakajian
a4a01cef4c update server code to work with updated mongoose version 2019-11-07 13:38:02 -05:00
Cassie Tarakajian
287ea0d0aa
Merge pull request #1210 from processing/remove-titles
fixes #1206, removes titles where it is unneccesary
2019-11-07 13:19:52 -05:00
dependabot[bot]
cee9fa7441
Bump mongoose from 4.13.18 to 5.7.5
Bumps [mongoose](https://github.com/Automattic/mongoose) from 4.13.18 to 5.7.5.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/4.13.18...5.7.5)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-02 00:55:28 +00:00
Cassie Tarakajian
57ecfb7e1e fixes #1206, removes titles where it is unnecesary 2019-10-31 17:27:23 -04:00
Cassie Tarakajian
821b2ea111 remove link to feedback, since we're not using the google doc at all 2019-10-31 15:25:44 -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
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
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
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
Cassie Tarakajian
7e815b1dcb
Merge pull request #1171 from processing/action-error
fixes #1170
2019-10-01 16:32:38 -04:00
Cassie Tarakajian
ad93782496 fixes #1170 2019-10-01 16:32:07 -04:00
Cassie Tarakajian
8281a7ee9e
Merge pull request #1166 from processing/expand-file-types
fixes #1162, fixes #1118, adds shader and .bin files to web editor
2019-09-26 16:18:24 -04:00
Cassie Tarakajian
02f4cb23b4 fixes #1162, fixes #1118 2019-09-26 16:17:22 -04:00
Cassie Tarakajian
5c54983c24 add searchbar to sketches dashboard view, adjust sketch list and asset list styling to have sticky header 2019-09-24 17:52:45 -04:00
Cassie Tarakajian
5900e62904 unify navigation for authentication pages, add authorization to front end, fixes #650 2019-09-19 13:38:27 -04:00
Cassie Tarakajian
7f2529a973 merge master 2019-09-11 19:05:15 -04:00
Cassie Tarakajian
f09e743e92
Merge pull request #1143 from andrewn/feature/standalone-sketches
Standalone sketches and asset page (fixes #1142)
2019-09-11 16:52:39 -04:00
Cassie Tarakajian
3a65afb6da change link to editor back to 'back to editor' 2019-09-11 16:46:56 -04:00
Andrew Nicolaou
41636642c9 Style Dashboard tabs to match visual style of other tabs in app 2019-09-11 20:11:46 +02:00
Andrew Nicolaou
125051ccb1 Use Nav with user menu in "dashboard" layout 2019-09-11 20:11:46 +02:00
Andrew Nicolaou
611730c289 Refactor Nav 2019-09-11 19:06:30 +02:00
Cassie Tarakajian
8d0e59efc2
Merge pull request #1151 from davidbmx/master
Add matches search into code mirror fixes #936
2019-09-10 16:45:54 -04:00
davidbmx
6030b355ff Remove num results when don't match find 2019-09-10 12:38:12 -05:00
davidbmx
22f958e50a Add matches search into code mirror 2019-09-10 12:00:27 -05:00