Commit Graph

1356 Commits

Author SHA1 Message Date
Sebastian Grewe
ef28547940 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-07 09:40:02 +01:00
Sebastian Grewe
727b082059 [FIX] Registration password lenght, API class default time 2014-01-07 09:39:43 +01:00
Sebastian Grewe
5ce2662ae5 Merge pull request #1246 from TheSerapher/issue-1242
[INITIAL] Working version checks
2014-01-06 08:05:32 -08:00
Sebastian Grewe
fe31737576 Merge pull request #1264 from TheSerapher/issue-1016
[FIX] Caching issues with hybrid templates
2014-01-06 03:27:56 -08:00
Sebastian Grewe
d0e899b7d0 [FIX] Empty / no template detection 2014-01-06 12:00:48 +01:00
Sebastian Grewe
cfe47ed787 [FIX] Caching issues with hybrid templates
* Create subfolders for cache/compiled files for themes

Fixes #1016 once merged.
2014-01-06 10:52:21 +01:00
Sebastian Grewe
766032fbdb Merge pull request #1259 from TheSerapher/issue-1255
[FIX] Closing nocache tags
2014-01-05 22:26:03 -08:00
Sebastian Grewe
64958782a4 [FIX] Closing nocache tags
Fixes #1255 once merged.
2014-01-06 07:25:09 +01:00
Sebastian Grewe
3f1e74e381 [UPSTREAM] Upgraded smarty libraries
Fixes #1249 once merged.
2014-01-05 13:41:41 +01:00
Sebastian Grewe
2568ced4d4 [INITIAL] Working version checks
* Check DB structure version, config file version and MPOS core version
* Added new Admin Dashboard to show this core information
* Cronjobs will be disabled if SQL files are not imported
 * SQL files must re-set the db_upgrade_required setting
* Cronjobs will disabled if config files are not updated
 * Simple config file update and version string update will fix this
* Added MPOS status overview
 * Cronjobs and Wallet information for now, others may be added later
* Added new navigation link for Admin Panel Dashboard
* Added new version file
 * Will require updates whenever DB or configs are updated
* Update SQL file that adds the DB_VERSION setting

This will address #1242 and already includes a huge chunk of changes
required to make this work.
2014-01-05 11:19:09 +01:00
Sebastian Grewe
017a56549d Merge pull request #1213 from TheSerapher/issue-670-unlocks
[IMPROVED] Unlock notification mails on auto-locks
2014-01-04 00:11:28 -08:00
Sebastian Grewe
8fcd59eeea [ADDED] Account unlock mail on failed PIN 2014-01-02 13:28:33 +01:00
Sebastian Grewe
8c2912a7df Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-02 12:25:46 +01:00
Sebastian Grewe
11c417230b [FIX] Reset pin button 2014-01-02 12:25:22 +01:00
Sebastian Grewe
878fa1c1c8 [IMPROVED] Unlock notification mails on auto-locks
* Added new token type: account_unlock
* Added update SQL File
* Updated base structure with new token type
* Added empty template
* Updated user class to send mail on failed passwords
* Added unlock account page to use tokens

Addresses #670
2014-01-02 11:51:22 +01:00
Sebastian Grewe
80d0467c2d Merge pull request #1211 from TheSerapher/issue-1040
[CHANGE] Moved from bar shares to pie shares
2014-01-02 02:09:34 -08:00
Sebastian Grewe
5c5db8dc93 Merge pull request #1191 from TheSerapher/issue-1181
Issue 1181
2014-01-02 02:08:19 -08:00
Sebastian Grewe
e8d460cfe6 [UPDATE] Removed debug echo output 2014-01-02 11:05:49 +01:00
Sebastian Grewe
67a6d9aff4 [UPDATE] Coding style 2014-01-02 11:05:07 +01:00
Sebastian Grewe
4c3421cc8a Merge pull request #1165 from Neozonz/issue-1164
Initial commit for pin reset functionality
2014-01-02 02:02:37 -08:00
rog1121
494a3a2714 Fix Hardcoded blockchain 2014-01-01 15:08:39 -07:00
Sebastian Grewe
dc81ad3123 Merge pull request #1166 from TheSerapher/issue-1159
Issue 1159
2014-01-01 02:11:02 -08:00
Sebastian Grewe
e762bb0391 [IMPROVED] Use data interval on getuserworkers 2014-01-01 09:08:09 +01:00
Sebastian Grewe
020905679a [FIX] Display TX Fee in account panel
Fixes #1196 once merged.
2014-01-01 08:43:53 +01:00
Sebastian Grewe
6656e47fdc [FIX] Spelling error
Fixes #1192 once merged
2014-01-01 08:39:49 +01:00
Sebastian Grewe
4fa4259932 [CHANGE] Moved from bar shares to pie shares
The cake is a lie! It's a pie!

Addresses #1040
2013-12-31 23:51:39 +01:00
Sebastian Grewe
731985b30f [IMPROVED] Token expiration timers
* Added new SQL file to update tokentypes table
* Added new function to base class
* Renamed function in base class used in shares class
* Added new error code
* Added new cronjob to delete expired tokens
* Added new cronjob to run-cron scripts and monitoring page
* Added new function to tokentype class
* Added new function to token class

Will address #1181 once merged.
2013-12-31 22:31:47 +01:00
Sebastian Grewe
82efbb4609 Merge branch 'issue-1185' into next
Conflicts:
	public/templates/mpos/global/navigation.tpl
2013-12-31 17:11:03 +01:00
Sebastian Grewe
2675a9573f [FIX] Better version 2013-12-31 16:34:37 +01:00
Sebastian Grewe
e9c780f2ee [FIX] Don not show decimals > 0.0001 fee 2013-12-31 16:32:57 +01:00
Sebastian Grewe
9c2e6fa30b [FIX] Properly display pool fee in dashboard
Fixes #1178 once merged.
2013-12-31 16:28:53 +01:00
Sebastian Grewe
ee02445b7d Merge branch 'issue-965' into next
Conflicts:
	public/templates/mpos/master.tpl
2013-12-31 16:27:16 +01:00
Sebastian Grewe
4026eec570 Merge pull request #1187 from TheSerapher/issue-1159-dashboardsplit
[IMPROVED]
2013-12-31 07:19:11 -08:00
Sebastian Grewe
4a98724fc5 [FIX] Disallow to post messages for guests
* Disallow to post messages if guest forms are disabled
2013-12-31 16:17:02 +01:00
Sebastian Grewe
a8a7d2c52f [IMPROVED] Allow contactform for guests
* Added admin option to disable access to contactform for guests
* Propagated new option to templates

Fixes #1185
2013-12-31 16:14:56 +01:00
Frederick Behrends
f333bdcc0e moved blockchainsettings to extra page in admin settings 2013-12-31 04:39:27 +01:00
Frederick Behrends
3b980cbf5d [IMPROVMENT] Added option to link transaction-ids to transaction on blockchainwebsite 2013-12-31 04:25:47 +01:00
Neozonz
33b06946f4 PIN Reset email template 2013-12-30 11:45:39 -08:00
Sebastian Grewe
8e4c56d597 [IMPROVED]
Splitting dashboard calls up instead of using one single API call:

* Use getuserbalance for Balance updates
* Use getuserworkers for Worker updates

For those and potential other SQL intensive Ajax calls I have added a
long ajax refresh interval setting. It can be set via admin panel and
will change the refresh time on the JS file on the dashboard for those
two calls.

Should help a bit with high worker and transaction volume pools.

Address #1159
2013-12-30 19:23:27 +01:00
Neozonz
5e401bd6dd fixed indent 2013-12-30 09:17:22 -08:00
Sebastian Grewe
b2ac77d9a5 Merge pull request #1128 from nicoschtein/patch-12
Make TXId & Address clickable on Transaction Lists
2013-12-30 03:23:14 -08:00
Sebastian Grewe
2c18abf8be [SECURITY] Better token generator 2013-12-30 12:15:36 +01:00
Sebastian Grewe
abb3688e56 [FIX] Hardcoded confirms removed 2013-12-30 12:05:33 +01:00
Sebastian Grewe
48a4edad5b [FIX] Proper account summary 2013-12-30 12:02:38 +01:00
Sebastian Grewe
de302a03dc [IMPROVED] data gathering for Auto Payout
* Using improved SQL query created by @feeleep75
* Adjusted the query to further cut down the data returned

Fixes #1159 once merged.
2013-12-30 11:57:29 +01:00
Neozonz
e3db7e0a02 Initial commit for pin reset functionality 2013-12-30 03:29:20 -05:00
Sebastian Grewe
96d096f669 [MERGE] Fix merge conflict 2013-12-30 08:19:13 +01:00
Sebastian Grewe
f4a1110c48 Merge pull request #1089 from TheSerapher/issue-1043
Issue 1043
2013-12-28 12:23:23 -08:00
Sebastian Grewe
bac119dcc8 Merge pull request #1132 from poolpm/patch-1
[FIX] Wrong behavior on Edit Account with no addy
2013-12-28 12:18:05 -08:00
neonbunny
f94e48eb89 Fix for reflected XSS security issue. 2013-12-28 17:34:09 +00:00