aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵jeroenpraat2015-06-022-123/+237
| | | | | | | | | | | | quickly check if I'm doing it right?
| | * 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
| | | | | | | | that attachments get the correct permissions when private mentions are used.
| * 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
| | | | | | | | on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-2810-2505/+4071
|\| | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
| * 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 translation
| | | * 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
|\| | | | | | | | | Conflicts: mod/impel.php
| * some high-level stuff we may need for shareable menus. Also make the client ↵redmatrix2015-05-272-68/+84
| | | | | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-272-0/+81
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-05-271-1/+1
| | |\
| | * | define some custom attributes and html5 elements for htmlpurifierMario Vavti2015-05-271-0/+66
| | | |
| | * | make it possible to include menus in blocks - this will only work in html ↵Mario Vavti2015-05-271-0/+15
| | | | | | | | | | | | | | | | blocks of course
| * | | fix for forked thread on diasporaredmatrix2015-05-272-11/+5
| | | |
| * | | revert for nowredmatrix2015-05-272-6/+6
| | | |
| * | | Comments need to have some kind of routing instructions.redmatrix2015-05-262-1/+14
| | |/ | |/|
| * | Update api.phpjeroenpraat2015-05-261-1/+1
| |/ | | | | one comma to much
| * add ability to change existing channel/account service class withHabeas Codice2015-05-263-0/+73
| | | | | | | | | | util/service_class add link from main doc
| * placeholder for dynamic regoredmatrix2015-05-252-10/+2
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-252-0/+65
| |\
| | * Add docs about current service class system, tiny util to make updates aHabeas Codice2015-05-252-0/+65
| | | | | | | | | | | | little easier than the standard config util
| * | slow but forward progress on dynamic client registrationredmatrix2015-05-251-0/+42
| |/
| * some work on issue #329redmatrix2015-05-254-8/+11
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-254-7/+41
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-251-0/+1
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 16:15:37 +0000