Commit graph

2061 commits

Author SHA1 Message Date
Cassie Tarakajian
cd564d2d76 Merge branch 'release-1.0.6' into develop 2020-07-20 15:18:43 -04:00
Cassie Tarakajian
ef758be3bd 1.0.6 2020-07-20 14:42:16 -04:00
Cassie Tarakajian
52bc65abf2
Merge pull request #1506 from processing/bug/translation-404
[#1505] Change "translation.json" path to absolute
2020-07-20 14:38:45 -04:00
Cassie Tarakajian
70e34c31d5 [#1505] Change "translation.json" path to absolute 2020-07-20 14:35:34 -04:00
Cassie Tarakajian
5c79c7c2b1
Merge pull request #1504 from oruburos/pr_cache_policy
Server Cache Policy
2020-07-20 14:20:42 -04:00
Cassie Tarakajian
ce0493a953
Merge pull request #1503 from processing/chore/upgrade-react-redux
[#1498] Upgrade react-redux to 7.2.0
2020-07-20 14:17:10 -04:00
Cassie Tarakajian
4506c2bde1
Merge pull request #1317 from shakti97/login-signup-issue
Fix username/email case issue in login/signup
2020-07-20 14:16:41 -04:00
Cassie Tarakajian
2b3be3accc [#1317] Update and run email consolidation script 2020-07-17 19:09:23 -04:00
oruburos
4d81154151 Server.js
Change in Cache Policy
2020-07-17 22:02:05 +01:00
Cassie Tarakajian
1fbe050cb3 [#1498] Upgrade react-redux to 7.2.0 2020-07-16 19:47:38 -04:00
Cassie Tarakajian
cd5c000d6d [#1317] Update email consolidation script
- Update the emailConsolidation script so that it will de-duplicate the
  first duplicated user
- Sends email to user alerting them that the consolidation has taken
  place.
2020-07-16 19:37:37 -04:00
Cassie Tarakajian
f19f52683b Merge branch 'develop' into login-signup-issue 2020-07-16 17:11:05 -04:00
Cassie Tarakajian
b83824d933
Merge pull request #1501 from processing/bug/duplicate-sketch-media-files
[#1500] Update sketch media file duplication code
2020-07-16 17:10:23 -04:00
Cassie Tarakajian
cc6d868988 [#1500] Update sketch media file duplication code
- Sketch duplication code now checks for AWS endpoint via environment
  variable, rather than hard-coded string
- Fixes `aws.controller#getObjectKey`, which was incorrectly generating
  file keys
2020-07-16 17:00:50 -04:00
Cassie Tarakajian
b126a69c11 [#1317] Begin writing duplicate email script 2020-07-16 14:25:02 -04:00
Cassie Tarakajian
6259f58233 [#1314][#1489] Add static methods to user model
- Add new static methods to user model
  - `findByEmailAndUsername`
  - renames `findByMailOrName` to `findByEmailOrUsername`
  - `findByUsername`
  - `findByEmail`
- Reverts case insensitive behavior for username
2020-07-15 17:33:11 -04:00
Cassie Tarakajian
15ad07d5ce [#1314][#1489] Use collation instead of RegEx
- Add case insensitive indexes for User.email and User.username
- Update user queries by username or email so that they are case
  insensitive
2020-07-14 18:16:17 -04:00
Cassie Tarakajian
16860d76dd Merge branch 'develop' into login-signup-issue 2020-07-14 15:11:18 -04:00
Cassie Tarakajian
4b3e00560b Merge branch 'release-1.0.5' into develop 2020-07-14 15:09:58 -04:00
Cassie Tarakajian
ac4eab20e0 1.0.5 2020-07-13 17:42:34 -04:00
Cassie Tarakajian
6556997990
Merge pull request #1495 from processing/missing-translations
[#1492] Update missing translations in en-US
2020-07-13 17:37:58 -04:00
Cassie Tarakajian
2b67ea7575 [#1492] Update missing translations in en-US 2020-07-13 17:16:14 -04:00
Cassie Tarakajian
fd06f5ff9a Merge branch 'develop' into login-signup-issue 2020-07-13 16:50:18 -04:00
Cassie Tarakajian
fffe0f828b Merge branch 'release-1.0.4' into develop 2020-07-13 16:42:21 -04:00
Cassie Tarakajian
9767a749cd Merge branch 'release-1.0.4' into release 2020-07-13 16:09:36 -04:00
Cassie Tarakajian
b12e60f09c 1.0.4 2020-07-13 16:08:59 -04:00
Cassie Tarakajian
8f323ff64e [#1491] Update Dockerfile, fix npm vulnerabilities 2020-07-13 15:33:34 -04:00
Cassie Tarakajian
982b7022e9 Add fallback for --percent in asset-size 2020-07-13 14:03:59 -04:00
Cassie Tarakajian
c13d5f4d7c
Merge pull request #1491 from oruburos/i18n_copy_webpack
Webpack config in dev and prod include copywebpack for static transla…
2020-07-13 13:05:21 -04:00
oruburos
c31a65a78d Webpack config in dev and prod include copywebpack for static translations.json
Change in i18n to serve the translations from a different path
2020-07-10 17:32:15 +01:00
oruburos
348056ecf9 Webpack config in dev and prod include copywebpack for static translations.json
Change in i18n to serve the translations from a different path
2020-07-10 17:08:47 +01:00
oruburos
78f87b6ec1 Webpack config in dev and prod include copywebpack for static translations.json
Change in i18n to serve the translations from a different path
2020-07-10 13:45:35 +01:00
Cassie Tarakajian
afe74e9e00
Merge pull request #1488 from saijatin28/refactorIDEView
refactor-warnIfUnsavedChanges #1458
2020-07-09 12:57:40 -04:00
Cassie Tarakajian
decf4a9c4d [#1458] Fix merge bug, rename handler function
- Fix bug in warnIfUnsavedChanges that referred to this.props by
  changing it to props
- Change function name from `warnIfUnsavedChangesCaller` to
  `handleUnsavedChanges`, remove it being called via binding/arrow func
2020-07-09 12:50:46 -04:00
Cassie Tarakajian
e666b46e7c Merge branch 'develop' into refactorIDEView 2020-07-09 12:37:03 -04:00
Cassie Tarakajian
97c3b3549c
Merge pull request #1490 from ghalestrilo/fix/mobile-crash-on-leave-preview
Fixes #1487
2020-07-06 15:20:39 -04:00
Sai Jatin K
1a78cebd3b
replaced anonymous function with named function: warnIfUnsavedChangesCaller 2020-07-07 00:31:56 +05:30
Cassie Tarakajian
5e0d5226e7
Merge pull request #1480 from andrewn/bugfix/deleted-collection-sketch
Allow deleted sketches in collections to be removed (fixes #1465)
2020-07-06 13:09:42 -04:00
Cassie Tarakajian
6f1ac99a77
Merge pull request #1477 from andrewn/chore/split-test-runners
Use React Testing Library instead of Enzyme for tests
2020-07-06 12:40:44 -04:00
Cassie Tarakajian
67e132d4eb Merge branch 'develop' into chore/split-test-runners 2020-07-06 12:38:22 -04:00
ov
b05d1b1a02
Prototype with proposed i18n architecture (#1478)
* Branch with i18n functionality
* Translation files with new entries
* includes Loader in index.jsx
* Uses WithTranslation In Nav
* New Namespace
* Shortcuts Modal Complete
* Preferences complete
* About overlay title translated
2020-07-06 11:36:45 +02:00
ghalestrilo
835a553bf9 🐛 <PreviewFrame /> check for own iframe body tag before unmounting it 2020-07-03 14:40:20 -03:00
Sai Jatin K
707db59458
refactor-warnIfUnsavedChanges #1458 2020-07-02 17:58:45 +05:30
Andrew Nicolaou
74a3d64aba Remove old test run scripts 2020-07-01 23:08:08 +02:00
Cassie Tarakajian
69bd6cb4a0
Merge pull request #1472 from ghalestrilo/feature/mobile-settings-screen
Mobile Preferences Screen Prototype
2020-07-01 17:00:49 -04:00
Cassie Tarakajian
88ebe9e7ea Re-add Redux DevTools to App.jsx 2020-07-01 16:56:05 -04:00
Cassie Tarakajian
7d6ba6f34f Merge branch 'develop' into feature/mobile-settings-screen 2020-07-01 16:51:53 -04:00
Cassie Tarakajian
ff658c75ff
Merge pull request #1467 from ghalestrilo/feature/mobile-sketch-view
Mobile Sketch Preview Screen
2020-07-01 16:41:43 -04:00
ghalestrilo
58d8fc18d5 👌 fixed warnings on MobileSketchView and MobilePreferences 2020-07-01 17:37:32 -03:00
ghalestrilo
82ec5207cb 👌 fixed warnings 2020-07-01 17:36:25 -03:00