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 |
|
Mario Vavti
|
e37ccb7a63
|
move cid filter js to the widget
|
2018-06-09 13:08:14 +02:00 |
|
Mario Vavti
|
468af29e3e
|
new feature filter network by name
|
2018-06-08 23:03:05 +02:00 |
|
zotlabs
|
38a2493ed0
|
Merge branch 'red'
|
2018-06-07 18:44:05 -07:00 |
|
Mario Vavti
|
dfa48ba17c
|
fixes for search_item.tpl
|
2018-06-07 23:24:36 +02:00 |
|
Mario Vavti
|
dd4b8529c2
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-06 20:13:03 +02:00 |
|
zotlabs
|
d6f98ab88e
|
some work to make menus editable by visitors with webpage write permissions; this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality.
|
2018-06-05 21:12:42 -07:00 |
|
Mario Vavti
|
7188e719ef
|
rely on the pf argument to determine if we deal with a forum or not. xchan_pubforum is not set for all public forums in the forum filters for some reason.
|
2018-06-05 11:56:30 +02:00 |
|
zotlabs
|
915c50064c
|
consolidate directory functions into libzotdir
|
2018-06-04 23:19:16 -07:00 |
|
Mario Vavti
|
8189408190
|
finalize filters and forum notifications
|
2018-06-02 22:11:11 +02:00 |
|
Mario Vavti
|
db0a3a7534
|
some more work on forum notifications
|
2018-06-02 15:39:38 +02:00 |
|
Mario Vavti
|
53efd4e470
|
unread forum notifications - wip/unfinished
|
2018-06-01 23:22:52 +02:00 |
|
Mario Vavti
|
22a9e4c9a9
|
add manage privacy groups entry to the panel channel menu dropdown for now
|
2018-06-01 21:52:54 +02:00 |
|
Mario Vavti
|
56f0244360
|
fixes for css fix
|
2018-06-01 20:59:28 +02:00 |
|
Mario Vavti
|
60a7e68b1b
|
css fix
|
2018-06-01 13:39:29 +02:00 |
|
Mario Vavti
|
ec6d4f8ac3
|
add hover effect to dropdown caret
|
2018-06-01 13:30:02 +02:00 |
|
Mario Vavti
|
6bf0f4225c
|
move file and groups filter to submenu
|
2018-06-01 12:11:07 +02:00 |
|
Mario Vavti
|
cbaaa1c57f
|
merge groups and filed posts into activity filters
|
2018-05-31 13:05:32 +02:00 |
|
Mario Vavti
|
6349a7417f
|
make navbar search use the module search function in /network and /channel
|
2018-05-30 22:40:22 +02:00 |
|
Mario Vavti
|
e1a55ba471
|
remove redundant css from default.css
|
2018-05-30 20:18:13 +02:00 |
|
Mario Vavti
|
8d6441704b
|
add widget files and templates
|
2018-05-30 14:06:18 +02:00 |
|
Mario Vavti
|
9fcb3bf2e8
|
first cut on restructuring the previously called network tabs
|
2018-05-30 14:02:58 +02:00 |
|
git-marijus
|
e00c5c6bf1
|
Merge pull request #1197 from galettesaucisse/patch-52
Update hstrings.php
|
2018-05-29 08:40:27 +02:00 |
|
git-marijus
|
7e8c895ccd
|
Merge pull request #1196 from galettesaucisse/patch-51
Update hmessages.po
|
2018-05-29 08:40:13 +02:00 |
|
Mario Vavti
|
5a475453ab
|
fix js error with catalan language (unescaped strings)
|
2018-05-27 12:20:07 +02:00 |
|
Galette Saucisse
|
89d97c556a
|
Update hstrings.php
|
2018-05-26 09:18:41 +02:00 |
|
Galette Saucisse
|
4ff2b8ed1b
|
Update hmessages.po
|
2018-05-26 09:17:04 +02:00 |
|