aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13 from redmatrix/devmrjive2018-01-3034-132/+450
|\
| * 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 select...zotlabs2018-01-291-0/+11
| | * | unable to delete accounts using tickboxes on admin/accounts - make all the ac...zotlabs2018-01-292-5/+8
| | * | redirect to the email_validation page if login was attempted after account cr...zotlabs2018-01-293-1/+3
| * | | 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 e...zotlabs2018-01-291-0/+9
| | * 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 ch...zotlabs2018-01-283-3/+7
| | * | Surface the ability to change the landing page after channel creation and cr...zotlabs2018-01-286-3/+93
| | * | Guranteed somebody will paste the verification link and not the token, especi...zotlabs2018-01-271-1/+1
| * | | Merge pull request #967 from dawnbreak/devgit-marijus2018-01-291-38/+41
| |\ \ \
| | * | | 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 detailsmrjive2018-01-291-2/+2
| |/ /
| * | 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 a...zotlabs2018-01-274-2/+106
| | * typo from previous checkin and partial fix to hubzilla #965 - show any connec...zotlabs2018-01-262-2/+9
| | * 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
| * | | if startpage is /hq redirect all notifications links to /hq and minor notific...Mario Vavti2018-01-276-48/+44
| | |/ | |/|
| * | 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, observer,...zotlabs2018-01-251-14/+28
* | | small changesmrjive2018-01-291-1/+1
* | | Update connections.tplmrjive2018-01-291-1/+1
* | | Merge pull request #12 from redmatrix/devmrjive2018-01-2628-1004/+999
|\| |
| * | 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) fr-...zotlabs2018-01-241-1/+34
| * 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 pla...Mario Vavti2018-01-241-3/+3
| * update to bootstrap 4 stableMario Vavti2018-01-2422-602/+925
| * consolidate notifications caching and loadingMario Vavti2018-01-243-25/+33
* | Merge pull request #11 from redmatrix/devmrjive2018-01-24171-9879/+35010
|\|
| * 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 ori...zotlabs2018-01-23121-0/+34733
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 09:52:30 +0000