| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-30 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-30 | 6 | -6/+20 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-29 | 10 | -7/+110 |
| | |\ \ | |||||
| * | | | | cosmetic readme changes, code cleanup | zotlabs | 2018-01-30 | 2 | -4/+4 |
| | |_|/ |/| | | |||||
| * | | | remove logging | zotlabs | 2018-01-29 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-29 | 2 | -40/+43 |
| |\| | | |||||
| | * | | Merge pull request #967 from dawnbreak/dev | git-marijus | 2018-01-29 | 1 | -38/+41 |
| | |\ \ | | | | | | | | | Fix a PHP7.2 warning when a channel has no cards. | ||||
| | | * | | Fix a PHP7.2 warning when a channel has no cards. | Klaus Weidenbach | 2018-01-28 | 1 | -38/+41 |
| | | | | | |||||
| | * | | | Merge pull request #970 from mrjive/patch-1 | git-marijus | 2018-01-29 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | small details on connections.tpl | ||||
| | | * | | small details | mrjive | 2018-01-29 | 1 | -2/+2 |
| | |/ / | | | | | | | Just changed the icon from sort to filter (it's what it does, it filters) and changed id to class in connection-wrapper clearfix (line 28) | ||||
| * | | | don't show jot bb-edit buttons if a mimetype other than text/bbcode is ↵ | zotlabs | 2018-01-29 | 1 | -0/+11 |
| | | | | | | | | | | | | | selected (:todo: also disable bbcode autocomplete) | ||||
| * | | | unable to delete accounts using tickboxes on admin/accounts - make all the ↵ | zotlabs | 2018-01-29 | 2 | -5/+8 |
| | | | | | | | | | | | | | action names consistent | ||||
| * | | | redirect to the email_validation page if login was attempted after account ↵ | zotlabs | 2018-01-29 | 3 | -1/+3 |
| | |/ |/| | | | | | creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it. | ||||
| * | | fix workflow for form based email validation when auto_channel_create is in ↵ | zotlabs | 2018-01-29 | 1 | -0/+9 |
| | | | | | | | | | effect. Eventually we will need to rework the workflow logic because it is getting a bit tangled. | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-28 | 10 | -49/+61 |
| |\| | |||||
| | * | do not always look first in chache when receiving the *open* status from cache | Mario Vavti | 2018-01-28 | 1 | -2/+2 |
| | | | |||||
| | * | query optimisations for notifications - use a specific index only | Mario Vavti | 2018-01-28 | 5 | -7/+23 |
| | | | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-28 | 3 | -5/+23 |
| | |\ | |||||
| | * | | fix syntax error | Mario Vavti | 2018-01-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | accidently reverted a fix from yesterday in ma previous commit | Mario Vavti | 2018-01-27 | 1 | -7/+7 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-27 | 7 | -19/+163 |
| | |\ \ | |||||
| | * | | | if startpage is /hq redirect all notifications links to /hq and minor ↵ | Mario Vavti | 2018-01-27 | 6 | -48/+44 |
| | | | | | | | | | | | | | | | | | notifications and hq fixes | ||||
| * | | | | change the image - make it bland and neutral | zotlabs | 2018-01-28 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | provide a default video image if nothing else is available. Allow sites to ↵ | zotlabs | 2018-01-28 | 3 | -3/+7 |
| | | | | | | | | | | | | | | | | | change it. | ||||
| * | | | | Surface the ability to change the landing page after channel creation and ↵ | zotlabs | 2018-01-28 | 6 | -3/+93 |
| | | | | | | | | | | | | | | | | | create a 'go' module to present several possible things to do at this point. Change the default from 'settings' to 'profiles' so that the focus is more on you rather than the software configuration. | ||||
| * | | | | Guranteed somebody will paste the verification link and not the token, ↵ | zotlabs | 2018-01-27 | 1 | -1/+1 |
| | |_|/ |/| | | | | | | | | especially before all the translations are completed. But even then... | ||||
| * | | | registration testing | zotlabs | 2018-01-27 | 3 | -5/+23 |
| | | | | |||||
| * | | | typo | zotlabs | 2018-01-27 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Usability improvements to registration/verification workflow. This requires ↵ | zotlabs | 2018-01-27 | 4 | -2/+106 |
| | | | | | | | | | additional testing. | ||||
| * | | typo from previous checkin and partial fix to hubzilla #965 - show any ↵ | zotlabs | 2018-01-26 | 2 | -2/+9 |
| | | | | | | | | | connection without comment permission as archived in contact_block(). | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-26 | 2 | -13/+19 |
| |\| | |||||
| | * | preserve open state of notifications | Mario Vavti | 2018-01-26 | 1 | -0/+10 |
| | | | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-26 | 1 | -14/+28 |
| | |\ | |||||
| | * | | move template out of #notifications and revert reset timer on manual trigger | Mario Vavti | 2018-01-25 | 2 | -9/+7 |
| | | | | |||||
| | * | | reset timer on manual update trigger | Mario Vavti | 2018-01-25 | 1 | -6/+4 |
| | | | | |||||
| * | | | Issue with configurable site age limit, vagueness when informing about email ↵ | zotlabs | 2018-01-26 | 3 | -16/+49 |
| | |/ |/| | | | | | validation policy; added email validation resend ability and the option to input a verification code at a webpage though both require additional work to provide these abilities. | ||||
| * | | don't do any bbcode translation within code blocks (except baseurl, ↵ | zotlabs | 2018-01-25 | 1 | -14/+28 |
| |/ | | | | observer, and linefeeds) | ||||
| * | improve browser language detection by offering fallback of (for instance) ↵ | zotlabs | 2018-01-24 | 1 | -1/+34 |
| | | | | | fr-fr to fr if no other language matches could be found | ||||
| * | remove unused prototype importer template and obsolete reflection cms importer | zotlabs | 2018-01-24 | 2 | -365/+0 |
| | | |||||
| * | fix some issues with bootstrap accordion (this needs fixing in some other ↵ | Mario Vavti | 2018-01-24 | 1 | -3/+3 |
| | | | | | places too) | ||||
| * | update to bootstrap 4 stable | Mario Vavti | 2018-01-24 | 22 | -602/+925 |
| | | |||||
| * | consolidate notifications caching and loading | Mario Vavti | 2018-01-24 | 3 | -25/+33 |
| | | |||||
| * | bump version | Mario Vavti | 2018-01-24 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-24 | 164 | -9763/+34837 |
| |\ | |||||
| | * | some code cleanup and simplification in mod_like | zotlabs | 2018-01-23 | 2 | -40/+42 |
| | | | |||||
| | * | add units to css | zotlabs | 2018-01-23 | 1 | -1/+1 |
| | | | |||||
| | * | undo and redo adding new cropper library as it had a .git config from the ↵ | zotlabs | 2018-01-23 | 121 | -0/+34733 |
| | | | | | | | | | original project | ||||
| | * | cleanup git issue | zotlabs | 2018-01-23 | 1 | -0/+0 |
| | | | |||||
| | * | replace image cropping library | zotlabs | 2018-01-23 | 37 | -9717/+55 |
| | | | |||||
| | * | annual license update | zotlabs | 2018-01-22 | 1 | -1/+1 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |