aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-261-14/+28
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | 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
| | * | | | | | | | Issue with configurable site age limit, vagueness when informing about email ...zotlabs2018-01-263-16/+49
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | don't do any bbcode translation within code blocks (except baseurl, observer,...zotlabs2018-01-251-14/+28
| | |/ / / / / /
| | * | | | | | 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
| | | |_|_|_|/ | | |/| | | |
| | * | | | | 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
| | | * | | | | 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
| | * | | | | | implement caching of notifications in browser session storageMario Vavti2018-01-243-97/+136
| | |/ / / / /
| | * | | | | Merge branch 'dev'zotlabs2018-01-222-5/+22
| | |\ \ \ \ \
| | | * | | | | better notifications for edit post/comments which may have been originally po...zotlabs2018-01-221-1/+15
| | | * | | | | ensure filter words are not emptyzotlabs2018-01-211-4/+7
| | | * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-2113-100/+146
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1817-211/+139
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-176-5/+24
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1515-42/+40
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1338-4210/+11849
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-1237-171/+415
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-095-9/+12
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-0834-192/+338
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-226-108/+140
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-21388-13373/+18884
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-149-1400/+1539
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-1219-38/+199
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-075-7/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-0619-436/+206
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-0419-90/+232
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-0212-49/+132
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-308-309/+152
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-283-235/+132
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2721-91/+261
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2529-83/+281
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2324-19/+699
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2240-11/+2561
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-219-69/+172
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2028-58/+5653
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1936-94/+690
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-159-48/+113
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \