Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | 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 | |
| | |/ | |/| | ||||||
| * | | don't do any bbcode translation within code blocks (except baseurl, observer,... | zotlabs | 2018-01-25 | 1 | -14/+28 | |
| |/ | ||||||
| * | improve browser language detection by offering fallback of (for instance) fr-... | zotlabs | 2018-01-24 | 1 | -1/+34 | |
| * | 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 pla... | Mario Vavti | 2018-01-24 | 1 | -3/+3 | |
| * | 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 ori... | zotlabs | 2018-01-23 | 121 | -0/+34733 | |
| | * | 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 | |
| | * | siteinfo embellishments | zotlabs | 2018-01-22 | 2 | -2/+3 | |
| | * | hubzilla issue #920 - unable to delete permission groups with space in name | zotlabs | 2018-01-22 | 2 | -3/+3 | |
| * | | implement caching of notifications in browser session storage | Mario Vavti | 2018-01-24 | 3 | -97/+136 | |
| |/ | ||||||
| * | Merge branch 'dev' | zotlabs | 2018-01-22 | 2 | -5/+22 | |
| |\ | ||||||
| | * | better notifications for edit post/comments which may have been originally po... | zotlabs | 2018-01-22 | 1 | -1/+15 | |
| | * | ensure filter words are not empty | zotlabs | 2018-01-21 | 1 | -4/+7 | |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-21 | 13 | -100/+146 | |
| | |\ | ||||||
| | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-18 | 17 | -211/+139 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-17 | 6 | -5/+24 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-15 | 15 | -42/+40 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-13 | 38 | -4210/+11849 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-12 | 37 | -171/+415 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-09 | 5 | -9/+12 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-08 | 34 | -192/+338 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-22 | 6 | -108/+140 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-21 | 388 | -13373/+18884 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-14 | 9 | -1400/+1539 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-12 | 19 | -38/+199 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-07 | 5 | -7/+56 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-06 | 19 | -436/+206 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-04 | 19 | -90/+232 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-02 | 12 | -49/+132 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-30 | 8 | -309/+152 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-28 | 3 | -235/+132 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-27 | 21 | -91/+261 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-25 | 29 | -83/+281 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-23 | 24 | -19/+699 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-22 | 40 | -11/+2561 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-21 | 9 | -69/+172 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-20 | 28 | -58/+5653 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-19 | 36 | -94/+690 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-15 | 9 | -48/+113 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |