aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-093-3/+82
|\
| * hide the redeliver option one level down since it should rarely be needed by ↵redmatrix2016-07-071-1/+8
| | | | | | | | folks outside of shared hosting.
| * force immediate avatar updateTreer2016-07-031-0/+72
| |
| * use visibility instead of display to hide elementsMario Vavti2016-07-011-2/+2
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-014-22/+24
|\|
| * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-014-22/+24
| |
* | JavaScript popup for page delete confirmationAndrew Manning2016-07-011-0/+3
|/
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-309-12/+53
|\
| * templatise the Dreport page and add a redeliver option for when things stuff ↵redmatrix2016-06-291-0/+21
| | | | | | | | up badly.
| * only request geolocation permission if we're creating a post.redmatrix2016-06-291-1/+1
| |
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-281-1/+7
| |\
| | * fix month view in fullscreen modeMario Vavti2016-06-281-1/+7
| | |
| * | erge branch 'dev' into sabre32Mario Vavti2016-06-282-8/+0
| |\|
| | * update fullcalendar to version 2.8.0Mario Vavti2016-06-282-8/+0
| | |
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-281-0/+3
| |\|
| | * add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵redmatrix2016-06-271-0/+3
| | | | | | | | | | | | registrations
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-3/+132
| |\|
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-243-4/+4
| |\ \
| * \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-232-7/+7
| |\ \ \
| * \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-223-24/+30
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-212-14/+80
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2037-86783/+61544
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | return something so we can make a conclusionMario Vavti2016-06-191-0/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-199-0/+21512
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-181-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-173-3/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+40
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ mrge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-162-1/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | css fixMario Vavti2016-06-141-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | css fixesMario Vavti2016-06-131-1/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-133-0/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-116-9051/+9048
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-106-1/+331
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-101-16/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | more style workMario Vavti2016-06-091-1/+11
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ↵Andrew Manning2016-06-301-0/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toc is linked to document headings.
* | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-2/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki
| * | | | | | | | | | | | | | | | | | Insert image links wherever cursor is in the editorAndrew Manning2016-06-251-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-254-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-251-1/+130
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
* | | | | | | | | | | | | | | | | | fix help linkTreer2016-06-261-1/+1
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | add url permalink mf2 markupBen Roberts2016-06-241-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | p-author missing from embedded h-card in itemsBen Roberts2016-06-231-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | make dropdown-caret invoke the dropdownredmatrix2016-06-231-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-231-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | microformats 2 for postsBen Roberts2016-06-221-6/+6
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | code cleanup for profile_photosredmatrix2016-06-231-1/+1
|/ / / / / / / / / / / / / / / /