Commit graph

84 commits

Author SHA1 Message Date
redmatrix
be701677d6 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-10-17 16:38:57 -07:00
redmatrix
b6c765c9dc allow homepage content to be a full redirect 2015-10-17 16:33:28 -07:00
redmatrix
2128d5a256 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-10 15:47:23 -07:00
Mario Vavti
edd2d1e8d4 show login without checking for block_public, local or remote channel 2015-06-10 13:24:16 +02:00
Mario Vavti
20a317b5b7 really show login form if it is enabled 2015-06-10 11:58:45 +02:00
redmatrix
faa7f97c25 s/broder/border/ 2015-06-09 16:52:53 -07:00
redmatrix
03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
54b61f817d provide a mechanism for loading the frontpage without redirecting. 2015-06-08 21:19:05 -07:00
redmatrix
3c5a5a9ebf more frontpage tweaks 2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f reverse logic of homepage login setting 2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a frontpage tweaks 2015-06-07 18:15:26 -07:00
redmatrix
65bea5e02c frontpage changes 2015-06-07 16:19:59 -07:00
redmatrix
7c7a5cba8f Merge branch 'master' into tres 2015-05-17 19:49:36 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix
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
2015-05-17 19:48:57 -07:00
redmatrix
91d7b0f7eb more work isolating the projectname from core. 2015-05-17 16:28:16 -07:00
redmatrix
a6cb90c81c Merge branch 'master' into tres
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
2015-05-14 18:02:29 -07:00
redmatrix
25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
friendica
6679734135 Merge branch 'master' into tres
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
2015-04-23 19:49:41 -07:00
friendica
649ada7100 provide ability to have randomised homepage content from a set of pages name home-* 2015-04-02 13:22:48 -07:00
friendica
7f6ba91dfa allow webpage for home to use its own layout file 2015-03-31 17:52:03 -07:00
friendica
2bd19e6b51 $simple_update isn't so simple any more. Make sure we don't re-itnroduce the 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). 2015-03-22 15:00:41 -07:00
friendica
6631540d20 provide visual feedback when deleting a like by liking it again. 2015-03-22 12:55:13 -07:00
friendica
a2e3ca6fd8 add loadtime search to channel and fix it for home. display and search need further investigation 2015-03-21 16:46:28 -07:00
friendica
2e3daf77bb site firehose 2015-02-15 20:20:23 -08:00
friendica
da2349bb6a provide relief to sites that are severely impacted by the slow ITEM_UNSEEN 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. 2015-02-12 17:45:25 -08:00
friendica
912be23e16 Merge branch 'master' into tres
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
2015-01-29 15:09:35 -08:00
friendica
ff68ea6087 more message restrict conversions 2015-01-29 14:51:41 -08:00
friendica
e157371c39 remote_user => remote_channel 2015-01-28 20:58:59 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
e46eba1258 heavy lifting converting item flag bits 2015-01-22 17:41:16 -08:00
friendica
1005618faf honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set. 2015-01-14 13:52:34 -08:00
friendica
e528483d81 hide friends broken, add parameter for item search by verb 2015-01-13 14:42:54 -08:00
friendica
f28103d595 wall tags 2014-12-15 14:37:31 -08:00
friendica
d191e7c348 project roadmap 2014-11-23 14:51:04 -08:00
friendica
e74a3926fe yet another option for the homepage 2014-11-20 17:38:41 -08:00
friendica
b11ed7f88e allow somebody to access the "home page content" (whatever that may be) even 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. 2014-11-16 22:46:52 -08:00
Thomas Willingham
6416a61c41 A bit of mod/home refactoring. This is a transient state, so it's still
messy, but it'll be much nicer after the move is finished.
2014-09-15 01:38:55 +01:00
Alexandre Hannud Abdo
aed07dddce Let's have a global default startpage before falling back to apps 2014-06-26 01:30:21 -03:00
friendica
a868da6c07 project homepage tweaks 2014-06-16 15:55:20 -07:00
friendica
71a4abe293 Time to flip the switch. 2014-05-21 21:33:31 -07:00
friendica
731ab80ac2 set system.projecthome to 1 if you want the project page for a home page. 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. 2013-12-15 15:37:51 -08:00
friendica
db11f5af78 missed this 2013-12-14 17:06:50 -08:00
friendica
d14e2db6b4 make home.html fullpage mode - make directory search work for non-logged in, but leave off suggest and invite 2013-12-14 17:03:37 -08:00
Tobias Diekershoff
6c6c8a2451 add option to hide login form from homepage 2013-12-06 12:00:43 +01:00
friendica
a8dd7280b3 get rid of more variables with dashes in the names - use underscore *except* 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. 2013-08-15 22:52:19 -07:00
Thomas Willingham
595c2a5e9d Lets not require files if we don't need them. 2013-05-31 03:46:52 +01:00
Thomas Willingham
bfb6f20ef2 By golly, I do believe it works. 2013-05-31 03:38:37 +01:00
Thomas Willingham
a061499c91 Half-assed use-webpage-instead-of-html. 2013-05-31 03:25:44 +01:00
friendica
df32c93d56 zidify img links, delay notifier until actually published for time travelling posts 2013-05-27 05:27:35 -07:00