resolve Api.js conflict
Description
Description
Details
Details
- Committed
borel Jul 6 2021, 07:51 - Pushed
borel Jul 6 2021, 07:51 - Parents
- rOACCT7ce3b4867d30: fixed some missing horizontal_filters
rOACCT35a403c3018f: Merge branch 'dev' into staging - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7ce3b4867d30 | borel | fixed some missing horizontal_filters | Jul 5 2021 | |||
| 44f72d353ada | borel | ConditionSetAdmin making more sense using TabularInlines | Jul 5 2021 | |||
| 6121dd55b8f3 | borel | more convenient manytomany selectors thanks to filter_horizontal | Jul 5 2021 | |||
| 3a97308224ec | borel | longer nginx timeout thresholds might solve the problem of large JSON uploads | Jul 5 2021 | |||
| 474d78f51656 | borel | Api.js should be the same for all branches | Jul 5 2021 | |||
| 4575b4c4f3a5 | borel | Use self.id instead of self.pk for display strings | Jul 2 2021 | |||
| b5f6071e01de | borel | Embryonic Sphinx code documentation | Jul 2 2021 |
