aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-104-11/+18
|\
| * assign right aside the same width as we have in left aside but hide it on sma...Mario Vavti2015-06-104-11/+18
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-092-0/+2
|\|
| * put mirror_frontpage setting into admin/siteredmatrix2015-06-091-0/+1
| * toggle diaspora protocol on a per-channel level in addition to the existing p...redmatrix2015-06-091-0/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-093-2/+15
|\|
| * css regression fixesMario Vavti2015-06-081-0/+12
| * Merge branch 'frontpage'redmatrix2015-06-072-2/+3
| |\
| | * more frontpage tweaksredmatrix2015-06-071-1/+1
| | * reverse logic of homepage login settingredmatrix2015-06-071-1/+1
| | * frontpage tweaksredmatrix2015-06-071-0/+1
| | * frontpage changesredmatrix2015-06-071-1/+1
| * | Upd NLjeroenpraat2015-06-072-7229/+7132
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0611-793/+619
|\|
| * missing commaMario Vavti2015-06-061-1/+1
| * Added translatable strings to the Display Settings page and refreshed util/me...jeroenpraat2015-06-061-3/+3
| * css fixesMario Vavti2015-06-061-17/+9
| * whitespaceMario Vavti2015-06-061-169/+175
| * some cleanup after scheme transitionMario Vavti2015-06-062-196/+19
| * More schemas in new formatjeroenpraat2015-06-054-119/+114
| * Schemas: should be ok now.jeroenpraat2015-06-037-342/+116
| * 2 more schemas in new formatjeroenpraat2015-06-034-239/+473
| * empty php schema backjeroenpraat2015-06-031-0/+2
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-022-123/+237
|\|
| * First schema completely to the new format. git-marijus: Can you please quickl...jeroenpraat2015-06-022-123/+237
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-314-10/+29
|\|
| * add some yes/no labels and minor template fixesMario Vavti2015-05-292-3/+3
| * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-292-12/+14
| * show created/edited dates for menusMario Vavti2015-05-292-3/+20
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-282-2496/+3962
|\|
| * update pt_BR translationAlexandre Hannud Abdo2015-05-282-1021/+1031
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-252-1/+3
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-251-0/+1
| |\
| | * add this to better support mobile devices out of the box in zen templateMario Vavti2015-05-251-0/+1
| * | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ...redmatrix2015-05-251-1/+2
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-203-72/+76
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-202-71/+71
| |\
| | * Another update for Dutch with complete $Projectname substitutions (and channe...jeroenpraat2015-05-202-71/+71
| * | PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-201-0/+3
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-191-52/+56
|\|
| * New update Dutchjeroenpraat2015-05-192-104/+104
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-183-128/+128
|\|
| * Update Dutch (Projectname variable not translated yet, because of undefined v...jeroenpraat2015-05-182-383/+390
* | Merge branch 'master' into tresredmatrix2015-05-174-23/+23
|\ \
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-174-23/+23
| |\|
| | * updated the templates to the {{}}, compared toRazlo2015-05-174-23/+23
* | | Merge branch 'master' into tresredmatrix2015-05-141-4/+3
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-141-4/+3
| |\|
| | * Add sprintf.js v1.0.2.Klaus Weidenbach2015-05-141-4/+3
| | * Dutch 100\% againjeroenpraat2015-05-122-56/+76