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 |
|