aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more migration of page typesredmatrix2015-05-218-42/+40
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-212-2/+5
|\
| * preserve lock on edited commentsredmatrix2015-05-212-2/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-2013-118/+151
|\| | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
| * cloning abook entries was broken in several ways if the target xchan wasn't ↵redmatrix2015-05-202-16/+13
| | | | | | | | available on the clone site. This should make it less broken.
| * check for success before updating remote idredmatrix2015-05-201-8/+9
| |
| * don't allow item_id to update without a valid post idredmatrix2015-05-201-0/+5
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-203-72/+89
| |\
| | * Another update for Dutch with complete $Projectname substitutions (and ↵jeroenpraat2015-05-202-71/+71
| | | | | | | | | | | | channel activity as suggested on previous discussion)
| | * make design elements translateableMario Vavti2015-05-201-1/+18
| | |
| * | PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-208-26/+32
| |/
* | re-arrange the html cache a bitredmatrix2015-05-203-12/+19
| |
* | more db structureredmatrix2015-05-192-16/+32
| |
* | add rot47 to the mix. This shouldn't affect the speed to any measurable degree.redmatrix2015-05-194-20/+26
| |
* | merge redmatrix fixredmatrix2015-05-191-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-191-1/+9
|\|
| * issue with deleting imported design elements and re-installing themredmatrix2015-05-191-1/+9
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-196-57/+80
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-196-108/+127
| |\
| | * Merge pull request #327 from solstag/helpredmatrix2015-05-203-3/+21
| | |\ | | | | | | | | Document php-xml requirement for webdav and widget creation.
| | | * Document widget creation.Alexandre Hannud Abdo2015-05-192-1/+17
| | | |
| | | * Document php-xml requirement for webdav.Alexandre Hannud Abdo2015-05-191-2/+4
| | | |
| | * | remove dbg codeMario Vavti2015-05-191-1/+1
| | | |
| | * | be verbose about what type of element (block, layout, webpage) is beeing ↵Mario Vavti2015-05-191-1/+2
| | |/ | | | | | | | | | installed
| | * New update Dutchjeroenpraat2015-05-192-104/+104
| | |
| * | version updateredmatrix2015-05-191-1/+1
| |/
* | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵redmatrix2015-05-195-35/+29
| | | | | | | | cipher would be adequate for our requirements.
* | vsprintf errorredmatrix2015-05-181-1/+1
| |
* | consensus items not working correctly and make the collections widget abide ↵redmatrix2015-05-182-4/+8
| | | | | | | | by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.
* | get rid of photo_flags in the coderedmatrix2015-05-181-7/+7
| |
* | bring the new photo schema into playredmatrix2015-05-185-53/+37
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-182-4/+6
|\|
| * this should fix undeletable blocks and layoutsredmatrix2015-05-182-4/+6
| |
* | fix some merge errorsredmatrix2015-05-183-1012/+1270
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-182-8/+16
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-184-385/+446
| |\
| * | fix po2php to handle projectname variables correctlyredmatrix2015-05-182-8/+16
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-187-134/+188
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-05-181-0/+47
| |\ \
| | * \ Merge pull request #326 from sierracircle/patch-1redmatrix2015-05-191-0/+47
| | |\ \ | | | | | | | | | | Create Primary-Directory
| | | * | Create Primary-DirectoryAdam Robertson2015-05-181-0/+47
| | | | | | | | | | | | | | | Description and Instruction on using a Primary Directory for a series of Private Hubs
| * | | | if block title contains $content but $content title is empty do not show an ↵Mario Vavti2015-05-181-1/+1
| |/ / / | | | | | | | | | | | | empty <h3> tag
| * | | remove dbg codeMario Vavti2015-05-181-2/+0
| | | |
| * | | allow block title to contain $content titleMario Vavti2015-05-181-2/+11
| |/ /
| * / Update Dutch (Projectname variable not translated yet, because of undefined ↵jeroenpraat2015-05-182-383/+390
| |/ | | | | | | variable)
| * spellingredmatrix2015-05-172-4/+4
| |
* | Merge branch 'tres'redmatrix2015-05-1869-843/+657
|\ \
| * \ Merge branch 'master' into tresredmatrix2015-05-1731-421/+612
| |\ \
| * \ \ Merge branch 'master' into tresredmatrix2015-05-1419-18/+537
| |\ \ \
| * \ \ \ Merge branch 'master' into tresredmatrix2015-05-14187-9453/+9692
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 14:36:02 +0000