Commit graph

22245 commits

Author SHA1 Message Date
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
kostikov
062633d312 Add var to respect current hstrings.php format 2018-07-20 16:40:35 +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
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
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
bd8a6d6195 updates 2018-07-19 22:15:50 -07:00
zotlabs
ad020db7d8 minor tweaks 2018-07-19 20:44:34 -07:00
zotlabs
a94c9d2709 checkjs fix ($page not bin-hex in all cases) 2018-07-19 17:19:19 -07:00
zotlabs
07e526693e update the zot api (xchan store), plus a couple of typos 2018-07-19 17:14:37 -07:00
kostikov
f9b18aa62f Update php2po.php 2018-07-20 00:22:04 +02:00
zotlabs
5d94cfba4a Merge branch 'red' 2018-07-19 13:48:32 -07: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
b21d24e83e fix delivery reports 2018-07-18 20:15:46 -07:00
zotlabs
13d19d42cb Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-18 19:14:21 -07:00
zotlabs
1829094e6a styling 2018-07-18 18:57:20 -07:00
zotlabs
f8ed09b3fa Merge branch 'red' 2018-07-18 18:55:28 -07:00
zotlabs
a757749be6 readme 2018-07-18 18:51:01 -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 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
762acc9565 typo 2018-07-17 17:30:00 -07:00
zotlabs
dec6e81d3c better typo check 2018-07-17 17:27:13 -07:00
zotlabs
6baf4441e0 get rid of the deprecated location message type 2018-07-17 17:26:26 -07: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
5f5fedb6b5 responses to events 2018-07-16 23:40:09 -07:00
zotlabs
3407c73bdf update event item[obj] 2018-07-16 21:50:07 -07:00
zotlabs
731e9b9dad update site import 2018-07-16 20:04:47 -07:00
zotlabs
717c0df9d5 comment and mail permissions, remove page permissions from core 2018-07-16 19:08:10 -07:00
zotlabs
564aa2f134 pass render options to code highlight 2018-07-16 18:12:03 -07:00
zotlabs
46c468e376 update more object data structures 2018-07-16 17:23:24 -07:00