RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,352 Commits 4 Branches 11 Tags 14 MiB
1dfb7e9702
Commit Graph

916 Commits

Author SHA1 Message Date
Sebastian Grewe
0eebc89fe7 Added more graph options 
* [FEATURE] Added graph trendline (average)
* [FEATURE] Added graph labels
 2013-09-14 23:23:36 +02:00
Sebastian Grewe
728ee2dd11 Feature update and Improvement to Dashboard 
* [FEATURE] Dasboard honors Ajax interval for hashrate graph
* [IMPROVEMENT] Load graph plugins on graph template not on master template
 2013-09-14 23:01:31 +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
faadf7cbaf [FEATURE] Proper login/logout/auth redirects 
* Allow to redirect to referrer page when access is denied
* Logout user and point towards login, add redirect
* Logout user as usual but added save redirects
* Adjusted templates and page codes
 2013-09-14 21:20:12 +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
727ed1f79a adding gethashps changes to dashboard 2013-09-14 19:32:37 +02:00
Sebastian Grewe
69ed2ab768 load initial Gauges data via Ajax 2013-09-14 19:08:19 +02:00
Sebastian Grewe
9b50e9d842 removed debug output 2013-09-14 18:52:22 +02:00
Sebastian Grewe
de560ea422 ajax calls interval 10s 2013-09-14 18:43:19 +02:00
Sebastian Grewe
2ba96b6a2f make async ajax calls 2013-09-14 18:01:35 +02:00
Sebastian Grewe
4df57f612e make async ajax calls 2013-09-14 18:00:43 +02:00
Sebastian Grewe
4303ccc42f added query time as gauge 2013-09-14 17:59:13 +02:00
Sebastian Grewe
1fab736eb6 new graph location 2013-09-14 17:59:01 +02:00
Sebastian Grewe
4e19de4c7a Unified gauges Ajax 
* Single call for all data
* Use proper hash units as configured in pool
* New API call for dashboard data that has adjusted output
 2013-09-14 17:03:19 +02:00
Sebastian Grewe
c7ca211532 Merge branch 'next' into issue-444-theserapher 2013-09-14 15:50:28 +02:00
Sebastian Grewe
e6ab8006d1 [FEATURE] Adding more to gauges, adding graph to dashboard 
* Adding live-updates for gauges
* Adding new API calls
* Updated statistics to allow custom intervals
* Disabled caching for API calls for now
* Added new hashrate graph with auto-update

Addresses #444
 2013-09-14 14:43:14 +02:00
Sebastian Grewe
504855b55d Merge pull request #656 from TheSerapher/issue-646 
Issue 646
 2013-09-14 00:39:01 -07:00
Sebastian Grewe
c20c9619a4 Update wallet.inc.php 2013-09-14 09:37:08 +02:00
nrpatten
35f042dd7b Update default.tpl 
Add center span
 2013-09-14 09:44:38 +10:00
nrpatten
af94ba00fd Update default.tpl 
add center span
 2013-09-14 09:41:28 +10:00
nrpatten
805fca23a1 Update default.tpl 
Add center span
 2013-09-14 09:38:27 +10:00
nrpatten
18c4ff60aa Update custom.css 
Add span to center switches
 2013-09-14 09:36:57 +10: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
nrpatten
e691c5cd8b Update default.tpl 2013-09-13 22:16:46 +10:00
nrpatten
25027c09b5 Update default.tpl 
Update Toggle Switch Test
 2013-09-13 22:13:30 +10:00
nrpatten
48e89d78cb Update default.tpl 
Toggle Switch Test
 2013-09-13 22:05:26 +10:00
nrpatten
aeb3827b4d Update default.tpl 
Toggle Switch Test
 2013-09-13 22:01:05 +10:00
nrpatten
ca780ba164 Update default.tpl 
Toggle Switch Test
 2013-09-13 21:58:12 +10:00
nrpatten
5e873c3d8a Update default.tpl 
Toggle Switch test
 2013-09-13 21:56:38 +10:00
nrpatten
29a99edf57 Update custom.css 2013-09-13 21:48:56 +10: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
Sebastian Grewe
6d0854149b adding pool and net hashrate gauges 2013-09-13 10:28:23 +02:00
Sebastian Grewe
f35c7cedc8 adding network hashrate to poolstatus 2013-09-13 10:28:12 +02:00
Sebastian Grewe
522e37717b adding Ajax refresh for Gauges 2013-09-13 09:35:30 +02:00
Sebastian Grewe
5e09208f54 adding share-rate to getuserstatus API 2013-09-13 09:35:14 +02:00
Sebastian Grewe
e0b1db19db adding missing master template 2013-09-13 08:40:35 +02:00
Sebastian Grewe
5176da94a4 adding missing JS files 2013-09-13 08:40:06 +02:00
Sebastian Grewe
c8f7163fa8 adding sample gauges with static data for now 2013-09-13 08:39:17 +02:00
Sebastian Grewe
03fca51af0 minor update to contactform layout 2013-09-12 18:37:06 +02:00
Sebastian Grewe
23bc5295f9 adding fieldset to transaction filters 2013-09-12 18:31:48 +02:00
Sebastian Grewe
6de81c8b78 admin settings via fieldset 2013-09-12 18:25:40 +02:00
Sebastian Grewe
493db31dcc adding better colors for confirms/orphans/... 2013-09-12 17:56:41 +02:00
Sebastian Grewe
5e1c3ae372 fixing issue mentioned in #145 with payouts 2013-09-12 13:22:39 +02:00
Sebastian Grewe
c99c98866f fixing PHP notice on navbar 2013-09-12 12:49:20 +02:00
Sebastian Grewe
cca0610cd3 minor donors update 2013-09-12 12:45:19 +02:00
nrpatten
32e789b8e6 Update navigation.tpl 2013-09-12 20:19:49 +10:00
nrpatten
962079b97c Update navigation.tpl 2013-09-12 20:12:40 +10:00
nrpatten
3176363b24 Create body.tpl 2013-09-12 20:06:16 +10:00
nrpatten
61f6f5b94b Create contactform.inc.php 2013-09-12 20:03:58 +10:00
nrpatten
ff6bd18749 Create contactform.inc.php 2013-09-12 20:01:28 +10:00
nrpatten
c9c507c93e Update admin_settings.inc.php 2013-09-12 19:59:38 +10:00
nrpatten
34bc88533f Update mail.class.php 2013-09-12 19:57:30 +10:00
nrpatten
493dfcd85c Update mail.class.php 2013-09-12 19:55:59 +10:00
nrpatten
233cc96ea2 Create default.tpl 2013-09-12 19:52:10 +10:00
nrpatten
ae7e19c5f6 Create default.tpl 2013-09-12 19:51:36 +10:00
nrpatten
84173e225c Create disabled.tpl 2013-09-12 19:46:37 +10:00
nrpatten
2c1a560e82 Update navigation.tpl 2013-09-12 19:43:59 +10:00
nrpatten
4e36a25c81 Create default.tpl 2013-09-12 19:30:17 +10:00
nrpatten
72e3a75a1e Create default.tpl 2013-09-12 19:29:06 +10:00
nrpatten
2e7187faba Create default.tpl 2013-09-12 19:26:38 +10:00
nrpatten
25ec8f3ec6 Create default.tpl 2013-09-12 19:23:54 +10:00
nrpatten
acecc5ea1d Create default.tpl 2013-09-12 19:22:56 +10:00
nrpatten
18e977e12d Create default.tpl 2013-09-12 19:21:57 +10:00
nrpatten
b2ae8efbd0 Create default.tpl 2013-09-12 19:20:54 +10:00
Sebastian Grewe
e57e82466b adding missing icons to news admin 2013-09-12 10:14:24 +02:00
Sebastian Grewe
0bd21a0873 fixing pagination/pagesort conflicts 2013-09-12 10:02:48 +02:00
Sebastian Grewe
f3ce2cb812 [FEATURE] Added new icons, added pagination 
This commit uses the class icons instead of actual images. Also changed
the layout a slight bit to give room for data in the header just as used
in the tab involved version.
 2013-09-12 09:48:56 +02:00
Sebastian Grewe
39eddd979d Merge branch 'issue-444-theserapher' of https://github.com/TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-12 08:50:08 +02:00
Sebastian Grewe
e203f31ba9 adding login icon 2013-09-12 08:49:57 +02:00
Sebastian Grewe
00c6955680 removing unpaid shares, not used 2013-09-12 08:45:26 +02:00
Sebastian Grewe
85fa71136f adding placeholder dashboards and missing image 2013-09-12 08:43:01 +02:00
Sebastian Grewe
e2011a68b0 [FIX] Unconfirmed Wallet Balance 
Fixes #646
 2013-09-12 08:30:34 +02:00
Sebastian Grewe
f738b426f2 cleaned up dashboard page file 2013-09-09 16:07:42 +02:00
Sebastian Grewe
b05aac4678 @nrpatten: Updated dashboard for prop 2013-09-09 16:03:54 +02:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
a128ca3ba0 minor fix to contrib hashrates 2013-09-09 14:44:17 +02:00
Sebastian Grewe
823ba4d844 minor changes to account-edit 2013-09-09 14:41:44 +02:00
Sebastian Grewe
eb20c0304e adding hide button to admin panel 2013-09-09 09:53:54 +02:00
Sebastian Grewe
4b9105b84b small update to account-workers 2013-09-09 09:52:44 +02:00
Sebastian Grewe
2235f8e15a adding missing JS lib 2013-09-09 09:52:27 +02:00
Sebastian Grewe
31fe769091 adding API qrcode in account 2013-09-09 09:52:05 +02:00
Sebastian Grewe
6fa46137f5 adding account invitations 2013-09-09 09:47:28 +02:00
Sebastian Grewe
8e05ab71a6 adding notification account view 2013-09-09 09:37:59 +02:00
Sebastian Grewe
fb9fb9cdb2 adding account transaction view 2013-09-09 09:27:42 +02:00
Sebastian Grewe
ab7360d187 adding account edit page 2013-09-09 09:24:26 +02:00
Sebastian Grewe
f7ced8f80d added registration templates 2013-09-09 07:46:52 +02:00
Sebastian Grewe
0dd1cc7d50 template updates for new empty content 2013-09-09 07:46:36 +02:00
Sebastian Grewe
5c11c74974 allow simple authentication checks wihtout logout 2013-09-09 07:45:55 +02:00
Sebastian Grewe
3c7bb41f81 stats template changes 2013-09-09 07:45:35 +02:00
Sebastian Grewe
b4ed4ed06a fixing PHP warning 2013-09-08 00:23:00 +02:00
Sebastian Grewe
a19b3f5e31 Adding round statistics 2013-09-08 00:22:02 +02:00
Sebastian Grewe
82e8941c02 Merge branch 'next' into issue-444-theserapher 2013-09-07 23:55:49 +02:00
Sebastian Grewe
98688d5839 Updated testing template 
* Removed unneeded template icons
* Added new icon font
* Added icons to navbard
* Added full admin features

Updates #444
 2013-09-07 23:49:45 +02:00
Sebastian Grewe
bf5408568b Merge branch 'next' of https://github.com/TheSerapher/php-mmcfe-ng into next 2013-09-07 20:53:39 +02:00
Sebastian Grewe
8ae36844f1 fixing some PHP warnings 2013-09-07 20:53:28 +02:00
Sebastian Grewe
bc7e511177 removing debug echos 2013-09-06 15:00:47 +02:00
Sebastian Grewe
5257001153 fixing blockhash in round block details 2013-09-06 14:55:44 +02:00
Sebastian Grewe
f87a7fc380 Merge branch 'next' into issue-145 2013-09-06 10:55:31 +02:00
Sebastian Grewe
b656be751d indentations 2013-09-06 10:51:55 +02:00
Sebastian Grewe
d4ce764d77 proper allow back/forth on blocks 2013-09-06 10:49:19 +02:00
Sebastian Grewe
ab6a4f57d3 further implemetation into mmcfe-ng 2013-09-06 10:29:42 +02:00
Sebastian Grewe
b3ba080345 obigals work, cherrypicked 2013-09-06 09:48:08 +02:00
Sebastian Grewe
5b353ab759 Merge branch 'next' into issue-543 2013-09-06 09:40:28 +02:00
Sebastian Grewe
ecfbeec01c adding new icon set 2013-09-02 12:55:33 +02:00
Sebastian Grewe
cecbcb7d4b Adding testing theme for #444 
This is just a WiP to test a new website template. Taken online from
source referenced in the sidebar footer.

Very nice and clean look, have not had the time to add all features yet
and is only used to demonstrate it.
 2013-08-26 20:07:54 +02:00
Sebastian Grewe
0e27cda093 Fix: Blocks not being confirmed 
Fixes an issue introduce with #610.
 2013-08-26 11:11:52 +02:00
Sebastian Grewe
0a4047420b Merge pull request #631 from TheSerapher/issue-630 
Fix: Properly send notifications again
 2013-08-23 02:45:11 -07:00
Sebastian Grewe
e6cf43efa0 Fix: Properly send notifications again 
Fixes #630
 2013-08-23 11:28:07 +02:00
Sebastian Grewe
a98080ec13 adding missing THEME_DIR to dist config 2013-08-22 16:32:06 +02:00
Sebastian Grewe
6eec747be6 fixing PPLNS payouts one last time 2013-08-22 16:16:04 +02:00
Sebastian Grewe
db754c146e Revert "Revert "adjusting pplns target to baseline shares"" 
Reverting the revert .... :-/

This reverts commit 2d27132725.
 2013-08-22 15:20:46 +02:00
Sebastian Grewe
927fc12cb3 fixing admin panel user info 2013-08-22 15:01:00 +02:00
Sebastian Grewe
2d27132725 Revert "adjusting pplns target to baseline shares" 
* Shares are already baselined when calculating rounds

This reverts commit c9a8f8dc65.
 2013-08-22 14:51:30 +02:00
Sebastian Grewe
c9a8f8dc65 adjusting pplns target to baseline shares 2013-08-22 14:39:46 +02:00
Sebastian Grewe
75d0dfe5f7 adding share rate to all sidebars 2013-08-22 14:18:04 +02:00
Sebastian Grewe
eb435b4072 fixing difficulty per worker value 2013-08-22 12:33:29 +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
10a794cd4f Merge pull request #626 from TheSerapher/issue-622 
Issue 622
 2013-08-22 02:36:12 -07:00
Sebastian Grewe
6ec5b4b845 Fixing hashrate graphs 
* Proper initilize array in order
* Fill data after initilizing
* Removed 0 fills

Thanks @iriiria for this fix!

Fixes #624
 2013-08-22 11:33:26 +02:00
Sebastian Grewe
eacb8dff03 updated templates 2013-08-22 11:30:27 +02:00
Sebastian Grewe
ae1a5c8ed3 Use baseline shares for share class 2013-08-22 11:30:13 +02:00
Sebastian Grewe
b23dd56bc8 Adding baseline shares to statistics class 
* Calculate shares towards our base diff
* Calculate share rate based on actual shares not diff
 2013-08-22 11:29:26 +02:00
Sebastian Grewe
d28e728d6c minor cleanup 2013-08-22 11:28:18 +02:00
Sebastian Grewe
36d64b27fd adding share rate to prop sidebar 2013-08-22 11:28:01 +02:00
Sebastian Grewe
56cfa24eb4 Include worker diff in API 
Addresses #145
 2013-08-20 17:03:41 +02:00
Sebastian Grewe
96066993ac adding per-worker difficulty display 2013-08-20 16:50:40 +02:00
Sebastian Grewe
7769550f89 fixing missing network hashrate in this branch 2013-08-20 15:58:17 +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
4abe462e01 Merge pull request #618 from TheSerapher/issue-617 
Fix: Display proper PPS value
 2013-08-19 01:41:44 -07:00
Sebastian Grewe
2db6dba482 Fix: Display proper PPS value 
* Fixes: Wrong PPS value before the first block is found

Fixes #617
 2013-08-19 10:40:25 +02:00
Sebastian Grewe
c057efce3e Merge pull request #616 from TheSerapher/issue-605 
Issue 605
 2013-08-19 01:00:12 -07:00
Sebastian Grewe
59bd71c75d Fixing admin requests 
Fixes #605
 2013-08-19 09:59:41 +02:00
Sebastian Grewe
2e4a94ff8c Merge pull request #615 from TheSerapher/issue-612 
Removing IRC reference
 2013-08-19 00:40:10 -07:00
Sebastian Grewe
f8f50fdc05 Removing IRC reference 
Fixes #612
 2013-08-19 09:39:45 +02:00
Sebastian Grewe
d6422ea5a8 Merge pull request #602 from TheSerapher/issue-582 
Adding QRCodes under Accounts
 2013-08-19 00:38:37 -07:00
Sebastian Grewe
7e4c5dab4e Adding unconfirmed blocks to wallet 
First attempt addressing #610, still missing a detection for the actual
confirmation limit required for each block in case one lowers it in the
config.
 2013-08-19 09:31:53 +02:00
Sebastian Grewe
a56907ba00 Adding gethourlyhashrates API call 
Fixes #608
 2013-08-15 10:08:48 +02:00
Sebastian Grewe
1708e5d2b5 Do not add 24th hour, use 0 hour 2013-08-15 10:03:22 +02:00
Sebastian Grewe
14c0535b10 Fill empty hours with proper data 
* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
 2013-08-15 09:58:33 +02:00
Sebastian Grewe
50f380c25e first test to fill with data 2013-08-15 09:14:02 +02:00
Sebastian Grewe
16557465e4 Added: getuserbalance API call 
* Adds getbalance to API
* Admins: Can fetch any users balance
* Users: Can fetch only their own balance

Fixes #605
 2013-08-15 08:58:50 +02:00
Sebastian Grewe
ad6ceed77e fixing worker activity on mobile template 2013-08-14 11:47:46 +02:00
Sebastian Grewe
fcf5a21ce3 Adding QRCodes under Accounts 
* Added: API String QR Code for #582 and #591

This will allow more QRCodes being added that are specific to an
account. The require library is added and the API string can be used as
an example how codes are generated.

Fixes #582
 2013-08-14 11:44:29 +02:00
Sebastian Grewe
e5cb4d0886 Fixing combined hashrate graph 
This shouuld fix #598 with graphs being completely off
 2013-08-14 11:23:14 +02:00
Sebastian Grewe
184ad5d58b fixing color of total percentage again 2013-08-14 11:15:49 +02:00