Commit Graph

744 Commits

Author SHA1 Message Date
Diego Najar 8aa64a65e6 Merge pull request #76 from Allec-Bernz/patch-5
Upd to v0.4
2015-10-30 14:42:27 -03:00
Aleksey e935fb4ea3 Upd to v0.4
Update to Bludit	v0.4 + small fixes
2015-10-30 19:23:48 +02:00
Diego Najar 6c62d98bae Merge pull request #75 from clickwork-git/master
Some changes
2015-10-30 11:19:19 -03:00
clickwork-git 10c6fc204a Some changes 2015-10-30 11:51:10 +01:00
Diego Najar ea1afe5b01 Merge pull request #72 from Fred89/master
French update + Fix user admin template lang
2015-10-29 15:46:07 -03:00
Frédéric K 9492e7b9f4 French update + Fix user admin template lang 2015-10-29 19:30:26 +01:00
dignajar f5f9328ac3 SimpleMDE plugin upgrade 2015-10-29 01:02:48 -03:00
dignajar 602dca10a4 SimpleMDE plugin upgrade 2015-10-29 01:00:41 -03:00
dignajar f5e1d089b7 Merge branch 'master' of github.com:dignajar/bludit 2015-10-29 00:56:56 -03:00
dignajar a4dfa8c65d Links update 2015-10-29 00:56:38 -03:00
dignajar 4a36bf6a15 Pages without index.txt exception catch 2015-10-29 00:49:09 -03:00
Diego Najar 9cb9606d51 Merge pull request #71 from ethan42411/master
Update zh_TW.json
2015-10-27 10:44:12 -03:00
Ethan Chen 39f618c808 Update zh_TW.json
Update zh_TW.json
2015-10-27 13:03:35 +08:00
Ethan Chen b127d18e36 Update zh_TW.json
Update zh_TW.json
2015-10-27 13:03:01 +08:00
Ethan Chen 5aa313c307 Update zh_TW.json
Update zh_TW.json
2015-10-27 13:02:43 +08:00
Ethan Chen f5396aac73 Merge pull request #5 from dignajar/master
Merge update from dignajar
2015-10-27 12:54:54 +08:00
dignajar 0fb1525f29 Bug fixes, timezone and user permissions 2015-10-25 22:11:46 -03:00
dignajar c08a6303f9 Bug fixes, edit user 2015-10-25 17:27:24 -03:00
dignajar f6ecbdcf4e Language updates 2015-10-24 21:25:40 -03:00
dignajar 0ca40566eb Updates 2015-10-24 21:21:19 -03:00
dignajar 409f9e7572 Merge branch 'master' of github.com:dignajar/bludit 2015-10-24 21:20:10 -03:00
dignajar cef0152625 Updates 2015-10-24 21:20:01 -03:00
Diego Najar 13676af2a7 Merge pull request #68 from clickwork-git/master
New pull
2015-10-24 21:18:41 -03:00
clickwork-git 4331f68e9d Update settings-advanced.php 2015-10-25 02:10:58 +02:00
clickwork-git 6a873ae253 Update settings-advanced.php 2015-10-25 02:04:57 +02:00
Diego Najar b70b482095 Merge pull request #67 from 18jaguar18/patch-6
Dashboard clean-up
2015-10-24 20:50:46 -03:00
clickwork-git 376f193d18 Update de_DE.json 2015-10-25 01:30:04 +02:00
clickwork-git e9759b1d7e Update de_DE.json 2015-10-25 01:24:25 +02:00
clickwork-git 7af562e9e2 Typo 2015-10-25 01:19:50 +02:00
clickwork-git c1ddb92b4c Update de_DE.json
Adiitions.
2015-10-25 01:18:37 +02:00
clickwork-git 65302fac03 Correction 2015-10-25 00:55:56 +02:00
clickwork-git 950659a3c4 Merge pull request #6 from dignajar/master
New pull
2015-10-25 00:53:58 +02:00
18jaguar18 16b9753181 Dashboard clean-up
Dashboard clean-up
2015-10-24 23:18:04 +02:00
dignajar bf9fc2f3c5 Updates 2015-10-24 17:43:50 -03:00
dignajar 76cdea6ac8 Dashboard clean-up 2015-10-24 12:34:10 -03:00
dignajar 3b33beda3f Dashboard clean-up 2015-10-24 12:32:26 -03:00
Diego Najar e684e07e78 Merge pull request #65 from 18jaguar18/patch-5
Login access code via email
2015-10-24 11:38:29 -03:00
dignajar 6fcf448e98 Dashboard clean-up 2015-10-23 20:23:33 -03:00
dignajar 654b3d6b3b Dashboard clean-up 2015-10-22 00:14:22 -03:00
18jaguar18 7fd28231cf Login access code via email 2015-10-21 09:15:52 +02:00
dignajar 4d99885320 Login access code via email 2015-10-20 00:20:48 -03:00
dignajar a1f8a187ac Login access code via email 2015-10-20 00:18:00 -03:00
dignajar c4d8825151 Login access code via email 2015-10-20 00:14:28 -03:00
dignajar fca3ff9ab0 Merge branch 'master' of github.com:dignajar/bludit 2015-10-18 19:46:11 -03:00
dignajar 8509eb49d5 Changes on admin panel 2015-10-18 19:45:58 -03:00
Diego Najar c694c2ed58 Merge pull request #64 from clickwork-git/master
Create de_DE.json
2015-10-16 21:50:50 -03:00
clickwork-git e9f86e96f9 Small corrections 2015-10-14 01:27:25 +02:00
clickwork-git 498c975ab4 Create de_DE.json 2015-10-14 01:10:51 +02:00
Diego Najar badc54ce30 Merge pull request #63 from clickwork-git/master
Merge pull request #5 from dignajar/master
2015-10-13 20:00:49 -03:00
Diego Najar 154bb278c7 Merge pull request #62 from clickwork-git/patch-1
Update de_DE.json
2015-10-09 10:34:10 -03:00