rabuzarus
|
e7914ecc95
|
add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template
|
2017-04-23 14:58:23 +02:00 |
|
rabuzarus
|
46291b2e2b
|
fix smarty PHP warnings
|
2017-04-23 14:51:41 +02:00 |
|
rabuzarus
|
f99bb958f6
|
Merge develop into 20170407_-_group_edit
Conflicts:
mod/group.php
|
2017-04-21 16:09:48 +02:00 |
|
rabuzarus
|
40e5436604
|
some restructuring in groups.php + Frio: provide own group template
|
2017-04-21 16:04:29 +02:00 |
|
|
|
3592f90910
|
Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
Conflicts:
include/bbcode.php
|
2017-04-20 05:44:31 +00:00 |
|
Michael Vogel
|
83cc56e713
|
Merge pull request #3326 from Alkarex/utf8mb4
Default to utf8mb4
|
2017-04-20 05:28:16 +02:00 |
|
Pierre Rudloff
|
8549da4f7b
|
Make standalone tweaks work with infinite scrolling
|
2017-04-19 23:51:18 +02:00 |
|
|
|
e16fb74b0c
|
Reworked OStatus communication part to better support Mastodon.
|
2017-04-19 21:37:00 +00:00 |
|
Pierre Rudloff
|
2ea2c4b87b
|
In standalone mode, open links to source in a new tab (fixes #3359)
|
2017-04-19 23:27:11 +02:00 |
|
Alexandre Alapetite
|
6cc4f8b0a9
|
Delete frio dynamic.php
https://github.com/friendica/friendica/pull/3326#discussion_r112116929
|
2017-04-19 21:44:13 +02:00 |
|
Hypolite Petovan
|
f15bb6c516
|
Add autosize call for all external textarea value changes
|
2017-04-18 22:04:23 -04:00 |
|
Hypolite Petovan
|
5c3abe0ca6
|
Prevent comment UI from closing when using BBCode buttons with empty textarea
|
2017-04-18 22:03:49 -04:00 |
|
|
|
33d5e5b818
|
Issue 3157: No fulltext anymore
|
2017-04-18 20:09:05 +00:00 |
|
rabuzarus
|
6a7a4591d3
|
Merge pull request #3333 from Rudloff/feature/theme-color
theme-color meta
|
2017-04-17 13:51:37 +02:00 |
|
Pierre Rudloff
|
6cd6e886db
|
Updated theme-color code
Add comment explaining what the code does
Remove unused include
Code standards
|
2017-04-17 13:38:55 +02:00 |
|
Alexandre Alapetite
|
5d3bf9307f
|
More replaces UTF8 to UTF8MB4
|
2017-04-16 15:53:48 +02:00 |
|
|
|
a0a0885527
|
Merge pull request #3339 from Hypolite/issue/#2803-icons
Change icon of contact page links
|
2017-04-14 07:35:16 +02:00 |
|
|
|
b8fd48dddc
|
Merge pull request #3335 from annando/issue-3331
Issue 3331: Remove unneeded table "deliverq"
|
2017-04-14 07:32:30 +02:00 |
|
Hypolite Petovan
|
440fd29c1e
|
Change icon of contact page links
|
2017-04-13 23:00:02 -04:00 |
|
Pierre Rudloff
|
ead9cbe534
|
Web app manifest (fixes #3317)
|
2017-04-13 16:46:36 +02:00 |
|
Pierre Rudloff
|
d0407f8b76
|
theme-color meta
|
2017-04-13 12:03:02 +02:00 |
|
|
|
d82684219a
|
Issue 3331: Removed unneeded table "deliverq"
|
2017-04-13 04:51:16 +00:00 |
|
|
|
dad89a125a
|
RU translations THX pztrn
|
2017-04-09 07:35:12 +02:00 |
|
Hypolite Petovan
|
472345d740
|
Merge branch 'develop' into space_before_t
|
2017-04-08 23:17:31 -04:00 |
|
rebeka-catalina
|
554704e6b9
|
Added a whitespace between comma and t()
|
2017-04-08 16:57:24 +02:00 |
|
|
|
42cc8d729b
|
Merge pull request #3306 from Hypolite/issue/#3274
Fix path to default Text_Highlighter CSS
|
2017-04-08 15:24:16 +02:00 |
|
Hypolite Petovan
|
318166a381
|
Fix path to default Text_Highlighter CSS
|
2017-04-08 08:59:41 -04:00 |
|
rabuzarus
|
c65fc6f8de
|
Bugfix: there was a gui issue on the navbar account dropdown button
|
2017-04-08 13:30:16 +02:00 |
|
|
|
fb94a0add7
|
the Quattro admin_user template was missing the users note for the admin
|
2017-04-07 12:59:22 +02:00 |
|
rabuzarus
|
a9b3696560
|
Bugfix: bulk deletion button was not available anymore
|
2017-04-07 11:35:45 +02:00 |
|
Hypolite Petovan
|
cfb99aa323
|
Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser
frio: fbrowser styling
|
2017-04-07 00:01:46 -04:00 |
|
Sandro Santilli
|
27cce1e6dc
|
Add type="text" attribute for openid input field
|
2017-04-06 21:48:20 +02:00 |
|
rabuzarus
|
c3b975e516
|
change fbrowser image margin and box-shadow
|
2017-04-05 12:46:09 +02:00 |
|
rabuzarus
|
190b03e706
|
add aria attributes for filebrowser
|
2017-04-05 12:34:00 +02:00 |
|
rabuzarus
|
0542cd6a14
|
add aria attributes + restructure some js to change the aria attributes
|
2017-04-05 11:46:42 +02:00 |
|
rabuzarus
|
dd919b7f80
|
small css fix
|
2017-04-03 15:04:54 +02:00 |
|
rabuzarus
|
0bb1466723
|
use buttons for mobile jot nav
|
2017-04-03 14:32:54 +02:00 |
|
rabuzarus
|
0b280219c6
|
use box-shadow instead of border
|
2017-04-03 14:20:34 +02:00 |
|
rabuzarus
|
9f37acc6d4
|
add href attribute to jot links
|
2017-04-03 14:00:27 +02:00 |
|
rabuzarus
|
036c18be7b
|
use height: 0 instead of display: none to hide jot sections
|
2017-04-03 13:38:07 +02:00 |
|
rabuzarus
|
68659c7740
|
add missing overflow to css
|
2017-04-03 12:55:06 +02:00 |
|
rabuzarus
|
4dfdbeba54
|
fix max-height for screens bigger than 768px
|
2017-04-03 12:46:31 +02:00 |
|
Hypolite Petovan
|
9237b2611a
|
Merge branch 'develop' into rewrites/coding-convention-split2
|
2017-04-03 06:35:27 -04:00 |
|
rabuzarus
|
80f5a026be
|
re-enabel browser for small screens
|
2017-04-03 02:04:13 +02:00 |
|
rabuzarus
|
ee293f2ce2
|
Merge develop into 20170321_-_frio-fbbrowser
Conflicts:
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl
|
2017-04-03 00:51:34 +02:00 |
|
rabuzarus
|
1ce5cc1b49
|
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
Frio: Turn action links into buttons
|
2017-04-02 23:15:57 +02:00 |
|
Michael Vogel
|
d9451ef969
|
Merge pull request #3279 from Hypolite/improvement/add-composer
Add Composer
|
2017-04-02 14:57:37 +02:00 |
|
Hypolite Petovan
|
7606ac5e32
|
frio: Fix help pages inline code display
|
2017-04-01 17:58:35 -04:00 |
|
Roland Häder
|
49527b70d3
|
Merge branch 'develop' into rewrites/coding-convention-split2
|
2017-04-01 22:16:08 +02:00 |
|
|
|
f6d7ee2781
|
Issue 3142: mcrypt is no more (as well as phpseclib)
|
2017-04-01 08:28:42 +00:00 |
|
