Commit Graph

471 Commits

Author SHA1 Message Date
Samuel Denis-D'Ortun 3af2b23518 Update .gitattributes 2016-05-19 01:22:07 -04:00
Samuel Denis-D'Ortun bbb9284689 Update README.rst 2016-05-18 23:38:42 -04:00
Samuel Denis-D'Ortun fb131b843a Bump version 3.2.0 2016-05-18 23:31:40 -04:00
Samuel Denis-D'Ortun aac195e893 Merge branch 'master' into develop 2016-05-18 23:14:56 -04:00
Pavel Dvořák 5fc59454d0 Issue #286 Popular Ports
- scripts.js - selection and filling port based on a selection from the popular port
- update.tpl.html - Added section with a selection of popular ports
- ServerController.php - Methods to getLabels added new label
- en_US.lang.php + cs_CZ.lang.php - modified the language of the new texts
2016-05-18 23:04:50 -04:00
Pavel Dvořák 2d460abbf8 Issue #287 - Added to the default English language
- Modified file functions.inc.php - because if you add new language variable so it is necessary to immediately translate all languages or all files added to the English translation of which is very inconvenient and time consuming.

- Function psm_load_lang - loading the default language that I chose English and stored in the $ GLOBALS [ 'sm_lang_default'] for further use.

- Function psm_get_lang - edited selection of translation. If there is no translation in the language you chose the user returns to the default language.
2016-05-18 23:04:50 -04:00
Samuel Denis-D'Ortun cbfd60871e Allow empty db password 2016-05-18 22:48:09 -04:00
Samuel Denis-D'Ortun 9aadc6b8a8 Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop 2016-05-15 05:16:54 -04:00
Samuel Denis-D'Ortun bceb6ea3db Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop
# Conflicts:
#	README.rst
#	docs/credits.rst
#	docs/intro.rst
#	src/includes/functions.inc.php
#	src/lang/de_DE.lang.php
#	src/lang/en_US.lang.php
#	src/lang/es_ES.lang.php
#	src/lang/fr_FR.lang.php
#	src/lang/it_IT.lang.php
#	src/lang/nl_NL.lang.php
#	src/lang/pl_PL.lang.php
#	src/lang/pt_BR.lang.php
#	src/lang/ru_RU.lang.php
#	src/lang/sv_SE.lang.php
#	src/lang/tr_TR.lang.php
#	src/lang/zh_CN.lang.php
2016-05-15 05:15:32 -04:00
Samuel Denis-D'Ortun 2b8fae9416 Fix #268 2016-05-15 05:00:49 -04:00
Samuel Denis-D'Ortun 6af6e4b459 Merge branch 'Laupe-develop' into develop 2016-05-15 04:36:01 -04:00
Samuel Denis-D'Ortun 421a67abaa Do not force EOL for non-text files 2016-05-15 04:35:27 -04:00
Pavel Dvořák f01c39695d update language Czech (cs_CZ) 2016-05-14 08:43:10 +02:00
Pavel Dvořák 22112777d1 Issue #269 update language Slovenian (sl_SI) 2016-05-14 08:42:33 +02:00
Pavel Dvořák d7140c9b2a Issue #269 new language Slovenian (sl_SI) 2016-05-13 23:34:08 +02:00
Pavel Dvořák e5db728634 Editing and updating of the Czech language 2016-05-13 23:22:30 +02:00
Samuel Denis-D'Ortun 4e954e594d Merge pull request #280 from Abawell/develop
Fix regression
2016-04-30 19:15:05 -04:00
Samuel Denis-D'Ortun 73f77218fd Merge pull request #258 from prathers/develop
Update da_DK.lang.php
2016-04-30 18:18:38 -04:00
Samuel Denis-D'Ortun 4f4676476d Merge pull request #263 from Xendorf/develop
Update it_IT.lang.php
2016-04-30 18:18:17 -04:00
Samuel Denis-D'Ortun 36b19de7a5 Merge pull request #267 from axi/master
add support for Octopush sms provider
2016-04-30 18:02:36 -04:00
Jerome 14b9e63e27 Fix regression 2016-04-30 21:42:04 +02:00
Samuel Denis-D'Ortun 9111e502c0 Merge commit '62ba2d7ae8325937bea0e62ad638120b8ea64af9' into develop 2016-04-29 12:55:46 -04:00
Samuel Denis-D'Ortun 72132efac6 Merge pull request #279 from SDDProductions/master
Update README.rst
2016-04-29 12:47:28 -04:00
Samuel Denis-D'Ortun 62ba2d7ae8 Update README.rst 2016-04-29 12:46:25 -04:00
Alexis U (portable) 87a576642c ajout mode premium 2016-03-15 15:11:52 +01:00
Alexis U (portable) 57a01d27c5 add support for Octopush sms provider 2016-03-15 13:00:07 +01:00
Xendorf 9bda115e47 Update it_IT.lang.php 2016-03-01 11:25:40 +01:00
Preben Rather Sørensen 1c763e82ef Update da_DK.lang.php
Done a few typos and translated new labels
2016-02-15 20:24:30 +01:00
Pepijn Over a30dcf5610 adding estonian translation to changelog/credits 2016-01-31 18:08:45 +01:00
Pep 62ee04707f Merge pull request #185 from ItsRichardRaz/patch-1
et_ET.lang.php
2016-01-31 18:02:04 +01:00
Pepijn Over f46fae667b fixes issue #202 and #203: adding right-to-left stylesheet and html class 2016-01-31 17:58:12 +01:00
Pepijn Over 3093b421ea Merge branch 'evazzadeh-patch-1' into develop 2016-01-31 17:50:00 +01:00
Pepijn Over 52803e2d70 adding language subtags to template and support for right-to-left locales 2016-01-31 17:48:59 +01:00
Pepijn Over daf843df07 Merge branch 'patch-1' of git://github.com/evazzadeh/phpservermon into evazzadeh-patch-1 2016-01-31 17:09:53 +01:00
Pepijn Over 4be64dfa3a removing csrf key from login module to prevent 401 errors on login 2016-01-31 17:07:56 +01:00
Pepijn Over b2d77ca27e adding issue #195 to changelog/credits 2016-01-31 00:30:24 +01:00
Pep 653fe4f7b8 Merge pull request #195 from Esselans/develop
Improved translation & UTF email output
2016-01-31 00:28:04 +01:00
Pepijn Over 98faef1b06 fixes #237: adding CSRF token to all forms and requires now on POST 2016-01-31 00:24:37 +01:00
Pepijn Over b2ed873b1b on login, make sure to clear existing session vars and start from fresh (moving from migrate() to invalidate()) 2016-01-31 00:17:28 +01:00
Pepijn Over 5947f7382f updating composer symfony packages, and excluding composer.phar from CRLF fun 2016-01-30 22:08:16 +01:00
Pepijn Over 9c4191949b updating changelog/credits with finnish translation 2016-01-30 21:33:06 +01:00
Pepijn Over 2ed52f8a8d fixing invalid composer.phar package 2016-01-30 21:31:33 +01:00
Pep 6300e8103f Merge pull request #210 from celeroncool/develop
Added finnish translation and chrome mobile statusbar color
2016-01-30 21:27:05 +01:00
Pep b1647d2c3f Merge pull request #207 from loran750/patch-1
If pattern is set up, you cannot catch server problems
2016-01-30 21:13:47 +01:00
Pep c0b4264959 Merge pull request #218 from rigonijunior/develop
changed the character of capitalized to tiny is the correct the ediom…
2016-01-30 21:11:51 +01:00
Pep 051788ffda Merge pull request #235 from Southparkfan/patch-1
Translation fixes for NL language
2016-01-30 21:10:51 +01:00
Southparkfan 1cecc80845 Translation fixes for NL language 2015-10-19 14:28:29 +02:00
José Rigoni Jr 7035410c1e changed the character of capitalized to tiny is the correct the edioma pt_BR
changed the character of capitalized to tiny is the correct the edioma pt_BR 

line 152
2015-07-23 10:35:53 -03:00
Pep 57b9830c67 Merge pull request #213 from joglomedia/develop
Fix for issue #187 (Unable to connect to MySQL)
2015-06-17 12:21:08 -04:00
Edi Septriyanto a482ae5e27 Fix for issue #187 (Unable to connect to MySQL) 2015-06-17 23:15:10 +07:00