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

3573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Grewe
fcaffe7fc0 [MERGE] Fix conflicts with development 2014-05-03 12:18:30 +02:00
Sebastian Grewe
75bda55f5e Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-05-01 13:23:57 +02:00
Sebastian Grewe
e6b98ce482 [FIX] Removed getnavbardata from pool stats 2014-05-01 13:23:34 +02:00
Sebastian Grewe
295fb869fc Merge pull request #2161 from iAmShorty/timezone-settings 
[FIX] disabled timezone with two factor auth
 2014-05-01 13:21:21 +02:00
iAmShorty
79d8db2659 [FIX] disabled timezone with two factor auth 2014-05-01 12:45:59 +02:00
Sebastian Grewe
b4d8d1006e [FIX] Undefined offset, pplns round stats 2014-05-01 09:42:31 +02:00
Sebastian Grewe
e445ab4bbc [FIX] Undefined Index in Workers page 2014-05-01 09:26:23 +02:00
Sebastian Grewe
ed1bbb5675 Merge pull request #2158 from raistlinthewiz/development 
added scrypt-n coin-algo class for sake of completeness
 2014-04-30 15:55:46 +02:00
Hüseyin Uslu
0246fb33ea Updated the coin_scryptn.class.php comment. 2014-04-30 16:49:08 +03:00
Hüseyin Uslu
33560ec19d added scrypt-n coin-algo class for sake of completeness 2014-04-30 16:34:10 +03:00
Sebastian Grewe
bdee180733 Merge branch 'disable-navbar-api' into development 2014-04-30 15:23:28 +02:00
Sebastian Grewe
ab2a62efa3 [REMOVED] Getnavbardata API 2014-04-30 15:23:22 +02:00
Sebastian Grewe
99e3a6349c [FIX] Password Hashing on new accounts 2014-04-30 15:20:46 +02:00
Sebastian Grewe
61f7aa6ff0 Merge pull request #2154 from raistlinthewiz/development 
added X11 algorithm support (coins like darkcoin)
 2014-04-29 06:48:12 +02:00
Hüseyin Uslu
4c4944fdb2 added X11 algorithm support (coins like darkcoin) 2014-04-29 01:47:44 +03:00
Sebastian Grewe
bf036b13a6 Merge branch 'development' into move-internals 2014-04-28 11:26:47 +02:00
Sebastian Grewe
aa28e2dea9 Merge pull request #2153 from MPOS/fix-memcache-usage 
[FIX] Use existing memcache instance for AntiDOS
 2014-04-28 11:06:50 +02:00
Sebastian Grewe
23eed77ebe [FIX] Use existing memcache instance for AntiDOS 2014-04-28 11:05:39 +02:00
Sebastian Grewe
1d6a560dd7 Merge pull request #2142 from MPOS/online-version-check 
[ADDED] Online version checks
 2014-04-28 10:31:04 +02:00
Sebastian Grewe
dab06b7b53 Merge pull request #2151 from daygle/development 
Add Hyperlink To Email Notifications
 2014-04-27 15:38:14 +02:00
Glen
c3e0c383b6 Update reset.tpl 2014-04-27 23:30:19 +10:00
Glen
26b17d40ec Update body.tpl 2014-04-27 23:29:25 +10:00
Glen
ba696f7c90 Update withdraw_funds.tpl 2014-04-27 23:28:28 +10:00
Glen
24807e4d4f Update locked.tpl 2014-04-27 23:27:36 +10:00
Glen
0ee8cb63db Update change_pw.tpl 2014-04-27 23:26:52 +10:00
Glen
1f4fb5f7b1 Update account_edit.tpl 2014-04-27 23:25:07 +10:00
Sebastian Grewe
79529c0d2a [ADDED] Online version checks 2014-04-25 15:40:07 +02:00
Sebastian Grewe
43bf7be200 [FIX] Merge conflict with development 2014-04-24 11:43:38 +02:00
Sebastian Grewe
90181483b9 [FIX] Merge with development 2014-04-24 11:43:00 +02:00
Sebastian Grewe
78e7eccad9 Merge pull request #2131 from MPOS/timezone-support 
[ADDED] Timezone support
 2014-04-24 11:36:15 +02:00
Sebastian Grewe
8f36c18dac Merge pull request #2138 from barrybingo/development 
[Fix] Correctly hash new password
 2014-04-23 19:01:40 +02:00
Boris
4e1855c375 [Fix] Correctly hash new password 2014-04-23 17:41:42 +01:00
Sebastian Grewe
02cf3ad573 Merge pull request #2137 from iAmShorty/motd-resize 
[UPDATE] resize motd in settings
 2014-04-23 18:09:20 +02:00
Sebastian Grewe
ad75c92e8e Merge pull request #2136 from iAmShorty/jquery-update 
[UPDATE] jquery to version 2.1.0
 2014-04-23 18:09:02 +02:00
iAmShorty
72e3a5836d [UPDATE] resize motd in settings 2014-04-23 17:18:06 +02:00
iAmShorty
0977c0d669 [UPDATE] jquery to version 2.1.0 2014-04-23 17:07:08 +02:00
Sebastian Grewe
0a502b2487 [REMOVED] Old select box for timezones 2014-04-23 11:09:04 +02:00
Sebastian Grewe
97225fdf1e [FIX] Merge conflict 2014-04-23 10:46:33 +02:00
Sebastian Grewe
1c02b09636 [UPDATE] UTC as default timezone (ID 415) 2014-04-23 10:35:18 +02:00
Sebastian Grewe
68d59d6eae [SQL] Base structure updated 2014-04-23 10:35:18 +02:00
Sebastian Grewe
2bcc48937f [FIX] Re-new timezone on account update 2014-04-23 10:35:17 +02:00
Sebastian Grewe
440d0bad17 [ADDED] Timezone support for user accounts 2014-04-23 10:35:17 +02:00
Sebastian Grewe
d84e54983a Merge pull request #2135 from MPOS/hashing-improvements 
Hashing improvements
 2014-04-23 10:24:22 +02:00
Sebastian Grewe
b37aa821ed [FIX] HTTP(s) Detection on Mail Templates 2014-04-23 10:18:58 +02:00
Sebastian Grewe
22df492d7c [ADDED] HASH_VERSION for easier hash upgrades 2014-04-20 18:38:24 +02:00
Sebastian Grewe
7ffb6ad484 [ADDED] Upgrades hashes after pin/password update 2014-04-20 18:18:45 +02:00
Sebastian Grewe
4cac2ce3b4 [IMPROVED] Versioned password hashing support 
Addresses #2047
 2014-04-20 17:08:13 +02:00
Sebastian Grewe
d5af8ec8b2 [FIX] Mail template usage 2014-04-20 15:34:56 +02:00
Sebastian Grewe
257941af54 [ADDED] Hint to use git status 2014-04-20 15:34:56 +02:00
Sebastian Grewe
8a2fb4c659 [UPDATE] htaccess for docroot 2014-04-20 15:34:55 +02:00