Commit Graph

7523 Commits

Author SHA1 Message Date
Max Kostikov
9af8a1d30c Move JS to main module 2019-05-01 06:23:56 +02:00
Max Kostikov
4da96ee980 Remove 'doreply' JS function 2019-04-30 17:35:53 +02:00
Max Kostikov
21637e033c Add JS 'doreply' function 2019-04-30 17:34:56 +02:00
Mario Vavti
a04689b784 do not allow editing events that do not belong to us 2019-04-30 12:08:19 +02:00
Max Kostikov
5066945adc Fix add multiple icons on 'Submit' button when reply on comment 2019-04-30 11:17:22 +02:00
Mario Vavti
0b062d0b8a select event by event_hash instead of item_id 2019-04-30 10:47:48 +02:00
Mario Vavti
9cc1eff15c remove logging 2019-04-30 00:12:19 +02:00
Mario Vavti
327e5d06e1 calendar merge: implement single event editing UI 2019-04-30 00:09:57 +02:00
Max Kostikov
c0be4c36e1 Update main.js 2019-04-29 23:40:21 +02:00
Max Kostikov
31e04378cd Add 'reply to comment' processing 2019-04-29 23:30:51 +02:00
Max Kostikov
e80c99ad74 Add 'reply to comment' button 2019-04-29 23:29:16 +02:00
Mario Vavti
dce6a5763d calendar merge: d&d support and some minor cleanup and fixes 2019-04-29 11:45:55 +02:00
Mario Vavti
f616b2d49a calendar merge: bring back event categories 2019-04-24 14:48:30 +02:00
Mario Vavti
9275fd16c2 resolve merge conflict 2019-04-20 10:23:11 +02:00
Max Kostikov
54f95389a8 Add anti SEO link properties in directory listing 2019-04-19 23:17:24 +02:00
Max Kostikov
c374072822 Update cdav_calendar.tpl 2019-04-19 21:22:42 +02:00
Max Kostikov
7560918b32 Add translation to update button 2019-04-19 21:04:00 +02:00
Mario Vavti
fd87faa7a6 Merge branch 'dev' into calendar_merge 2019-04-19 19:37:06 +02:00
Mario Vavti
2bd5ae3617 provide link to source and some cleanup 2019-04-19 17:21:45 +02:00
Mario Vavti
9b6e46dc6b calendar merge initial commit 2019-04-19 15:32:56 +02:00
Max Kostikov
ea1d8b8104 Add remove profile photo button 2019-04-19 15:29:08 +02:00
harukin
5f691fb05c Merge branch 'origin' into 'develop'
Update 4.0.2

See merge request harukin/core!48
2019-04-18 06:33:41 +09:00
Max Kostikov
c2ee7cbff5 Update Russian hstrings.php 2019-04-15 12:25:40 +02:00
Max Kostikov
27f813e043 Update Russian hmessages.po 2019-04-15 12:24:51 +02:00
Mario Vavti
767a1711ff enable list views 2019-04-06 16:10:50 +02:00
Mario Vavti
3007009fab upgrade cdav calendar to version 4 2019-04-06 10:22:03 +02:00
Max Kostikov
595429fdde Add submit button styling 2019-03-30 23:08:41 +01:00
Max Kostikov
f9e602c44c Add remove cover button 2019-03-30 22:54:20 +01:00
harukin
087b45ab90 Merge branch 'origin' into 'develop'
marge from origin 4.1

See merge request harukin/core!45
2019-03-21 21:42:45 +09:00
Zot
ea9925f489 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible 2019-03-18 09:35:53 +01:00
Mario Vavti
769dd174bd fix dreport redeliver 2019-03-15 23:10:17 +01:00
harukin
b329d998ca Merge branch 'japanese' into 'develop'
marge from origin 4.0

See merge request harukin/core!44
2019-03-09 18:03:04 +09:00
harukin
8f594ad6d9 Merge branch 'origin' into 'japanese'
marge from origin 4.0

See merge request harukin/core!41
2019-03-09 17:58:02 +09:00
harukin
d8d46039a2 Merge branch 'origin' into 'develop'
marge from origin 4.0

See merge request harukin/core!40
2019-03-09 17:48:31 +09:00
harukin
19e1325604 edit translation 2019-03-09 17:36:26 +09:00
harukin
0d283b2666 edit translation 2019-03-06 10:32:47 +09:00
Mario Vavti
aa6a31eba5 iron out some kinks with scrollToItem() in combination with collapsed content and images
(cherry picked from commit 2244bf2ba2)
2019-03-02 15:32:36 +01:00
Mario Vavti
2244bf2ba2 iron out some kinks with scrollToItem() in combination with collapsed content and images 2019-03-01 14:16:19 +01:00
harukin
8134ba1faf add cmd support test 2019-02-27 10:53:11 +09:00
harukin
d30748f1de edit translation 2019-02-27 10:47:05 +09:00
harukin
e9edec0875 edit translation 2019-02-24 09:19:28 +09:00
Mario Vavti
06aa32db22 fix regression from commit 04ec35d9cc where selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true 2019-02-23 21:48:45 +01:00
Manuel Jiménez Friaza
c91641aa83 Quickfix es-es/hstrings.php
(cherry picked from commit f92d2e3f7c)
2019-02-21 18:37:21 +01:00
Manuel Jiménez Friaza
a5bf32a97d Fix es-es/hstrings.php
(cherry picked from commit a9b75d059b)
2019-02-21 12:46:48 +01:00
Mario
938e8110ca Merge branch 'es-es' into 'dev'
Update es-es

See merge request hubzilla/core!1526
2019-02-21 12:34:31 +01:00
Manuel Jiménez Friaza
a3a90ea09b Update Spanish translation
(cherry picked from commit e6f289deb6)
2019-02-21 11:38:45 +01:00
Max Kostikov
3a6ea57d2c Update Russian hstrings.php 2019-02-20 09:00:05 +01:00
Max Kostikov
e960bcfd1c Update Russian hmessages.po 2019-02-20 08:59:50 +01:00
zotlabs
a77d7b8442 urlencode links in category widget 2019-02-19 20:51:06 -08:00
zotlabs
1a77bdd1d0 fix ability for file storage creators (visitors) to be able to delete their own content 2019-02-19 13:14:19 -08:00
Mario Vavti
48f2c85791 prevent page jumping on like if comments are expanded (show all x comments) 2019-02-18 14:40:41 +01:00
harukin
6dda2713cf edit translation 2019-02-15 23:29:31 +09:00
harukin
38443c72c3 おまえかぁぁぁぁぁぁぁぁぁあ!!!!!!!!!!!!!!!!!!!!!11 2019-02-13 23:56:49 +09:00
harukin
0cef3e67ce fix delete strings.php.... 2019-02-13 23:49:33 +09:00
harukin
b98d4875da fix strings.php 2019-02-13 23:24:13 +09:00
harukin
ae52db41de edit translation 2019-02-13 23:19:40 +09:00
Max Kostikov
07df43aa2a Merge branch 'dev' into 'dev'
Update Russian translayion

See merge request hubzilla/core!1509
2019-02-12 11:55:17 +01:00
Max Kostikov
6e3bc77369 Update hstrings.php 2019-02-12 11:48:50 +01:00
Max Kostikov
24ddefe3ad Update hmessages.po 2019-02-12 11:47:53 +01:00
harukin
5e0ce96e49 Merge branch 'origin' into 'japanese'
marge from origin 3.8.9

See merge request harukin/core!37
2019-02-11 17:51:12 +09:00
harukin
4a2228a372 Merge branch 'origin' into 'develop'
marge from origin 3.8.9

See merge request harukin/core!36
2019-02-11 17:48:25 +09:00
harukin
d9a0382539 edit translation 2019-02-11 17:15:48 +09:00
Mario Vavti
2b7a605223 exec updateInit() instead of notificationsUpdate() in jotShare() 2019-02-07 09:55:22 +01:00
Mario Vavti
d70f0092f7 Merge remote-tracking branch 'mike/master' into dev 2019-02-07 09:34:22 +01:00
zotlabs
29c1797493 work on repeat/share for Hubzilla 2019-02-06 17:26:09 -08:00
DM42.Net (Matt Dent)
708d288121 Add filter hooks and the ability to add buttons to the default status editor 2019-02-01 09:49:11 -05:00
Max Kostikov
a2cae45f00 Merge branch 'dev' into 'dev'
Fix typos in Russian translation

See merge request hubzilla/core!1500
2019-01-31 18:14:16 +01:00
Max Kostikov
c1159337da Update hstrings.php 2019-01-31 18:06:19 +01:00
Max Kostikov
71adbd7c39 Update hmessages.po 2019-01-31 18:06:09 +01:00
harukin
ded949052c edit translation 2019-01-31 18:44:51 +09:00
harukin
de15a1e7c8 edit translation 2019-01-31 16:50:53 +09:00
zotlabs
a56bc0e1e0 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-30 18:34:44 -08:00
zotlabs
519db2aace set document title when title changes on a page update 2019-01-30 18:33:10 -08:00
Klaus Weidenbach
728788e3b9 Extend documentation. 2019-01-28 23:58:19 +01:00
Max Kostikov
5ad055efb4 Merge branch 'dev' into 'dev'
Update Russian translation

See merge request hubzilla/core!1491
2019-01-25 20:04:19 +01:00
Max Kostikov
3277595366 Update hstrings.php 2019-01-25 19:56:15 +01:00
Max Kostikov
b11be32063 Update hmessages.po 2019-01-25 19:55:23 +01:00
Mario Vavti
ddbc35181c fix page jumping when liking a collapsed/expanded post
(cherry picked from commit 54806f6ee8)
2019-01-24 13:39:49 +01:00
Mario Vavti
0946ac2ff9 possibly more page jumping fixes 2019-01-24 12:53:38 +01:00
harukin
875aecf9c6 edit translation 2019-01-24 17:43:03 +09:00
Mario Vavti
54806f6ee8 fix page jumping when liking a collapsed/expanded post 2019-01-23 15:36:34 +01:00
M. Dent
cd8a0f33b5 Add remaining hook insertions 2019-01-22 12:13:16 +01:00
harukin
c85acf8044 edit translation 2019-01-20 22:33:47 +09:00
harukin
78a587791f edit translation 2019-01-20 21:38:53 +09:00
harukin
f4a3ebcb41 edit translation 2019-01-20 21:31:43 +09:00
harukin
086dab902c edit translation 2019-01-20 17:22:38 +09:00
harukin
722c03b6c6 edit translation 2019-01-20 17:08:14 +09:00
Mario Vavti
cc1e1a525f possible fix for #1326 2019-01-17 21:42:24 +01:00
harukin
bb962b90cc edit translation 2019-01-16 21:19:38 +09:00
Mario
2e94e4cd67 Merge branch 'core_fixes' into 'dev'
Core fixes

See merge request hubzilla/core!1470
2019-01-15 11:38:41 +01:00
harukin
44f75d94e1 edit translation 2019-01-15 18:07:33 +09:00
harukin
ad89310c45 edit translation 2019-01-15 17:36:43 +09:00
Mario Vavti
c26e112bee whitespace 2019-01-14 15:06:21 +01:00
Mario Vavti
7daf18b077 fix a new instance of autocomplete created on each conversation update 2019-01-14 14:07:56 +01:00
Mario Vavti
f3554804bf only load new content onpopstate if the mid has actually changed 2019-01-14 10:14:37 +01:00
DM42.Net (Matt Dent)
dba9c2fbb0 Add pgrp_extras hook & display 2019-01-13 14:34:04 -05:00
harukin
f481ba1c1c edit translation 2019-01-13 10:39:40 +09:00
Mario Vavti
06beb59628 slightly improve item.is_new rendering 2019-01-08 15:23:08 +01:00
harukin
2dbe567e3b edit translation 2019-01-08 21:48:31 +09:00
Mario Vavti
6f93001658 fix issue with IE 2019-01-07 09:47:08 +01:00