harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,819 Commits 6 Branches 36 Tags
8e2e09bb167de47b2171f4698afff3cc472c0fbb
Commit Graph

21819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kostikov 8e2e09bb16 Update passchanged_eml.tpl 2018-07-20 19:26:24 +02:00
kostikov 3713aa210f Update lostpass_eml.tpl 2018-07-20 19:25:46 +02:00
kostikov a65c23546b Add new file 2018-07-20 19:21:58 +02:00
Mario Vavti f6de91bf0f prevent double file uploads when dropping files into jot 2018-07-20 16:44:43 +02:00
Mario Vavti 4a54699c1f Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-20 10:42:45 +02:00
Mario Vavti c72f6e6ea8 fix jot drag and drop 2018-07-20 10:42:16 +02:00
Mario a274c87cb3 Merge branch 'dev' into 'dev' 
Update php2po.php

See merge request hubzilla/core!1229
 2018-07-20 09:21:35 +02:00
zotlabs a94c9d2709 checkjs fix ($page not bin-hex in all cases) 2018-07-19 17:19:19 -07:00
kostikov f9b18aa62f Update php2po.php 2018-07-20 00:22:04 +02:00
zotlabs 0866cea72c Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-19 13:45:30 -07:00
zotlabs 6adbb93f0a fix the filtered query string so it can potentially be re-used as is. 2018-07-19 13:42:57 -07:00
Mario Vavti fe0e00f8f8 Merge remote-tracking branch 'mike/master' into dev 2018-07-19 09:12:33 +02:00
zotlabs 13d19d42cb Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-18 19:14:21 -07:00
zotlabs ec852b0c8d typo 2018-07-18 17:51:10 -07:00
zotlabs a05c8ff66b query filter was a bit greedy 2018-07-18 17:48:23 -07:00
zotlabs 5ce50d0a2e mangled urls on redirects 2018-07-18 17:05:38 -07:00
Mario Vavti dfbdeafa39 Merge remote-tracking branch 'mike/master' into dev 2018-07-18 20:59:45 +02:00
Mario Vavti eb322e8312 set the correct album name when moving photos 2018-07-18 13:18:37 +02:00
Mario Vavti c2e819771f version 3.7 2018-07-18 11:56:26 +02:00
Mario Vavti 896d29d0c0 update composer autoload cache 2018-07-18 11:52:42 +02:00
Mario Vavti 4c633a9fb8 update strings 2018-07-18 11:49:32 +02:00
Mario Vavti 5fd1674d50 version 3.6RC 2018-07-18 11:39:22 +02:00
kostikov 67cbeaa3d4 Update hmessages.po 
(cherry picked from commit cbab7d2150)
 2018-07-18 08:28:18 +02:00
kostikov 23f3d554b8 Fix wrong plural function logic 
(cherry picked from commit 4284088611)
 2018-07-18 08:27:53 +02:00
zotlabs 744d548380 util/typo - perform php -l and then include the file. We'll catch a bunch more stuff. 2018-07-17 05:01:22 -07:00
zotlabs 82a4bbd571 spellcheck 2018-07-15 23:32:09 -07:00
zotlabs c187461985 update_addon_repo: scan the addon dir after updating and remove dead symlinks (which represent deprecated/removed addons). 2018-07-15 21:34:06 -07:00
zotlabs cc91db55b7 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-15 18:43:41 -07:00
Mario Vavti bb70223509 when calling timeago() from mod_mail.js it is called before the translations are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time) 2018-07-13 11:00:37 +02:00
Mario Vavti 98fb2ec639 let timeago render the date 2018-07-13 10:16:07 +02:00
Mario Vavti a8cef79b1a let timeago render the date 2018-07-13 10:13:11 +02:00
Mario Vavti 5076e38c1c update jquery.timeago lib 2018-07-13 10:12:11 +02:00
Mario e000d98cc5 Merge branch 'hookableCSP-mr' into 'dev' 
Hookable csp mr

See merge request hubzilla/core!1225
 2018-07-13 09:34:48 +02:00
M. Dent 38cc88c861 Hookable csp mr 2018-07-13 09:34:48 +02:00
zotlabs d71e70bedf functions to support module and widget registration by plugins. These have identical construction to core modules and widgets and are registered just like hooks during addon load. Also additional Apps functions addon_app_installed() and system_app_installed() which will eventually replace feature_installed() for features which are converted to apps. The convention being used is that the module associated with the app calls the appropriate *_app_installed() function and if not present emits descriptive text about the app and exits. This allows one to click on an 'available' app and learn about it. Once installed, the app module behaves normally and may offer functionality or what once were addon settings on the settings/featured page. Refer to zap-addons in the zap repository for examples of how this is being used to eliminate the 'additional features' and 'addon settings' pages. 2018-07-12 16:23:32 -07:00
Mario Vavti 48e74035f2 Merge remote-tracking branch 'mike/master' into dev 2018-07-12 09:16:52 +02:00
zotlabs 38bccecc04 fix to cart behaviour 2018-07-11 18:00:47 -07:00
Andrew Manning 3ebe35f7f7 Merge branch 'patch-1' into 'dev' 
Update hstrings.php - spelling - Privatsphäre

See merge request hubzilla/core!1223
 2018-07-10 01:36:14 +02:00
Heiko Förster b81f1111d1 Update hstrings.php - spelling - Privatsphäre 2018-07-08 16:48:37 +02:00
Mario Vavti ac8db6479e fix css regression 2018-07-07 08:14:11 +02:00
Mario Vavti d903772831 this is messing with names containing a comma and is superfluous now 2018-07-06 08:44:25 +02:00
zotlabs cc71e507cb don't provide manage apps button when viewing all available 2018-07-05 22:03:41 -07:00
zotlabs fe44ebee93 change to import system apps at most once a day per person 2018-07-05 21:55:03 -07:00
zotlabs c80e009cf3 app store fixes 2018-07-05 21:46:34 -07:00
zotlabs f6e8ce5516 appstore changes 2018-07-04 23:20:35 -07:00
zotlabs 51a2e64a89 issue syncing pageflags 2018-07-04 19:51:16 -07:00
zotlabs bf24a106ce Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-04 19:07:52 -07:00
zotlabs 1387b88ba4 remove manage group link from activity_filter, already in personal menu 2018-07-04 19:04:12 -07:00
Mario Vavti d9ece80fda order nouveau by created instead of received since ordering by received returns unexpected results once old expired items get re-imported 2018-07-04 10:55:38 +02:00
Mario Vavti b88a9c2627 Revert "add the missing link to manage privacy groups" 
This reverts commit c28e27357a.
 2018-07-04 10:53:07 +02:00