| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 5 | -15/+60 |
| |\ | |||||
| | * | fix unable to crop profile pic on postgres | Habeas Codice | 2015-05-30 | 1 | -1/+1 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 3 | -12/+18 |
| | |\ | |||||
| | | * | whitespace | Mario Vavti | 2015-05-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | add some yes/no labels and minor template fixes | Mario Vavti | 2015-05-29 | 2 | -6/+6 |
| | | | | |||||
| | | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 1 | -5/+9 |
| | | | | |||||
| | | * | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 1 | -0/+2 |
| | | | | |||||
| | * | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -1/+1 |
| | |/ | |||||
| | * | untested menu element import, be aware that the menu api does not over-write ↵ | redmatrix | 2015-05-28 | 1 | -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/redmatrix | redmatrix | 2015-05-28 | 2 | -0/+4 |
| |\| | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| | * | catch a window that wasn't yet saved when the last checkin occurred | redmatrix | 2015-05-27 | 1 | -1/+0 |
| | | | |||||
| | * | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+4 |
| | | | |||||
| | * | missing row in sql query which is used further down | redmatrix | 2015-05-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 2 | -58/+84 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -57/+83 |
| | | | | | | | | | 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. | ||||
| | * | some work on issue #329 | redmatrix | 2015-05-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-25 | 1 | -5/+37 |
| |\| | |||||
| | * | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵ | redmatrix | 2015-05-25 | 1 | -5/+37 |
| | | | | | | | | | the censor flag from that page. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 4 | -11/+16 |
| |\| | |||||
| | * | timezone setting not saved issue #336 | redmatrix | 2015-05-24 | 1 | -1/+1 |
| | | | |||||
| | * | typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page | redmatrix | 2015-05-24 | 3 | -10/+15 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 1 | -2/+2 |
| |\| | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-24 | 2 | -191/+257 |
| | |\ | |||||
| | * | | search result heading not translatable | redmatrix | 2015-05-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 2 | -190/+258 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: index.php mod/setup.php | ||||
| | * | | Merge pull request #331 from solstag/jqueryprop | redmatrix | 2015-05-24 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | Fix accepting contacts by using correct jquery calls. | ||||
| | | * | | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -2/+2 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure what the operation on disabled is supposed to do, but it also seemed to requier prop instead of attr. See for reference: http://api.jquery.com/prop/ """ The checked attribute value does not change with the state of the checkbox, while the checked property does. """ | ||||
| | * / | Add PHP's xml module check and upload limits to setup. | Klaus Weidenbach | 2015-05-24 | 1 | -189/+255 |
| | |/ | | | | | | | And some documentation. | ||||
| * | | more migration of page types | redmatrix | 2015-05-21 | 6 | -39/+37 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-21 | 1 | -1/+4 |
| |\| | |||||
| | * | preserve lock on edited comments | redmatrix | 2015-05-21 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 4 | -11/+24 |
| |\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| | * | check for success before updating remote id | redmatrix | 2015-05-20 | 1 | -8/+9 |
| | | | |||||
| | * | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 3 | -5/+15 |
| | | | |||||
| * | | merge redmatrix fix | redmatrix | 2015-05-19 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -1/+9 |
| |\| | |||||
| | * | issue with deleting imported design elements and re-installing them | redmatrix | 2015-05-19 | 1 | -1/+9 |
| | | | |||||
| * | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 1 | -2/+0 |
| | | | | | | | | | cipher would be adequate for our requirements. | ||||
| * | | get rid of photo_flags in the code | redmatrix | 2015-05-18 | 1 | -7/+7 |
| | | | |||||
| * | | bring the new photo schema into play | redmatrix | 2015-05-18 | 2 | -27/+19 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 2 | -4/+6 |
| |\| | |||||
| | * | this should fix undeletable blocks and layouts | redmatrix | 2015-05-18 | 2 | -4/+6 |
| | | | |||||
| * | | fix some merge errors | redmatrix | 2015-05-18 | 1 | -2/+4 |
| | | | |||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 11 | -22/+20 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 11 | -22/+20 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| | | * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 11 | -18/+18 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -10/+15 |
| |\| | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -10/+15 |
| | |\| | |||||
| | | * | provide default permissions ('all') for existing and newly created OAuth app ↵ | redmatrix | 2015-05-14 | 1 | -10/+15 |
| | | | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions. | ||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 24 | -69/+67 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |