Commits · master · Massimiliano / ISPConfig 3

02 Jan, 2019 - 2 commits
- - fixed typos from merge in previous commit · c76e0cc2
  Marius Burkard authored Jan 02, 2019
  
  c76e0cc2
- Merge branch 'ahrasis/ispconfig3-patch-1' · 5bf8371d
  Marius Burkard authored Jan 02, 2019
  
  5bf8371d
17 Dec, 2018 - 25 commits
- Merge branch 'patch-3' into 'master' · ae7f2174
  Marius Burkard authored Dec 17, 2018
```
Patch 3

See merge request ispconfig/ispconfig3!837
```
  ae7f2174
- Merge branch 'patch-2' into 'master' · 1b0ffe4e
  Marius Burkard authored Dec 17, 2018
```
Patch 2

See merge request ispconfig/ispconfig3!836
```
  1b0ffe4e
- Merge branch 'darkalex/ispconfig3-dns-status' · d93e2d63
  Marius Burkard authored Dec 17, 2018
  
  d93e2d63
- Merge branch 'patch-9' into 'master' · 4e7339b7
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_client_circle_list.lng" file

See merge request ispconfig/ispconfig3!857
```
  4e7339b7
- Merge branch 'patch-8' into 'master' · e637c93d
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_client_message.lng" file

See merge request ispconfig/ispconfig3!856
```
  e637c93d
- Merge branch 'patch-7' into 'master' · c3065398
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_client_message_template_list.lng" file

See merge request ispconfig/ispconfig3!855
```
  c3065398
- Merge branch 'patch-6' into 'master' · 33843cba
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_client_template_list.lng" file

See merge request ispconfig/ispconfig3!854
```
  33843cba
- Merge branch 'patch-4' into 'master' · dbdc39ee
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_domain.lng" file

See merge request ispconfig/ispconfig3!852
```
  dbdc39ee
- Merge branch 'patch-10' into 'master' · a0ef0346
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_client_circle.lng" file

See merge request ispconfig/ispconfig3!858
```
  a0ef0346
- Merge branch 'patch-5' into 'master' · 110adbda
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_clients_list.lng" file

See merge request ispconfig/ispconfig3!853
```
  110adbda
- Merge branch 'patch-3' into 'master' · 8153eaaa
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_domain_list.lng" file

See merge request ispconfig/ispconfig3!851
```
  8153eaaa
- Merge branch 'patch-2' into 'master' · 9ac2dc77
  Marius Burkard authored Dec 17, 2018
```
Add new "fa_resellers_list.lng" translation file

See merge request ispconfig/ispconfig3!850
```
  9ac2dc77
- Merge branch 'patch-1' into 'master' · dde58703
  Marius Burkard authored Dec 17, 2018
```
Add new "Farsi/Persian" translation file

See merge request ispconfig/ispconfig3!849
```
  dde58703
- Merge branch 'stable-3.1' · 18256840
  Marius Burkard authored Dec 17, 2018
  
  18256840
- - missing changes from previous merge · c53767c4
  Marius Burkard authored Dec 17, 2018
  
  c53767c4
- Merge branch 'webdev/ispconfig3-master' · 091d2ce6
  Marius Burkard authored Dec 17, 2018
  
  091d2ce6
- Add new "fa_client_circle.lng" file · bbfff551
  Game Over! authored Dec 17, 2018
  
  bbfff551
- Add new "fa_client_circle_list.lng" file · 358620bf
  Game Over! authored Dec 17, 2018
  
  358620bf
- Add new "fa_client_message.lng" file · 91db5d14
  Game Over! authored Dec 17, 2018
  
  91db5d14
- Add new "fa_client_message_template_list.lng" file · 6ba86a76
  Game Over! authored Dec 17, 2018
  
  6ba86a76
- Add new "fa_client_template_list.lng" file · 67848045
  Game Over! authored Dec 17, 2018
  
  67848045
- Add new "fa_clients_list.lng" file · e054c36e
  Game Over! authored Dec 17, 2018
  
  e054c36e
- Add new "fa_domain.lng" file · 64d71add
  Game Over! authored Dec 17, 2018
  
  64d71add
- Add new "fa_domain_list.lng" file · cdb7fb00
  Game Over! authored Dec 17, 2018
  
  cdb7fb00
- Add new "fa_resellers_list.lng" translation file · ecd82f7b
  Game Over! authored Dec 17, 2018
  
  ecd82f7b
14 Dec, 2018 - 13 commits
- Add new "Farsi/Persian" translation file · f66e8c9f
  Game Over! authored Dec 14, 2018
  
  f66e8c9f
- - added datalog undelete to viewer · fcfeb806
  Marius Burkard authored Dec 14, 2018
  
  fcfeb806
- - added undelete to datalog history viewer · 880e4c71
  Marius Burkard authored Dec 14, 2018
  
  Before-merging-3.2dev
  
  880e4c71
- - datalog history view and restore added missing files · 28bfeb97
  Marius Burkard authored Dec 14, 2018
  
  28bfeb97
- - fixed charset encoding · f08ea8ff
  Marius Burkard authored Dec 14, 2018
  
  f08ea8ff
- - backported datalog viewer from 3.2, contributed by Timme Hosting · b25bf4f5
  Marius Burkard authored Dec 14, 2018
  
  b25bf4f5
- - added dns bulk editor, contributed by Timme Hosting · 0a329cdf
  Marius Burkard authored Dec 14, 2018
  
  0a329cdf
- - further jailkit cron improvements · 336b8380
  Marius Burkard authored Dec 14, 2018
  
  336b8380
- - jailkit update cron improvements · b6936b38
  Marius Burkard authored Dec 14, 2018
  
  b6936b38
- - changed default jailkit programs · e96019c5
  Marius Burkard authored Dec 14, 2018
  
  e96019c5
- - patches for jailkit update feature, contributed by Timme Hosting · 06b26aa2
  Marius Burkard authored Dec 14, 2018
  
  06b26aa2
- - implemented datalog viewer and restore, contributed by Timme Hosting · 818d002e
  Marius Burkard authored Dec 14, 2018
  
  818d002e
- - patch for jailkit programs edit · a0a45277
  Marius Burkard authored Dec 14, 2018
  
  a0a45277