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

995 Commits

Author SHA1 Message Date
Sebastian Grewe
e68ea2b1a4 Added donation info to account dashboard 2013-09-25 09:53:45 +02:00
Sebastian Grewe
29edf83083 Display pool fee in dashboard 2013-09-25 09:49:51 +02:00
Sebastian Grewe
716e118041 Update statistics.class.php 
Fixes #664
 2013-09-23 07:11:43 +02:00
Sebastian Grewe
e58e9bcfb9 fix display of pool hashrate 2013-09-20 19:40:46 +02:00
Sebastian Grewe
fdfc82476a Re-added username in getuserstatus 
Upon popular demand *cough* @WKNiGHT- *cough* this is now available in
the data JSON array.
 2013-09-20 18:14:06 +02:00
Sebastian Grewe
c85b5f0207 skip Smarty Globals for API pages 2013-09-20 18:13:47 +02:00
Sebastian Grewe
baeae10027 Merge branch 'next' into issue-444-theserapher 2013-09-20 16:11:41 +02:00
Sebastian Grewe
432f2b1fba Merge branch 'next' into issue-145 2013-09-20 16:11:25 +02:00
Sebastian Grewe
ab90b045c0 [FIX #662] IDLE Worker False Positives 2013-09-20 16:07:57 +02:00
Sebastian Grewe
d7deac370a [FIX] Fieldset Textarea box size 2013-09-19 15:09:31 +02:00
Sebastian Grewe
0aac4289a9 [IMPROVEMENT] Better site layout 2013-09-19 14:33:02 +02:00
Sebastian Grewe
515af18ea5 [FIX] Display Pool Hashrate on Pool Stats 2013-09-19 11:54:39 +02:00
Sebastian Grewe
a345175ec5 [FIX] Link to round on general pool stats 2013-09-19 10:46:20 +02:00
Sebastian Grewe
442fcb015a adding FTC address for donations 2013-09-19 10:41:23 +02:00
Sebastian Grewe
5ce61d9f18 Merge branch 'next' into issue-145 2013-09-19 09:25:15 +02:00
Sebastian Grewe
c4d11885e3 [FIX] Properly show user sharerate 2013-09-19 09:24:48 +02:00
Sebastian Grewe
326397b48f [IMPROVEMENT] Website Layout 
* [FEATURE] Added footer, thanks @nrpatten for the idea and sample
* [IMPROVEMENT] Sidebar smaller and min width added
* [IMPROVEMENT] Properly format debug console
* [IMRPOVEMENT] Moved all custom CSS into own file
 2013-09-19 08:19:01 +02:00
Sebastian Grewe
1387bbdf44 [MERGE] Merge conflict NEXT 2013-09-18 16:34:52 +02:00
Sebastian Grewe
c578c504ed [MERGE] Conflict with NEXT 2013-09-18 16:32:29 +02:00
Sebastian Grewe
d863e66ef4 [BUG] Fixing contrib shares issue without cache 2013-09-18 16:31:36 +02:00
Sebastian Grewe
50cc2da3a3 [BUG] Fixed contrib shares with empty cache 2013-09-18 16:23:34 +02:00
Sebastian Grewe
88b2a35a7a [BUG] Fixed PHP notice 2013-09-18 16:19:42 +02:00
Sebastian Grewe
0f8df566f3 Merge branch 'issue-444-theserapher' of github.com:TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-18 15:52:11 +02:00
Sebastian Grewe
822c643d88 Merge branch 'issue-444-theserapher' of https://github.com/TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-18 15:51:53 +02:00
Sebastian Grewe
8224f6148e [IMPROVEMENT] @nrpatten supplied better quicklogin 
* Needs to be fixed to properly use fieldset tags
 2013-09-18 15:50:49 +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
f41ea296df [IMPROVEMENT] Fixed notification table layout and icons 2013-09-18 12:50:09 +02:00
Sebastian Grewe
ec4931bbc8 [IMPROVEMENT] Using fontello icons instead of theme icons 2013-09-18 12:38:45 +02:00
Sebastian Grewe
20fe936feb [IMPROVEMENT] Added round statistics link to transaction blocks 2013-09-18 12:38:26 +02:00
Sebastian Grewe
6ae6b3febd adding Fontello config to expand icons as needed 2013-09-18 12:37:57 +02:00
Sebastian Grewe
1a9ada84d4 fixing merge conflict from next to branch 2013-09-18 11:46:22 +02:00
Sebastian Grewe
a349e1e060 use archive table for sharerate calcs 2013-09-18 11:38:51 +02:00
Sebastian Grewe
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +02:00
Sebastian Grewe
07f0361050 [IMPROVEMENT] Support incremental contrib shares 2013-09-18 10:48:02 +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
5d19964321 adding DEBUG console 2013-09-18 08:06:22 +02:00
Sebastian Grewe
7aace8be26 [IMPROVEMENT] Added secondary login box in header 2013-09-18 07:42:54 +02:00
Sebastian Grewe
f05a9c2b25 [FIX] Properly prompt for user or email at login 2013-09-18 07:34:55 +02:00
Sebastian Grewe
05f6f03424 removing unused template 2013-09-18 07:34:29 +02:00
Sebastian Grewe
5e64d43732 [IMPROVEMENT] Allow user login via E-Mail 2013-09-18 07:33:57 +02:00
Sebastian Grewe
fbf2a86162 [FIX] Properly redirect after login 2013-09-18 07:24:34 +02:00
Sebastian Grewe
3930285521 fixing website name in breadcrumbs 2013-09-17 17:14:06 +02:00
Sebastian Grewe
49b6ebe62f Also show negative cold coins 
Fixes #660
 2013-09-17 16:49:11 +02:00
Sebastian Grewe
e7f62134f1 adding cold wallet coin display and setting 2013-09-17 16:15:18 +02:00
Sebastian Grewe
022054140e removin accidentally added files 2013-09-17 15:23:08 +02:00
Sebastian Grewe
cdf71cbfba adding account balance to new dashboard via Ajax 2013-09-17 14:27:46 +02:00
Sebastian Grewe
59b82c72e1 fixing PHP notice when blocks table empty on blockstats 2013-09-17 12:56:30 +02:00
Sebastian Grewe
4ffca7d5ac API overhaul for easier handling of API calls 
* [FEATURE] Allow in-class checking for user permissions
* [FEATURE] Allow in-class creation of the JSON data for coherence
* [FEATURE} Added API version in JSON data for client side checks
* [IMPROVEMENT] Adjusted all API calls to use the new JSON layout

**NOTE**: This is breaking backwads compatibility with the old API!
Please adjust your client application to support this new version.
The data array should not change much more other than added features.
 2013-09-17 11:55:54 +02:00
Sebastian Grewe
ffe6a01003 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:56:36 +02:00
Sebastian Grewe
b8029c04f3 use wrapper to fetch last network block 2013-09-17 09:55:41 +02:00
Sebastian Grewe
e88d80cd02 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:42:56 +02:00
Sebastian Grewe
baaf743218 use bitcoin wrapper method for getdiff calls 2013-09-17 09:42:41 +02:00
Sebastian Grewe
af21cafea5 use new bitcoin method wrapper for public API 2013-09-17 09:39:37 +02:00
Sebastian Grewe
bbe39228e1 Bitcoin Wrapper improvements 
* [FEATURE] Allow for PoS/PoW Detecion in getdifficulty
* [FEATURE] Allow for SHA detecion in getnetworkhashps
* [IMRPOVEMENT] Added caching for bitcoin values (30s only)
 * Will reduce the amount of RPC calls for high load pages
 2013-09-17 09:36:08 +02:00
Sebastian Grewe
04786aafb5 Merge branch 'next' into issue-145 2013-09-17 08:53:21 +02:00
Sebastian Grewe
b89660ae32 re-adjusting old sidebar info 2013-09-16 18:00:38 +02:00
Sebastian Grewe
0af26e7647 moving templates for old themes 2013-09-16 17:53:50 +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
2b8fff3a9b New graph for round shares 
* [FEATURE] Adding bar graph for round shares
 * Graph auto-updates via Ajax from getdashboarddata
* [IMPROVEMENT] Minor improvements to the JS template
 2013-09-16 16:22:23 +02:00
Sebastian Grewe
9ad04e9b92 removing unsed graphics in CSS 2013-09-16 16:21:51 +02:00
Sebastian Grewe
29246a1f11 add cached share information to dashboard data API 2013-09-16 16:21:23 +02:00
Sebastian Grewe
e1ec8ed9da removing unused template 2013-09-16 16:20:33 +02:00
Sebastian Grewe
373c25366f minor userinfo update 2013-09-16 16:20:13 +02:00
Sebastian Grewe
8ad5a234c0 fixing website name in pub api 2013-09-16 15:41:23 +02:00
Sebastian Grewe
4bbe40068a Improved dashboard overview graphs and gauges 2013-09-16 11:36:20 +02:00
Sebastian Grewe
6a7d34181a Adding share rate graph 
* [FEATURE] Adding share rate to graph
 2013-09-16 11:04:14 +02:00
Sebastian Grewe
b533ea11a7 Updated hashrate graphs in dashboard 
* [FEATURE] Display both pool and personal hashrate
* [FEATURE] Use EnhancedLegendRendere to toggle lines in graph
* [IMPROVEMENT] Unified Ajax call for graph and gauges
* [IMPROVEMENT] Allow `getdashboarddata` to supply raw hashrate values
 2013-09-16 09:59:22 +02:00
Sebastian Grewe
27a76509f6 disabled JS console output 2013-09-15 17:52:49 +02:00
Sebastian Grewe
0b0483f679 re-enabled jqplot plugins 2013-09-15 17:49:41 +02:00
Sebastian Grewe
286c1d5110 Fixed refresh interval functions and memory leaks 
* [FIX] Memory leak fixed in Hashrate Graph
* [FIX] Potential memory leak in Gauges
* [FIX] Properly refresh data via setTimeout
 * Ensures Ajax calls are completed before re-calling them
 2013-09-15 17:40:24 +02:00
Sebastian Grewe
7a73fbf099 API optimizations 
* [IMRPOVEMENT] Do not include smarty globals, they are not needed on the API
* [IMPROVEMENT] Display correct runtimeinformation of entire script, not
  just the SQL queries
 2013-09-15 17:29:44 +02:00
Sebastian Grewe
0c3713284f removing JS console output 2013-09-15 14:23:31 +02:00
Sebastian Grewe
4aea28cb9c remove graph min/max, adding padding 2013-09-15 01:45:24 +02:00
Sebastian Grewe
8193860bd9 Do not store that many data points 2013-09-15 01:42:25 +02:00
Sebastian Grewe
917aeace49 Better visualize our hashrate graph 
* Do not pre-init the data graph
* Fill with new data as it arrives
 2013-09-15 01:38:42 +02:00
Sebastian Grewe
8add7f75c4 Adjusted graph colors 
* Matching the existing visualize plugin closely
 2013-09-15 00:17:35 +02:00
Sebastian Grewe
7471e505f9 Graph line update 
* Removed data points from display
* Hover to see data point information
* Fill area under the line
 2013-09-14 23:43:32 +02:00
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