Skip to content
This repository has been archived by the owner on Oct 9, 2019. It is now read-only.

2.20 Release #255

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
346537f
added emailNotifications to form model
whitef0x0 Oct 6, 2017
ae946bd
Merge branch 'master' into emailNotifications
whitef0x0 Oct 6, 2017
00e1d43
got basic emailNotifications to work
whitef0x0 Oct 6, 2017
8de93d4
Merge branch 'master' into emailNotifications
whitef0x0 Oct 26, 2017
76d6d54
got edit-submissions-form directive tests to pass
whitef0x0 Oct 29, 2017
538030c
got edit-form-directive tests to pass
whitef0x0 Oct 29, 2017
7d65f01
removed duplicate translation keyword for form admin panel
whitef0x0 Oct 29, 2017
ebcc0c6
fixed field-icon tests
whitef0x0 Oct 29, 2017
f427092
fixed field directive tests
whitef0x0 Oct 29, 2017
6fbfa35
fixed on-finish-render directive tests
whitef0x0 Oct 29, 2017
88fbf9e
got user tests to pass
whitef0x0 Oct 29, 2017
759a4ef
got all tests to pass
whitef0x0 Oct 29, 2017
aa554c8
added coveralls support
whitef0x0 Oct 29, 2017
3dbfe2f
added helper function to remove sensitive data from forms/users
whitef0x0 Oct 29, 2017
9fffdf5
added tests to cover reset password routes
whitef0x0 Oct 29, 2017
aed7c6c
added test for changing password route
whitef0x0 Oct 30, 2017
15eb66e
added test for /users/me routes
whitef0x0 Oct 30, 2017
99a6cb5
fixed hasAuthorization bug for API
whitef0x0 Oct 30, 2017
e1db98e
added tests for api routes
whitef0x0 Oct 30, 2017
3e3e7cc
removed hasRole and hasAdminRole from passport_helpers
whitef0x0 Oct 30, 2017
9a0a301
got rid of unnessecary user middleware
whitef0x0 Oct 30, 2017
774d256
removed unused code from user.server.model.js
whitef0x0 Oct 30, 2017
d0d273a
removed secure configuration
whitef0x0 Oct 30, 2017
b2b0917
fixed api tests
whitef0x0 Oct 30, 2017
8ea1f63
fixed travis settings
whitef0x0 Oct 30, 2017
8d9e665
remove references to i18n-lint
whitef0x0 Oct 30, 2017
26716e2
migrating to yarn
whitef0x0 Oct 30, 2017
fc4d9a1
fixed lcovMerge for travis
whitef0x0 Oct 30, 2017
5805c9b
fixed travis test command
whitef0x0 Oct 30, 2017
56fda0d
switched travis scripts to yarn
whitef0x0 Oct 30, 2017
814466c
switched to npm for travis
whitef0x0 Oct 30, 2017
c871d32
remove swig
whitef0x0 Oct 30, 2017
56cf745
added check to not load .env on travis run
whitef0x0 Oct 30, 2017
3652b41
Merge branch 'master' into emailNotifications
whitef0x0 Oct 30, 2017
5451475
added translations for email notification panel
whitef0x0 Oct 30, 2017
22cf374
added share and design form directives
whitef0x0 Oct 30, 2017
8f55df1
Merge pull request #246 from tellform/increaseTestCoverage
whitef0x0 Oct 30, 2017
86d8b88
got url-linked tabs to work for admin panel
whitef0x0 Oct 31, 2017
798d28d
added routable tabs for configure panel
whitef0x0 Oct 31, 2017
12e1fd0
got static url for admin tabs to work
whitef0x0 Oct 31, 2017
aa8efe8
got static url for configure tabs to work
whitef0x0 Oct 31, 2017
5a6b957
added variable support in editor
whitef0x0 Oct 31, 2017
b5b8df9
got subject field to support variables
whitef0x0 Nov 1, 2017
19880b0
add support when no email field is detected for self notifications
whitef0x0 Nov 1, 2017
983d2ce
fixed bug with detecting whether form has emails for config panel
whitef0x0 Nov 1, 2017
f291eda
fixed add variable dropdown only showing email fields on subject inpu…
whitef0x0 Nov 1, 2017
bbb3137
got all tests to pass
whitef0x0 Nov 1, 2017
ddd4c2b
Merge branch '2.20' into emailNotifications
whitef0x0 Nov 1, 2017
cc62f6d
Added test for parseTemplate for send-email-notifications
whitef0x0 Nov 1, 2017
a7c0cdc
got tests for send-email-notification template logic to pass
whitef0x0 Nov 1, 2017
9faa514
added backend logic for email notifications and got it to pass server…
whitef0x0 Nov 1, 2017
33368f0
got basic email templating to work
whitef0x0 Nov 1, 2017
522dd85
got respondent-notifications to work
whitef0x0 Nov 2, 2017
eaea950
fix url tab bug with configure tabs
whitef0x0 Nov 2, 2017
5120a2f
fixed dropdowns for configure admin panel
whitef0x0 Nov 2, 2017
4d94ed5
fixed config admin panel field input padding
whitef0x0 Nov 2, 2017
692e4e4
updated styling of config panel
whitef0x0 Nov 2, 2017
b2f2599
fix css bug for dropdown field in admin view
whitef0x0 Nov 2, 2017
22875ab
fixed signin validation bug
whitef0x0 Nov 2, 2017
72b3e31
fixed form expected object but got array error
whitef0x0 Nov 2, 2017
15d023c
fixed editable variables in textAngular editor
whitef0x0 Nov 2, 2017
4e18e70
fix html bug with textAngular attribute in config admin panel
whitef0x0 Nov 5, 2017
8521ede
Merge branch 'master' into 2.20
whitef0x0 Nov 5, 2017
43ce60b
Merge branch 'master' into 2.20
whitef0x0 Nov 6, 2017
a77a59c
Merge branch '2.20' into emailNotifications
whitef0x0 Nov 6, 2017
a40ecad
added aggregating for form analytics
whitef0x0 Nov 6, 2017
6823542
Merge branch 'master' into fixSlowAnalyticsBug
whitef0x0 Nov 6, 2017
4fe1e8e
Merge pull request #230 from tellform/emailNotifications
whitef0x0 Nov 6, 2017
04e71be
Merge branch '2.20' into fixSlowAnalyticsBug
whitef0x0 Nov 6, 2017
ffb2a23
fixed duplicate npm dep in prod and dev
whitef0x0 Nov 6, 2017
5516e76
Merge branch 'fixSlowAnalyticsBug' of github.com:tellform/tellform in…
whitef0x0 Nov 6, 2017
4f26825
merged with master
whitef0x0 Nov 12, 2017
62953a6
changed dropdown add option to list of strings that are seperated by …
whitef0x0 Nov 12, 2017
f786f24
Merge branch '2.20' into fixSlowAnalyticsBug
whitef0x0 Nov 12, 2017
421d3b5
Merge pull request #260 from tellform/improvedAddOptionUX
whitef0x0 Nov 12, 2017
28fe150
Merge branch '2.20' into fixSlowAnalyticsBug
whitef0x0 Nov 13, 2017
060cd59
Merge branch 'fixSlowAnalyticsBug' of github.com:tellform/tellform in…
whitef0x0 Nov 13, 2017
1f9a0ed
Merge pull request #254 from tellform/fixSlowAnalyticsBug
whitef0x0 Nov 13, 2017
09d430a
added cosmetic changes to analytics panel
whitef0x0 Nov 13, 2017
ed6d917
fixed incorrect responses count for form list view
whitef0x0 Nov 14, 2017
15a508c
change name of form assets from form-vendor.min.js to vendor.min.js
whitef0x0 Nov 14, 2017
6848b74
moved from on('scroll' to using duScroll for tracking activeField
whitef0x0 Nov 14, 2017
0400124
fixed prev and next field buttons
whitef0x0 Nov 14, 2017
f5e32e9
got validity working for rating field
whitef0x0 Nov 14, 2017
2e5bd5b
fixed form validation bug with radio
whitef0x0 Nov 14, 2017
67a3013
readded page loader gif for form view
whitef0x0 Nov 14, 2017
56bbc68
fixed shape dropdown for rating field
whitef0x0 Nov 14, 2017
9d51608
added email notifications to json form data
whitef0x0 Nov 14, 2017
499f2c9
Merge pull request #261 from tellform/fixedScrollspy
whitef0x0 Nov 14, 2017
49141e6
Merge pull request #262 from tellform/fixResponseCountOnFormList
whitef0x0 Nov 14, 2017
9ff247f
Merge branch 'master' into 2.20
whitef0x0 Nov 21, 2017
5f65451
added docker-compose file for development work
whitef0x0 Nov 24, 2017
d8c5b00
bumped version in bower.json and package.json
whitef0x0 Nov 24, 2017
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Oscar_Credentials.*
npm-debug.log
node_modules/
public/lib/
public/dist
public/dist/
app/tests/coverage/
.bower-*/
.idea/
Expand Down
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@ services:
addons:
code_climate:
repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf
after_script:
- grunt coverage
install:
- npm install phantomjs
- npm install -g grunt
- npm install
script:
- yarn run travis
21 changes: 21 additions & 0 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Build:
# docker build -t tellform-prod -f ./Dockerfile-production .
#
# Run:
# docker run -it tellform-prod

FROM node:7
MAINTAINER David Baldwynn <team@tellform.com>

# Install NPM Global Libraries
RUN npm install --quiet -g grunt bower && npm cache clean

ADD . /code
WORKDIR /code

RUN npm install --quiet
RUN bower install --interactive-mode=false --allow-root
RUN grunt build

# Run TellForm server
CMD ["grunt"]
Loading