Private
Public Access
1
0
Commit Graph

4860 Commits

Author SHA1 Message Date
Sander Roosendaal
e595ffd5fe Merge branch 'release/v10.11' into develop 2019-08-19 21:09:49 +02:00
Sander Roosendaal
a4860a8314 Merge branch 'release/v10.11' 2019-08-19 21:09:37 +02:00
Sander Roosendaal
14cdfca05d tested 2019-08-19 21:09:25 +02:00
Sander Roosendaal
97c156fc0a passed tests 2019-08-19 19:47:45 +02:00
Sander Roosendaal
f3fd512913 Merge branch 'feature/metricalerts' into develop 2019-08-19 16:53:46 +02:00
Sander Roosendaal
270feb4dde email as remote task 2019-08-19 16:34:01 +02:00
Sander Roosendaal
52dff568a2 sending alerts in rudimentary form 2019-08-19 12:55:54 +02:00
Sander Roosendaal
5015266ba8 rudimentary alert report page 2019-08-18 15:03:21 +02:00
Sander Roosendaal
f9231f94e0 further improvements to create/edit alerts 2019-08-17 17:38:39 +02:00
Sander Roosendaal
729ed0d4f8 alert edit including filters 2019-08-17 16:19:09 +02:00
Sander Roosendaal
8009831ab1 alert create including filters 2019-08-17 15:17:11 +02:00
Sander Roosendaal
451d2a419b more progress on alerts 2019-08-16 19:38:42 +02:00
Sander Roosendaal
40ad973b33 alert form 2019-08-16 18:18:54 +02:00
Sander Roosendaal
de6d498717 basic views (not complete) 2019-08-16 14:52:42 +02:00
Sander Roosendaal
b7aa7f863c just removed old link from laboratory 2019-08-15 15:16:15 +02:00
Sander Roosendaal
04fcdf6d6d minimal working version of alert_get_stats 2019-08-14 21:42:30 +02:00
Sander Roosendaal
267691c8e9 fd 2019-08-11 10:25:46 +02:00
Sander Roosendaal
8716bf2562 fixed opaque 2019-08-11 10:02:38 +02:00
Sander Roosendaal
99a9afc488 Merge branch 'release/v10.10' 2019-08-10 14:40:18 +02:00
Sander Roosendaal
fcaf838eea tested 2019-08-10 14:39:43 +02:00
Sander Roosendaal
333aac474e fixed paypal sandbox 2019-08-10 14:28:32 +02:00
Sander Roosendaal
9024aa7686 first model of basic alert functions 2019-08-09 16:12:50 +02:00
Sander Roosendaal
ac441534a3 small changes 2019-08-09 15:12:26 +02:00
Sander Roosendaal
13ad9f5012 Merge branch 'feature/paypaltest' into develop 2019-08-09 11:47:06 +02:00
Sander Roosendaal
886a7a54ae tested 2019-08-09 11:46:15 +02:00
Sander Roosendaal
9d66fcc3f7 works on paypal sandbox - until create subscription 2019-08-09 10:52:24 +02:00
Sander Roosendaal
d0a8abc85b models for alerts and conditions 2019-08-07 11:51:46 +02:00
Sander Roosendaal
5b65be3c69 Merge branch 'release/v10.09' 2019-08-06 20:42:59 +02:00
Sander Roosendaal
7e284690de fixing zip file processing 2019-08-06 20:42:05 +02:00
Sander Roosendaal
3208c2d8a9 now working on linux with mariadb 2019-08-05 22:05:31 +02:00
Sander Roosendaal
8e13511b76 Merge branch 'release/v10.08' 2019-08-05 20:12:09 +02:00
Sander Roosendaal
a17af76838 adding address to transactions 2019-08-05 20:11:01 +02:00
Sander Roosendaal
9b65731902 Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop 2019-08-01 20:31:37 +02:00
Sander Roosendaal
fa87202e51 tested 2019-08-01 20:30:52 +02:00
Sander Roosendaal
41498737d4 fixing annoying bug 2019-08-01 08:23:55 +02:00
Sander Roosendaal
29974524b6 Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-08-01 07:37:00 +02:00
Sander Roosendaal
ed82255a44 bla 2019-08-01 07:36:23 +02:00
Sander Roosendaal
dcea3f830c Merge branch 'release/v10.07' into develop 2019-07-31 23:27:09 +02:00
Sander Roosendaal
b2ace1bca6 Merge branch 'release/v10.07' 2019-07-31 23:26:51 +02:00
Sander Roosendaal
c456372099 removing powerhr temporarily 2019-07-31 23:26:38 +02:00
Sander Roosendaal
3f4a1aff9e removing powerhr 2019-07-31 23:24:22 +02:00
Sander Roosendaal
38aba9da3e Merge branch 'release/v10.06' 2019-07-31 21:51:59 +02:00
Sander Roosendaal
168b80e766 h 2019-07-31 21:51:48 +02:00
Sander Roosendaal
8ed3397911 testing setting 2019-07-31 21:50:34 +02:00
Sander Roosendaal
634230498d Merge branch 'release/v10.05' into develop 2019-07-31 20:22:24 +02:00
Sander Roosendaal
f7405e1dbf Merge branch 'release/v10.05' 2019-07-31 20:22:16 +02:00
Sander Roosendaal
500c95b32f release
strava import fix, 3D Secure, powerhr, team messaging
2019-07-31 20:20:57 +02:00
Sander Roosendaal
c6592d2652 tested 2019-07-31 20:17:12 +02:00
Sander Roosendaal
1711ced864 adding rowers 2019-07-31 14:19:29 +02:00
Sander Roosendaal
c159330cda Merge branch 'feature/teamcom' into develop 2019-07-31 14:14:21 +02:00