Commit graph

10084 commits

Author SHA1 Message Date
friendica
8dcf9e78e1 This preserves the alignment work done earlier but provides a more aesthetically pleasing page. 2014-04-17 01:33:44 -07:00
friendica
962665b8b5 saved search adjustments 2014-04-16 21:46:06 -07:00
friendica
be498be840 a few more alignment issues 2014-04-16 21:08:43 -07:00
friendica
f191637ffa clean up the group selector on the connedit page 2014-04-16 20:33:15 -07:00
friendica
9be4cd4dcd Lots of positional changes on sidebar menus - reduce indented margins
Merge branch 'master' into ruler

Conflicts:
	view/css/widgets.css
2014-04-16 20:28:23 -07:00
friendica
acc70b9deb fixing widgets 2014-04-16 20:09:19 -07:00
friendica
d26a433a5e Merge https://github.com/friendica/red into pending_merge 2014-04-16 18:36:26 -07:00
friendica
c7712d3b45 bug fixes after widget cleanup 2014-04-16 18:35:37 -07:00
friendica
558e283260 button cleanup directory page 2014-04-16 18:28:36 -07:00
friendica
433d964dd5 this makes conversations look a lot better 2014-04-16 18:07:33 -07:00
Thomas Willingham
3a96691e29 Doc - missing closing tag 2014-04-17 01:19:58 +01:00
Thomas Willingham
3f98d57fdd Merge pull request #415 from encyclomundi/master
added "network" as another user group for davfs
2014-04-17 01:17:49 +01:00
Charles
51d7be6f24 added "network" as another user group for davfs 2014-04-16 17:12:49 -07:00
friendica
2d86c7317c rev update 2014-04-16 16:42:27 -07:00
friendica
1b0bf90d13 first cut - straighten out the margins 2014-04-16 16:41:44 -07:00
Thomas Willingham
9589d12c93 Doco - Add some troubleshooting for 0 byte files in Davfs2 2014-04-16 18:50:48 +01:00
RedMatrix
077296ccf1 Merge pull request #414 from jeroenpraat/patch-2
Large update dark schema
2014-04-16 17:39:51 +10:00
friendica
925c63343e The comment submit button seems to have drifted into some strange place 2014-04-15 21:36:51 -07:00
friendica
e0cccb4cc2 Merge https://github.com/friendica/red into pending_merge 2014-04-15 18:36:05 -07:00
friendica
1eb8e570bf tag anyone 2014-04-15 18:35:22 -07:00
jeroenpraat
16db393495 Needed for large update dark schema and minor fixes default. 2014-04-15 21:35:30 +02:00
jeroenpraat
74ec0530f6 Needed for large update dark schema. 2014-04-15 21:33:26 +02:00
jeroenpraat
bef2d26484 Large update dark schema
The new ACL and some minor things still needs to be done. Style.css and style.php will follow.
2014-04-15 21:29:03 +02:00
marijus
efe80bb8e9 minor css fix 2014-04-15 20:48:15 +02:00
friendica
9026ea649a better mapping of visible connections 2014-04-14 17:29:19 -07:00
friendica
dc9a06ed37 Merge https://github.com/friendica/red into pending_merge 2014-04-14 16:55:57 -07:00
friendica
506ae56385 Better handling of restricted /channel and /profile permissions. We will show the name, profile photo and a 'connect' button if appropriate on these pages regardless of permissions. A blank page makes it difficult for folks to figure out how to connect and if it is their real life friend 'x' or not. It also matches our overall policy (adopted from Facebook's lessons learned) that the channel name and default profile photo are always visible and can't really be blocked without messing up the usability of the entire network. This also makes sure that a connect button can be found somewhere besides the directory - where the entry could be blocked; and avoid somebody having to figure out the webbie and find the link to "follow" (another related issue). 2014-04-14 16:45:16 -07:00
marijus
02c08d0cda fixes rconnect button for bs-default scheme 2014-04-14 21:47:00 +02:00
marijus
d371ad3da7 a small fix for bs-default scheme 2014-04-14 21:10:48 +02:00
friendica
bf8f5d5b2b directory: make "connect" more prominent, but this ultimately needs more theme work. 2014-04-14 02:37:04 -07:00
friendica
4feeacb51b until we can figure out how to allow commenting on the discover page without killing the matrix, just turn it off. 2014-04-13 20:26:20 -07:00
friendica
bc041bdb77 profperm: abook_profile was being handled by profile id rather than profile_guid, causing private profiles to not be activated in many cases. 2014-04-13 19:57:47 -07:00
friendica
769b0f6bc9 Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed. 2014-04-13 18:30:06 -07:00
friendica
73f459b68d Merge https://github.com/friendica/red into pending_merge 2014-04-13 18:08:15 -07:00
friendica
e3aa7d2aaf only show forum tags on contact autocomplete, not in the ACL selector 2014-04-13 18:07:19 -07:00
friendica
08435e5b1a minor alignment issues 2014-04-13 16:07:47 -07:00
Thomas Willingham
153cc599a3 Merge pull request #411 from beardy-unixer/master
Tony has been near the Git again.
2014-04-13 19:27:19 +01:00
Thomas Willingham
abcd835bf0 Tony has been near the Git again. 2014-04-13 19:25:41 +01:00
RedMatrix
581e999f6c Merge pull request #407 from tonybaldwin/master
added spoiler tag to bbcode help doc
2014-04-13 18:16:37 +10:00
RedMatrix
fe1ecbd012 Merge pull request #408 from beardy-unixer/master
Update sabre
2014-04-13 18:16:04 +10:00
friendica
dc1a529b63 remove extra tag logging 2014-04-12 23:57:19 -07:00
friendica
4fda10db2f don't match quote remnants 2014-04-12 17:04:54 -07:00
friendica
d7aaff459f let normal hashtags be quoted strings also 2014-04-12 16:58:19 -07:00
friendica
5cb7e48dad major cleanup of handle_tag() 2014-04-12 15:53:52 -07:00
Thomas Willingham
cdc8454cf1 Update sabre 2014-04-12 18:13:37 +01:00
tony baldwin
9919d109fd added breaks after added bbcode spoiler line 2014-04-12 08:44:28 -04:00
tony baldwin
e8de088037 added spoiler tag to bbcode help doc 2014-04-12 08:40:48 -04:00
tony baldwin
ebd33b185d Merge remote-tracking branch 'upstream/master'
Conflicts:
	view/theme/redbasic/css/style.css

whatever
2014-04-12 08:37:56 -04:00
friendica
2d9ab91e9f Merge branch 'master' into prvtag 2014-04-12 03:45:46 -07:00
friendica
d0834c7e13 Merge https://github.com/friendica/red into pending_merge 2014-04-12 03:32:58 -07:00