aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-3114-60/+60
|\
| * triple a is more saneMario Vavti2017-03-311-1/+1
| |
| * minor css adjustmentsMario Vavti2017-03-311-1/+5
| |
| * various form css fixesMario Vavti2017-03-3110-42/+38
| |
| * make btn-outline-secondary color slightly darkerMario Vavti2017-03-311-0/+4
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-314-7/+8
| |\
| | * Merge pull request #710 from dawnbreak/importcsrfgit-marijus2017-03-314-7/+8
| | |\ | | | | | | | | :lock: Add CSRF protection for import and import_items.
| * | | css fixesMario Vavti2017-03-313-17/+9
| |/ /
| * | add max height to #navbar-collapse-2Mario Vavti2017-03-312-0/+2
| | |
| * | version bumpMario Vavti2017-03-311-1/+1
| | |
| * | regenerate hmessages.poMario Vavti2017-03-311-6525/+6399
| | |
| * | fix a couple more instances where we were still calling mail() directly for ↵zotlabs2017-03-311-27/+27
| | | | | | | | | | | | site critical messages
| * | get rid of some more deprecated uses of $azotlabs2017-03-313-9/+7
| | |
| * | remove obsolete app argument from load_pdlzotlabs2017-03-313-3/+3
| | |
| * | get rid of get_app()zotlabs2017-03-317-30/+3
| | |
| * | add 'author_is_pmable()' function with plugin hooks to control whether or ↵zotlabs2017-03-313-3/+42
| | | | | | | | | | | | not to display a 'send mail' link in the thread author menu.
| * | provide platform specific install scriptzotlabs2017-03-311-3/+5
| | |
| * | provide compatibility with old-style update systemzotlabs2017-03-311-6/+16
| | |
| * | get rid of 'davguest' and allow for project specific DB updates (currently ↵zotlabs2017-03-314-2138/+2128
| | | | | | | | | | | | db updates are common between all possible projects/subprojects/forks).
| * | move db_upgrade to zlibzotlabs2017-03-316-199/+129
| | |
* | | stringszotlabs2017-03-311-3044/+3010
| | |
* | | aes256gcm is not ready for prime time. Stay tuned. Until it is, we're pretty ↵zotlabs2017-03-301-5/+5
| | | | | | | | | | | | much stuffed unless we go to 3rd party crypto libs.
* | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrfzotlabs2017-03-304-7/+8
|\ \ \ | | |/ | |/|
| * | :lock: Add CSRF protection for import and import_items.Klaus Weidenbach2017-03-304-7/+8
| |/
* | whitespacezotlabs2017-03-301-12/+14
| |
* | make aes256gcm the primary crypto modezotlabs2017-03-301-1/+14
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-3021-432/+3283
|\|
| * Merge pull request #709 from dawnbreak/docuKlaus2017-03-305-323/+465
| |\ | | | | | | Add some documentation for import functions.
| | * Add some documentation for import functions.Klaus Weidenbach2017-03-305-323/+465
| | |
| * | do not allow creating two wikis with the same nameMario Vavti2017-03-301-3/+10
| | |
| * | add some missing filesMario Vavti2017-03-308-0/+2661
| | |
| * | update to textcomplete v 1.8.0Mario Vavti2017-03-304-58/+125
| | |
| * | more css fixesMario Vavti2017-03-302-1/+5
| | |
| * | circular logic - we need the mailbox to find the last message so move the ↵zotlabs2017-03-301-4/+9
| | | | | | | | | | | | code block back where it was, and only set a direct mid if one was specified.
| * | when clicking a notification to view a private mail message, actually view ↵zotlabs2017-03-301-2/+9
| | | | | | | | | | | | that message instead of the most recent.
| * | css fixesMario Vavti2017-03-302-47/+17
| |/
* | circular logic - we need the mailbox to find the last message so move the ↵zotlabs2017-03-291-4/+9
| | | | | | | | code block back where it was, and only set a direct mid if one was specified.
* | when clicking a notification to view a private mail message, actually view ↵zotlabs2017-03-291-2/+9
| | | | | | | | that message instead of the most recent.
* | channel_store_lowlevel declared twicezotlabs2017-03-292-42/+0
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-299-25/+80
|\|
| * remove hubzilla.site from directory fallback servers until further noticeMario Vavti2017-03-291-1/+1
| |
| * missing closing bracket and semicolonMario Vavti2017-03-291-0/+1
| |
| * create channel_store_lowlevel()Mario Vavti2017-03-291-20/+56
| |
| * css fixesMario Vavti2017-03-291-2/+11
| |
| * bump versionMario Vavti2017-03-291-1/+1
| |
| * allow setting the system email name/address/replyzotlabs2017-03-292-0/+20
| |
| * more cloud updates - upgrade the DAV structures as well.zotlabs2017-03-293-41/+79
| |
| * some more photo issueszotlabs2017-03-293-32/+33
| |
| * fix photo prvnxt after all the changes yesterdayzotlabs2017-03-291-6/+5
| |
| * more work on the photo album messzotlabs2017-03-292-97/+71
| |