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.

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

Stable 2019 03 29 #14

Open
wants to merge 960 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
960 commits
Select commit Hold shift + click to select a range
6b3daaf
Removed useless logging info
noliveleger Nov 9, 2018
475037d
Removed useless filer on AssetViewSet
noliveleger Nov 9, 2018
bed6475
Merge pull request #2068 from kobotoolbox/2061-duplicate-assets
jnm Nov 10, 2018
71d9359
display registration form second half on smaller screens
magicznyleszek Nov 12, 2018
ad0defb
create read- and writeParameters utils functions with tests
magicznyleszek Nov 12, 2018
5eb7113
hide parameters from settings
magicznyleszek Nov 12, 2018
5303ea0
one more readParameters test
magicznyleszek Nov 12, 2018
ef5f90f
make it possible to pass JSON as parameter value
magicznyleszek Nov 13, 2018
4e37776
readParameters returns null for invalid/no parameters
magicznyleszek Nov 13, 2018
681d298
check empty string too
magicznyleszek Nov 13, 2018
b21eb0f
copy read- and writeParameters code to separate branch for PR
magicznyleszek Nov 13, 2018
ac49132
add icon for range
magicznyleszek Nov 14, 2018
34723a9
add range and file as question types
magicznyleszek Nov 14, 2018
b048d00
temporarily hide range from question types
magicznyleszek Nov 14, 2018
7764b18
Avoid imports error when default_language is present but no translations
noliveleger Nov 14, 2018
8ac515f
Merge branch 'enable-file-range-simple' into issue-2051
magicznyleszek Nov 15, 2018
76fdc0a
Merge branch 'parameters-utils' into issue-2051
magicznyleszek Nov 15, 2018
4c233da
add error notification for failing to delete and update permissions
magicznyleszek Nov 15, 2018
19b0c9a
remove unused images
magicznyleszek Nov 16, 2018
69fd83a
update existing favicon.ico files
magicznyleszek Nov 16, 2018
0aa72b5
add misc other favicons from generator
magicznyleszek Nov 16, 2018
7255202
check if anonymousUser has permissions for collection icon
magicznyleszek Nov 16, 2018
3364637
unhide range question from selection
magicznyleszek Nov 20, 2018
29e1826
add comment to parameters nullification
magicznyleszek Nov 20, 2018
44ecf3f
range question expansion template wip
magicznyleszek Nov 20, 2018
2b686ae
add parameters methods to row model
magicznyleszek Nov 20, 2018
b9666fe
change delete button text
magicznyleszek Nov 20, 2018
2ed55ff
reading parameters and displaying a thing in formbuilder ui for a que…
magicznyleszek Nov 20, 2018
778b33c
create default parameters for range type question
magicznyleszek Nov 20, 2018
1b54a61
add empty parameters test
magicznyleszek Nov 20, 2018
9be27f0
Merge branch 'parameters-utils' into issue-2051
magicznyleszek Nov 20, 2018
d7cdf29
set default parameters for other types
magicznyleszek Nov 20, 2018
4059e76
define parameters types configs
magicznyleszek Nov 20, 2018
87ff756
Remove Fabric configuration. Closes #2087
jnm Nov 20, 2018
4277177
work on displaying parameters inputs
magicznyleszek Nov 20, 2018
83e62c7
define params-view styles, move related styles to same file
magicznyleszek Nov 22, 2018
170b7f8
define templates for param types
magicznyleszek Nov 22, 2018
3505cc8
display params after choices
magicznyleszek Nov 22, 2018
e0a118e
disable questions sorting on params
magicznyleszek Nov 22, 2018
9db773e
paramsView renders params list
magicznyleszek Nov 22, 2018
bfebf8b
rewrite default parameters in saner way - fix overriding defaults
magicznyleszek Nov 22, 2018
9346273
Merge pull request #2088 from kobotoolbox/2087-remove-fabric-configur…
noliveleger Nov 22, 2018
d8a4899
trigger event with params changes
magicznyleszek Nov 22, 2018
22c1898
Use FormPack fix #182
noliveleger Nov 22, 2018
f961833
finally fixed setting parameters
magicznyleszek Nov 26, 2018
3495bdc
remove debug console logs
magicznyleszek Nov 26, 2018
4baa2e2
start moving parameters to settings tab
magicznyleszek Nov 26, 2018
9f425b1
remove unnecessary code
magicznyleszek Nov 26, 2018
ff109e2
go to form landing after cloning
magicznyleszek Nov 27, 2018
05e7d27
debounce username check calls
magicznyleszek Nov 28, 2018
eb24d7c
Fixed typos in exception messages
noliveleger Nov 28, 2018
6da893d
Merge pull request #2091 from kobotoolbox/2089-remove-multiple-option…
jnm Nov 28, 2018
e26731e
replace translations help texxt
magicznyleszek Nov 29, 2018
07e0bb2
fix html
magicznyleszek Nov 29, 2018
9ebfdc6
Merge pull request #2099 from kobotoolbox/issue-2098
jnm Nov 29, 2018
7271db8
Merge pull request #2097 from kobotoolbox/1917-deploy-non-survey
jnm Nov 29, 2018
811a765
Merge pull request #2095 from kobotoolbox/issue-2079
jnm Nov 29, 2018
1dfc0b9
Merge pull request #2092 from kobotoolbox/issue-2084
jnm Nov 29, 2018
03c0f77
Merge pull request #2045 from kobotoolbox/2004-spss-remove-language
magicznyleszek Nov 30, 2018
9d93145
always show group separator
magicznyleszek Nov 30, 2018
37d92cd
throw an error for forbidden id column in form file
magicznyleszek Nov 30, 2018
46dc9d4
save navigate to library list for library
magicznyleszek Dec 3, 2018
18584f1
add guidance hint as default question property
magicznyleszek Dec 3, 2018
69ff05a
change label and icon for barcode type
magicznyleszek Dec 4, 2018
232ea08
escape label text (html)
magicznyleszek Dec 5, 2018
25bd28e
listen to all 403/401 ajax errors and display notification
magicznyleszek Dec 5, 2018
9a14874
Merge branch 'enable-file-range-simple' into 2050-file-type-extensions
magicznyleszek Dec 5, 2018
8650800
Merge branch 'parameters-utils' into 2050-file-type-extensions
magicznyleszek Dec 5, 2018
9cb1a59
Merge branch 'issue-2051' into 2050-file-type-extensions
magicznyleszek Dec 5, 2018
32d6251
Merge branch '2054-guidance-hint' into 2050-file-type-extensions
magicznyleszek Dec 5, 2018
2d5f1b2
start working on accepted files view
magicznyleszek Dec 5, 2018
086024c
remove some more leftover code
magicznyleszek Dec 5, 2018
58e40d4
Merge branch 'issue-2051' into 2050-file-type-extensions
magicznyleszek Dec 5, 2018
abd1753
Changed error message to something more concise
noliveleger Dec 6, 2018
2e8d7f6
PEP-8 compliance: Missing 2 blank lines
noliveleger Dec 6, 2018
b5ce37a
Merge branch 'master' into replace-project-with-template
magicznyleszek Dec 6, 2018
781b7a1
Merge branch 'master' into browserslist
magicznyleszek Dec 6, 2018
9f17e27
add Firefox ESR and url to browserslistrc file
magicznyleszek Dec 6, 2018
e5b0e64
Merge pull request #2017 from kobotoolbox/issue-2013
jnm Dec 6, 2018
31a6981
change to 2 versions
magicznyleszek Dec 6, 2018
14b1b19
display template button second for new project, but last for replace …
magicznyleszek Dec 6, 2018
db64837
Fixed unittest. New explicit error message
noliveleger Dec 6, 2018
94cbcb6
Merge pull request #2032 from kobotoolbox/issue-1839
jnm Dec 6, 2018
3653099
Merge pull request #2046 from kobotoolbox/auto_shrink_db
jnm Dec 8, 2018
fb26fc9
Merge pull request #2047 from kobotoolbox/fix-contributing-link
jnm Dec 8, 2018
eec78ba
Merge pull request #2070 from kobotoolbox/issue-2065
jnm Dec 8, 2018
c7b4fe7
Merge pull request #2067 from kobotoolbox/issue-324
jnm Dec 8, 2018
a55f842
Merge pull request #2072 from kobotoolbox/parameters-utils
jnm Dec 8, 2018
8109602
Merge pull request #2077 from kobotoolbox/2073-value-error-translatio…
jnm Dec 8, 2018
9eeee54
Merge pull request #2080 from kobotoolbox/issue-2075
jnm Dec 8, 2018
35a9eac
Merge pull request #2100 from kobotoolbox/2044-group-separator-exports
jnm Dec 8, 2018
cb2ea23
Merge pull request #2102 from kobotoolbox/1984-ghost-questions
jnm Dec 8, 2018
bbc0bba
Merge pull request #2104 from kobotoolbox/2101-fb-back-button
jnm Dec 8, 2018
2f056a3
Merge pull request #2105 from kobotoolbox/2054-guidance-hint
jnm Dec 8, 2018
ccd0689
Merge pull request #2107 from kobotoolbox/683-do-not-strip
jnm Dec 8, 2018
252a239
Merge branch 'master' into rest-enhancements-2
magicznyleszek Dec 10, 2018
791e159
put eye icon first in row
magicznyleszek Dec 10, 2018
076e987
fix typo
magicznyleszek Dec 10, 2018
49f1197
Merge branch 'master' into kobocat-488
magicznyleszek Dec 10, 2018
f60bc83
change archive and unarchive buttons colors
magicznyleszek Dec 10, 2018
86f7888
after unarchiving go to landing plus some small fixes
magicznyleszek Dec 10, 2018
63968cc
Merge pull request #1889 from kobotoolbox/replace-project-with-template
jnm Dec 10, 2018
219592a
Merge pull request #1899 from kobotoolbox/browserslist
jnm Dec 10, 2018
87aa7e2
Merge pull request #2033 from kobotoolbox/rest-enhancements-2
jnm Dec 10, 2018
a2b3b56
Merge pull request #2034 from kobotoolbox/kobocat-488
jnm Dec 10, 2018
ab6e8c4
Merge pull request #2043 from kobotoolbox/password-strength
jnm Dec 10, 2018
a01f3f8
Merge branch 'master' into issue-2074
magicznyleszek Dec 10, 2018
f1aee60
use existing function
magicznyleszek Dec 10, 2018
77b566b
Tweak label for `range` questions
jnm Dec 10, 2018
fafea5d
Merge pull request #2076 from kobotoolbox/enable-file-range-simple
jnm Dec 10, 2018
b61d838
fix hamburger crash on account settings
magicznyleszek Dec 10, 2018
aed5fae
fallback for unlabelled select_one options for table view
magicznyleszek Dec 10, 2018
3bda48c
Merge remote-tracking branch 'origin/master' into issue-2051
jnm Dec 11, 2018
c8fb8cc
fallback to name and autoname
magicznyleszek Dec 11, 2018
fec7433
try giving postcss-loader our postcss config
magicznyleszek Dec 11, 2018
26cbfe4
fix postcss config problems
magicznyleszek Dec 11, 2018
7ffab3b
Merge pull request #2119 from kobotoolbox/fixing-build-problems
jnm Dec 11, 2018
fb9125f
Merge branch 'master' into 2112-fix-extra-whitespace
magicznyleszek Dec 11, 2018
925b169
Merge pull request #2093 from kobotoolbox/issue-2051
jnm Dec 11, 2018
bf71dd8
Merge pull request #2117 from kobotoolbox/2116-unlabelled-select-one-…
jnm Dec 11, 2018
73d7690
Merge pull request #2106 from kobotoolbox/1142-qrcode-barcode
jnm Dec 11, 2018
8ca1c33
fix extra whitespace
magicznyleszek Dec 11, 2018
87147d6
Merge remote-tracking branch 'origin/master' into 2110-hamburger-crash
jnm Dec 11, 2018
57f308b
Merge pull request #2115 from kobotoolbox/2110-hamburger-crash
jnm Dec 11, 2018
e54e3bd
Merge branch 'master' into 2112-fix-extra-whitespace
magicznyleszek Dec 11, 2018
8141789
Merge pull request #2083 from kobotoolbox/issue-2074
jnm Dec 11, 2018
5dcaa28
templates list takes whole width of modal
magicznyleszek Dec 11, 2018
0e76629
fix autoprefixer for postcss config
magicznyleszek Dec 11, 2018
5115c4a
add comment about webpack config hack
magicznyleszek Dec 11, 2018
18d0f3b
Merge pull request #2121 from kobotoolbox/2112-fix-extra-whitespace
jnm Dec 11, 2018
b9207f6
Merge branch 'master' into 506-auth-error-notification
magicznyleszek Dec 13, 2018
3965b18
better auth error handling
magicznyleszek Dec 13, 2018
64765a1
Merge branch 'master' into issue-2081
magicznyleszek Dec 14, 2018
8277bcf
better svg icon
magicznyleszek Dec 14, 2018
b51c8f1
final final svg icon
magicznyleszek Dec 14, 2018
ab5677c
use defaultsForType for question labels
magicznyleszek Dec 14, 2018
b00d931
Merge pull request #2123 from kobotoolbox/2118-defaults-for-type
jnm Dec 14, 2018
c5e126c
Merge pull request #2082 from kobotoolbox/issue-2081
jnm Dec 14, 2018
82d4650
Merge branch 'master' into 2050-file-type-extensions
magicznyleszek Dec 17, 2018
e4387c7
finish up acceptedFiles
magicznyleszek Dec 17, 2018
2e508d3
Upgrade PyXForm to v0.12
noliveleger Dec 17, 2018
c6b799d
Use corresponding FormPack commit with pyxform v0.12
noliveleger Dec 17, 2018
c90953f
Merge pull request #2129 from kobotoolbox/2125-bool-not-iterable
jnm Dec 17, 2018
2e6029b
account menu is scrollable and language menu toggles on click
magicznyleszek Dec 18, 2018
c73cfe2
add default bool to state
magicznyleszek Dec 18, 2018
0acec57
add strings for password strength to translations
magicznyleszek Dec 19, 2018
286676e
note version number for copied strings
magicznyleszek Dec 19, 2018
a7884e7
start reworking params view for special range type display
magicznyleszek Dec 19, 2018
47edbd4
work out splitting
magicznyleszek Dec 19, 2018
8cc129c
bring back old look
magicznyleszek Dec 19, 2018
6426e9f
Monkey Patch django-storage 'flush_buffer' method
noliveleger Dec 19, 2018
2f642fb
Fixed typo
noliveleger Dec 20, 2018
c8969ae
display reports styes settings even for no report data
magicznyleszek Dec 21, 2018
df34b27
check if provided data
magicznyleszek Dec 21, 2018
710dca7
update support url
magicznyleszek Dec 21, 2018
d92a2b2
Merge pull request #2140 from kobotoolbox/fix-support-url
noliveleger Dec 21, 2018
c1af019
better groupBy check
magicznyleszek Dec 22, 2018
a022108
render editable hint under question label, use input
magicznyleszek Dec 27, 2018
0b09a60
Revert "render editable hint under question label, use input"
magicznyleszek Dec 27, 2018
168b4fc
render editable hint under question label, use input
magicznyleszek Dec 27, 2018
5053316
better differentiation for placeholder
magicznyleszek Dec 27, 2018
2810ccd
cleanup project deletion flow
magicznyleszek Dec 28, 2018
f52b441
display asset type label instead of vague "library item"
magicznyleszek Dec 28, 2018
356fae0
pass firstQuestionName to assetRow and use it
magicznyleszek Dec 28, 2018
b16d88c
forgot to commit file
magicznyleszek Dec 28, 2018
6617c38
display stringified values instead of crashing
magicznyleszek Dec 29, 2018
ddd1a9c
display stringified values instead of crashing
magicznyleszek Dec 29, 2018
7d8f8a2
start implementing smarter callbacks for archive flow
magicznyleszek Dec 30, 2018
a4280ca
implement archive flow that avoids old problems
magicznyleszek Dec 30, 2018
4d18de3
define read_only as visible property
magicznyleszek Jan 2, 2019
1000a9e
Define shadow UserObjectPermission; fixes #2148
jnm Jan 3, 2019
60e3b11
Stop trying to remove shadow model instances
jnm Jan 3, 2019
7ef5a0b
Add a kludgy 2-step deletion process to the admin
jnm Jan 3, 2019
a6eaa46
cleanup old FB header code
magicznyleszek Jan 4, 2019
cb5b6d3
add debug logs
magicznyleszek Jan 4, 2019
66b68a1
print error for makeEditable if el not found
magicznyleszek Jan 4, 2019
a68fe54
change card header title to input
magicznyleszek Jan 4, 2019
55e129d
fix tests
magicznyleszek Jan 4, 2019
54d58a0
fix input text colors
magicznyleszek Jan 7, 2019
0a35b48
remove make_label_editable code, use simpler listenForInputChange
magicznyleszek Jan 7, 2019
5912a37
remove debug logs
magicznyleszek Jan 7, 2019
39878cf
prepopulate hint value
magicznyleszek Jan 7, 2019
50cf706
Merge pull request #2149 from kobotoolbox/2148-remove-related-objects
noliveleger Jan 7, 2019
1dee2ff
Merge branch 'master' into stylelint-config
magicznyleszek Jan 8, 2019
071f0c3
run stylelin with webpack
magicznyleszek Jan 8, 2019
a2ae141
fix error lines from scss files
magicznyleszek Jan 9, 2019
3a76f31
fix dev server linter config
magicznyleszek Jan 9, 2019
b5def26
add trailing slash in missing data interface calls
magicznyleszek Jan 13, 2019
0736e15
Merge tag '2.018.48' into merge-upstream-2019-01-14
Jan 14, 2019
ed1d906
fix validation status filtering
magicznyleszek Jan 17, 2019
324da74
Rename "Replace project" to "Replace form"
magicznyleszek Jan 17, 2019
d253cec
display translations box for no languages
magicznyleszek Jan 17, 2019
703a9d5
Update to Django 1.8.19 and sync all requirements files according to …
noliveleger Jan 17, 2019
1c6a256
one more slash missing
magicznyleszek Jan 17, 2019
84e2b2c
Merge pull request #2164 from kobotoolbox/2158-replace-form-rename
noliveleger Jan 17, 2019
877d2c4
Merge pull request #2161 from kobotoolbox/2160-trailing-slash
noliveleger Jan 17, 2019
31801e2
Updated several pip dependencies
noliveleger Jan 17, 2019
b430b2e
Replaced psycopg2 with -psycopg2-binary
noliveleger Jan 17, 2019
7d6e6df
ensure survey keys are always included
magicznyleszek Jan 17, 2019
624c003
fix validation statuses column ordering
magicznyleszek Jan 18, 2019
568a5ac
Merge pull request #2130 from kobotoolbox/2111-scrollable-account-menu
jnm Jan 22, 2019
840659c
Merge pull request #2131 from kobotoolbox/2114-pass-strength-translat…
jnm Jan 22, 2019
e0cd2a2
Merge pull request #2134 from kobotoolbox/2133-overflow-csv-export
jnm Jan 22, 2019
09ffa43
remove unused file
magicznyleszek Jan 23, 2019
bf8f092
Merge branch 'master' into 506-auth-error-notification
magicznyleszek Jan 23, 2019
ae7dcc4
handle auth error on 404s too
magicznyleszek Jan 23, 2019
f1c5582
Merge branch 'master' into 2050-file-type-extensions
magicznyleszek Jan 23, 2019
abf3d5a
better placeholder
magicznyleszek Jan 23, 2019
be969ab
Merge branch 'master' into 2120-range-params
magicznyleszek Jan 23, 2019
32f39cd
use defaultValue as input value if input empty
magicznyleszek Jan 23, 2019
a7ea6ae
# make sure that params without values use default one
magicznyleszek Jan 23, 2019
6e2c03b
Change authenticaion error text
jnm Jan 24, 2019
dc5f9f7
Merge pull request #2108 from kobotoolbox/506-auth-error-notification
jnm Jan 24, 2019
c5fc97a
Merge pull request #2128 from kobotoolbox/2050-file-type-extensions
jnm Jan 24, 2019
5ac3279
Merge branch 'master' into 2120-range-params
magicznyleszek Jan 24, 2019
1a09579
Merge pull request #2166 from kobotoolbox/django-1.8.19-sync-requirem…
jnm Jan 24, 2019
5790bef
Merge pull request #2168 from kobotoolbox/update-requirements
jnm Jan 24, 2019
8d48041
Merge pull request #2163 from kobotoolbox/2162-validation-status-filter
noliveleger Jan 24, 2019
c065951
Merge pull request #2132 from kobotoolbox/2120-range-params
jnm Jan 25, 2019
4ad52e4
Merge pull request #2141 from kobotoolbox/2138-no-data-reports-bug
jnm Jan 25, 2019
e55f43e
Merge pull request #2142 from kobotoolbox/556-move-hint-under-label
jnm Jan 28, 2019
cbef000
Change `firstQuestionName` to `firstQuestionLabel`
jnm Jan 28, 2019
e05c088
Merge pull request #2144 from kobotoolbox/2136-delete-projects-simult…
jnm Jan 28, 2019
751a5df
Merge pull request #2145 from kobotoolbox/2137-nested-repeat-submissi…
jnm Jan 28, 2019
77234e5
Correct capitalization per existing convention
jnm Jan 28, 2019
a260d76
Merge pull request #2147 from kobotoolbox/1726-read-only
jnm Jan 28, 2019
0f4134a
Merge remote-tracking branch 'origin/master' into 2113-archive-flow-fix
jnm Jan 28, 2019
62d9e95
Refer to our users as humans
jnm Jan 28, 2019
462f72b
Merge pull request #2146 from kobotoolbox/2113-archive-flow-fix
jnm Jan 28, 2019
3da94eb
Merge remote-tracking branch 'origin/master' into 554-drop-make-editable
jnm Jan 28, 2019
dc3c710
Merge pull request #2151 from kobotoolbox/554-drop-make-editable
jnm Jan 28, 2019
c735297
Merge pull request #2167 from kobotoolbox/2153-table-header-sort-fix
jnm Jan 28, 2019
cfa495e
Merge pull request #2172 from kobotoolbox/remove-unused-index-file
magicznyleszek Jan 28, 2019
e19019e
fix single language defined case
magicznyleszek Jan 31, 2019
a593560
use minutes as minutes not months as minutes
magicznyleszek Feb 1, 2019
c046875
Merge pull request #2150 from kobotoolbox/kobotoolbox/tasks#32-delete…
noliveleger Feb 1, 2019
dca323b
Merge pull request #1769 from kobotoolbox/stylelint-config
jnm Feb 4, 2019
77ee7a1
Merge pull request #2177 from kobotoolbox/2176-date-fix
jnm Feb 4, 2019
89ad210
Upgrade formpack (which upgrades its dependencies)
jnm Feb 4, 2019
1c90d7f
Copy .stylelintrc.json for production builds
jnm Feb 4, 2019
88a94db
Merge pull request #2181 from kobotoolbox/fix-stylelint-production-bu…
jnm Feb 4, 2019
6ef2158
Merge pull request #2165 from kobotoolbox/2156-translation-box
jnm Feb 4, 2019
94d88be
Merge pull request #2180 from kobotoolbox/upgrade-formpack
noliveleger Feb 5, 2019
e6d590b
Change "read more" URL for adding new languages
jnm Feb 12, 2019
bae00d2
Merge pull request #2194 from kobotoolbox/change-translation-help-url
magicznyleszek Feb 12, 2019
317bf3a
safety check if $autoname exists
magicznyleszek Feb 12, 2019
dfb853e
check name and $autoname
magicznyleszek Feb 12, 2019
66a5bf2
Fix crash in table view with missing responses
jnm Feb 13, 2019
857512b
Merge pull request #2195 from kobotoolbox/fix-table-view-crash
magicznyleszek Feb 13, 2019
df54ad5
Merge tag '2.019.07' into stable-2019-02-21--02
Mar 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Browsers that we support:
# https://browserl.ist/?q=last+2+major+versions%2C+%3E+1%25%2C+not+dead%2C+IE+11%2C+Firefox+ESR

last 2 major versions
> 1%
not dead
IE 11
Firefox ESR
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
},
}
},
"rules": {
"strict": 0,
"curly": 0,
"quotes": ["warn", "single"],
"quotes": ["warn", "single", {"avoidEscape": true}],
"no-underscore-dangle": 0,
"camelcase": [0],
"new-cap": 0,
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
1. [ ] If you've added code that should be tested, add tests
2. [ ] If you've changed APIs, update (or create!) the documentation
3. [ ] Ensure the tests pass
4. [ ] Make sure your code lints and you followed [our coding style](../CONTRIBUTING.md)
4. [ ] Make sure your code lints and you followed [our coding style](https://github.com/kobotoolbox/kpi/blob/master/CONTRIBUTING.md)
5. [ ] If this is a big feature, make sure to prefix the title with `Feature:` and add a thorough description for non-dev folk

## Description
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ test/compiled/*
.idea/
celerybeat-schedule
deployments.json
.DS_Store
.DS_Store
jsapp/fonts
261 changes: 261 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
{
"rules": {
"at-rule-empty-line-before": [
"always",
{
"except": [
"blockless-after-same-name-blockless",
"first-nested"
],
"ignore": ["after-comment"],
"severity": "warning"
}
],
"at-rule-name-case": ["lower", { "severity": "warning" }],
"at-rule-name-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"at-rule-semicolon-newline-after": [
"always",
{ "severity": "warning" }
],
"block-no-empty": true,
"block-closing-brace-empty-line-before": [
"never",
{ "severity": "warning" }
],
"block-closing-brace-newline-after": [
"always",
{ "severity": "warning" }
],
"block-closing-brace-newline-before": [
"always-multi-line",
{ "severity": "warning" }
],
"block-closing-brace-space-before": [
"always-single-line",
{ "severity": "warning" }
],
"block-opening-brace-newline-after": [
"always-multi-line",
{ "severity": "warning" }
],
"block-opening-brace-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"block-opening-brace-space-before": [
"always",
{ "severity": "warning" }
],
"color-no-invalid-hex": true,
"color-hex-case": ["lower", { "severity": "warning" }],
"color-hex-length": ["short", { "severity": "warning" }],
"comment-no-empty": true,
"comment-empty-line-before": [
"always",
{
"except": ["first-nested"],
"ignore": ["stylelint-commands"],
"severity": "warning"
}
],
"comment-whitespace-inside": ["always", { "severity": "warning" }],
"custom-property-empty-line-before": [
"always",
{
"except": ["after-custom-property", "first-nested"],
"ignore": ["after-comment", "inside-single-line-block"],
"severity": "warning"
}
],
"declaration-block-no-duplicate-properties": [
true,
{ "severity": "warning" }
],
"declaration-block-no-shorthand-property-overrides": true,
"declaration-bang-space-after": ["never", { "severity": "warning" }],
"declaration-bang-space-before": ["always", { "severity": "warning" }],
"declaration-block-semicolon-newline-after": [
"always-multi-line",
{ "severity": "warning" }
],
"declaration-block-semicolon-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"declaration-block-semicolon-space-before": [
"never",
{ "severity": "warning" }
],
"declaration-block-single-line-max-declarations": [
1,
{ "severity": "warning" }
],
"declaration-block-trailing-semicolon": [
"always",
{ "severity": "warning" }
],
"declaration-colon-newline-after": [
"always-multi-line",
{ "severity": "warning" }
],
"declaration-colon-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"declaration-colon-space-before": ["never", { "severity": "warning" }],
"declaration-empty-line-before": [
"always",
{
"except": ["after-declaration", "first-nested"],
"ignore": ["after-comment", "inside-single-line-block"],
"severity": "warning"
}
],
"font-family-no-duplicate-names": true,
"font-family-no-missing-generic-family-keyword": [
true,
{ "severity": "warning" }
],
"function-calc-no-unspaced-operator": [true, { "severity": "warning" }],
"function-linear-gradient-no-nonstandard-direction": true,
"function-comma-newline-after": [
"always-multi-line",
{ "severity": "warning" }
],
"function-comma-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"function-comma-space-before": ["never", { "severity": "warning" }],
"function-max-empty-lines": [0, { "severity": "warning" }],
"function-name-case": ["lower", { "severity": "warning" }],
"function-parentheses-newline-inside": [
"always-multi-line",
{ "severity": "warning" }
],
"function-parentheses-space-inside": [
"never-single-line",
{ "severity": "warning" }
],
"function-whitespace-after": ["always", { "severity": "warning" }],
"keyframe-declaration-no-important": [true, { "severity": "warning" }],
"length-zero-no-unit": [true, { "severity": "warning" }],
"max-empty-lines": [1, { "severity": "warning" }],
"media-feature-name-no-unknown": true,
"media-feature-colon-space-after": [
"always",
{ "severity": "warning" }
],
"media-feature-colon-space-before": [
"never",
{ "severity": "warning" }
],
"media-feature-name-case": ["lower", { "severity": "warning" }],
"media-feature-parentheses-space-inside": [
"never",
{ "severity": "warning" }
],
"media-feature-range-operator-space-after": [
"always",
{ "severity": "warning" }
],
"media-feature-range-operator-space-before": [
"always",
{ "severity": "warning" }
],
"media-query-list-comma-newline-after": [
"always-multi-line",
{ "severity": "warning" }
],
"media-query-list-comma-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"media-query-list-comma-space-before": [
"never",
{ "severity": "warning" }
],
"no-duplicate-at-import-rules": true,
"no-duplicate-selectors": [true, { "severity": "warning" }],
"no-empty-source": true,
"no-extra-semicolons": [true, { "severity": "warning" }],
"no-eol-whitespace": [true, { "severity": "warning" }],
"no-missing-end-of-source-newline": [true, { "severity": "warning" }],
"no-invalid-double-slash-comments": [true, { "severity": "warning" }],
"number-leading-zero": ["always", { "severity": "warning" }],
"number-no-trailing-zeros": [true, { "severity": "warning" }],
"property-no-unknown": [true, { "severity": "warning" }],
"property-case": ["lower", { "severity": "warning" }],
"rule-empty-line-before": [
"always-multi-line",
{
"except": ["first-nested"],
"ignore": ["after-comment"],
"severity": "warning"
}
],
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-element-no-unknown": true,
"selector-type-no-unknown": true,
"selector-attribute-brackets-space-inside": [
"never",
{ "severity": "warning" }
],
"selector-attribute-operator-space-after": [
"never",
{ "severity": "warning" }
],
"selector-attribute-operator-space-before": [
"never",
{ "severity": "warning" }
],
"selector-combinator-space-after": [
"always",
{ "severity": "warning" }
],
"selector-combinator-space-before": [
"always",
{ "severity": "warning" }
],
"selector-descendant-combinator-no-non-space": [
true,
{ "severity": "warning" }
],
"selector-list-comma-newline-after": [
"always",
{ "severity": "warning" }
],
"selector-list-comma-space-before": [
"never",
{ "severity": "warning" }
],
"selector-max-empty-lines": [0, { "severity": "warning" }],
"selector-pseudo-class-case": ["lower", { "severity": "warning" }],
"selector-pseudo-class-parentheses-space-inside": [
"never",
{ "severity": "warning" }
],
"selector-pseudo-element-case": ["lower", { "severity": "warning" }],
"selector-pseudo-element-colon-notation": [
"double",
{ "severity": "warning" }
],
"selector-type-case": ["lower", { "severity": "warning" }],
"string-no-newline": [true, { "severity": "warning" }],
"unit-no-unknown": true,
"unit-case": ["lower", { "severity": "warning" }],
"value-list-comma-newline-after": [
"always-multi-line",
{ "severity": "warning" }
],
"value-list-comma-space-after": [
"always-single-line",
{ "severity": "warning" }
],
"value-list-comma-space-before": ["never", { "severity": "warning" }],
"value-list-max-empty-lines": [0, { "severity": "warning" }]
}
}
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ COPY ./scripts/copy_fonts.py ${KPI_SRC_DIR}/scripts/copy_fonts.py
COPY ./scripts/generate_icons.js ${KPI_SRC_DIR}/scripts/generate_icons.js
COPY ./webpack ${KPI_SRC_DIR}/webpack
COPY ./.eslintrc ${KPI_SRC_DIR}/.eslintrc
COPY ./.stylelintrc.json ${KPI_SRC_DIR}/.stylelintrc.json
COPY ./test ${KPI_SRC_DIR}/test

COPY ./jsapp ${KPI_SRC_DIR}/jsapp
Expand Down Expand Up @@ -127,6 +128,8 @@ RUN ln -s "${KPI_SRC_DIR}/docker/init.bash" /etc/my_init.d/10_init_kpi.bash && \
ln -s "${KPI_SRC_DIR}/docker/run_uwsgi.bash" /etc/service/uwsgi/run && \
mkdir -p /etc/service/celery && \
ln -s "${KPI_SRC_DIR}/docker/run_celery.bash" /etc/service/celery/run && \
mkdir -p /etc/service/celery_beat && \
ln -s "${KPI_SRC_DIR}/docker/run_celery_beat.bash" /etc/service/celery_beat/run && \
mkdir -p /etc/service/celery_sync_kobocat_xforms && \
ln -s "${KPI_SRC_DIR}/docker/run_celery_sync_kobocat_xforms.bash" /etc/service/celery_sync_kobocat_xforms/run

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pip_compile: $(PIP_DEPENDENCY_TARGETS)

# All `pip` dependency files depend on their corresponding `.in` file and the base `requirements.in`.
$(PIP_DEPENDENCY_DIR)/%.txt: $(PIP_DEPENDENCY_DIR)/%.in $(PIP_DEPENDENCY_DIR)/requirements.in
pip-compile --output-file=$@ ${ARGS} $<
CUSTOM_COMPILE_COMMAND='make pip_compile' pip-compile --output-file=$@ ${ARGS} $<

6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,8 @@ As this is a Django project, you may find the admin panel at `<kpi base url>/adm

Icons
-----
All project icons are kept in `jsapp/svg-icons/`. Adding new icon requires adding new `svg` file here and regenerating icons with `npm run generate-icons`. Filenames are used for icon font classnames, e.g. `.k-icon-arrow-last` for `arrow-last.svg` (please use kebab-case). You can see all available icons by running `npm run show-icons` - it will open a list in your browser.
All project icons are kept in `jsapp/svg-icons/`. Adding new icon requires adding new `svg` file here and regenerating icons with `npm run generate-icons`. Filenames are used for icon font classnames, e.g. `.k-icon-arrow-last` for `arrow-last.svg` (please use kebab-case). You can see all available icons by running `npm run show-icons` - it will open a list in your browser.

Supported Browsers
------------------
See [browsers list config](./.browserslistrc)
Loading