| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | improve zotfeed for discover channel so it will send updates to posts you've ↵ | friendica | 2014-04-17 | 3 | -17/+16 |
| | | | | | already received. Incidentally I discovered why we had the meltdown replying to discover channel items the other day - but can't fix it easily. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-17 | 4 | -9/+58 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2014-04-17 | 14 | -78/+114 |
| | |\ | |||||
| | * | | Dark schema: fixed code view, ACL window and preview | jeroenpraat | 2014-04-16 | 4 | -9/+58 |
| | | | | |||||
| * | | | This preserves the alignment work done earlier but provides a more ↵ | friendica | 2014-04-17 | 4 | -2/+18 |
| | |/ |/| | | | | | aesthetically pleasing page. | ||||
| * | | saved search adjustments | friendica | 2014-04-16 | 2 | -13/+9 |
| | | | |||||
| * | | a few more alignment issues | friendica | 2014-04-16 | 3 | -13/+16 |
| | | | |||||
| * | | clean up the group selector on the connedit page | friendica | 2014-04-16 | 1 | -1/+4 |
| | | | |||||
| * | | Lots of positional changes on sidebar menus - reduce indented margins | friendica | 2014-04-16 | 10 | -59/+351 |
| |\ \ | | | | | | | | | | | | | | | | | | | Merge branch 'master' into ruler Conflicts: view/css/widgets.css | ||||
| | * \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-16 | 4 | -39/+313 |
| | |\ \ | |||||
| | | * | | Doc - missing closing tag | Thomas Willingham | 2014-04-17 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge pull request #415 from encyclomundi/master | Thomas Willingham | 2014-04-17 | 1 | -0/+4 |
| | | |\ \ | | | |/ | | |/| | added "network" as another user group for davfs | ||||
| | | | * | added "network" as another user group for davfs | Charles | 2014-04-16 | 1 | -0/+4 |
| | | |/ | |||||
| | | * | Doco - Add some troubleshooting for 0 byte files in Davfs2 | Thomas Willingham | 2014-04-16 | 1 | -1/+20 |
| | | | | |||||
| | | * | Merge pull request #414 from jeroenpraat/patch-2 | RedMatrix | 2014-04-16 | 3 | -38/+289 |
| | | |\ | | | | | | | | | Large update dark schema | ||||
| | | | * | Needed for large update dark schema and minor fixes default. | jeroenpraat | 2014-04-15 | 1 | -18/+98 |
| | | | | | |||||
| | | | * | Needed for large update dark schema. | jeroenpraat | 2014-04-15 | 1 | -4/+107 |
| | | | | | |||||
| | | | * | Large update dark schema | jeroenpraat | 2014-04-15 | 1 | -16/+84 |
| | | | | | | | | | | | | | The new ACL and some minor things still needs to be done. Style.css and style.php will follow. | ||||
| | * | | | bug fixes after widget cleanup | friendica | 2014-04-16 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | button cleanup directory page | friendica | 2014-04-16 | 3 | -14/+18 |
| | | | | | |||||
| | * | | | rev update | friendica | 2014-04-16 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | fixing widgets | friendica | 2014-04-16 | 5 | -34/+32 |
| | | | | |||||
| * | | | this makes conversations look a lot better | friendica | 2014-04-16 | 1 | -1/+8 |
| | | | | |||||
| * | | | first cut - straighten out the margins | friendica | 2014-04-16 | 1 | -1/+8 |
| |/ / | |||||
| * | | The comment submit button seems to have drifted into some strange place | friendica | 2014-04-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-15 | 2 | -10/+2 |
| |\| | |||||
| | * | minor css fix | marijus | 2014-04-15 | 2 | -10/+2 |
| | | | |||||
| * | | tag anyone | friendica | 2014-04-15 | 4 | -23/+41 |
| |/ | |||||
| * | better mapping of visible connections | friendica | 2014-04-14 | 3 | -23/+17 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-14 | 2 | -3/+5 |
| |\ | |||||
| | * | fixes rconnect button for bs-default scheme | marijus | 2014-04-14 | 1 | -3/+3 |
| | | | |||||
| | * | a small fix for bs-default scheme | marijus | 2014-04-14 | 1 | -0/+2 |
| | | | |||||
| * | | Better handling of restricted /channel and /profile permissions. We will ↵ | friendica | 2014-04-14 | 3 | -20/+27 |
| |/ | | | | 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). | ||||
| * | directory: make "connect" more prominent, but this ultimately needs more ↵ | friendica | 2014-04-14 | 3 | -3/+3 |
| | | | | | theme work. | ||||
| * | until we can figure out how to allow commenting on the discover page without ↵ | friendica | 2014-04-13 | 1 | -0/+7 |
| | | | | | killing the matrix, just turn it off. | ||||
| * | profperm: abook_profile was being handled by profile id rather than ↵ | friendica | 2014-04-13 | 1 | -7/+7 |
| | | | | | profile_guid, causing private profiles to not be activated in many cases. | ||||
| * | Often somebody will join the matrix with a dodgy cert and we'll sort that ↵ | friendica | 2014-04-13 | 2 | -12/+26 |
| | | | | | 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. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-13 | 200 | -291/+588 |
| |\ | |||||
| | * | Merge pull request #411 from beardy-unixer/master | Thomas Willingham | 2014-04-13 | 1 | -6/+0 |
| | |\ | | | | | | | Tony has been near the Git again. | ||||
| | | * | Tony has been near the Git again. | Thomas Willingham | 2014-04-13 | 1 | -6/+0 |
| | |/ | |||||
| | * | Merge pull request #407 from tonybaldwin/master | RedMatrix | 2014-04-13 | 2 | -0/+7 |
| | |\ | | | | | | | added spoiler tag to bbcode help doc | ||||
| | | * | added breaks after added bbcode spoiler line | tony baldwin | 2014-04-12 | 1 | -1/+1 |
| | | | | |||||
| | | * | added spoiler tag to bbcode help doc | tony baldwin | 2014-04-12 | 1 | -0/+1 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/master' | tony baldwin | 2014-04-12 | 326 | -15932/+20842 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css whatever | ||||
| | | * \ | Merge remote-tracking branch 'upstream/master' | Tony Baldwin | 2014-03-09 | 393 | -13322/+24226 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/redbasic/tpl/theme_settings.tpl reset to upstream | ||||
| | | * | | | took the padding out of bbcode.php | Tony Baldwin | 2014-03-09 | 1 | -8/+8 |
| | | | | | | |||||
| | | * | | | added padding around images floated right and left | Tony Baldwin | 2014-03-09 | 1 | -9/+16 |
| | | | | | | |||||
| | | * | | | reimplementing navbar colours that were undone by git-marjus | tony baldwin | 2014-02-20 | 2 | -4/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #408 from beardy-unixer/master | RedMatrix | 2014-04-13 | 199 | -291/+587 |
| | |\ \ \ \ | | | | | | | | | | | | | Update sabre | ||||
| | | * | | | | Update sabre | Thomas Willingham | 2014-04-12 | 199 | -291/+587 |
| | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |