zotlabs
|
970f4a3175
|
namespace/use swapped, merge conflict
|
2018-07-15 19:22:15 -07:00 |
|
zotlabs
|
444de76ee6
|
Merge branch 'red'
|
2018-07-15 18:47:55 -07:00 |
|
zotlabs
|
cc91db55b7
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-15 18:43:41 -07:00 |
|
zotlabs
|
cf88cbb46f
|
add summary field to item table
|
2018-07-15 18:31:39 -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
|
b3b6b813f2
|
upstream/downstream comment work
|
2018-07-11 18:02:25 -07:00 |
|
zotlabs
|
38bccecc04
|
fix to cart behaviour
|
2018-07-11 18:00:47 -07:00 |
|
zotlabs
|
b7e0115447
|
add plugin registration for widgets, move wiki to addon/app
|
2018-07-10 19:58:18 -07:00 |
|
zotlabs
|
4cc607ca36
|
provide widget registration for addons
|
2018-07-10 16:42:16 -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 |
|
zotlabs
|
cc90f71230
|
trim features (e2ee and bookmarks)
|
2018-07-08 22:28:15 -07:00 |
|
zotlabs
|
505d9bef60
|
remove the techlevel settings
|
2018-07-08 20:19:44 -07:00 |
|
zotlabs
|
a778b07ed3
|
the app link goes nowhere, unlink it
|
2018-07-08 20:10:23 -07:00 |
|
zotlabs
|
47e1c1a7dd
|
move articles to addons, allow addons to provide module pdl files.
|
2018-07-08 18:33:55 -07: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
|
5b084c759e
|
more app work
|
2018-07-05 22:27:44 -07: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
|
49963d4a79
|
trim features and menus
|
2018-07-05 20:28:23 -07:00 |
|
zotlabs
|
f7db9dcec5
|
more app work
|
2018-07-05 17:52:32 -07:00 |
|
zotlabs
|
0c0d177c2e
|
remove the view_stream advisory permission
|
2018-07-04 23:59:13 -07:00 |
|
zotlabs
|
f6e8ce5516
|
appstore changes
|
2018-07-04 23:20:35 -07:00 |
|
zotlabs
|
cbcfed9445
|
missing include
|
2018-07-04 22:57:27 -07:00 |
|
zotlabs
|
07ce5e04c1
|
appstore
|
2018-07-04 22:56:43 -07:00 |
|
zotlabs
|
6c3d8b0929
|
renamed grid app
|
2018-07-04 22:54:05 -07:00 |
|
zotlabs
|
580b6ee7c1
|
removed obsolete app
|
2018-07-04 22:52:32 -07:00 |
|
zotlabs
|
1b7543680b
|
Merge branch 'dev'
|
2018-07-04 20:09:55 -07:00 |
|
zotlabs
|
51a2e64a89
|
issue syncing pageflags
|
2018-07-04 19:51:16 -07:00 |
|
zotlabs
|
cf4a12b173
|
Merge branch 'dev'
|
2018-07-04 19:18:05 -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 |
|
zotlabs
|
19a04c1d92
|
add linkid structure
|
2018-07-04 18:46:28 -07:00 |
|
zotlabs
|
c2c4e427a8
|
add plugin route registration, deprecate/remove plugin_module() functionality
|
2018-07-04 18:18:35 -07:00 |
|
zotlabs
|
c8235d02e9
|
remove some obsolete stuff
|
2018-07-04 01:56:55 -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 |
|
zotlabs
|
a9cfa51c68
|
more reorg
|
2018-07-03 23:24:36 -07:00 |
|
zotlabs
|
e2e7acd20f
|
more optimisations
|
2018-07-03 22:18:07 -07:00 |
|
zotlabs
|
18dbc490fe
|
remove broken include path hack
|
2018-07-03 18:26:34 -07:00 |
|
zotlabs
|
29d973f848
|
move group to lib
|
2018-07-03 16:40:54 -07:00 |
|