Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: My Projects Redo #4240

Merged
merged 208 commits into from
Aug 7, 2023
Merged

Feature: My Projects Redo #4240

merged 208 commits into from
Aug 7, 2023

Commits on Jan 12, 2023

  1. reuse code for my projects route

    @magicznyleszek
    magicznyleszek committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    8435f3e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Merge branch 'custom-views-integrate-endpoints-into-front-end' into 4… 

    …209-my-projects-redo

# Conflicts:
#	jsapp/js/projects/customViewStore.ts
    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    11f3965 View commit details
    Browse the repository at this point in the history

  2. use different orderable fields for my projects and custom views

    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    2894318 View commit details
    Browse the repository at this point in the history

  3. use /projects/home instead of /forms

    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    3396a22 View commit details
    Browse the repository at this point in the history

  4. remove all old code /forms route used

    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    1728ffb View commit details
    Browse the repository at this point in the history

  5. fix typo

    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    75d8420 View commit details
    Browse the repository at this point in the history

  6. add todo comment

    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    b0bc3da View commit details
    Browse the repository at this point in the history

  7. Merge branch 'custom-views-integrate-endpoints-into-front-end' into 4… 

    …209-my-projects-redo
    @magicznyleszek
    magicznyleszek committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    c7145e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Merge branch 'custom-views-integrate-endpoints-into-front-end' into 4… 

    …209-my-projects-redo

# Conflicts:
#	jsapp/js/projects/projectViews/constants.ts
    @magicznyleszek
    magicznyleszek committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    b718628 View commit details
    Browse the repository at this point in the history

  2. add comment

    @magicznyleszek
    magicznyleszek committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c0e11a3 View commit details
    Browse the repository at this point in the history

  3. use fetchPostUrl

    @magicznyleszek
    magicznyleszek committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    5ff876d View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Merge branch 'feature/regional_projects' into 4209-my-projects-redo

    @magicznyleszek
    magicznyleszek committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    198923a View commit details
    Browse the repository at this point in the history

  2. use proper route in nav link

    @magicznyleszek
    magicznyleszek committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    6bec172 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. add checkboxes to ProejctsTable

    @magicznyleszek
    magicznyleszek committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    df1d964 View commit details
    Browse the repository at this point in the history

  2. display action buttons in custom view (WIP)

    @magicznyleszek
    magicznyleszek committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    8230712 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Merge branch 'beta' into 4209-my-projects-redo 

    # Conflicts:
#	jsapp/js/lists/forms.es6
#	jsapp/js/lists/forms.module.scss
    @magicznyleszek
    magicznyleszek committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    0e3b969 View commit details
    Browse the repository at this point in the history

  2. change KoboDropdown option from enum to type to simplify code 

    also update backend response type
    @magicznyleszek
    magicznyleszek committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    123ba15 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. fix placements leftovers

    @magicznyleszek
    magicznyleszek committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    a2ee273 View commit details
    Browse the repository at this point in the history

  2. introduce floatingRoundedBox mixin

    @magicznyleszek
    magicznyleszek committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    dd5cf75 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. split code out of mixins file

    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    2f4af7c View commit details
    Browse the repository at this point in the history

  2. define two components for quick action buttons

    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    6988395 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into 4209-my-projects-redo

    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    fb3fbea View commit details
    Browse the repository at this point in the history

  4. Merge branch 'cleanup-permissions-mixin' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    45d6591 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/my-projects' into 4209-my-projects-redo 

    # Conflicts:
#	jsapp/js/mixins.tsx
    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    9e6d0eb View commit details
    Browse the repository at this point in the history

  6. Merge branch 'cleanup-permissions-mixin' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    88d2a6e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/my-projects' into 4209-my-projects-redo 

    # Conflicts:
#	jsapp/js/components/assetrow.es6
#	jsapp/js/components/assetsTable/assetActionButtons.tsx
#	jsapp/js/components/header.es6
#	jsapp/js/mixins.tsx
    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    a9b8ea7 View commit details
    Browse the repository at this point in the history

  8. import userCan from new place

    @magicznyleszek
    magicznyleszek committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    d5eef38 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. fix userCan in projectQuickActions component

    @magicznyleszek
    magicznyleszek committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    0732dfb View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. proejct quick actions done

    @magicznyleszek
    magicznyleszek committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    c2401c7 View commit details
    Browse the repository at this point in the history

  2. remove bulk actions for now

    @magicznyleszek
    magicznyleszek committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    8737f96 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4209-fix-unaborted-calls--2.023.04' into feature/my-pro… 

    …jects
    @magicznyleszek
    magicznyleszek committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    aa0cf37 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/my-projects' into 4209-my-projects-redo

    @magicznyleszek
    magicznyleszek committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    21a287e View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2023

  1. WIP handling changes to assets

    @magicznyleszek
    magicznyleszek committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    900cc31 View commit details
    Browse the repository at this point in the history

  2. make sure deleted asset is removed from the list

    @magicznyleszek
    magicznyleszek committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    c3a4e66 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. finish up refetching data code

    @magicznyleszek
    magicznyleszek committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    601796c View commit details
    Browse the repository at this point in the history

  2. run prettier on modified code

    @magicznyleszek
    magicznyleszek committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    c6a4d82 View commit details
    Browse the repository at this point in the history

  3. Add asset_type and downloads to serializer for Project Views feature

    @magicznyleszek
    magicznyleszek committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    0df968d View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. remove leftover todo comment

    @magicznyleszek
    magicznyleszek committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    a85d6ef View commit details
    Browse the repository at this point in the history

  2. update comment

    @magicznyleszek
    magicznyleszek committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    4e75293 View commit details
    Browse the repository at this point in the history

  3. remove leftover commented out code

    @magicznyleszek
    magicznyleszek committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    2f3028e View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. new component FormSummaryProjectInfo for FormSummary 

    gathers data from two different places, will add some more details to it in next commits
    @magicznyleszek
    magicznyleszek committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    925c026 View commit details
    Browse the repository at this point in the history

  2. new component FormSummaryProjectInfo for FormSummary 

    gathers data from two different places, will add some more details to it in next commits
    @magicznyleszek
    magicznyleszek committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    f0e6b8e View commit details
    Browse the repository at this point in the history

  3. Merge branch '4233-project-summary-details-improvement' of github.com… 

    …:kobotoolbox/kpi into 4233-project-summary-details-improvement
    @magicznyleszek
    magicznyleszek committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    cf8d5e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. AssetStatusBadge component

    @magicznyleszek
    magicznyleszek committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    8c3a455 View commit details
    Browse the repository at this point in the history

  2. add all missing parts to FormSummaryProjectInfo component

    @magicznyleszek
    magicznyleszek committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    ada6844 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. Make ViewSwitcher display "My Projects" for no views defined

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    3db9770 View commit details
    Browse the repository at this point in the history

  2. bring back Dropzone for My Projects route

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    192bd80 View commit details
    Browse the repository at this point in the history

  3. missing semicolon and run prettier

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    bc10eb0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'cleanup-permissions-mixin' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    e104595 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/my-projects' into 4209-my-projects-redo

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    72573b4 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4209-my-projects-redo' into 4233-project-summary-detail… 

    …s-improvement
    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    1e5dbbc View commit details
    Browse the repository at this point in the history

  7. tidying some code

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    d11fe9e View commit details
    Browse the repository at this point in the history

  8. typescriptize HeaderTitleEditor

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    2835d2c View commit details
    Browse the repository at this point in the history

  9. typescriptize SearchBox component

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    ab171b8 View commit details
    Browse the repository at this point in the history

  10. move header component to better directory, split out and typescriptiz… 

    …e AccountMenu from it
    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    1ac9de6 View commit details
    Browse the repository at this point in the history

  11. migrate searchBoxStore to MobX

    @magicznyleszek
    magicznyleszek committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    4e2af4f View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Make the checkbox clicking experience a bit more generous and forgiving 

    … especially since the quick actions menu is triggered by checkbox

- Wider, taller checkbox click target, extends to the beginning of the 
  next cell
- Visually indicate if a click would trigger navigation (soft underline
  the project name on row hover)
    @p2edwards
    p2edwards committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    6ffcd72 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    88ec2ec View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    cdd430e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/my-projects' into 4209-my-projects-redo

    @magicznyleszek
    magicznyleszek committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    ecb7fb1 View commit details
    Browse the repository at this point in the history

  3. split translation strings

    @magicznyleszek
    magicznyleszek committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    6a1a48c View commit details
    Browse the repository at this point in the history

  4. Merge branch '4209-my-projects-redo' into 4063-use-searchbox-in-proje… 

    …ct-views
    @magicznyleszek
    magicznyleszek committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    e06834d View commit details
    Browse the repository at this point in the history

  5. rebuild searchBoxStore with context prop and use it in customViewStore

    @magicznyleszek
    magicznyleszek committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    555e223 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. use new searchBoxStore in library stores

    @magicznyleszek
    magicznyleszek committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    d5f7e82 View commit details
    Browse the repository at this point in the history

  2. remove unnecessary methods

    @magicznyleszek
    magicznyleszek committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    fa8b60b View commit details
    Browse the repository at this point in the history

  3. change order of context storing

    @magicznyleszek
    magicznyleszek committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    04721d9 View commit details
    Browse the repository at this point in the history

  4. change default ordering to dateModified (was by name)

    @magicznyleszek
    magicznyleszek committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    11cbdb4 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Merge pull request #4219 from kobotoolbox/4209-my-projects-redo 

    Update the looks of My Projects route and add advanced filtering and configuration
    @p2edwards
    p2edwards authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    9fd02d2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4286 from kobotoolbox/4233-project-summary-detail… 

    …s-improvement

Project Summary Details improvement
    @p2edwards
    p2edwards authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    8c0b56d View commit details
    Browse the repository at this point in the history

  3. Merge branch '4209-my-projects-redo' into feature/my-projects

    @p2edwards
    p2edwards committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    e38a10a View commit details
    Browse the repository at this point in the history

  4. run prettier on projects code

    @magicznyleszek
    magicznyleszek committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    bf6a071 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4326 from kobotoolbox/4209-my-projects-redo 

    Run prettier on projects code
    @magicznyleszek
    magicznyleszek authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    f342784 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    d3672ae View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/my-projects' into 4063-use-searchbox-in-project… 

    …-views
    @magicznyleszek
    magicznyleszek committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    0776a8a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    538afab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/my-projects' into 4063-use-searchbox-in-project… 

    …-views
    @magicznyleszek
    magicznyleszek committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    03e7b28 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Edit comments - Apply suggestions from code review

    @p2edwards
    p2edwards authored Mar 21, 2023
    Configuration menu
    Copy the full SHA
    e8675b7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4310 from kobotoolbox/4063-use-searchbox-in-proje… 

    …ct-views

Update SearchBox and use it in Project Views code
    @p2edwards
    p2edwards authored Mar 21, 2023
    Configuration menu
    Copy the full SHA
    2c033f1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    aee57b2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/my-projects' of github.com:kobotoolbox/kpi into… 

    … feature/my-projects
    @magicznyleszek
    magicznyleszek committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    b0992b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    02728c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. improve styles for project quick actions

    @magicznyleszek
    magicznyleszek committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    5470c40 View commit details
    Browse the repository at this point in the history

  2. safer checks for getting lastDeployedDate

    @magicznyleszek
    magicznyleszek committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    047612f View commit details
    Browse the repository at this point in the history

  3. use new util function for My Projects route Dropzone

    @magicznyleszek
    magicznyleszek committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    0ebc77c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Merge branch 'beta' into feature/my-projects 

    # Conflicts:
#	package-lock.json
#	package.json
    @magicznyleszek
    magicznyleszek committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    37317d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/my-projects' into 4374-fix-dropzone-on-my-projects

    @magicznyleszek
    magicznyleszek committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    2355db5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/my-projects' into 4377-fix-ui-crash-for-drafts

    @magicznyleszek
    magicznyleszek committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    c01d0d2 View commit details
    Browse the repository at this point in the history

  4. Fix data not being fetched when navigating back to My Projects from a… 

    … project route
    @magicznyleszek
    magicznyleszek committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    7821e1a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4386 from kobotoolbox/4375-fix-infinite-spinner 

    Fix infinite spinner on My Projects
    @p2edwards
    p2edwards authored Mar 24, 2023
    Configuration menu
    Copy the full SHA
    e332b2e View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. simplify code

    @magicznyleszek
    magicznyleszek committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    03e8f13 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4382 from kobotoolbox/4377-fix-ui-crash-for-drafts 

    Fix UI crash for drafts
    @magicznyleszek
    magicznyleszek authored Mar 27, 2023
    Configuration menu
    Copy the full SHA
    8ef4073 View commit details
    Browse the repository at this point in the history

  3. fix left divider for project name column

    @magicznyleszek
    magicznyleszek committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    72ea584 View commit details
    Browse the repository at this point in the history

  4. update ProjectsFieldsSelector modal consistently 

    fixes #4380
    @magicznyleszek
    magicznyleszek committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    8062169 View commit details
    Browse the repository at this point in the history

  5. create ProjectBulkActions component

    @magicznyleszek
    magicznyleszek committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    9589fc4 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4379-add-date-deployed-to-assets-list--beta' into featu… 

    …re/my-projects
    @magicznyleszek
    magicznyleszek committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    ca49df2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/my-projects' into 4376-bulk-delete-projects

    @magicznyleszek
    magicznyleszek committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    22b662c View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Merge branch 'feature/my-projects' into 4374-fix-dropzone-on-my-projects

    @p2edwards
    p2edwards committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    8edf338 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    08b094d View commit details
    Browse the repository at this point in the history

  2. split dropzone utils method to separately handle single and multiple … 

    …files

also use exponential interval for better UX with single upload
    @magicznyleszek
    magicznyleszek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    a0be66c View commit details
    Browse the repository at this point in the history

  3. fix typo in "successfully"

    @magicznyleszek
    magicznyleszek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    dd481df View commit details
    Browse the repository at this point in the history

  4. add deprecated comment

    @magicznyleszek
    magicznyleszek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    b8c6d9b View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. Update jsapp/js/mixins.tsx 

    Co-authored-by: Philip Edwards <[email protected]>
    @magicznyleszek @p2edwards
    magicznyleszek and p2edwards authored Apr 3, 2023
    Configuration menu
    Copy the full SHA
    323a5a9 View commit details
    Browse the repository at this point in the history

  2. Update jsapp/js/dropzone.utils.tsx 

    Co-authored-by: Philip Edwards <[email protected]>
    @magicznyleszek @p2edwards
    magicznyleszek and p2edwards authored Apr 3, 2023
    Configuration menu
    Copy the full SHA
    233b2f0 View commit details
    Browse the repository at this point in the history

  3. add helpful comment

    @magicznyleszek
    magicznyleszek committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    310edaa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4383 from kobotoolbox/4374-fix-dropzone-on-my-pro… 

    …jects

Fix dropzone on My Projects
    @p2edwards
    p2edwards authored Apr 3, 2023
    Configuration menu
    Copy the full SHA
    9482332 View commit details
    Browse the repository at this point in the history

  5. Re-hide left divider without decreasing checkbox target size

    @p2edwards
    p2edwards committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    0705b71 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/my-projects' into 4376-bulk-delete-projects

    @magicznyleszek
    magicznyleszek committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    2414e11 View commit details
    Browse the repository at this point in the history

  7. introduce bulk delete prompt

    @magicznyleszek
    magicznyleszek committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    139b479 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. finalize bulk delete flow

    @magicznyleszek
    magicznyleszek committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    3e870f6 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Merge branch 'beta' into feature/my-projects.bak

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    40c06dc View commit details
    Browse the repository at this point in the history

  2. hide search box for access denied routes

    @magicznyleszek @noliveleger
    magicznyleszek authored and noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ccd6236 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/my-projects' into 4376-bulk-delete-projects

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    bfec2f3 View commit details
    Browse the repository at this point in the history

  4. update bulk api handling

    @magicznyleszek @noliveleger
    magicznyleszek authored and noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    8f15732 View commit details
    Browse the repository at this point in the history

  5. make failed api calls throw

    @magicznyleszek @noliveleger
    magicznyleszek authored and noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    5cdb441 View commit details
    Browse the repository at this point in the history

  6. Add _deployment_status to asset and use it for sort and search

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    12f6884 View commit details
    Browse the repository at this point in the history

  7. Use _deployment_status instead of _deployment_data__active

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    4c51de5 View commit details
    Browse the repository at this point in the history

  8. Use XForm cached field to get number of submissions

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    850fea1 View commit details
    Browse the repository at this point in the history

  9. Set deployment status on surveys only

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ffb3071 View commit details
    Browse the repository at this point in the history

  10. Add unit test to test default ordering

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    6fc2f0f View commit details
    Browse the repository at this point in the history

  11. Add support to sort by deployment status

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    7244dc3 View commit details
    Browse the repository at this point in the history

  12. Add default sorting button

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    208a08e View commit details
    Browse the repository at this point in the history

  13. Expose _deployment_status value instead of label

    @noliveleger
    noliveleger committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    dfcb4fa View commit details
    Browse the repository at this point in the history

  14. Show success notification on bulk deletion

    @magicznyleszek
    magicznyleszek committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    2fcce88 View commit details
    Browse the repository at this point in the history

  15. fix tooltip placement

    @magicznyleszek
    magicznyleszek committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ec542a1 View commit details
    Browse the repository at this point in the history

  16. cleanup sort-default icon file

    @magicznyleszek
    magicznyleszek committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    b3713cc View commit details
    Browse the repository at this point in the history

  17. Fix redeploy message

    @magicznyleszek
    magicznyleszek committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    f973052 View commit details
    Browse the repository at this point in the history

  18. improve deployment_status typings

    @magicznyleszek
    magicznyleszek committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    5695661 View commit details
    Browse the repository at this point in the history

  19. fix archive and unarchive asset prompt self-closing on success

    @magicznyleszek
    magicznyleszek committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    67c9205 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Move deployment serializer to v2

    @noliveleger
    noliveleger committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    da718b8 View commit details
    Browse the repository at this point in the history

  2. Save deployment status when archiving project

    @noliveleger
    noliveleger committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    4d95f8a View commit details
    Browse the repository at this point in the history

  3. Merge branch '4312-sort-by-deployment-status' of github.com:kobotoolb… 

    …ox/kpi into 4312-sort-by-deployment-status
    @noliveleger
    noliveleger committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    b3ad817 View commit details
    Browse the repository at this point in the history

  4. make getOrderQuery return null for default (for no query)

    @magicznyleszek
    magicznyleszek committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    7790ee1 View commit details
    Browse the repository at this point in the history

  5. fix (un)archive flow in Project Settings 

    bug was introduced after fixing other (un)archive flow bug in assetQuickActions
    @magicznyleszek
    magicznyleszek committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    51dd68c View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Col Resize Perf: Skip re-rendering DraggingStyle between drag start/end 

    This optimization was the main point of separating the DraggingStyle out
from the ColumnWidths style, but I forgot to apply memo() before.

- With memo(), React skips re-rendering the child component if its own
  props are the same as before.
- Without memo(), React re-renders whenever the parent is re-rendered.

So we skip some JS work (and likely some browser style parsing work)
during the drag event by applying memo() to styles that don't need to
change whenever the columns resize.
    @p2edwards
    p2edwards committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    4c4492a View commit details
    Browse the repository at this point in the history

  2. Adjust Project Name hover link styles 

    - Thinner, darker, more immediate, less subtle
    @p2edwards
    p2edwards committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    d84d749 View commit details
    Browse the repository at this point in the history

  3. Left-align all columns in project table 

    No need to right-align date fields (or rightmost column) anymore
    @p2edwards
    p2edwards committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    f5e4769 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    0b1450a View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. add option for project views to exclude some fields from UI 

    and use it for My Projects view
    @magicznyleszek
    magicznyleszek committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    238aad7 View commit details
    Browse the repository at this point in the history

  2. improve safety of loading settings from me endpoint

    @magicznyleszek
    magicznyleszek committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    05b1422 View commit details
    Browse the repository at this point in the history

  3. Fix a checkbox column layout bug during Project name resize

    @p2edwards
    p2edwards committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    fb71d20 View commit details
    Browse the repository at this point in the history

  4. Rearrange/recolor dropdown triangle and sorting indicators (legibility) 

    Per UX review:

- Move the dropdown triangle to the left of the dropdown label
- Give the sorting indicator a distinct color (kobo-teal)

Upkeep:

- Re-space the triangle and label to keep them in optical alignment with
  the left-aligned cell text below
    @p2edwards
    p2edwards committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    37fdb1d View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Redo checkbox forgiveness css for better filter support 

    - Less interference with Project name field appearance, particularly if
  filtering it's being filtered / highlighted
- Support clicking along the left edge of the table
    @p2edwards
    p2edwards committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ebd64a4 View commit details
    Browse the repository at this point in the history

  2. More predictable row click behavior, with matching hover styles 

    - Click anywhere in row (except project name) to toggle the row checkbox
- Click project name to navigate

Matching hover styles:

- Checkbox cell: Outline checkbox
- Project name cell: Underline project name
- Any other cell: Outline checkbox, subtle but still noticeable

Keyboard focus ring:

- Add keyboard focus ring for selection checkboxes
    @p2edwards
    p2edwards committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    79ffed1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4409 from kobotoolbox/4378-exclude-fields-from-my… 

    …-projects

Exclude fields from My Projects route
    @magicznyleszek
    magicznyleszek authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    789044d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/my-projects' into 4376-bulk-delete-projects 

    # Conflicts:
#	jsapp/js/projects/myProjectsRoute.tsx
    @magicznyleszek
    magicznyleszek committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    dae49fd View commit details
    Browse the repository at this point in the history

  5. Force refresh sidebar projects list after successful bulk deletion

    @magicznyleszek
    magicznyleszek committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    4bf22f9 View commit details
    Browse the repository at this point in the history

  6. Add simple focus styles for radio and checkbox components

    @magicznyleszek
    magicznyleszek committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    cf8826a View commit details
    Browse the repository at this point in the history

  7. cleanup focus outline related styles

    @magicznyleszek
    magicznyleszek committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    4b7bad2 View commit details
    Browse the repository at this point in the history

  8. run prettier on touched files

    @magicznyleszek
    magicznyleszek committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    74bc8ce View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4404 from kobotoolbox/4376-bulk-delete-projects 

    UI for bulk deleting projects
    @magicznyleszek
    magicznyleszek authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ee63a74 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Rephrase some comments

    @p2edwards
    p2edwards committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    07c3679 View commit details
    Browse the repository at this point in the history

  2. Use clearer language in comments

    @p2edwards
    p2edwards committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    9823da4 View commit details
    Browse the repository at this point in the history

  3. Simplify code and comments

    @p2edwards
    p2edwards committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    2cc98c9 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. Merge branch 'feature/my-projects' into 4313-table-ux-tweaks

    @p2edwards
    p2edwards committed May 18, 2023
    Configuration menu
    Copy the full SHA
    b52540b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' into feature/my-projects

    @p2edwards
    p2edwards committed May 18, 2023
    Configuration menu
    Copy the full SHA
    011a357 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/my-projects' into 4313-table-ux-tweaks

    @p2edwards
    p2edwards committed May 18, 2023
    Configuration menu
    Copy the full SHA
    9a4856d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/4306-update-radio-and-checkbox-s… 

    …tyles' into 4313-table-ux-tweaks
    @p2edwards
    p2edwards committed May 18, 2023
    Configuration menu
    Copy the full SHA
    c165c4a View commit details
    Browse the repository at this point in the history

  5. Project Table: Adapt checkbox appearance for #4442 

    - Re-center new checkbox, adapt borders and colors
- Add global keyboard focus styles to checkbox and radio
    @p2edwards
    p2edwards committed May 18, 2023
    Configuration menu
    Copy the full SHA
    18d1e66 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Make full dropdown headers clickable 

    Realign dropdown menu below the label text
    @p2edwards
    p2edwards committed May 19, 2023
    Configuration menu
    Copy the full SHA
    4716d5a View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Merge remote-tracking branch 'origin/beta' into feature/my-projects

    @p2edwards
    p2edwards committed May 22, 2023
    Configuration menu
    Copy the full SHA
    7a075d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/my-projects' into 4313-table-ux-tweaks

    @p2edwards
    p2edwards committed May 22, 2023
    Configuration menu
    Copy the full SHA
    c1f5278 View commit details
    Browse the repository at this point in the history

  3. fix getCountryDisplayString returning empty string instead of dash fo… 

    …r no countries
    @magicznyleszek
    magicznyleszek committed May 22, 2023
    Configuration menu
    Copy the full SHA
    75b5fb8 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Use default cursor on checkbox header

    @p2edwards
    p2edwards committed May 23, 2023
    Configuration menu
    Copy the full SHA
    9e5f153 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge pull request #4402 from kobotoolbox/4312-sort-by-deployment-status 

    Add support for ordering projects by deployment status
    @magicznyleszek
    magicznyleszek authored May 24, 2023
    Configuration menu
    Copy the full SHA
    9ae7549 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4408 from kobotoolbox/4313-table-ux-tweaks 

    Project Table UI/UX adjustments
    @magicznyleszek
    magicznyleszek authored May 24, 2023
    Configuration menu
    Copy the full SHA
    e6fc3f5 View commit details
    Browse the repository at this point in the history

  3. split top tabs from formViewTabs file and remove x button

    @magicznyleszek
    magicznyleszek committed May 24, 2023
    Configuration menu
    Copy the full SHA
    597d554 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed May 30, 2023
    Configuration menu
    Copy the full SHA
    5c21054 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d55eebf View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Resolve migration conflict

    @jnm
    jnm committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4f1d9ab View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. split default visible columns between My Projects and other views

    @magicznyleszek
    magicznyleszek committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    d3007eb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/beta' into feature/my-projects

    @jnm
    jnm committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    c606e62 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. More compact styles for ProjectsTable component to display more data

    @magicznyleszek
    magicznyleszek committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    ef5691a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4502 from kobotoolbox/my-projects-display-more-info 

    My projects display more info
    @magicznyleszek
    magicznyleszek authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    5b4d0d1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/my-projects 

    # Conflicts:
#	jsapp/js/components/header/searchBox.es6
#	jsapp/js/components/projectDownloads/exportFetcher.ts
#	jsapp/js/mixins.tsx
    @magicznyleszek
    magicznyleszek committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    e1e8974 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/my-projects' into 4234-remove-x-button-from-pro… 

    …ject-route
    @magicznyleszek
    magicznyleszek committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    f013820 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Merge remote-tracking branch 'origin/beta' into feature/my-projects

    @jnm
    jnm committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    34fafae View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Clarify where (re)deployment writes to database

    @jnm
    jnm committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    2044cdb View commit details
    Browse the repository at this point in the history

  2. Revert #4387 

    The changes were causing issues with swc-loader
    @magicznyleszek
    magicznyleszek committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    e08e630 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'revert--ts-plugin-css-modules' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    07c37bc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4521 from kobotoolbox/clarify-deployment-database… 

    …-saves

Clarify where (re)deployment writes to database
    @noliveleger
    noliveleger authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    799f018 View commit details
    Browse the repository at this point in the history

  5. Revert "Merge branch 'revert--ts-plugin-css-modules' into feature/my-… 

    …projects"

This reverts commit 07c37bc, reversing
changes made to 34fafae.
    @magicznyleszek
    magicznyleszek committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    e7f54b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. make project table row name <a> tag link for better UX

    @magicznyleszek
    magicznyleszek committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    5bdaebb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4450 from kobotoolbox/4234-remove-x-button-from-p… 

    …roject-route

split top tabs from `formViewTabs` file and remove x button
    @magicznyleszek
    magicznyleszek authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    75adb9d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    87854e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Merge remote-tracking branch 'origin/feature/my-projects' into 4524-p… 

    …roject-row-a-link
    @p2edwards
    p2edwards committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    924a810 View commit details
    Browse the repository at this point in the history

  2. Add a keyboard focus ring for project table links

    @p2edwards
    p2edwards committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    7c56774 View commit details
    Browse the repository at this point in the history

  3. Remove unused variable

    @p2edwards
    p2edwards committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    12a0774 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge pull request #4529 from kobotoolbox/4524-project-row-a-link 

    Make project row name a normal link
    @magicznyleszek
    magicznyleszek authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    a7a9260 View commit details
    Browse the repository at this point in the history

  2. typescriptize MainHeader component

    @magicznyleszek
    magicznyleszek committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    583c033 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Merge branch 'beta' into feature/my-projects 

    # Conflicts:
#	jsapp/js/api.ts
#	jsapp/js/components/common/button.tsx
    @magicznyleszek
    magicznyleszek committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    3ae4845 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2023

  1. Merge remote-tracking branch 'origin/beta' into feature/my-projects

    @p2edwards
    p2edwards committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    e982d97 View commit details
    Browse the repository at this point in the history

  2. (auto/format) Apply automated eslint and prettier changes to some files… 

    - jsapp/js/app.js
- jsapp/js/components/drawer.es6
- jsapp/js/components/header/searchBoxStore.ts
- jsapp/js/components/library/myLibraryStore.ts
- jsapp/js/components/library/publicCollectionsStore.ts
- jsapp/js/lists/forms.js
- jsapp/js/mixins.tsx
- jsapp/js/router/allRoutes.es6
- jsapp/js/components/map.es6

…in an attempt to reduce merge conflicts between diverging branches
(beta after react router 6.14 upgrade, feature/my-projects)
    @p2edwards
    p2edwards committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    af65c7c View commit details
    Browse the repository at this point in the history

  3. Preempt merge conflicts between react-router-6-14 and my-projects

    @p2edwards
    p2edwards committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    f2fa32c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into feature/my-projects

    @p2edwards
    p2edwards committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    1d8751a View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Resolve migration conflict between feature/my-projects and beta 

    jnm:

> 0051_add_deployment_status_to_asset will have to be renamed to 0052…
> and have its dependencies updated to the new 0051_set_free… that's
> already in beta.
>
> Before doing this, people working on feature/my-projects should roll
> their database back to 0050 with `./manage.py migrate kpi 0050`. After
> the migration shuffle is done, then migrate (forward) normally:
>    ./manage.py migrate
    @p2edwards
    p2edwards committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    b6ddfa2 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. (mark auto/format commit in .git-blame-ignore-revs) 

    be3a9b6
    @p2edwards
    p2edwards committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    0aa13a7 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. use the const value instead of separate variable

    @magicznyleszek
    magicznyleszek committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    6339abf View commit details
    Browse the repository at this point in the history

  2. use route const instead of comment

    @magicznyleszek
    magicznyleszek committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    77246f1 View commit details
    Browse the repository at this point in the history

  3. add comment about setTimeout hack

    @magicznyleszek
    magicznyleszek committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    b475c07 View commit details
    Browse the repository at this point in the history

  4. add comment instead of useless and unused code

    @magicznyleszek
    magicznyleszek committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    a9f9421 View commit details
    Browse the repository at this point in the history

  5. code review fixes

    @magicznyleszek
    magicznyleszek committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    8ca284d View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Merge pull request #4548 from kobotoolbox/merge-my-projects-react-rou… 

    …ter-6-14

Resolve conflicts and api changes from react-router-6-13 branch
    @magicznyleszek
    magicznyleszek authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    41a86e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/my-projects' into typescriptize-main-header-com… 

    …ponent

# Conflicts:
#	jsapp/js/app.js
#	jsapp/js/components/header/mainHeader.component.tsx
    @magicznyleszek
    magicznyleszek committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    9b84ba7 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. post merge fixes

    @magicznyleszek
    magicznyleszek committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    df169c9 View commit details
    Browse the repository at this point in the history

  2. fix My Library icons

    @magicznyleszek
    magicznyleszek committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    fc5f293 View commit details
    Browse the repository at this point in the history

  3. run prettier

    @magicznyleszek
    magicznyleszek committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    3b82b11 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4535 from kobotoolbox/typescriptize-main-header-c… 

    …omponent

Typescriptize MainHeader component
    @magicznyleszek
    magicznyleszek authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    66e27c9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta' into feature/my-projects

    @magicznyleszek
    magicznyleszek authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    c37cd7a View commit details
    Browse the repository at this point in the history