Dennis Ruhe
467f8e5335
Merge branch 'development' of https://github.com/MPOS/php-mpos into development
2018-03-07 12:44:08 +01:00
Dennis Ruhe
31965de2b2
Implemented recaptcha v2
2018-03-07 12:41:40 +01:00
Sebastian Grewe
40ba37490e
Merge pull request #2687 from desaerun/patch-4
...
add start to getusertransactions api page
2018-03-05 11:29:02 +01:00
desaerun
fbdcd9c4e7
add "start" to getusertransactions api
2018-03-05 03:24:28 -07:00
Sebastian Grewe
1b217711a4
Revert "add 'start' parameter to getusertransactions api page"
2018-03-03 16:27:10 +01:00
desaerun
653729e6dc
add 'start' parameter to getusertransactions api page
...
sets db start row
2018-02-27 23:12:45 -07:00
Sebastian Grewe
6c0d9a1e9e
Merge pull request #2676 from smiba/development-patch-1
...
Expend CSRF token expiry & Est. Diff for constantly changing coins
2018-02-21 20:38:58 +01:00
smiba
85ef9d521c
Expend CSRF token expiry time
...
Change it to 15 minutes, 2 minutes is not enough.
2018-02-21 14:31:58 +01:00
Sebastian Grewe
ae337b418c
Merge pull request #2673 from smiba/patch-1
...
Fix: Calculate the efficiency correctly in API
2018-02-21 10:27:18 +01:00
Bart S
a598e6ecd6
Don't divide by zero
...
Small change I overlooked
2018-02-21 10:08:21 +01:00
Bart S
963a8f7d27
Fix: Calculate the efficiency correctly in API
2018-02-20 22:57:16 +01:00
Sebastian Grewe
9e6f02b648
Merge pull request #2669 from mecab/ignore-old-cronjob-option
...
Add -t option to ignore too old cronjob active flag
2018-02-05 11:26:40 +01:00
mecab
495f48d4e5
Add -t option for cronjobs to ignore too old active jobs.
2018-02-04 10:20:05 -06:00
Sebastian Grewe
3cb167a70e
Merge pull request #2666 from mecab/fix-contact-form
...
Fix errors while sending mail is not displayed in contact form.
2018-02-01 09:51:38 +01:00
Sebastian Grewe
1d32e1e6af
Merge pull request #2667 from mecab/remove-validation
...
Remove unnessesary validation in sending contact form
2018-02-01 09:51:14 +01:00
mecab
1b871e16ce
Remove unnessesary validation in sending contact form
...
Non-alphanumeric character causes some problems if used in the mail header (i.e., sender name or subject), but the filled info is just used in the mail body so removing the validation is safe at this time.
2018-01-31 11:36:45 -06:00
mecab
2fec35cf70
Fix errors while sending mail is not displayed in contact form.
2018-01-31 11:33:59 -06:00
mecab
be1b57a838
Fix SQL in cleaning up old notifications
...
Subtracting numbers from datetime causes wrong value, or raises error depending on MySQL version/configurations
2018-01-31 11:32:58 -06:00
Tiago Peralta
0e3cbe2876
Fix INSERTS with Selects inside
2017-12-29 03:45:42 +00:00
Tiago Peralta
d259610ac5
Properly fixed possible MySQL Errors, will test in prod for 1 day
...
Had to rewrite all the mysqli->error/errno to mysqli->lastused because of the read/write splitting, shoud be working now
Reverted notifications code back to previous version
Added the lastused property to mysqlms, so that when calling the error/errno we know what was the lsat connection used, same for insert_id
2017-12-11 03:30:56 +00:00
Tiago Peralta
12cee6e25a
There was a bug here, whereas the query is perfectly fine, but instead of returning false it was returning the this->sqlError.... which by then was returning the return false, the problem was the log in the cron that was misleading, took 2 days figuring this one out
2017-12-11 02:05:26 +00:00
Tiago Peralta
c27db96f05
removed trash
2017-12-10 20:48:14 +00:00
Tiago Peralta
c5ca7a83b2
Modified slave validation
...
.gitignore composer.lock, and remove composer.lock from repo
2017-12-10 20:46:30 +00:00
Tiago Peralta
142261d4e0
Same as previous... damn hangover
2017-12-10 20:34:53 +00:00
Tiago Peralta
7929ac79ab
Same as previous
2017-12-10 20:34:15 +00:00
Tiago Peralta
f290aeee63
Small bugfix to not validate the Slave when it's not enabled
2017-12-10 20:22:58 +00:00
Tiago Peralta
4233563573
Removed var_dump from debugging....
2017-12-08 23:11:19 +00:00
Tiago Peralta
52c3e2ff93
Implemented Read/Write Mysql Split (Master for writes, Slave for reads)
2017-12-08 22:53:15 +00:00
Sebastian Grewe
eedbaba316
[VERSION] 1.0.8 release
2017-11-02 10:38:51 +01:00
Sebastian Grewe
8d8ba4fcbf
Merge pull request #2630 from blondak/development
...
Development
2017-10-30 07:09:52 +00:00
Sebastian Grewe
79c09bd62a
Merge pull request #2603 from shtse8/master
...
Correct SERVER_NAME to HTTP_HOST to get a valid host url
2017-09-28 21:16:59 +02:00
shtse8
6c1aa15879
Correct SERVER_NAME to HTTP_HOST to get a valid host url
2017-09-28 11:44:33 +00:00
Blonďák
7dd8c690bc
Merge https://github.com/MPOS/php-mpos into development
2017-09-13 21:25:24 +02:00
Blonďák
6875749f15
TYPO - remove unused variable
2017-09-13 18:28:48 +02:00
Blonďák
4670e553b2
FIX - check for data in SQL result
2017-09-13 18:27:48 +02:00
Blonďák
b144d21cb3
FIX - Only variables should be passed by reference in usersettings.class.php on line 34
2017-09-06 21:03:37 +02:00
Blonďák
d687cab6c1
FIXED - notifications without email notifications
2017-09-05 20:08:35 +02:00
Blonďák
f6bfc10b90
update - notifymyandroid.com - title from configuration
2017-09-04 20:19:03 +02:00
Blonďák
70ea8f1609
fixed - Undefined index: count_all
2017-09-04 20:05:13 +02:00
Blonďák
0307e1e62d
fixed - Only variables should be passed by reference
2017-09-04 15:26:27 +02:00
RaJiska
615d6c433d
Pin attempts not reset upon success fix
2017-08-29 17:14:16 +02:00
Sebastian Grewe
86ad3027fb
[VERSION] 1.0.7
2017-07-18 15:22:19 +02:00
Sebastian Grewe
6e65a48914
[FIX] Default to bootstrap theme if none added to DB
2017-07-18 15:19:29 +02:00
Sebastian Grewe
0387451e28
Merge pull request #2574 from MPOS/issue-2565-uptimerobot
...
Issue #2565 uptimerobot
2017-07-18 09:31:08 +02:00
Sebastian Grewe
586ca79601
[ FIX #2565 ] New Uptime Robot HTTPS URL
2017-07-18 09:15:22 +02:00
Blonďák
bcfd7cfb30
Updated push notifications format
2017-02-06 09:53:17 +01:00
Blonďák
dad43012e9
#2539 - FIXED user login push notification
2017-01-17 07:00:37 +01:00
Blonďák
96fb92d237
FIX - change log to public,...
2017-01-17 06:39:54 +01:00
Blonďák
41bd5e4e50
#2539 - fixed doubled push notifications
2017-01-12 22:11:50 +01:00
Blonďák
9f32f0119d
#2539 - Fixed upgrading DB version
2017-01-12 21:30:29 +01:00
