Commit Graph

414 Commits

Author SHA1 Message Date
Dipchikov bbd143e961 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/master 2015-11-23 08:21:31 +02:00
Dipchikov eb395a668b Merge remote-tracking branch 'refs/remotes/origin/master' into dignajar/master 2015-11-23 08:17:52 +02:00
Dipchikov ce7f46116b Update 2015-11-18 11:40:00 +02:00
Dipchikov ddf5cb2d0d Update 2015-11-18 11:34:04 +02:00
Dipchikov 522a3c9e52 Merge remote-tracking branch 'upstream/master' into dignajar/master
Conflicts:
	languages/bg_BG.json
2015-11-13 08:59:29 +02:00
dignajar c7095e37f9 Plugins updated 2015-11-13 01:02:20 -03:00
dignajar 6edd56ec39 Page date 2015-11-12 22:25:59 -03:00
dignajar a397c2ac19 Minor changes 2015-11-11 18:13:32 -03:00
dignajar d3741ee773 Minor changes 2015-11-10 19:47:21 -03:00
Diego Najar 6eb8a7260b Merge pull request #94 from ethan42411/master
Update zh_TW.json
2015-11-10 10:26:29 -03:00
Diego Najar c586bdb3c6 Merge pull request #95 from Dipchikov/master
Bulgarian translate
2015-11-10 10:17:59 -03:00
Dipchikov ae7aecff30 Bulgarian translate
Update 6
2015-11-10 14:19:33 +02:00
Ethan Chen 5988379d2d Update zh_TW
Update zh_TW
2015-11-10 15:14:39 +08:00
Ethan Chen 183735d52f Update zh_TW
Update zh_TW
2015-11-10 15:14:12 +08:00
Ethan Chen b05b48bb8f Merge pull request #7 from dignajar/master
Merge update from dignajar
2015-11-10 15:12:58 +08:00
Diego Najar 1f8616941b Merge pull request #93 from clickwork-git/master
New pull request
2015-11-09 21:31:47 -03:00
Edi dc6343c6e7 Modification for translation ('Plugin label'). 2015-11-10 01:26:31 +01:00
Edi c594873997 Change 2015-11-10 01:19:02 +01:00
Edi 3b9eacec36 Update de_DE.json 2015-11-10 01:14:34 +01:00
Edi 72243144ac Update de_DE.json 2015-11-10 01:12:10 +01:00
Edi da92982abe Create de_DE.json 2015-11-10 01:04:32 +01:00
Edi d4d8152fd7 Modifications
Reverted to "Allgemein" and "Erweitert" because "Allgemeine Einstellungen" and "Erweiterte Einstellungen" is too long.
2015-11-10 01:00:40 +01:00
Edi 1052accf1d Merge pull request #2 from dignajar/master
New pull request
2015-11-10 00:51:01 +01:00
Diego Najar 6a7dbae22d Merge pull request #91 from Dipchikov/master
Bulgarian translate
2015-11-09 10:10:33 -03:00
Dipchikov c8b0be5968 Bulgarian translate
Update 5
2015-11-09 08:32:36 +02:00
Dipchikov 71656f5618 Bulgarian translate
Upadte 4
2015-11-09 08:18:10 +02:00
dignajar fba7439059 Improves on image uploader 2015-11-08 20:26:39 -03:00
dignajar b875b4870d Improves on image uploader 2015-11-08 20:26:19 -03:00
Diego Najar 2d43675645 Merge pull request #88 from Fred89/master
Fench update
2015-11-08 15:27:14 -03:00
Frédéric K b57ab61ea3 French update 2015-11-08 10:31:22 +01:00
Frédéric K 320677ad48 Merge remote-tracking branch 'dignajar/master' 2015-11-08 10:30:15 +01:00
dignajar de39deea01 Missing quote 2015-11-06 21:43:33 -03:00
dignajar e21a89423f User manager improves 2015-11-06 21:24:02 -03:00
dignajar 6326ed8c2a User manager improves 2015-11-06 21:23:50 -03:00
Diego Najar 87eeae2d29 Merge pull request #87 from Dipchikov/master
Bulgarien stranslate
2015-11-06 11:03:04 -03:00
Dipchikov b3e051db8c Bulgarian translate
Update 3
2015-11-06 15:51:40 +02:00
Dipchikov 6338d90f6c Bulgarian translate
Update 2
2015-11-06 15:42:15 +02:00
Dipchikov 2548eb5b91 Bulgarian translate
Update
2015-11-06 14:49:29 +02:00
Dipchikov 1ecc85df6a Revert "Revert "Bulgarien stranslate""
This reverts commit ac6d17ccf2.
2015-11-06 14:46:51 +02:00
Dipchikov ac6d17ccf2 Revert "Bulgarien stranslate"
This reverts commit f94a2558aa.
2015-11-06 14:46:03 +02:00
Dipchikov f94a2558aa Bulgarien stranslate 2015-11-06 14:31:47 +02:00
Dipchikov 46970a987d Bulgarien stranslate
Version 1
2015-11-06 14:28:05 +02:00
Diego Najar 69cf6eaa23 Merge pull request #86 from clickwork-git/master
New push request
2015-11-05 16:43:20 -03:00
clickwork-git 60074676bb Some changes and update image loader 2015-11-05 20:39:36 +01:00
clickwork-git 18db825f6d Merge pull request #1 from dignajar/master
New pull request
2015-11-05 20:25:02 +01:00
Diego Najar 6ef4119cd8 Merge pull request #84 from ethan42411/master
Update zh_TW.json
2015-11-05 10:13:03 -03:00
Diego Najar e56c97577b Merge pull request #83 from vorons/master
Update ru_RU.json
2015-11-05 10:11:48 -03:00
Ethan Chen bfc7dfce27 Update zh_TW.json
Update zh_TW.json
2015-11-05 20:52:04 +08:00
Ethan Chen 2fed9ccec9 Merge pull request #6 from dignajar/master
Merge update from dignajar
2015-11-05 20:49:48 +08:00
Сергей Ворон ed6161a003 Update ru_RU.json 2015-11-05 14:27:44 +08:00