Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
| * | | second pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -9/+49 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | provide ability to have randomised homepage content from a set of pages name ↵ | friendica | 2015-04-02 | 1 | -2/+6 |
| | | | | | | | | home-* | ||||
| * | allow webpage for home to use its own layout file | friendica | 2015-03-31 | 1 | -0/+14 |
| | | |||||
| * | $simple_update isn't so simple any more. Make sure we don't re-itnroduce the ↵ | friendica | 2015-03-22 | 1 | -1/+1 |
| | | | | | | | | bug that session['loadtime'] was created to fix. It's questionable whether we still need to even look for item_unseen but I won't make that call today. We can also eliminate the restriction on not doing live updates from the discover tab since we aren't relying completely on item_unseen (which can only be set by the owner and won't work on a page with virtual owners). | ||||
| * | provide visual feedback when deleting a like by liking it again. | friendica | 2015-03-22 | 1 | -1/+2 |
| | | |||||
| * | add loadtime search to channel and fix it for home. display and search need ↵ | friendica | 2015-03-21 | 1 | -2/+15 |
| | | | | | | | | further investigation | ||||
| * | site firehose | friendica | 2015-02-15 | 1 | -3/+11 |
| | | |||||
| * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. | ||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | |||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -5/+5 |
| | | |||||
* | | more message restrict conversions | friendica | 2015-01-29 | 1 | -2/+2 |
| | | |||||
* | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -1/+1 |
|/ | |||||
* | honor disable_discover_tab in mod/home - it isn't a tab here but basically ↵ | friendica | 2015-01-14 | 1 | -0/+5 |
| | | | | block public content from showing if it's set. | ||||
* | hide friends broken, add parameter for item search by verb | friendica | 2015-01-13 | 1 | -0/+1 |
| | |||||
* | wall tags | friendica | 2014-12-15 | 1 | -0/+1 |
| | |||||
* | project roadmap | friendica | 2014-11-23 | 1 | -0/+3 |
| | |||||
* | yet another option for the homepage | friendica | 2014-11-20 | 1 | -10/+136 |
| | |||||
* | allow somebody to access the "home page content" (whatever that may be) even ↵ | friendica | 2014-11-16 | 1 | -23/+25 |
| | | | | after logging in by including a home/splash argument. It appears that nothing else is required to provide 'sys' channel webpage contents except a link in the admin page to create them. There *may* be an issue with comanche theme selection but we'll cross that bridge when we come to it. Also thinking that we might want to map /home/foo to /page/sys/foo in the longer term scheme of things. | ||||
* | A bit of mod/home refactoring. This is a transient state, so it's still | Thomas Willingham | 2014-09-15 | 1 | -20/+27 |
| | | | | messy, but it'll be much nicer after the move is finished. | ||||
* | Let's have a global default startpage before falling back to apps | Alexandre Hannud Abdo | 2014-06-26 | 1 | -0/+2 |
| | |||||
* | project homepage tweaks | friendica | 2014-06-16 | 1 | -0/+1 |
| | |||||
* | Time to flip the switch. | friendica | 2014-05-21 | 1 | -2/+4 |
| | |||||
* | set system.projecthome to 1 if you want the project page for a home page. ↵ | friendica | 2013-12-15 | 1 | -43/+49 |
| | | | | There was a bit of re-org of mod/home, which might alter the behaviour for some existing sites. Basically we're not showing a login box at all if you've got home.html - there should be a login link in th nav bar. If you haven't defined anything at all we'll fall back to the old behaviour but still allow the home contents to be set via plugin. | ||||
* | missed this | friendica | 2013-12-14 | 1 | -7/+9 |
| | |||||
* | make home.html fullpage mode - make directory search work for non-logged in, ↵ | friendica | 2013-12-14 | 1 | -4/+4 |
| | | | | but leave off suggest and invite | ||||
* | add option to hide login form from homepage | Tobias Diekershoff | 2013-12-06 | 1 | -0/+1 |
| | |||||
* | get rid of more variables with dashes in the names - use underscore *except* ↵ | friendica | 2013-08-15 | 1 | -3/+3 |
| | | | | in CSS. These were probably already here, but if you see any - please keep them out of PHP and MySQL where they sometimes get interpreted as a subtraction operation and are a bugger to find. | ||||
* | Lets not require files if we don't need them. | Thomas Willingham | 2013-05-31 | 1 | -2/+3 |
| | |||||
* | By golly, I do believe it works. | Thomas Willingham | 2013-05-31 | 1 | -16/+16 |
| | |||||
* | Half-assed use-webpage-instead-of-html. | Thomas Willingham | 2013-05-31 | 1 | -2/+41 |
| | |||||
* | zidify img links, delay notifier until actually published for time ↵ | friendica | 2013-05-27 | 1 | -1/+1 |
| | | | | travelling posts | ||||
* | issue with startpage plugin | friendica | 2013-05-18 | 1 | -0/+1 |
| | |||||
* | default page on login changed to matrix (/network) | friendica | 2013-05-18 | 1 | -2/+6 |
| | |||||
* | lostpass fixes and login/logout flow if authenticated but no default channel ↵ | friendica | 2013-01-27 | 1 | -0/+4 |
| | | | | exists | ||||
* | more structural stuff | friendica | 2012-10-29 | 1 | -2/+2 |
| | |||||
* | send home redirection to xchan_profile instead of channel_profile | friendica | 2012-10-22 | 1 | -2/+2 |
| | |||||
* | slight optimisation | mike | 2012-10-22 | 1 | -2/+2 |
| | |||||
* | fix all the little typos from that huge change | friendica | 2012-09-25 | 1 | -1/+1 |
| | |||||
* | moving a lot of structure around. 'entity' is now 'channel' | friendica | 2012-09-25 | 1 | -2/+4 |
| | |||||
* | updates | friendica | 2012-09-09 | 1 | -0/+2 |
| | |||||
* | make home redirection and register link work again | friendica | 2012-08-28 | 1 | -6/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) |