515 Commits

Author SHA1 Message Date
Samuel Georges
a002d5da92 Merge branch 'develop' into ui-breakout
Conflicts:
	modules/system/assets/ui/js/chart.bar.js
2015-05-30 13:01:35 +10:00
Samuel Georges
069ec925b2 Merge branch 'master' into develop 2015-05-30 12:50:31 +10:00
Samuel Georges
3ba1cee05a Merge pull request #1161 from DZB-Team/master
Tanslation files for Latvian language
2015-05-30 10:45:00 +10:00
Samuel Georges
936ca3469c Merge pull request #1142 from gergo85/master
Improve multilanguage support
2015-05-30 10:44:30 +10:00
Samuel Georges
309f5debc9 Merge pull request #1178 from dshoreman/fix-flash-messages
Fixed error when using {% flash type %}
2015-05-30 10:26:09 +10:00
Dave Shoreman
aac3d196ee Fixed error when using {% flash type %}
While {% flash %} works fine for displaying all flash messages, if
a user wants to show only a certain type with {% flash success %}
(for example), it errors with "Undefined variable: message".
2015-05-30 01:24:11 +01:00
Samuel Georges
09501409c6 Fixes #1172 without using 7 commits 2015-05-30 10:00:55 +10:00
Samuel Georges
7e558ea706 Merge pull request #1171 from mrmlnc/develop
Update RU_lang
2015-05-30 09:58:28 +10:00
Samuel Georges
8e59305ede Update refs to flash message script 2015-05-28 20:33:49 +10:00
Denis Malinochkin
ab382e3771 Fix typos 2015-05-27 23:19:33 +03:00
Denis Malinochkin
8cdf2e1250 Update RU_lang 2015-05-27 23:16:06 +03:00
krisawzm
3d464a422a Improved language nb-no in cms module 2015-05-25 23:16:53 +02:00
krisawzm
d11680eba0 Updated language nb-no in cms module 2015-05-25 23:16:21 +02:00
raw99
5a6aaf760c adding translations for latvian language 2015-05-23 23:59:46 +03:00
Samuel Georges
a1291c3716 Restyle Administrator pages 2015-05-21 22:55:08 +10:00
gergo85
7ab72b3743 Improve multilanguage support 2015-05-16 11:47:24 +02:00
Samuel Georges
4d057ba266 Fixes flaw in logic
Recompile JS from #1135
2015-05-16 09:57:40 +10:00
Samuel Georges
8b3ab93786 Component variables set with $this->page no longer leech in to other component partials.
Fixes #852
2015-05-16 09:29:27 +10:00
Samuel Georges
ccf8073ad6 Make page listing more detailed, now includes [base file name] 2015-05-15 20:19:11 +10:00
Samuel Georges
e675866284 The |page filter now supports passing an empty string to generate a link to the current page. 2015-05-15 20:18:40 +10:00
Samuel Georges
7255615bef Merge pull request #1120 from gergo85/master
Updated Hungarian language
2015-05-09 19:02:23 +10:00
gergo85
53babb83b6 Updated Hungarian language 2015-05-09 10:54:11 +02:00
Samuel Georges
189d56a6c5 Merge pull request #1106 from gergo85/master
Improve multilanguage support
2015-05-09 11:06:59 +10:00
Samuel Georges
e3bd53230f Revert breaking from #1103 2015-05-09 11:06:04 +10:00
Samuel Georges
cf90b6ad93 Merge pull request #1103 from niclasleonbock/patch-1
Fix two minor media manager bugs
2015-05-09 11:05:07 +10:00
gergo85
cb670237f2 Improve multilanguage support 2015-05-04 13:29:48 +02:00
niclasleonbock
28f265c10a Fix two minor media manager bugs 2015-05-03 16:10:30 +02:00
Gerard Arall
a1790b0dbf Translations 2015-05-02 19:32:22 +02:00
Samuel Georges
f334be5116 Complete overhaul of module service providers
This is to improve readability of these ever growing classes, also we can prune specific registrations based on the execution context for performance reasons.
2015-05-02 14:43:14 +10:00
Samuel Georges
366cdd55a8 Add hooks to the cms/backend route definitions 2015-05-02 13:53:05 +10:00
Samuel Georges
e6e0facaa0 Fixes issue when routing to CmsController homepage (no params)
Fixes https://github.com/rainlab/translate-plugin/issues/67
Fixes https://github.com/rainlab/translate-plugin/pull/68
2015-05-02 12:56:40 +10:00
Samuel Georges
f49775d547 Routes cache should be used for all driver types
Minor cleanup of MediaManager class
2015-05-02 11:58:09 +10:00
Samuel Georges
cceae62812 Apply incremental default order values on side menu items
Refs #1079
2015-05-02 10:47:06 +10:00
Samuel Georges
7c205c7ceb Merge pull request #1079 from dshoreman/sortable-sidenavs
Add support for sorting sideMenu items
2015-05-02 10:28:55 +10:00
Samuel Georges
9470259727 Minor clean ups 2015-04-29 19:50:30 +10:00
alekseybobkov
bc4aa1495c Merge branch 'develop' into refactoring-profiling 2015-04-28 20:14:01 -07:00
Samuel Georges
10ec177c54 Pass parameters to route cache - Fixes #1088 2015-04-28 20:04:35 +10:00
Samuel Georges
cacec27d25 Fixes issue preventing CMS AJAX from returning arrays 2015-04-28 19:31:38 +10:00
Samuel Georges
0cacb4cbdd Merge pull request #1087 from krisawzm/nb-no
Updates language nb-no
2015-04-28 18:31:01 +10:00
Samuel Georges
9e2e0df74c Remove deprecated API on Psge::url 2015-04-28 07:48:00 +10:00
krisawzm
23afa8bc1c Updates lang nb-no 2015-04-26 21:38:02 +02:00
alekseybobkov
57777c0aad Ace editor updated to the latest version. Implemented the back-end controls utility class. Some back-end UI classes are updated and displsable now. Editor tabs on the CMS page now properly free memory and DOM elements when they're closed. 2015-04-25 22:48:49 -07:00
alekseybobkov
a4ab611228 Merge branch 'develop' of github.com:octobercms/october into develop 2015-04-25 14:33:47 -07:00
alekseybobkov
a989d4e0ba Merge branch 'refactoring-profiling' into develop 2015-04-25 14:33:26 -07:00
Samuel Georges
0083fcd356 Vars passed to content should be escaped 2015-04-25 14:28:52 +10:00
Samuel Georges
ab1272bea9 Add parameter support to {% content %} tags 2015-04-25 13:58:05 +10:00
Samuel Georges
84b80a10c2 The media manager should only look for uploads of its own species
Fixes https://github.com/rainlab/blog-plugin/issues/79
2015-04-24 18:51:06 +10:00
Samuel Georges
9173e3bb9a Merge branch 'develop' into media-manager 2015-04-23 18:09:18 +10:00
alekseybobkov
6458149cd5 Disposing the code editor 2015-04-22 21:33:07 -07:00
Dave Shoreman
85bdabe783 Update cms module for new order functionality
Since sideMenu items are now sortable, any sideMenu items that don't
have an order applied will get sorted however PHP decides to do so.
This adds the order parameter to all cms menu items to retain the
original order of the side menu items.
2015-04-22 22:23:30 +01:00