Private
Public Access
1
0
Commit Graph

4485 Commits

Author SHA1 Message Date
Sander Roosendaal
1d5e0696fe Merge branch 'develop' into bugfix/strava 2019-04-14 17:04:39 -04:00
Sander Roosendaal
374a06462f bug fix underarmour 2019-04-14 12:15:13 -04:00
Sander Roosendaal
6b6cc7f9b8 Merge branch 'feature/flushdb' into develop 2019-04-14 11:50:04 -04:00
Sander Roosendaal
2213fc295e tested 2019-04-14 11:48:54 -04:00
Sander Roosendaal
06a388f95d recreated database - now empty 2019-04-14 11:17:17 -04:00
Sander Roosendaal
b3237c57b9 Merge tag 'v9.76' into develop
bug fixes
2019-04-13 19:55:00 -04:00
Sander Roosendaal
b1623705c0 Merge branch 'release/v9.76' 2019-04-13 19:54:47 -04:00
Sander Roosendaal
c7113c0ab5 tested 2019-04-13 19:53:45 -04:00
Sander Roosendaal
1c63c6ef3a bug fixes 2019-04-12 21:48:59 -04:00
Sander Roosendaal
e164f03464 removed migrations 2019-04-12 21:12:14 -04:00
Sander Roosendaal
6722d0f9b8 updated celery (requirements.txt) 2019-04-12 12:21:08 -04:00
Sander Roosendaal
c0e5b0a522 small bug fixes 2019-04-11 13:15:12 -04:00
Sander Roosendaal
f267cb4805 upgraded win development environment 2019-04-07 13:47:18 +02:00
Sander Roosendaal
4a8c1a185e Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-04-07 13:33:35 +02:00
Sander Roosendaal
c662822993 comit 2019-04-07 13:32:58 +02:00
Sander Roosendaal
43d8ec7bae Merge branch 'release/v9.75' into develop 2019-04-07 10:35:58 +02:00
Sander Roosendaal
c277d045bb Merge branch 'release/v9.75' 2019-04-07 10:35:50 +02:00
Sander Roosendaal
35a6892dc9 tested 2019-04-07 10:35:39 +02:00
Sander Roosendaal
e4b0e2917a removed 500 page 2019-04-07 10:33:26 +02:00
Sander Roosendaal
905be7e1c0 Merge branch 'release/v9.74' 2019-04-07 10:28:35 +02:00
Sander Roosendaal
0d68f90066 custom test views repair 2019-04-07 10:28:03 +02:00
Sander Roosendaal
a6766bb109 not working 2019-04-06 20:36:19 +02:00
Sander Roosendaal
491e7faa6f Merge branch 'release/v9.73' 2019-04-06 20:16:32 +02:00
Sander Roosendaal
0e41bb7f91 tested 2019-04-06 20:15:51 +02:00
Sander Roosendaal
b28eb0f58e Merge branch 'release/v9.72' 2019-04-06 19:39:32 +02:00
Sander Roosendaal
295fd875e6 fix 2019-04-06 19:39:09 +02:00
Sander Roosendaal
9976636e59 Merge branch 'release/v9.70' 2019-04-06 18:33:39 +02:00
Sander Roosendaal
5e835a1fdb fix of fix 2019-04-06 18:33:13 +02:00
Sander Roosendaal
48d06b296f Merge branch 'release/v9.69' 2019-04-06 18:28:10 +02:00
Sander Roosendaal
b1f04581a8 fixed, tested 2019-04-06 18:27:17 +02:00
Sander Roosendaal
032364486d bug fix 2019-04-06 15:13:22 +02:00
Sander Roosendaal
5c9817a16e Merge branch 'hotfix/v9.68' into develop 2019-04-06 15:01:03 +02:00
Sander Roosendaal
f870e3ee17 Merge branch 'hotfix/v9.68' 2019-04-06 15:00:56 +02:00
Sander Roosendaal
6f4ce867e6 tested 2019-04-06 15:00:42 +02:00
Sander Roosendaal
778da891c7 Merge branch 'release/v9.67' into develop 2019-04-06 14:46:14 +02:00
Sander Roosendaal
9a2abcbc3c Merge branch 'release/v9.67' 2019-04-06 14:46:06 +02:00
Sander Roosendaal
d0cf2cc8ae tested 2019-04-06 14:45:56 +02:00
Sander Roosendaal
7caa4d3816 Merge branch 'feature/django2' into develop 2019-04-06 14:43:50 +02:00
Sander Roosendaal
2069391e93 tested 2019-04-06 14:43:39 +02:00
Sander Roosendaal
d9dbd67ef7 updated requirements 2019-04-06 08:59:50 +02:00
Sander Roosendaal
8e57463677 tested 2019-04-05 19:46:19 +02:00
Sander Roosendaal
b02179f0af Merge branch 'develop' into feature/django2 2019-04-05 19:44:16 +02:00
Sander Roosendaal
9488da2b37 passing tests 2019-04-05 19:40:39 +02:00
Sander Roosendaal
c3fda7e206 fix #459 2019-04-04 22:05:10 +02:00
Sander Roosendaal
0ff24d8aee small improvements 2019-04-03 22:22:40 +02:00
Sander Roosendaal
2049144d51 Merge branch 'release/v9.66' 2019-04-03 21:19:25 +02:00
Sander Roosendaal
9fb2523b9a fix 2019-04-03 21:17:58 +02:00
Sander Roosendaal
952e7384bb Merge branch 'hotfix/v9.65' into develop 2019-04-03 21:08:54 +02:00
Sander Roosendaal
68761b7192 Merge branch 'hotfix/v9.65' 2019-04-03 21:08:42 +02:00
Sander Roosendaal
815ef34491 bug fix tombstones 2019-04-03 21:08:25 +02:00