| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 1 | -1/+0 | |
| |\| | | | | | | | | | | | Conflicts: include/identity.php install/update.php | |||||
| | * | typo in sql | redmatrix | 2015-08-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | don't log the mundane - especially at normal levels. | redmatrix | 2015-08-31 | 1 | -2/+3 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 1 | -0/+1 | |
| |\| | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | |||||
| | * | change the likes db structure to make it more easily importable/exportable | redmatrix | 2015-08-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | mostly doc tweaks, some import/export work | redmatrix | 2015-08-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | rename 'register_account' hook to 'create_identity'. | redmatrix | 2015-08-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -4/+16 | |
| |\| | | | | | | | | | Conflicts: include/identity.php | |||||
| | * | provide ability to export by month as well as by year | redmatrix | 2015-08-17 | 1 | -3/+14 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -0/+12 | |
| |\| | ||||||
| | * | add item_id to yearly dump files | redmatrix | 2015-08-17 | 1 | -0/+12 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 1 | -2/+2 | |
| |\| | | | | | | | | | Conflicts: doc/to_do_code.bb | |||||
| | * | Fixes regarding the new default profile photo size. The default profile ↵ | Mario Vavti | 2015-07-20 | 1 | -2/+2 | |
| | | | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 1 | -1/+0 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php | |||||
| | * | provide a way to export a single year of items (to potentially keep from ↵ | redmatrix | 2015-07-16 | 1 | -1/+30 | |
| | | | | | | | | | exhausting resources either on export or import) | |||||
| * | | provide any single year of exported items | redmatrix | 2015-07-16 | 1 | -2/+35 | |
| | | | ||||||
| * | | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵ | redmatrix | 2015-06-30 | 1 | -3/+2 | |
| | | | | | | | | | other way) | |||||
| * | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 1 | -0/+5 | |
| | | | ||||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 1 | -24/+17 | |
| | | | ||||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -5/+4 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-11 | 1 | -0/+4 | |
| |\| | ||||||
| | * | don't provide a connect button on the sys channel profile sidebar | redmatrix | 2015-06-11 | 1 | -0/+4 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -2/+3 | |
| |\| | | | | | | | | | Conflicts: mod/impel.php | |||||
| | * | some work on issue #329 | redmatrix | 2015-05-25 | 1 | -2/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -3/+3 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | |||||
| | | * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | |||||
| | * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -2/+1 | |
| | | | | ||||||
| | * | | second pass name change | redmatrix | 2015-05-05 | 1 | -2/+2 | |
| | |/ | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -233/+207 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | |||||
| | * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -227/+200 | |
| | | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation. | |||||
| | * | provide a site-wide expiration policy without loopholes - still need work to ↵ | friendica | 2015-03-24 | 1 | -3/+1 | |
| | | | | | | | | | reduce the impact of expiration queries. | |||||
| | * | add reddress to profile - but all is not as it seems. Copy to clipboard is ↵ | friendica | 2015-03-07 | 1 | -4/+7 | |
| | | | | | | | | | blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy. | |||||
| | * | support rel=me on channel "homepage" url | friendica | 2015-02-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -0/+4 | |
| |\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | |||||
| | * | remote rating and addition of rate-me to channel profile sidebar | friendica | 2015-02-04 | 1 | -4/+2 | |
| | | | ||||||
| | * | first cut at rating widget. The flaw is that it is limited because it ↵ | friendica | 2015-02-04 | 1 | -0/+6 | |
| | | | | | | | | | requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -21/+21 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | |||||
| | * | remote_user => remote_channel | friendica | 2015-01-28 | 1 | -4/+4 | |
| | | | ||||||
| | * | local_user => local_channel | friendica | 2015-01-28 | 1 | -20/+20 | |
| | | | ||||||
| * | | start on item_restrict conversion | friendica | 2015-01-22 | 1 | -2/+1 | |
| | | | ||||||
| * | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -2/+1 | |
| | | | ||||||
| * | | working through the xchan table to remove bitfields, mostly complete except ↵ | friendica | 2015-01-20 | 1 | -4/+4 | |
| | | | | | | | | | for updating the updater | |||||
| * | | that should take care of the bitfields in hubloc | friendica | 2015-01-20 | 1 | -2/+2 | |
| |/ | ||||||
| * | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 1 | -13/+1 | |
| | | ||||||
| * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 1 | -1/+4 | |
| |\ | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js | |||||
| | * | Don't show links to edit alternate profiles if multi_profiles is disabled | Stefan Parviainen | 2014-12-30 | 1 | -1/+4 | |
| | | | ||||||
| * | | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 1 | -1/+1 | |
| |/ | | | | subscription plan | |||||
| * | Show tags in other channels profile field to make it easier to navigate to ↵ | Stefan Parviainen | 2014-12-07 | 1 | -3/+14 | |
| | | | | | the channels | |||||
| * | implicit boolean, formatting | Habeas Codice | 2014-11-20 | 1 | -2/+2 | |
| | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |