aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-011-15/+0
|\
| * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-011-15/+0
| |
* | delivery invoked twice in mod_tagger, once in post_activity_item() and ↵redmatrix2016-07-011-5/+1
| | | | | | | | another at the main module level
* | use small photo for Diaspora attribution correction; the medium looks ↵redmatrix2016-07-011-2/+2
|/ | | | awkward in the D* stream.
* sync flags even if post has not been editedredmatrix2016-06-301-19/+10
|
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-309-17/+110
|\
| * wiki featured disabled by default in UNO.redmatrix2016-06-291-1/+1
| |
| * provide wiki as a feature (default is on so there aren't any surprises) and ↵redmatrix2016-06-293-5/+14
| | | | | | | | add to channel menu and profile tabs
| * stream large photos through buffered I/O if possibleredmatrix2016-06-291-1/+1
| |
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-291-0/+38
| |\
| | * identity_export_year() was a bit short-sighted. We really require arbitrary ↵redmatrix2016-06-281-0/+38
| | | | | | | | | | | | date ranges. A new function was created to tackle this - channel_export_items() which takes a channel, and a start and finish date. Finish date will default to "now" if not set. Will be working this into the interface under a module named "export_items" which will correspond closely to the existing "import_items" module you'll need to do the reverse operation. Will also make it available via the API. Once that is complete, I anticipate removing identity_export_year() as it will then be somewhat redundant, and modifying the documentation on the channel export page accordingly. Note: the function works strictly in GMT so an interface would need to convert from channel local time.
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-284-7/+30
| |\|
| | * still working through some issues with curl magic-authredmatrix2016-06-271-0/+7
| | | | | | | | | | | | fixed profile photo upload
| | * add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵redmatrix2016-06-272-3/+19
| | | | | | | | | | | | registrations
| | * replace [+] and [-] with chevron iconsredmatrix2016-06-271-4/+4
| | |
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-273-3/+26
| |\|
| | * remove the app $a passed to profile_load, also add profile_load to mod_wiki ↵redmatrix2016-06-261-2/+1
| | | | | | | | | | | | which should fix issue #431
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-262-12/+42
| | |\
| | * | issue #442, tables contain too much whitespace (there's a definite issue ↵redmatrix2016-06-262-1/+25
| | | | | | | | | | | | | | | | here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem).
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-12/+42
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-251-9/+8
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-247-104/+62
| |\ \ \
| * \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-234-7/+10
| |\ \ \ \
| * \ \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-225-46/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-215-12/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-202-11/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-184-2/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-174-8/+38
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-164-12/+114
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-152-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-1411-75/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-134-24/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-102-0/+471
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | more style workMario Vavti2016-06-091-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ↵Andrew Manning2016-06-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toc is linked to document headings.
* | | | | | | | | | | | | | | | | | Added table of contents generator. Table is inserted wherever [toc] is ↵Andrew Manning2016-06-261-1/+75
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encountered.
* | | | | | | | | | | | | | | | | Merge pull request #441 from Treer/cdnhubzilla2016-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix absolute .js urls
| * | | | | | | | | | | | | | | | | fix absolute .js urlsTreer2016-06-261-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Wiki post generation option and image embed tool
| * | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another ↵Andrew Manning2016-06-251-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-259-120/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-251-4/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
* | | | | | | | | | | | | | | | | Allow absolute links to css and js filesTreer2016-06-251-8/+20
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | media (e.g. video) files weren't being detected correctly in oembed, causing ↵redmatrix2016-06-251-9/+8
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the stream to try and load large videos (and failing)
* | | | | | | | | | | | | | | change AbConfig to use channel_id instead of channel_hash; which was a ↵redmatrix2016-06-233-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mistake in retrospect
* | | | | | | | | | | | | | | relocate the cache classredmatrix2016-06-233-72/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | code cleanup for profile_photosredmatrix2016-06-231-20/+45
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | the xchan_query wasn't fully optimised as we were comparing quoted and ↵redmatrix2016-06-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unquoted strings when looking for duplicates