Commit graph

21935 commits

Author SHA1 Message Date
zotlabs
626a0ab788 only clone between similar platforms 2018-07-22 22:28:46 -07:00
zotlabs
cf03855f65 more import work 2018-07-22 22:18:58 -07:00
zotlabs
c6fc88b300 item lookups 2018-07-22 22:17:07 -07:00
zotlabs
b7ff2f5585 more libzot 2018-07-22 22:10:51 -07:00
zotlabs
647e92d6f7 use libzot 2018-07-22 22:04:20 -07:00
zotlabs
2542bc5b38 sync location 2018-07-22 17:50:01 -07: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
07e526693e update the zot api (xchan store), plus a couple of typos 2018-07-19 17:14:37 -07: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
zotlabs
2cc6ca0f88 update the photo item_obj format to AS2+ 2018-07-16 16:46:20 -07:00
zotlabs
82a4bbd571 spellcheck 2018-07-15 23:32:09 -07:00
zotlabs
c187461985 update_addon_repo: scan the addon dir after updating and remove dead symlinks (which represent deprecated/removed addons). 2018-07-15 21:34:06 -07:00
zotlabs
be7873b3af make static display the default and remove the UI to change it. 2018-07-15 20:34:21 -07:00
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