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

Include kobocat-template as subdirectory #544

Merged
merged 261 commits into from
Mar 29, 2019
Merged

Include kobocat-template as subdirectory #544

merged 261 commits into from
Mar 29, 2019

Conversation

jnm
Copy link
Member

@jnm jnm commented Mar 29, 2019 •
edited
Loading

…instead of keeping it in a separate repository. Supersedes #520; see #543.

tinok and others added 30 commits April 15, 2014 12:25
@tinok
#740 Link to KF prod server, removed old links
943b176
@dorey
Merge pull request #3 from kobotoolbox/#740
bbd09a1 
#740 direct link to KF, remove other header links
@tinok
Adding API template file
85bf7bb
#875 - remove unneeded items from dashboard
78fa2fb
#875 - remove unneeded items from dashboard
9801152
#876 - form editor chnages - incomplete and erroring
120d27d
@dorey
Merge pull request #5 from kobotoolbox/forms
cc6f36f 
Forms
@dorey
Merge pull request #4 from kobotoolbox/api-template
30ab36e 
Adding API template file
@dorey
shifting templates to different dir
8833897
@dorey
using latest ona templates
53dc9a2
@dorey
redirecting from login if koboform_url present
6358a84
@dorey
carrying over changes towards tp #876 and #875
137e1a3
@dorey
reverting kobo branding changes
9dbf2d2
@nstraub
Merge pull request #6 from kobotoolbox/tp876-hiding-items
823f324 
TP #876- Hiding items on Project page
@dorey
carrying over top-bar template changes
a95005d
@nstraub
Merge pull request #7 from kobotoolbox/topbar-template-updates
96dfbc8 
carrying over top-bar template changes
@dorey
finishing tp #742, redirecting homepage to KF
44f9e88
@nstraub
Merge pull request #8 from kobotoolbox/tp742-redirecting-non-loggedin…
eeb4259 
…-user

finishing tp #742, redirecting homepage to KF
@dorey
only redirecting if setting is set
5b07068
@nstraub
Merge pull request #9 from kobotoolbox/redirect-setting
4da877d 
only redirecting if setting is set
@pmusaraj
first round of css changes for kobocat
02874a0
@pmusaraj
more changes to kobocat header and added js for sliding top menu
e3325fb
@dorey
tp #875 - clean display of the form list page
7f4775a
@dorey
Merge pull request #10 from kobotoolbox/styling
f1d5326 
Added initial Kobo branding to templates
@nstraub
Merge pull request #11 from kobotoolbox/user-form-list-styled
931a9ab 
User form list styled
#1001 - User should see KC settings link in sidebar menu
9e43211
#1001 - Changes to side bar menu
55b76fd
@dorey
Merge pull request #12 from kobotoolbox/sidebar
7396506 
#1001 - User should see KC settings link in sidebar menu
@pmusaraj
first take on the single project view as a sandbox file
d27ab95
@dorey
upload form in form list
040d45b
pmusaraj and others added 28 commits June 30, 2016 14:37
@pmusaraj
fix table height issue in iframes
9e4a8cc
@jnm
Add warning about multi-versioned form exports
da29981 
Closes #251
@rhunwicks
Use Django {% static %} template tag in preference to /static and {{S…
b6e56f9 
…TATIC_URL}}
@rhunwicks
User relative urls in css to avoid hard-coding static
de2a4f1
@jeverling
Load and use static tag in api.html
d7bb7a8
@dorey
Merge pull request #88 from kimetrica/use_static_template_tag
c73ab2c 
Use static template tag
@dorey
Merge pull request #87 from kobotoolbox/251-issue
254c260 
Add warning about multi-versioned form exports
@pmusaraj
Merge branch 'master' into kpi-716-fix
f872d30
@pmusaraj
fix height issues with table pagination in iframe
76d569d
@jnm
Merge pull request #86 from kobotoolbox/kpi-716-fix
ea1e614 
fix table height issue in iframes
@pmusaraj
fix issue with table pagination not visible on IE, due to padding
d7e88c6
@jnm
Merge pull request #90 from kobotoolbox/fix-table-pagination-IE
be71275 
fix issue with table pagination not visible on IE, due to padding
@jnm
Remove SPSS label export to match kobocat#480
913322b
@magicznyleszek
remove right column
13e78e4
@magicznyleszek
hide add rest service form
0d77f2c
@magicznyleszek
remove form deleting functionality
3dfb5a4
@magicznyleszek
remove accept submissions functionality
cd0e642
@magicznyleszek
fix indentation
8db6601
@magicznyleszek
whitespace
60902a9
@magicznyleszek
hide rest services section if zero services
58253cf
@magicznyleszek
add loading message while rest services are being fetched from API
a3707f8
@magicznyleszek
add legacy warnings
d117cb7
@magicznyleszek
legacy warning
263165b
@jnm
Rename "Rest Services" to "Legacy Rest Services"
274e1e9 
This should (hopefully!) clarify that KC's Rest Services are not the same thing
as KPI's
@jnm
Merge pull request #92 from kobotoolbox/kobocat-488
9f5b48d 
Hide old options from Form Settings view
@jnm
Prepare to combine with kobocat repository
279f4d0
@jnm
Adjust kobocat-template in settings and…
11e027e 
Dockerfiles to use directory inside this repository instead of a separate
repository in the parent directory
@jnm
Import the kobocat-template repository
8b518a8
@jnm jnm merged commit 1b1d415 into master Mar 29, 2019
@jnm jnm deleted the kobocat-template-as-subdirectory branch March 29, 2019 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.