Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-05-02 12:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
450 Commits 2 Branches 2 Tags
Commit Graph

450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Brannfjell
0c6f177d45 $config['use_guild_logos'] now actually works, toggle it between true and false. 2014-06-14 07:39:58 +02:00
Stefan Brannfjell
5349c96018 TFS 0.3 OTX guild and guildwar support. Fix #134 2014-06-14 03:14:58 +02:00
Stefan A. Brannfjell
fb061f7510 Merge pull request #130 from ninjalulz/master 
War system (frag limit)
 2014-05-29 10:15:50 +02:00
Daniel Björkholm
be39af6235 Fix security hole 2014-05-29 09:41:35 +02:00
Daniel Björkholm
7fe609abdb War system (frag limit) 2014-05-28 22:43:50 +02:00
Stefan A. Brannfjell
feb0feffee Merge pull request #127 from Alvaritos/master 
Check for correct path - serverinfo Fix #124
 2014-05-21 19:46:18 +02:00
rigaer@hotmail.es
c695014f19 Check for correct path - serverinfo 2014-05-21 18:30:20 +02:00
Stefan A. Brannfjell
340b09348e Merge pull request #126 from Alvaritos/master 
Serverinfo minor fix
 2014-05-21 01:44:16 +02:00
rigaer@hotmail.es
29ebf4ee60 Serverinfo minor fix 2014-05-20 21:02:54 +02:00
Stefan Brannfjell
480f528e38 ZEOTSS integration. cURL validation for paypal and ZEOTSS, register users on ZEOTS server. 2014-05-19 09:09:05 +02:00
Stefan A. Brannfjell
e52fb6a2ef Merge pull request #120 from Alvaritos/master 
Guild logo upload and Market item name
 2014-05-18 22:32:43 +02:00
rigaer@hotmail.es
ef3f8ce91b Show item name at market 2014-05-18 20:44:55 +02:00
rigaer@hotmail.es
721a52867f Guild logo upload 2014-05-18 20:28:11 +02:00
Stefan A. Brannfjell
26961fae42 Merge pull request #119 from Kuzirashi/master 
When editing news, now, you also get nicedit.js editor.
 2014-05-18 20:06:39 +02:00
Stefan A. Brannfjell
8566ee6b5c Merge pull request #117 from Alvaritos/master 
News pagination
 2014-05-18 20:04:40 +02:00
Kuzirashi
8dd1a521ed When editing news, now, you also get nicedit.js editor. Forced width to be 100%. 2014-05-18 12:37:37 +02:00
rigaer@hotmail.es
48d6483a82 News pagination 2014-05-17 12:35:45 +02:00
Stefan A. Brannfjell
309c17eca3 Merge pull request #116 from Kuzirashi/master 
Added displaying orders from shop in Shop Admin page.
 2014-05-17 06:56:12 +02:00
Kuzirashi
5d77f6d7c4 Added displaying orders from shop in Shop Admin page. This references #82 issue. 2014-05-17 02:55:42 +02:00
Stefan A. Brannfjell
1f600c36fd Merge pull request #115 from ninjalulz/master 
Minor fix (showing contributors)
 2014-05-17 01:37:37 +02:00
Daniel Björkholm
ea9e709c59 Minor fix (showing contributors) 2014-05-17 00:06:57 +02:00
Stefan A. Brannfjell
175585c19e Merge pull request #114 from Kuzirashi/master 
Added information about setting directory access rights for /engine/cache.
 2014-05-16 23:27:11 +02:00
Kuzirashi
56d62cc443 Added information about setting directory access rights for /engine/cache. Fixed size issue with GitHub avatars when using default avatar. 2014-05-16 23:08:35 +02:00
Stefan A. Brannfjell
e53d0aebda Merge pull request #113 from Alvaritos/master 
Move nicedit to engine folder
 2014-05-16 21:48:47 +02:00
rigaer@hotmail.es
6f2a6049ba Move nicedit to engine folder 2014-05-16 21:33:53 +02:00
Stefan A. Brannfjell
607b3ac6d8 Merge pull request #110 from Alvaritos/master 
Support for WYSIWYG and Items.xml parser
 2014-05-16 21:12:05 +02:00
rigaer@hotmail.es
2e361e077f Youtube button 2014-05-16 20:52:06 +02:00
Stefan A. Brannfjell
94c0bab8ea Merge pull request #111 from Kuzirashi/master 
Showing contributors using GitHub API in Credits, if cURL is enabled.
 2014-05-16 20:19:28 +02:00
Kuzirashi
e98171ec41 Fixed typo in login widget. 2014-05-16 19:31:36 +02:00
Kuzirashi
ebaa3ab10d Showing contributors using GitHub API in Credits, if CURL is enabled. 2014-05-16 18:24:07 +02:00
rigaer@hotmail.es
070f5d32d5 Item parser + functions 2014-05-16 17:51:32 +02:00
rigaer@hotmail.es
b098bb6be6 Support for WYSIWYG 2014-05-16 16:34:42 +02:00
Stefan A. Brannfjell
7ead2b1bdd Merge pull request #108 from Alvaritos/master 
Serverinfo page TFS 1.0
 2014-05-16 14:22:09 +02:00
Stefan A. Brannfjell
cfafeef476 Merge pull request #103 from viperthepala/patch-4 
Update style.css
 2014-05-16 14:21:32 +02:00
Stefan A. Brannfjell
272eb94a16 Merge pull request #109 from viperthepala/patch-7 
part 1/3 for questlog: characterprofile.php
 2014-05-16 14:20:50 +02:00
Stefan A. Brannfjell
0c2161254e Merge pull request #101 from viperthepala/patch-2 
part 1/3 for questlog: Update config.php
 2014-05-16 14:20:19 +02:00
viperthepala
1a0b02ec04 Update characterprofile.php 
final version.
 2014-05-16 11:30:54 +02:00
Alvaritos
52c3c77ab4 Update config.php 2014-05-16 01:47:14 +02:00
rigaer@hotmail.es
820f886354 New serverinfo page 2014-05-16 01:44:44 +02:00
viperthepala
811c5a20c5 Update config.php 2014-05-13 08:32:18 +02:00
viperthepala
449fd69182 Update style.css 2014-05-12 18:10:21 +02:00
viperthepala
8ad84b35b4 Update config.php 2014-05-12 18:04:23 +02:00
Stefan A. Brannfjell
c9f61d65bf Merge pull request #98 from tarantonio/master 
Update downloads.php
 2014-05-10 02:17:36 +02:00
tarantonio
c23395838d Update downloads.php 2014-05-08 14:46:40 +02:00
Stefan A. Brannfjell
c275afa1cc Merge pull request #97 from cornex1/patch-3 
Fixed illegal string filter on name change
 2014-05-08 10:06:41 +02:00
cornex1
ab8d64ab0f Fixed illegal string filter on name change 2014-05-08 10:05:59 +02:00
Stefan A. Brannfjell
02179065f3 Merge pull request #96 from cornex1/patch-2 
Fix #79 Fixed illegal string filter on name change
 2014-05-08 10:04:21 +02:00
cornex1
9db05fe4c1 Fixed illegal string filter on name change 
Fixed illegal string filter on name change
 2014-05-08 10:00:56 +02:00
Stefan Brannfjell
fb52ef0c4f Mentioning that cURL is required to make paypal ipn work. 2014-05-06 00:33:53 +02:00
Stefan Brannfjell
34877357b6 Update to credits.php and README.md file. We need to start to focus on fixing issues related to Znote AAC 1.5 milestone so we can work toward a solid release, any help is appreciated! These are the assigned issues so far: https://github.com/Znote/ZnoteAAC/issues?milestone=1&page=1&state=open 2014-05-05 23:25:26 +02:00