1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-24 21:56:22 +02:00

817 Commits

Author SHA1 Message Date
Awilum
03653831c8 FilesManager Improvements 2014-01-03 02:44:48 +02:00
Awilum
b33b85860f FilesManager Improvements 2014-01-03 01:44:00 +02:00
Awilum
97b9982ba0 Frontend Improvements 2014-01-02 22:22:04 +02:00
Awilum
7b24e315b7 Frontend Improvements 2014-01-02 19:56:08 +02:00
Awilum
4d16d07b2c Frontend Improvements 2014-01-02 02:37:11 +02:00
Awilum
42e807db22 Monstra Installer - Frontend Improvements 2014-01-02 02:29:14 +02:00
Awilum
5ea80e31e0 Merge branch 'origin/dev'
Conflicts:
	engine/Monstra.php
	public/assets/js/bootstrap.js
2014-01-01 21:32:20 +02:00
Awilum
bfc41e03ea W3 Fixes 2014-01-01 21:21:26 +02:00
Awilum
80d1439471 Frontend Improvements 2014-01-01 19:46:23 +02:00
Awilum
197cd7afde Frontend Improvements 2013-12-30 23:38:45 +02:00
Mirosław Widz
97542ada1b Adding a newline 2013-12-25 21:56:50 +01:00
Mirosław Widz
db5e6b7868 Updated 'pl' language files 2013-12-25 21:50:44 +01:00
Awilum
03e5fc320c Email Layout: footer fixes 2013-12-25 00:24:00 +02:00
Awilum
1a1bfabda0 Sitemap Errors #175 - fixes 2013-12-22 23:31:38 +02:00
Sergey Romanenko
7734822789 Merge pull request #171 from bernte/patch-16
Update de.lang.php
2013-12-22 11:37:23 -08:00
bernte
0c90ab6bfe Update de.lang.php 2013-12-22 02:41:36 +01:00
bernte
35b75e9027 Update de.lang.php 2013-12-22 02:39:17 +01:00
Awilum
2c3d224e62 Frontend Improvements 2013-12-17 11:01:24 +02:00
Awilum
2fbb4c30c3 Frontend Improvements 2013-12-16 10:03:24 +02:00
Awilum
9b4ff3e2e3 Frontend Improvements 2013-12-14 00:40:55 +02:00
Sergey Romanenko
033d66a81a Pages Plugin: Bug with pages renaming - fixed 2013-12-13 12:06:19 +02:00
Awilum
8947295b83 Fix Translates 2013-12-09 22:10:22 +04:00
Awilum
98c618dbaf Merge branch 'master' 2013-12-08 21:04:12 +04:00
Awilum
230b397530 Set new Copyright date 2013-12-08 21:02:23 +04:00
Awilum
d1257fb00b Monstra Email Templates #164 2013-12-07 22:42:33 +04:00
Sergey Romanenko
dbefe506f0 Merge pull request #162 from bernte/patch-12
Update available_pages.view.php
2013-11-24 09:31:55 -08:00
Sergey Romanenko
454b328442 Merge pull request #154 from bernte/patch-10
Update de.lang.php
2013-11-24 09:31:15 -08:00
Sergey Romanenko
52353d79ef Merge pull request #146 from bernte/patch-2
Update de.lang.php
2013-11-24 09:31:03 -08:00
Sergey Romanenko
6dcc5ffac8 Merge pull request #121 from nogit/master
Captcha label tiny modification
2013-11-24 09:30:41 -08:00
bernte
07a8e823f8 Update available_pages.view.php
shows only published sites on frontend

found @ http://forum.monstra.org/post/1276/#p1276
2013-11-23 21:57:17 +01:00
Awilum
489f7017d1 Merge branch 'master' 2013-11-23 23:26:40 +04:00
bernte
d1a5a9c0e2 Update de.lang.php 2013-11-23 15:58:54 +01:00
Awilum
eaeff17cb9 #123 General method getPages() created 2013-11-23 15:35:53 +04:00
Awilum
9e2a7bc23b #158 deleting users - fixed by Oleg Gatseluk 2013-11-23 15:19:12 +04:00
Awilum
31c661a1e8 Merge remote-tracking branch 'refs/remotes/origin/master' into dev
Conflicts:
	plugins/box/users/views/frontend/login.view.php
2013-11-21 21:06:22 +02:00
Sergey Romanenko
a5c197fa99 Merge pull request #153 from bernte/patch-9
Update de.lang.php
2013-11-21 10:53:08 -08:00
Sergey Romanenko
09addce76e Merge pull request #152 from bernte/patch-8
Update de.lang.php
2013-11-21 10:52:45 -08:00
Sergey Romanenko
6c280ef102 Merge pull request #151 from bernte/patch-7
Update de.lang.php
2013-11-21 10:52:15 -08:00
Sergey Romanenko
1623d2b1fb Merge pull request #150 from bernte/patch-6
Update de.lang.php
2013-11-21 10:51:52 -08:00
Sergey Romanenko
2cabdf2864 Merge pull request #149 from bernte/patch-5
Update de.lang.php
2013-11-21 10:51:09 -08:00
Sergey Romanenko
397218d9e6 Merge pull request #148 from bernte/patch-4
Update de.lang.php
2013-11-21 10:50:40 -08:00
Sergey Romanenko
1eb7991f36 Merge pull request #147 from bernte/patch-3
Update de.lang.php
2013-11-21 10:49:07 -08:00
Евгений
8f60502a0e Update en.lang.php 2013-11-18 10:58:13 +06:00
Евгений
d79b092542 Update ru.lang.php
При сохранении настроек выскакивало оповещение "Your changes have been saved."
2013-11-18 10:57:30 +06:00
bernte
1d69c31aca Update de.lang.php 2013-11-10 01:33:20 +01:00
bernte
ca2bd3df8a Update de.lang.php 2013-11-10 01:26:52 +01:00
bernte
49185659f6 Update de.lang.php 2013-11-10 01:22:36 +01:00
bernte
d9a91f514f Update de.lang.php 2013-11-10 01:15:48 +01:00
bernte
5371f9f5db Update de.lang.php 2013-11-10 01:12:22 +01:00
bernte
df85b392b8 Update de.lang.php 2013-11-10 01:08:53 +01:00