zotlabs
|
2b21e4d6e6
|
fix mod_activity AS query and change the fix for urlencoding of categories in category widget to match upstream
|
2019-02-21 14:38:11 -08:00 |
|
zotlabs
|
e73af6511e
|
fix guest file (creator) delete
|
2019-02-19 13:04:28 -08:00 |
|
zotlabs
|
db4871ae1a
|
cloud perms and location independent content searching
|
2019-02-19 12:31:39 -08:00 |
|
zotlabs
|
4b96c88e50
|
more removal of unnecessary legacy stuff, string update
|
2019-02-17 15:00:08 -08:00 |
|
zotlabs
|
9b36994ef1
|
Merge ../p3 into dev
|
2019-02-14 17:08:44 -08:00 |
|
zotlabs
|
c8714bf9c2
|
wrong edit link
|
2019-02-14 15:33:51 -08:00 |
|
zotlabs
|
63a75cc7d5
|
rename privacy groups to access lists, forums to groups
|
2019-02-14 15:26:37 -08:00 |
|
zotlabs
|
8b5bc7303f
|
more work zot+
|
2019-02-13 19:55:36 -08:00 |
|
zotlabs
|
154b0e96d5
|
start zot+/zap+
|
2019-02-13 15:33:45 -08:00 |
|
zotlabs
|
329f441fec
|
remove hyperdrive setting as it does not work reliably in all cases
|
2019-02-11 15:15:12 -08:00 |
|
zotlabs
|
4bc9620597
|
expose setting to block public search
|
2019-02-07 21:05:42 -08:00 |
|
zotlabs
|
af66054c1e
|
tests updated for handle_tag() changes, Firefox slider no longer honours background color if proprietary foreground is unset.
|
2019-02-03 18:22:30 -08:00 |
|
zotlabs
|
0f2e991c56
|
rename the sharing options and update the license for 2019
|
2019-01-31 15:54:37 -08:00 |
|
zotlabs
|
6fd5bb36fb
|
implement old-style share as a post embed
|
2019-01-29 21:34:26 -08:00 |
|
zotlabs
|
8f861659d2
|
post embed
|
2019-01-29 21:26:52 -08:00 |
|
zotlabs
|
c43173109e
|
minor fixes from upstream
|
2019-01-24 19:03:14 -08:00 |
|
zotlabs
|
ad8c634b33
|
Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev
|
2019-01-23 14:29:01 -08:00 |
|
zotlabs
|
045debd26f
|
issues with autoperms, rewrite owa, upstream fixes to main.js
|
2019-01-23 14:27:51 -08:00 |
|
Marek Lach
|
f35cc32bf3
|
Update colorbox.css to be slightly lighter
|
2019-01-23 20:53:12 +01:00 |
|
zotlabs
|
cfd8209f0d
|
add "smoothed" koala artwork and change affinitiy slider background colour to match conversations
|
2019-01-21 15:06:21 -08:00 |
|
zotlabs
|
289150a21a
|
updates
|
2019-01-18 13:04:05 -08:00 |
|
zotlabs
|
f81d2f08d1
|
cleanup
|
2019-01-17 15:12:58 -08:00 |
|
zotlabs
|
a611a1cecc
|
send signed fetches over AP, requeue (queue::update) AP messages on fail, set ajaxasync flag on updates, upstream fixes to mail import
|
2019-01-13 16:08:26 -08:00 |
|
zotlabs
|
e0ac0e4050
|
allow notification updates when commenting
|
2019-01-05 16:50:33 -08:00 |
|
zotlabs
|
66e0c61ebb
|
separate blacklisting availability for public streams and general communications
|
2019-01-05 14:47:21 -08:00 |
|
zotlabs
|
5750baeadd
|
slider styling, remove obsolete bookmark prefix from js editing
|
2019-01-04 22:31:12 -08:00 |
|
zotlabs
|
921313f0c8
|
remaining work on slider conversion
|
2018-12-30 14:36:23 -08:00 |
|
zotlabs
|
4ba9257b9c
|
slider value updates
|
2018-12-29 15:40:07 -08:00 |
|
zotlabs
|
a0fae60363
|
slider - convert to flex and style a wee bit
|
2018-12-28 17:54:11 -08:00 |
|
zotlabs
|
ad55860b00
|
slider work
|
2018-12-28 15:13:22 -08:00 |
|
zotlabs
|
8ffbf543c4
|
upstream fixes
|
2018-12-15 14:03:20 -08:00 |
|
zotlabs
|
c3583e22a4
|
relocate
|
2018-12-13 14:28:38 -08:00 |
|
zotlabs
|
bbc90c4b4f
|
ebs
|
2018-12-13 14:14:01 -08:00 |
|
zotlabs
|
b9d1ccbbc3
|
issues with app ordering
|
2018-12-12 19:04:59 -08:00 |
|
zotlabs
|
0a2eae6612
|
configurable hyperdrive
|
2018-12-10 23:53:03 -08:00 |
|
zotlabs
|
74d1b11961
|
use modulus differentiation between thread levels to aid quick comparisons
|
2018-12-10 21:01:57 -08:00 |
|
zotlabs
|
484f2598ca
|
thread level indicators
|
2018-12-04 21:07:30 -08:00 |
|
zotlabs
|
b3d36b0c7c
|
thread issues
|
2018-12-02 20:24:12 -08:00 |
|
zotlabs
|
cb59d4a144
|
thread support
|
2018-12-02 14:39:58 -08:00 |
|
zotlabs
|
4cd565930c
|
allow notification filtering by name or addr
|
2018-11-30 19:01:10 -08:00 |
|
zotlabs
|
e253a25025
|
forum work
|
2018-11-21 17:46:08 -08:00 |
|
zotlabs
|
f10ed01fac
|
hardening
|
2018-11-20 18:55:33 -08:00 |
|
zotlabs
|
5c58abd801
|
superblock leaking through enotify::format
|
2018-10-25 22:12:47 -07:00 |
|
Mike Macgirvin
|
441b65c030
|
mv blueimp library to composer, remove duplicate copy in library
|
2018-10-23 11:00:33 +11:00 |
|
zotlabs
|
dabd21008f
|
fix branding in email notifications
|
2018-10-17 21:11:29 -07:00 |
|
zotlabs
|
134dd8d653
|
setup fixes
|
2018-10-16 20:25:37 -07:00 |
|
zotlabs
|
362acbd1cb
|
missing template
|
2018-10-14 15:49:16 -07:00 |
|
zotlabs
|
7fca42bec6
|
better response handling
|
2018-10-14 15:47:57 -07:00 |
|
zotlabs
|
23256b5b1a
|
update banner
|
2018-10-13 17:53:17 -07:00 |
|
zotlabs
|
4af3f25c15
|
remove nav link override, turn announce activities into sourced items
|
2018-10-11 21:05:30 -07:00 |
|
zotlabs
|
baf98a20f1
|
issue with nav.selected and dark schema
|
2018-10-11 17:48:34 -07:00 |
|
zotlabs
|
c998a084da
|
auto mention comment authors; up to 6 total. If more, select the first and last 3 and always exclude yourself.
|
2018-10-10 20:24:28 -07:00 |
|
zotlabs
|
84552ef9d5
|
better handling of tombstones, schema changes from upstream
|
2018-10-10 18:53:26 -07:00 |
|
zotlabs
|
b66312e408
|
status editor hook
|
2018-10-08 21:27:35 -07:00 |
|
zotlabs
|
c2b8829f9d
|
hubzilla core issue #1278
|
2018-10-07 22:15:46 -07:00 |
|
zotlabs
|
9424a7f56b
|
app updates from red/hubzilla
|
2018-10-04 20:29:41 -07:00 |
|
zotlabs
|
bd5d6158a1
|
zap/osada repo merger
|
2018-10-03 19:10:52 -07:00 |
|
zotlabs
|
6f6d54d378
|
cleanup
|
2018-09-25 17:50:12 -07:00 |
|
zotlabs
|
f1ed64efe4
|
fixes
|
2018-09-23 17:03:10 -07:00 |
|
zotlabs
|
8e4f5007b4
|
button to add conversation mentions in comments
|
2018-09-19 22:00:29 -07:00 |
|
zotlabs
|
0bc76e85e4
|
Merge branch 'zap' into dev
|
2018-09-19 16:26:36 -07:00 |
|
zotlabs
|
a8b582dd58
|
this was needed
|
2018-09-18 23:19:50 -07:00 |
|
zotlabs
|
d3b28b718c
|
Merge branch 'red' into dev
|
2018-09-18 20:51:38 -07:00 |
|
zotlabs
|
7756773683
|
missing autocomplete (e.g. mentions) in mod_photos comments
|
2018-09-18 19:52:10 -07:00 |
|
Mario Vavti
|
a9853e6033
|
seperate settings for mod network
|
2018-09-17 11:36:11 +02:00 |
|
Mario Vavti
|
f9d43479f2
|
css issues
|
2018-09-13 15:14:46 +02:00 |
|
Mario Vavti
|
4bb16b18ed
|
cover photo: mior issue and more cleanup
|
2018-09-10 12:12:05 +02:00 |
|
Mario Vavti
|
4cc413cdaf
|
cover photo: some code cleanup and fix height issue when photo was not cached
|
2018-09-10 11:12:15 +02:00 |
|
Mario Vavti
|
677ad71b96
|
fix some issues with latest notification improvements
|
2018-09-09 19:44:27 +02:00 |
|
Mario Vavti
|
54fa28441c
|
install bootstrap via composer
|
2018-09-07 11:26:02 +02:00 |
|
Mario Vavti
|
bb42ec2bfc
|
apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps
|
2018-09-07 10:39:15 +02:00 |
|
Mario Vavti
|
d31251c54e
|
overflow should be auto not visible
|
2018-09-07 10:07:29 +02:00 |
|
Mario Vavti
|
6a338e28b2
|
-1 has issues in some browsers
|
2018-09-06 14:27:56 +02:00 |
|
Mario Vavti
|
5135f236c2
|
improve cover-photo handling
|
2018-09-06 11:30:50 +02:00 |
|
Mario Vavti
|
78c847ef7d
|
improve notification handling on small screens
|
2018-09-06 11:14:08 +02:00 |
|
Mario Vavti
|
673a2f67f1
|
sticky-kit: improve handling
|
2018-09-06 10:08:55 +02:00 |
|
zotlabs
|
b38625aef6
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev
|
2018-09-05 21:23:49 -07:00 |
|
zotlabs
|
44ca674937
|
Merge branch 'red' into dev
|
2018-09-05 21:18:14 -07:00 |
|
Mario Vavti
|
4f82428a20
|
hide cover photo by default and show it only if conditions are met
|
2018-09-05 14:31:34 +02:00 |
|
Mario Vavti
|
e494a76b33
|
revert "Add bottom margin on aside elements and main to allow for viewport footer."
This reverts commit 1d7d604016 .
|
2018-09-05 12:34:30 +02:00 |
|
Mario Vavti
|
1753e40466
|
Revert "Fix jumpy sidebars"
This reverts commit 79eb6d3942 .
|
2018-09-05 12:32:53 +02:00 |
|
Mario Vavti
|
a821682c8c
|
instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid.
|
2018-09-05 12:17:32 +02:00 |
|
zotlabs
|
d155ded7c3
|
Merge branch 'zap'
|
2018-09-04 19:16:42 -07:00 |
|
zotlabs
|
2b472cf7eb
|
reshare theme changes
|
2018-09-04 19:15:13 -07:00 |
|
zotlabs
|
27a982249b
|
Merge branch 'zap'
|
2018-09-04 18:48:48 -07:00 |
|
zotlabs
|
bd1fa5c360
|
stream order widget
|
2018-09-04 18:44:02 -07:00 |
|
zotlabs
|
cf2604d104
|
Merge branch 'zap'
|
2018-09-02 20:46:40 -07:00 |
|
zotlabs
|
ed00b9957b
|
indicate repeated posts
|
2018-09-02 20:44:15 -07:00 |
|
zotlabs
|
143241a45e
|
Merge branch 'zap'
|
2018-09-02 20:17:52 -07:00 |
|
zotlabs
|
931e0b5445
|
changes to sharing
|
2018-09-02 20:16:04 -07:00 |
|
zotlabs
|
9282a6a40b
|
Merge branch 'zap'
|
2018-08-30 21:30:46 -07:00 |
|
zotlabs
|
d00648f3e1
|
Merge branch 'red'
|
2018-08-30 21:27:20 -07:00 |
|
zotlabs
|
89d1be0343
|
better format of like/dislike text, grab object['id'] if inreplyto missing for these activities
|
2018-08-29 20:02:27 -07:00 |
|
Mario
|
4c1944a08d
|
Merge branch 'extend-convitems-dropdown' into 'dev'
Extend cog dropdown & temp fix for feed display of corrupt mids
See merge request hubzilla/core!1265
|
2018-08-27 10:02:58 +02:00 |
|
M.Dent
|
a0c2bbac9d
|
Add hook to extend conv_item cog dropdown menu
|
2018-08-26 23:26:10 -04:00 |
|
Max Kostikov
|
f5f6ec3d71
|
Update wiki.tpl
|
2018-08-25 21:34:58 +02:00 |
|
Max Kostikov
|
44f639f371
|
Revert "Update wiki.tpl"
This reverts commit c16fda1cb6
|
2018-08-25 21:31:47 +02:00 |
|
Max Kostikov
|
6767ff5434
|
Revert "Update wiki.tpl"
This reverts commit ff1a0d217f
|
2018-08-25 21:30:58 +02:00 |
|
Max Kostikov
|
ff1a0d217f
|
Update wiki.tpl
|
2018-08-25 21:29:25 +02:00 |
|
Max Kostikov
|
732ce25d7f
|
Update nwiki_page_history.tpl
|
2018-08-25 21:17:25 +02:00 |
|
Max Kostikov
|
c16fda1cb6
|
Update wiki.tpl
|
2018-08-25 21:16:05 +02:00 |
|
Mario Vavti
|
f036c25dca
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-24 14:44:45 +02:00 |
|
zotlabs
|
29f809f078
|
clean up the admin summary page
|
2018-08-23 17:31:41 -07:00 |
|
zotlabs
|
6ecd31a715
|
tweak archive widget for articles
|
2018-08-22 13:30:16 -07:00 |
|
Max Kostikov
|
456bc2ef86
|
Update hstrings.php
|
2018-08-22 15:13:01 +02:00 |
|
Max Kostikov
|
e071cd4635
|
Update hmessages.po
|
2018-08-22 15:12:09 +02:00 |
|
Mario Vavti
|
cc03e1ceef
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-22 10:47:40 +02:00 |
|
Mario
|
e4d08fc5d7
|
Merge branch 'redbasic-addroomforfooter' into 'dev'
Fix jumpy sidebars
See merge request hubzilla/core!1261
|
2018-08-22 10:46:02 +02:00 |
|
zotlabs
|
decd86fc08
|
fix profile like images and remove export button
|
2018-08-21 23:42:51 -07:00 |
|
zotlabs
|
b25192332b
|
profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class
|
2018-08-21 23:39:49 -07:00 |
|
M.Dent
|
79eb6d3942
|
Fix jumpy sidebars
|
2018-08-21 13:18:42 -04:00 |
|
Mario
|
218029ee57
|
Merge branch 'redbasic-addroomforfooter' into 'dev'
Add bottom margin on aside elements and main to allow for viewport footer.
See merge request hubzilla/core!1259
|
2018-08-21 13:17:14 +02:00 |
|
fadelkon
|
af31bbeba1
|
Update catalan translations for sstrings up to 18th July 2018
|
2018-08-20 22:50:46 +02:00 |
|
M.Dent
|
1d7d604016
|
Add bottom margin on aside elements and main to allow for viewport footer.
|
2018-08-20 00:15:34 -04:00 |
|
zotlabs
|
c4328b9090
|
osada updates
|
2018-08-19 20:39:23 -07:00 |
|
zotlabs
|
57e75d9332
|
add affinity app and start some serious refactoring of mod_photos
|
2018-08-16 23:01:31 -07:00 |
|
zotlabs
|
64196dd2a7
|
article summaries and some other stuff
|
2018-08-15 18:56:18 -07:00 |
|
zotlabs
|
f230c07ba5
|
possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar
|
2018-08-15 17:00:37 -07:00 |
|
zotlabs
|
248d20c347
|
Merge branch 'red'
|
2018-08-13 20:36:40 -07:00 |
|
Mario Vavti
|
759a18685b
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-12 14:07:16 +02:00 |
|
Mario
|
e07ab65d73
|
Merge branch 'oauth2-ui-pr' into 'dev'
Oauth2 ui pr
See merge request hubzilla/core!1255
|
2018-08-12 14:06:24 +02:00 |
|
zotlabs
|
5afe779ffc
|
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
|
2018-08-11 16:16:54 -07:00 |
|
M.Dent
|
af042ccf07
|
OAuth2 UI and settings updates
|
2018-08-10 13:54:26 -04:00 |
|
zotlabs
|
4b6fa91bb3
|
directory packets need to be signed
|
2018-07-31 19:09:42 -07:00 |
|
zotlabs
|
88f3ce6736
|
cleanup unnecessary functions
|
2018-07-31 17:27:50 -07:00 |
|
zotlabs
|
a9c3af298b
|
prep work for converting mail
|
2018-07-30 23:55:09 -07:00 |
|
zotlabs
|
28819baa72
|
sort out some setup issues
|
2018-07-30 19:25:35 -07:00 |
|
zotlabs
|
a87d5aa730
|
Merge branch 'red' into red_merge
|
2018-07-30 18:22:25 -07:00 |
|
Manuel Jiménez Friaza
|
edf834188d
|
Update Spanish translation
|
2018-07-30 12:03:03 +02:00 |
|
zotlabs
|
dd899418c1
|
app fixes
Merge branch 'red'
|
2018-07-27 15:31:19 -07:00 |
|
Max Kostikov
|
06b0dbdfba
|
Update hstrings.php
|
2018-07-26 12:21:33 +02:00 |
|
Max Kostikov
|
48fb3d3653
|
Update hmessages.po
|
2018-07-26 12:20:53 +02:00 |
|
Max Kostikov
|
baa5fd9739
|
Update passchanged_eml.tpl
|
2018-07-26 12:19:59 +02:00 |
|
Max Kostikov
|
e01c277c56
|
Update lostpass_eml.tpl
|
2018-07-26 12:18:54 +02:00 |
|
kostikov
|
3342fc2244
|
Update hstrings.php
|
2018-07-23 12:15:10 +02:00 |
|
kostikov
|
87857fe5d9
|
Update hmessages.po
|
2018-07-23 12:14:33 +02:00 |
|
Mario
|
a68934f498
|
Merge branch 'patch-2' into 'dev'
New russian templates
See merge request hubzilla/core!1233
|
2018-07-21 11:29:09 +02:00 |
|
Mario
|
5be0743751
|
Merge branch 'dev' into 'dev'
Update russian translation for 3.6
See merge request hubzilla/core!1230
|
2018-07-21 11:26:43 +02:00 |
|
kostikov
|
8fc7f2aca1
|
Update update_fail_eml.tpl
|
2018-07-20 19:28:45 +02:00 |
|
kostikov
|
4db4ab9798
|
Create register_verify_member.tpl
|
2018-07-20 19:28:13 +02:00 |
|
kostikov
|
b6c2c8117e
|
Update register_verify_eml.tpl
|
2018-07-20 19:27:29 +02:00 |
|
kostikov
|
86a42aad16
|
Update register_open_eml.tpl
|
2018-07-20 19:26:54 +02:00 |
|
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
|
c72f6e6ea8
|
fix jot drag and drop
|
2018-07-20 10:42:16 +02:00 |
|
kostikov
|
790a9155d4
|
Update hstrings.php
|
2018-07-20 10:25:03 +02:00 |
|
kostikov
|
f141b845fd
|
Update hmessages.po
|
2018-07-20 10:24:23 +02:00 |
|
zotlabs
|
ad020db7d8
|
minor tweaks
|
2018-07-19 20:44:34 -07:00 |
|
zotlabs
|
5d94cfba4a
|
Merge branch 'red'
|
2018-07-19 13:48:32 -07:00 |
|
zotlabs
|
b21d24e83e
|
fix delivery reports
|
2018-07-18 20:15:46 -07:00 |
|
zotlabs
|
a757749be6
|
readme
|
2018-07-18 18:51:01 -07:00 |
|
kostikov
|
67cbeaa3d4
|
Update hmessages.po
(cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72)
|
2018-07-18 08:28:18 +02:00 |
|
kostikov
|
23f3d554b8
|
Fix wrong plural function logic
(cherry picked from commit 42840886119420b4efad511da0cb307f74542545)
|
2018-07-18 08:27:53 +02:00 |
|
zotlabs
|
91ac38f18e
|
more content formatting and feature trimming
|
2018-07-17 21:56:51 -07:00 |
|
zotlabs
|
731e9b9dad
|
update site import
|
2018-07-16 20:04:47 -07:00 |
|
zotlabs
|
2cc6ca0f88
|
update the photo item_obj format to AS2+
|
2018-07-16 16:46:20 -07:00 |
|
zotlabs
|
444de76ee6
|
Merge branch 'red'
|
2018-07-15 18:47:55 -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 |
|
zotlabs
|
b7e0115447
|
add plugin registration for widgets, move wiki to addon/app
|
2018-07-10 19:58:18 -07: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 |
|
zotlabs
|
cc71e507cb
|
don't provide manage apps button when viewing all available
|
2018-07-05 22:03:41 -07:00 |
|
zotlabs
|
f7db9dcec5
|
more app work
|
2018-07-05 17:52:32 -07:00 |
|
zotlabs
|
f6e8ce5516
|
appstore changes
|
2018-07-04 23:20:35 -07:00 |
|
zotlabs
|
07ce5e04c1
|
appstore
|
2018-07-04 22:56:43 -07:00 |
|
zotlabs
|
cf4a12b173
|
Merge branch 'dev'
|
2018-07-04 19:18:05 -07:00 |
|
zotlabs
|
c8235d02e9
|
remove some obsolete stuff
|
2018-07-04 01:56:55 -07:00 |
|
zotlabs
|
fa6e5e4d75
|
plugins -> addons
|
2018-06-28 16:43:22 -07:00 |
|
zotlabs
|
1b1d9e502c
|
Merge branch 'red'
|
2018-06-25 21:02:44 -07:00 |
|
Mario Vavti
|
cef1c09db6
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-25 23:49:11 +02:00 |
|
Mario Vavti
|
62610b5ec0
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-06-25 14:29:32 +02:00 |
|
Mario Vavti
|
2594178158
|
updates justified gallery lib to version 3.7 and minor fixes for full template
|
2018-06-25 14:29:07 +02:00 |
|
zotlabs
|
4866ed5283
|
remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead
|
2018-06-24 21:56:58 -07:00 |
|
Mike Macgirvin
|
e4f15c078a
|
Merge branch 'patch-1' into 'dev'
NL strings: fix simple error
See merge request hubzilla/core!1221
|
2018-06-20 07:49:43 +02:00 |
|
zotlabs
|
517f0b4f0d
|
Merge branch 'red'
|
2018-06-19 17:41:22 -07:00 |
|
zotlabs
|
48a25b1b85
|
channel sources: add 'resend' option to discard original author - similar to the Friendica remote_self setting
|
2018-06-18 20:44:59 -07:00 |
|
jeroenpraat
|
eabbad176d
|
fix simple error
|
2018-06-18 23:20:35 +02:00 |
|
jeroenpraat
|
e6d7f22ba9
|
fix simple error
|
2018-06-18 23:17:29 +02:00 |
|
zotlabs
|
7850ecbd95
|
remove several unused/unreferenced templates
|
2018-06-17 20:53:05 -07:00 |
|
zotlabs
|
3aa9bcac85
|
Merge branch 'red' into merge
|
2018-06-17 19:30:38 -07:00 |
|
Mario
|
28043726e6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-06-17 17:00:17 +02:00 |
|
Mario
|
9c5df51141
|
some work on mod group
|
2018-06-17 16:58:12 +02:00 |
|
zotlabs
|
2f3c3db020
|
hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes
|
2018-06-15 02:02:03 -07:00 |
|
zotlabs
|
967d4da30a
|
wiki: word-wrap code on any character
|
2018-06-14 22:46:20 -07:00 |
|
zotlabs
|
13d6b254ff
|
Merge branch 'red'
|
2018-06-13 21:41:11 -07:00 |
|
zotlabs
|
8da0f9d356
|
optionally report total available space when uploading
|
2018-06-13 21:06:56 -07:00 |
|
zotlabs
|
b5e4a5f51c
|
SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional.
|
2018-06-13 20:27:10 -07:00 |
|
zotlabs
|
a8f179145b
|
Merge branch 'master' of ../hz into dev
|
2018-06-10 22:16:39 -07:00 |
|
zotlabs
|
912ccb31a1
|
hubzilla core issue #1218
|
2018-06-10 19:26:35 -07:00 |
|
Mario Vavti
|
9e29c13678
|
fix issue #1219
|
2018-06-09 16:38:15 +02:00 |
|