aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Revert "more prefer zot6"Mario2020-08-241-7/+3
| | | | | | | | | | | | This reverts commit e9a264cb43e4c782160db645329d59db9835e388
| * | | provide some sort of feedbackMario Vavti2020-08-241-0/+5
| |/ /
| * | more prefer zot6Mario Vavti2020-08-241-3/+7
| | |
| * | prefer zot6 and also check for hubloc_deletedMario Vavti2020-08-241-2/+5
| | |
| * | an attempt to fix update 1238 for older hubs with broken xchan entriesMario Vavti2020-08-232-9/+11
| | |
| * | only show poke link if poke app is installedMario Vavti2020-08-221-1/+3
| | |
| * | move cryptojs to addonMario Vavti2020-08-2292-7203/+16
| | |
| * | Revert "composer update pear/text_languagedetect"Mario2020-08-2218-256/+39
| | | | | | | | | This reverts commit 646dce7765b36afab5c1688c51ebab48a214864e
| * | composer update pear/text_languagedetectMario Vavti2020-08-2218-39/+256
| | |
| * | composer update html-to-markdownMario Vavti2020-08-228-15/+89
| | |
| * | composer update htmlpurifierMario Vavti2020-08-2274-8938/+62
| | |
| * | bootstrap filesMario Vavti2020-08-227-0/+282
| | |
| * | composer update bootstrapMario Vavti2020-08-22128-2900/+2194
| | |
| * | composer update jquery-file-uploadMario Vavti2020-08-226-711/+448
| | |
| * | composer update sabre libsMario Vavti2020-08-2225-124/+180
| | |
| * | use the default setting and also add the mode to the cipher. aes-128 is to ↵Mario Vavti2020-08-215-8/+8
| | | | | | | | | | | | be preferred over aes-256 according to bruce schneier https://www.schneier.com/blog/archives/2009/07/another_new_aes.html#c386957
| * | whitespaceMario Vavti2020-08-201-1/+0
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2020-08-201-1/+1
| |\ \
| | * | be more clear in commentMario2020-08-201-1/+1
| | | |
| * | | first cut on implementing additional encryption with the SJCL library. aes ↵Mario Vavti2020-08-2010-10/+167
| |/ / | | | | | | | | | only and no backward compatibility.
| * | fix item deletionMario2020-08-202-15/+28
| | |
| * | Merge branch 'dev' into 'dev'Mario2020-08-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | issue with DAV - moveInto and variable scope See merge request hubzilla/core!1868
| | * | issue with DAV - moveInto and variable scopenobody2020-08-161-1/+1
| | | |
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devnobody2020-08-161-1/+1
| | |\ \ | | |/ / | |/| |
| * | | $id is expected to be an array with a calendarId and an instanceId for caldavMario Vavti2020-08-151-1/+1
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2020-08-052-16/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | update profile|cover photo activities converted to z6 See merge request hubzilla/core!1865
| | * | | update profile|cover photo activities converted to z6Zot2020-08-052-16/+0
| |/ / /
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devnobody2020-08-041-1/+1
| | |\ \ | | |/ / | |/| |
| * | | Ãthis should not be required anymoreMario2020-08-031-1/+1
| | | |
| | * | update profile|cover photo activities converted to z6nobody2020-08-042-16/+0
| |/ /
| * | css fixMario2020-07-311-1/+1
| | |
| * | event display zot/zot6 compatibilityMario2020-07-311-51/+51
| | |
| * | syntaxMario2020-07-301-4/+4
| | |
| * | use cursor-pointer for the lockMario2020-07-301-2/+2
| | |
| * | add new lock icon as svgMario2020-07-302-2/+45
| | |
| * | use the compact view in html2plain()Mario2020-07-301-1/+1
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-07-306-3/+18
| |\ \
| | * \ Merge branch 'dev' into 'dev'Mario2020-07-301-1/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | Add minimum form displaying time before login See merge request hubzilla/core!1863
| | | * | Add minimum form displaying time before loginMax Kostikov2020-07-211-1/+3
| | | | |
| | | * | Merge branch 'dev' into 'dev'Max Kostikov2020-07-19906-79470/+37883
| | | |\| | | | | | | | | | | | | | | | | | | | | Dev sync See merge request kostikov/core!1
| | * | | Merge branch 'dev' into 'dev'Mario2020-07-305-2/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | foreach warning and a minor update to util/zotsh See merge request hubzilla/core!1864
| | | * | | add api_verify to api_zotzotlabs2020-07-221-1/+14
| | | | | |
| | | * | | foreach warningzotlabs2020-07-224-1/+1
| | | | | |
| * | | | | respect notifications settingsMario2020-07-301-1/+34
| |/ / / /
| * | | | raise cache lifetime - this should probably be configurableMario2020-07-301-1/+1
| | | | |
| * | | | add some context to the notificationsMario2020-07-293-13/+11
| | | | |
| * | | | versionMario2020-07-261-1/+1
| | | | |
| * | | | whitespaceMario2020-07-262-2/+2
| | | | |
| * | | | fix hubloc_id_url for activitypub with broken xchan_urlMario2020-07-262-13/+44
| | | | |
| * | | | versionMario2020-07-261-1/+1
| | | | |