aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-306-6/+20
|\
| * remove loggingzotlabs2018-01-291-2/+0
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-292-40/+43
| |\
| * | don't show jot bb-edit buttons if a mimetype other than text/bbcode is ↵zotlabs2018-01-291-0/+11
| | | | | | | | | | | | selected (:todo: also disable bbcode autocomplete)
| * | unable to delete accounts using tickboxes on admin/accounts - make all the ↵zotlabs2018-01-292-5/+8
| | | | | | | | | | | | action names consistent
| * | redirect to the email_validation page if login was attempted after account ↵zotlabs2018-01-293-1/+3
| | | | | | | | | | | | creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it.
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-2910-7/+110
|\| | | |/ |/|
| * fix workflow for form based email validation when auto_channel_create is in ↵zotlabs2018-01-291-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_mergezotlabs2018-01-2810-49/+61
| |\
| * | change the image - make it bland and neutralzotlabs2018-01-281-0/+0
| | |
| * | provide a default video image if nothing else is available. Allow sites to ↵zotlabs2018-01-283-3/+7
| | | | | | | | | | | | change it.
| * | Surface the ability to change the landing page after channel creation and ↵zotlabs2018-01-286-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, ↵zotlabs2018-01-271-1/+1
| | | | | | | | | | | | especially before all the translations are completed. But even then...
* | | Merge pull request #967 from dawnbreak/devgit-marijus2018-01-291-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 Weidenbach2018-01-281-38/+41
| | |/ | |/|
* | | Merge pull request #970 from mrjive/patch-1git-marijus2018-01-291-2/+2
|\ \ \ | |/ / |/| | small details on connections.tpl
| * | small detailsmrjive2018-01-291-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)
* | do not always look first in chache when receiving the *open* status from cacheMario Vavti2018-01-281-2/+2
| |
* | query optimisations for notifications - use a specific index onlyMario Vavti2018-01-285-7/+23
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-283-5/+23
|\|
| * registration testingzotlabs2018-01-273-5/+23
| |
| * typozotlabs2018-01-271-1/+1
| |
* | fix syntax errorMario Vavti2018-01-271-2/+2
| |
* | accidently reverted a fix from yesterday in ma previous commitMario Vavti2018-01-271-7/+7
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-277-19/+163
|\|
| * Usability improvements to registration/verification workflow. This requires ↵zotlabs2018-01-274-2/+106
| | | | | | | | additional testing.
| * typo from previous checkin and partial fix to hubzilla #965 - show any ↵zotlabs2018-01-262-2/+9
| | | | | | | | connection without comment permission as archived in contact_block().
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-262-13/+19
| |\
| * | Issue with configurable site age limit, vagueness when informing about email ↵zotlabs2018-01-263-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.
* | | if startpage is /hq redirect all notifications links to /hq and minor ↵Mario Vavti2018-01-276-48/+44
| |/ |/| | | | | notifications and hq fixes
* | preserve open state of notificationsMario Vavti2018-01-261-0/+10
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-261-14/+28
|\|
| * don't do any bbcode translation within code blocks (except baseurl, ↵zotlabs2018-01-251-14/+28
| | | | | | | | observer, and linefeeds)
* | move template out of #notifications and revert reset timer on manual triggerMario Vavti2018-01-252-9/+7
| |
* | reset timer on manual update triggerMario Vavti2018-01-251-6/+4
|/
* improve browser language detection by offering fallback of (for instance) ↵zotlabs2018-01-241-1/+34
| | | | fr-fr to fr if no other language matches could be found
* remove unused prototype importer template and obsolete reflection cms importerzotlabs2018-01-242-365/+0
|
* fix some issues with bootstrap accordion (this needs fixing in some other ↵Mario Vavti2018-01-241-3/+3
| | | | places too)
* update to bootstrap 4 stableMario Vavti2018-01-2422-602/+925
|
* consolidate notifications caching and loadingMario Vavti2018-01-243-25/+33
|
* bump versionMario Vavti2018-01-241-1/+1
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-24164-9763/+34837
|\
| * some code cleanup and simplification in mod_likezotlabs2018-01-232-40/+42
| |
| * add units to csszotlabs2018-01-231-1/+1
| |
| * undo and redo adding new cropper library as it had a .git config from the ↵zotlabs2018-01-23121-0/+34733
| | | | | | | | original project
| * cleanup git issuezotlabs2018-01-231-0/+0
| |
| * replace image cropping libraryzotlabs2018-01-2337-9717/+55
| |
| * annual license updatezotlabs2018-01-221-1/+1
| |
| * siteinfo embellishmentszotlabs2018-01-222-2/+3
| |
| * hubzilla issue #920 - unable to delete permission groups with space in namezotlabs2018-01-222-3/+3
| |