mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-18 10:51:25 +02:00
Code Issues Releases Wiki Activity
1,557 Commits 5 Branches 9 Tags
master
Commit Graph

1557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awilum
b23f2b9c5a Messenger Library - Admin integration 2013-12-15 16:34:40 +02:00
Awilum
4f35153ac2 Messenger Library - Added 2013-12-15 16:31:48 +02:00
Awilum
82f02a7ab5 Default Theme - use Twitter Bootstrap 3.x.x 2013-12-14 00:43:06 +02:00
Awilum
16975a3062 Update Twitter Bootstrap to 3.0.3 2013-12-14 00:42:43 +02:00
Awilum
9b4ff3e2e3 Frontend Improvements 2013-12-14 00:40:55 +02:00
Awilum
798f558558 Frontend Improvements 2013-12-14 00:38:58 +02:00
Sergey Romanenko
033d66a81a Pages Plugin: Bug with pages renaming - fixed 2013-12-13 12:06:19 +02:00
Евгений
f311163ef4 Update Image.php 2013-12-11 17:48:07 +06:00
Awilum
8947295b83 Fix Translates 2013-12-09 22:10:22 +04:00
Awilum
fccf7b3c63 Monstra 2.3.0 beta 2013-12-08 21:06:56 +04:00
Awilum
98c618dbaf Merge branch 'master' 2013-12-08 21:04:12 +04:00
Awilum
4ae5fe6ede Set new Copyright date 2013-12-08 21:02:23 +04:00
Awilum
230b397530 Set new Copyright date 2013-12-08 21:02:23 +04:00
Awilum
fc2183b970 Set new Copyright date 2013-12-08 21:02:22 +04:00
Awilum
25fe85c8f1 Set new Copyright date 2013-12-08 21:02:22 +04:00
Awilum
c554b42f17 Set new Copyright date 2013-12-08 21:02:21 +04:00
Sergey Romanenko
988da91526 Update changelog.txt 2013-12-08 17:59:42 +02:00
Awilum
d1257fb00b Monstra Email Templates #164 2013-12-07 22:42:33 +04:00
Sergey Romanenko
31ec9de178 Merge pull request #163 from promo360/master 
Gelato image, resize and crop
 2013-11-28 03:00:20 -08:00
Евгений
05a9ff440f Update Image.php 2013-11-28 14:02:22 +06:00
Евгений
b54cac24b1 Update Image.php 
функция resize(200, 200) растягивала изображение, теперь нет.
http://f3.s.qip.ru/2Q3rL699.jpg - сверху до, снизу после
 2013-11-28 14:00:41 +06:00
Евгений
950b816ca6 function resize, crop 
Доработана функция resize
Оптимизирован код функции crop
 2013-11-28 13:57:19 +06:00
Sergey Romanenko
dc0c47f5fa Update changelog.txt 2013-11-24 19:33:48 +02: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
Sergey Romanenko
f73aa53e40 Update changelog.txt 2013-11-24 19:17:57 +02: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
Sergey Romanenko
b2ef78b556 Merge pull request #161 from bernte/patch-14 
Update de.lang.php
 2013-11-23 08:43:36 -08: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
Sergey Romanenko
d1c4f58c2e Update changelog.txt 2013-11-22 00:12:50 +02:00
Awilum
53c079f00a Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2013-11-22 00:11:58 +02:00
Sergey Romanenko
b23bb4b218 Merge pull request #131 from DmitriyMX/fix_table_php 
XMLDB: error select for empty table fix
 2013-11-21 14:10:10 -08:00
Awilum
5491848f29 Installer layout updates 2013-11-21 23:12:14 +02:00
Awilum
2548103a77 NL added 2013-11-21 22:08:06 +02:00
Awilum
c396744e64 PL flag added 2013-11-21 22:08:04 +02:00
Sergey Romanenko
a6156db3a9 Update changelog.txt 2013-11-21 21:52:05 +02:00
Sergey Romanenko
ad965bbcb9 Update changelog.txt 2013-11-21 21:36:30 +02:00
Sergey Romanenko
2a8babb4f8 Update PHPMailer to 5.2.7 2013-11-21 21:32:55 +02:00
Sergey Romanenko
a8c582c302 Update changelog.txt 2013-11-21 21:28:39 +02: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