aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | version updateredmatrix2015-06-071-1/+1
| |/ /
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0616-797/+704
|\| |
| * | missing commaMario Vavti2015-06-061-1/+1
| * | Added translatable strings to the Display Settings page and refreshed util/me...jeroenpraat2015-06-063-4618/+4478
| * | css fixesMario Vavti2015-06-061-17/+9
| * | whitespaceMario Vavti2015-06-061-169/+175
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-062-175/+176
| |\ \
| | * \ Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-0612-415/+498
| | |\ \
| | * | | string/version updateredmatrix2015-06-062-175/+176
| * | | | some cleanup after scheme transitionMario Vavti2015-06-062-196/+19
| | |/ / | |/| |
| * | | More schemas in new formatjeroenpraat2015-06-054-119/+114
| * | | use the right webpage layout for an installed webpage if it existsMario Vavti2015-06-042-1/+3
| * | | some doco on webpage blocksMario Vavti2015-06-041-2/+78
| * | | Schemas: should be ok now.jeroenpraat2015-06-037-342/+116
| * | | 2 more schemas in new formatjeroenpraat2015-06-034-239/+473
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixjeroenpraat2015-06-032-4/+14
| |\| |
| * | | empty php schema backjeroenpraat2015-06-031-0/+2
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0210-371/+380
|\ \ \ \ | | |/ / | |/| |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-025-328/+286
| |\| |
| | * | First schema completely to the new format. git-marijus: Can you please quickl...jeroenpraat2015-06-022-123/+237
| | * | update help linkMario Vavti2015-06-021-1/+1
| | * | update comanche docoMario Vavti2015-06-022-204/+48
| * | | asjld workredmatrix2015-06-022-4/+14
| |/ /
| * | move the photo and attachment permission syncing past the tag replacement so ...redmatrix2015-06-012-35/+37
| * | error in directory bbcode image filterredmatrix2015-05-311-1/+1
| * | bare bones ASLDredmatrix2015-05-312-5/+44
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-3114-791/+973
|\| |
| * | some basic background work for activitystreams-json-ld-2.0 conversionsredmatrix2015-05-313-1/+46
| * | fix unable to crop profile pic on postgresHabeas Codice2015-05-301-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-309-31/+61
| |\ \
| | * | should not redefine $var in the function callMario Vavti2015-05-291-1/+1
| | * | fix menu render for menu item edit - menu previewMario Vavti2015-05-291-1/+5
| | * | whitespaceMario Vavti2015-05-291-1/+1
| | * | add some yes/no labels and minor template fixesMario Vavti2015-05-294-9/+9
| | * | some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-295-23/+30
| | * | show created/edited dates for menusMario Vavti2015-05-293-3/+22
| * | | strip images from directory text entriesredmatrix2015-05-304-754/+820
| |/ /
| * | there was a reason we included that fileredmatrix2015-05-281-3/+3
| * | parse errorredmatrix2015-05-281-2/+2
| * | another case of committing with unsaved changes in a second windowredmatrix2015-05-281-2/+4
| * | untested menu element import, be aware that the menu api does not over-write ...redmatrix2015-05-281-7/+46
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-2810-2505/+4071
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-282-1021/+1031
| |\ \
| | * \ Merge pull request #341 from solstag/ptbrupdateredmatrix2015-05-292-1021/+1031
| | |\ \
| | | * | update pt_BR translationAlexandre Hannud Abdo2015-05-282-1021/+1031
| | |/ /
| * / / add menu_created, menu_edited fields to DBredmatrix2015-05-286-8/+65
| |/ /
| * | catch a window that wasn't yet saved when the last checkin occurredredmatrix2015-05-271-1/+0
| * | menu encoding for sharing/exchangeredmatrix2015-05-272-0/+43
| * | missing row in sql query which is used further downredmatrix2015-05-271-1/+1
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-2715-76/+356
|\| |