1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-07-13 01:26:19 +02:00
Commit Graph

88 Commits

Author SHA1 Message Date
b2ca81e9d6 Update en.lang.php 2014-02-28 23:51:55 +01:00
2178b7d406 Uploading new plugins via the admin panel - active tab 'Install New' after plugin uploading #215 2014-02-26 17:22:13 +02:00
32e2890b37 UI Improvements - Admin Default Theme - Updates #194 2014-02-18 23:02:26 +02:00
e449381555 UI Improvements - Admin Default Theme - Updates #194 2014-02-18 00:45:31 +02:00
2a3d9720d1 Monstra automatically rename files Issue #231 2014-02-15 22:56:10 +02:00
e3d0da1047 UI Improvements - Admin Default Theme - Updates #194 2014-02-14 21:35:56 +02:00
f7bc03ef91 Merge branch 'dev' of https://github.com/Awilum/monstra-cms into dev 2014-02-14 17:21:28 +02:00
7ca3946f8a Uploading new plugins via the admin panel - fileuploader refactoring: drag&drop uploader multiple instances support #215 2014-02-14 17:21:18 +02:00
1b77c928f4 UI Improvements - Admin Default Theme - Updates #194 2014-02-13 23:03:48 +02:00
2e19f5c1a7 Files Manager Improvements - fixes #94 2014-02-01 14:47:08 +02:00
948bf57a1c Box Plugins: .htaccess added 2014-01-31 21:54:43 +02:00
8f0e576f99 Files Manager Improvements - Bootstrap: fileinput.js v3.0.0-p7 #94 2014-01-31 19:02:44 +02:00
28ec930671 Files Manager Improvements - Maximum upload file size message - added #94 2014-01-29 20:56:39 +02:00
e72dcc3a94 Merge pull request #227 from Awilum/master
Merge with master branch
2014-01-29 01:14:49 -08:00
106c7b2c56 Files Manager Improvements - Updates #94 2014-01-29 00:13:48 +02:00
4b381efb10 Files Manager Improvements - Updates #94 2014-01-29 00:05:29 +02:00
67bf91a872 Files Manager Improvements - fixes #94 2014-01-25 13:17:28 +02:00
482e865358 Files Manager Improvements - fixes #94 2014-01-25 11:12:01 +02:00
2ba945313f Files Manager Improvements - Ability to rename Files & Directories #94 2014-01-24 22:56:13 +02:00
52192f9dea Update style.css 2014-01-24 12:15:00 +02:00
cff06f5564 Merge pull request #223 from ANISSA90/master
language
2014-01-23 01:10:41 -08:00
03045d03ae Files Manager Improvements - Drug'n'Drop uploader - error handler updates #94 2014-01-23 00:27:33 +02:00
5d8a4abcb9 Add Japanese language files. 2014-01-22 10:59:38 +09:00
274e9a1849 Files Manager Improvements - Drop Files section fixes #94 2014-01-20 22:14:07 +02:00
a76207ae96 Files Manager Improvements - Drop Files section fixes #94 2014-01-20 21:44:15 +02:00
d4f57e35d3 Fix: JSON.parse: unexpected character 2014-01-19 18:51:29 +04:00
7532ad1127 Fixes for #94 and #204 2014-01-18 12:06:39 +02:00
92064df622 Files Manager Improvements #94 2014-01-18 11:22:30 +02:00
fb121a88d1 Merge branch 'dev' of https://github.com/metalgvc/monstra-cms into metalgvc-dev
Conflicts:
	plugins/box/filesmanager/views/backend/index.view.php
2014-01-18 11:14:21 +02:00
abc04ee218 UI Improvements - Admin Theme Updates #194 2014-01-18 00:15:54 +02:00
fed3aa5664 Files Manager Improvements - Drop Files section added #94 2014-01-18 00:15:53 +02:00
9fabc679b4 Create id.lang.php 2014-01-16 07:05:14 +07:00
5c03f0cfab Update filesmanager.admin.php 2014-01-13 12:22:43 +02:00
c2a2dba621 Twitter Bootsrap 3 - Admin - Fixes #185 2014-01-11 00:56:21 +02:00
f340fcd3a2 Files Manager Improvements - Breadcrumbs fixes #94 2014-01-11 00:52:52 +02:00
e78f59126a Files Manager Improvements - create directory #94 2014-01-10 20:00:21 +02:00
5cb23c76c3 Merge pull request #196 from promo360/dev
Dev
2014-01-06 11:09:59 -08:00
02fa169760 Files Manager Improvements #94 2014-01-06 21:05:12 +02:00
3d83dc775f Site Url without trailing slashes 2014-01-07 01:02:23 +06:00
cd40c09496 Site Url without trailing slashes 2014-01-04 23:21:56 +02:00
c3fe4d16bc FilesManager Improvements 2014-01-03 02:56:01 +02:00
03653831c8 FilesManager Improvements 2014-01-03 02:44:48 +02:00
b33b85860f FilesManager Improvements 2014-01-03 01:44:00 +02:00
97b9982ba0 Frontend Improvements 2014-01-02 22:22:04 +02:00
5ea80e31e0 Merge branch 'origin/dev'
Conflicts:
	engine/Monstra.php
	public/assets/js/bootstrap.js
2014-01-01 21:32:20 +02:00
bfc41e03ea W3 Fixes 2014-01-01 21:21:26 +02:00
35b75e9027 Update de.lang.php 2013-12-22 02:39:17 +01:00
8947295b83 Fix Translates 2013-12-09 22:10:22 +04:00
230b397530 Set new Copyright date 2013-12-08 21:02:23 +04:00
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