Commit Graph

102 Commits

Author SHA1 Message Date
Sebastian Grewe
02c9be54ed [MAJOR] Changing project name to MPOS
* Adjusted mmcfe-ng occurences in code
* Adjusted Database strucutre to only supply the full structure
* Adjusted default template to MPOS

Addresses #643
2013-10-07 10:10:49 +02:00
Sebastian Grewe
64205dd099 [MERGE] Fix merge conflict with NEXT 2013-09-30 09:56:49 +02:00
Sebastian Grewe
6c3d2d1e96 Allow Public ACL for all round transactions 2013-09-25 10:34:36 +02:00
Sebastian Grewe
1387bbdf44 [MERGE] Merge conflict NEXT 2013-09-18 16:34:52 +02:00
Sebastian Grewe
c8f19d2841 Revert "[FEATURE] Added Ajax JSON Memcache"
This reverts commit bd8796b824.

It turns out it's pretty much useless as long as the data passed to
get_json is not also being cached.
2013-09-18 13:16:25 +02:00
Sebastian Grewe
bd8796b824 [FEATURE] Added Ajax JSON Memcache 2013-09-18 13:11:24 +02:00
Sebastian Grewe
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +02:00
Sebastian Grewe
a0fa71b264 [IMPROVEMENT] Adding incremental round/user shares
This will address #510. It needs thorough testing and is a WiP but
is a start to improve cron runtime and DB loads.
2013-09-18 09:45:52 +02:00
Sebastian Grewe
e7f62134f1 adding cold wallet coin display and setting 2013-09-17 16:15:18 +02:00
Sebastian Grewe
04786aafb5 Merge branch 'next' into issue-145 2013-09-17 08:53:21 +02:00
Sebastian Grewe
ae9459eb92 Merge branch 'next' into issue-444-theserapher 2013-09-16 17:46:31 +02:00
Sebastian Grewe
8abe371fba fixing cryptsy again, ty @Metice 2013-09-16 17:25:04 +02:00
Sebastian Grewe
8c96e166b7 [FEATURE] Added Ajax Data Interval Setting
* Allows Admins to change the SQL Interval used in queries
 * Default: 300 seconds / 5 minutes
 * Allowed: 1 minute, 5 minutes, 10 minutes
 * Tooltop in admin panel explains this setting
* Added data interval to API call for dashboard
* Added additional output to gauges footer

Addresses #444
2013-09-14 21:45:31 +02:00
Sebastian Grewe
b66c3eafec Admin Option for Ajax Refresh Interval
* Allow admins to change the refresh interval for Ajax calls
 * Only Gauges affected for now

Further Addresses #444 with more goodies
2013-09-14 19:35:30 +02:00
Sebastian Grewe
c7ca211532 Merge branch 'next' into issue-444-theserapher 2013-09-14 15:50:28 +02:00
Sebastian Grewe
f67d293382 Merge branch 'issue-652' into next 2013-09-13 16:24:47 +02:00
Sebastian Grewe
2e9332b7a0 fixed cryptsy API example 2013-09-13 15:49:07 +02:00
Sebastian Grewe
aa10b6efc1 [FEATURE] Adding hashrate modifiers
* Allow admins to set hashrate speed displays via admin panel
 * Personal
 * Pool
 * Network
* Allows for easier integration of SHA coins

Fixes #652
2013-09-13 13:36:36 +02:00
nrpatten
c9c507c93e Update admin_settings.inc.php 2013-09-12 19:59:38 +10:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
8ae36844f1 fixing some PHP warnings 2013-09-07 20:53:28 +02:00
Sebastian Grewe
f87a7fc380 Merge branch 'next' into issue-145 2013-09-06 10:55:31 +02:00
Sebastian Grewe
ab6a4f57d3 further implemetation into mmcfe-ng 2013-09-06 10:29:42 +02:00
Sebastian Grewe
a98080ec13 adding missing THEME_DIR to dist config 2013-08-22 16:32:06 +02:00
Sebastian Grewe
6522fb2747 fixing merge conflicts 2013-08-22 11:54:17 +02:00
Sebastian Grewe
1f6ccfd6be Merge pull request #628 from TheSerapher/issue-610
Issue 610
2013-08-22 02:47:46 -07:00
Sebastian Grewe
1c24820735 Adding network_confirmations to configuration
* Added new configuration option `$config['network_confirmations']` to
  dist config
* Default to 120 if not set

This will allow us to define a different confirmation level for user
transactions but still display blocks at their approriate unconfirmed
value when displaying them in the wallet information for admins. Risky
for pool owners but still a viable option.

Fixes #610
2013-08-22 11:45:40 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
ba95d678a0 moved motd to website tab 2013-08-20 12:08:59 +02:00
Sebastian Grewe
7ec8fa9b95 Moving a lot of settings from config to adminpanel
* Migrated configuration options to admin panel
* Removed configuration options from config file
* Added help text for each configuration option into panel

Addresses #622 and needs extensive testing by pools. A lot has changed
so pool owners might have to adjust their own templates to match this
new system.
2013-08-20 12:02:47 +02:00
Sebastian Grewe
c9139034a4 Merge pull request #573 from TheSerapher/issue-549
Make block count on stats page configurable
2013-08-07 21:44:30 -07:00
obigal
ef234fe80b Vardiff/pushpool and pps payout support 2013-08-07 09:29:48 +02:00
Sebastian Grewe
f675fc7055 Removed page generation PHP from settings
Committed those by accident, so removed.
2013-08-05 10:08:24 +02:00
Sebastian Grewe
4d77a7d299 Refactored admin panel settings
This will allow easier integration of new settings managed by the admin
panel. Includes setting types, tooltips, tabs etc.

No open ticket, just figured I'd add this.
2013-08-05 10:02:39 +02:00
Sebastian Grewe
d59b8ef563 Make block count on stats page configurable
Fixes #549
2013-08-05 09:18:52 +02:00
obigal
93e36a8259 Cryptsy api support 2013-07-21 14:15:34 -04:00
Sebastian Grewe
1cd39099ee Merge pull request #483 from TheSerapher/issue-446
Issue 446
2013-07-18 02:05:45 -07:00
Sebastian Grewe
73ec707381 Adds blockhash to blockexplorer URL
* Changed blockexplorer URL to use Blockhash instead of height
* Added calls to find current networks blocks blockhash
* Propagated changes onto temmplate
* Added new dist configuration for new blockexplorer URL

Fixes #446
2013-07-18 09:43:16 +02:00
Sebastian Grewe
d492b532b7 Adding ability to disable the sites API functions
Addresses #467 and will fix upon merge.
2013-07-17 09:43:02 +02:00
Sebastian Grewe
7f4f5cd343 Make invitations configurable via admin panel
Invitations can now be configured through admin panel settings. By
default, invitations are enabled. Invitation system is also available if
registrations are disabled. To completely remove the ability of new
users to sign up, disable both registration and invitations.

Fixes #330
2013-07-15 12:43:29 +02:00
Sebastian Grewe
bd32dfa9f8 Adding invitation system to mmcfe-ng core
This will allow users to send invitations to other people via email.
Each account will still need to confirm the email address if the option
is enabled.

Addresses #330, will need to allow pool operators to enable this feature
even with registrations turned off.
2013-07-15 12:26:31 +02:00
Sebastian Grewe
0ede05a6fd Adding email verification
* Adding mail verification during account registration
* Added new dist file option for mail verification
* Added account confirmation page using tokens
* Added mail class into user class for password resets
* Moved password reset template
* Adjusted account registration page
* Adjusted user class for email confirmation

Also fixed a bug with smarty_cache_key not being used properly if smarty
is disabled. Key still needs to be available even if caching is disabled

Addresses #330 and prepare the ticket for invitation only system.
2013-07-15 12:26:31 +02:00
Sebastian Grewe
dca14886de Merge pull request #448 from IainKay/Issue-447
Issue 447
2013-07-11 21:42:10 -07:00
Iain Kay
3e2608fcef Removed unnecessary cookie name variable that was not used. 2013-07-11 20:30:39 +00:00
Sebastian Grewe
a9ae72cd50 Merge pull request #445 from IainKay/issue-434
Issue 434
2013-07-11 13:06:41 -07:00
Iain Kay
a635d2163c Added note about php.ini session.gc_maxlifetime value - Important to stop garbage collection removing cookies that should be valid. 2013-07-11 19:56:10 +00:00
Iain Kay
d2bbc366d1 Changed the Cookie Explanation in global.inc.php to be more in line with the rest of the structure. 2013-07-11 19:26:09 +00:00
Iain Kay
638b8387c3 Updated global.inc.php to reflect the new values required for cookie configuration and documented each of the options. 2013-07-11 19:17:49 +00:00
Ilya Stromberg
521bcc8022 Fix built-in documentation 2013-07-11 20:19:35 +04:00
Sebastian Grewe
83c979b260 Merge pull request #427 from TheSerapher/issue-309
Issue 309
2013-07-11 02:35:24 -07:00