Commit graph

1693 commits

Author SHA1 Message Date
Cassie Tarakajian
040543c078
Merge pull request #1291 from shakti97/redundant-search-button
fix redundant search button issue
2020-04-02 15:55:56 -04:00
Cassie Tarakajian
3122fd76a4 Fixes #1290, change selector for search icon to work with div, remove unused styles 2020-04-02 15:54:40 -04:00
Cassie Tarakajian
f6cc77cd70 Merge master 2020-04-02 15:37:13 -04:00
Cassie Tarakajian
12433ae00c
Merge pull request #1358 from processing/center-loader
Fixes #1284 - Center loader in sketch list, collection list, and asset list
2020-04-02 13:45:01 -04:00
Cassie Tarakajian
68d4bddf66 Fixes #1284 - Center loader in sketch list, collection list, and asset list 2020-04-02 13:43:34 -04:00
Shakti Singh
eeb7e345f3
Fix project name blank issue (#1271)
* Fix project name blank issue

* Change length check from !length to length === 0
2020-04-01 13:47:08 -04:00
Cassie Tarakajian
2744ea4334
Merge pull request #1342 from Eswaraprasadp/modify/dark-theme
Modify dark theme
2020-04-01 13:24:05 -04:00
Cassie Tarakajian
c1d0ccec01 Additional updates to dark theme: specificity changes and reorder for proper cascade 2020-04-01 13:22:53 -04:00
Cassie Tarakajian
7f8ab3cded
Merge pull request #1265 from thegitone23/local-develop
Added safegaurd against invalid project id and undefined file path
2020-03-30 17:11:32 -04:00
Cassie Tarakajian
919a35108d Fix merge conflict 2020-03-30 17:07:50 -04:00
Cassie Tarakajian
416824ad56 Code style changes to use === and comparison to undefined 2020-03-30 17:07:10 -04:00
Mayank Gautam
c9b40bbd74 added undefined filePath check in the method resolvePathToFile 2020-03-30 16:58:53 -04:00
Mayank Gautam
8754848699 Added safegaurd against invalid project id in the method getFileContent 2020-03-30 16:58:53 -04:00
Cassie Tarakajian
f1dd9f44ef
Merge pull request #1340 from processing/feature/public-api
Merge Collections to Master
2020-03-30 16:07:53 -04:00
Cassie Tarakajian
0e0140a592 Add upload limit to .env.example 2020-03-30 16:06:57 -04:00
Elit Altum
ccfee879fa
fix(svg): removed unwanted svg tooltips - I1326 (#1327) 2020-03-27 13:12:04 +01:00
Elit Altum
4180e3497e
fix(.github/config.yml): fix link for contribution guidelines - I1328 (#1329) 2020-03-27 13:06:17 +01:00
Elit Altum
06bca997ee
fix(file.controller.js): set headers for file extensions from MIME -I1218 (#1330)
* fix(file.controller.js): set headers for file extensions from MIME - I1218
* Use name to work out content type and provide fallback

Co-authored-by: Andrew Nicolaou <me@andrewnicolaou.co.uk>
2020-03-27 13:00:50 +01:00
Tirta Wening Rachman
866d67d119
Fix broken link in developer docs (#1335) 2020-03-27 10:40:03 +01:00
Eswaraprasadp
2938c76d2d Modify dark theme 2020-03-25 19:03:02 +05:30
Cassie Tarakajian
c29e4a1c52 Close new file modal on enter, update upload limit selector to handle undefined case 2020-03-24 18:07:58 -04:00
Cassie Tarakajian
a6f59fd309
Merge pull request #1309 from processing/feature/public-api-asset-limit
Feature/public api asset limit, Fixes #168
2020-03-04 16:54:00 -05:00
Cassie Tarakajian
9de8257464 Fix server-side linting erros 2020-03-03 18:52:39 -05:00
Cassie Tarakajian
1107f7352a Add changes for asset upload limit, after cherry-picking changes from asset-limit-with-lambda 2020-03-03 16:33:52 -05:00
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
36d20281db add script to add total size to all user accounts, add totalSize to user model, return totalSize from user api request 2020-03-03 14:00:53 -05:00
Cassie Tarakajian
5654ed1922 Merge branch 'master' into feature/public-api 2020-03-03 12:49:32 -05:00
Cassie Tarakajian
8bf9c1089a
Merge pull request #1308 from processing/upgrade-node
Upgrade node version to 12.16.1, update Node installation docs
2020-03-03 12:48:21 -05:00
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
Mayank Gautam
bea3119147 added undefined filePath check in the method resolvePathToFile 2020-02-18 09:06:06 +05:30
Mayank Gautam
b1d558b3fc Added safegaurd against invalid project id in the method getFileContent 2020-02-17 22:26:16 +05:30
Cassie Tarakajian
d3da8989a7 Merge branch 'master' into feature/public-api 2020-02-13 16:13:17 -05:00
Cassie Tarakajian
ab7f4279bd Updating Contributing and Development docs 2020-02-13 16:13:03 -05:00
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
6931741813 Fix overlay styling for Add to Collection Overlay for sketch list 2020-02-11 16:27:33 -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
40403436df
Merge pull request #1253 from processing/getting-started
Update main README and Contribution docs
2020-02-04 17:12:30 -05:00
Cassie Tarakajian
58bdf90140 Update Node version in installation docs 2020-02-04 17:12:05 -05:00
Cassie Tarakajian
58a1ac9005 Update main README and Contribution docs 2020-02-04 17:05:48 -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