Hypolite Petovan
cbd3edbc05
Update remaining "dir.friendi.ca" instances
2017-06-02 22:15:43 -04:00
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
...
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
715e15cbe1
There is now a memory limit for the poller
2017-04-29 17:36:46 +00:00
ba5780c4a1
Remove the "discard" button for contact requests from Diaspora.
2017-04-28 08:36:10 +00:00
Hypolite Petovan
7d9d22914f
Refactor "URL" to "domain" for blocklist
...
- Add slash trimming to domain
- Reformatted mod/friendica
2017-04-25 22:45:42 -04:00
Hypolite Petovan
0b8f80c747
Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel
...
blocklist front end for the admin panel
2017-04-25 21:23:20 -04:00
f146c85e75
standards
2017-04-25 18:57:50 +02:00
Hypolite Petovan
82ea7ead66
Merge pull request #3374 from rabuzarus/20170407_-_group_edit
...
Frio: provide own group template + some restructuring in group.php
2017-04-24 19:50:46 -04:00
1a436281c5
added template for the blocklist editor in the admin panel
2017-04-24 23:44:27 +02:00
Sandro Santilli
e08228ca09
Add auth_cookie_lifetime variable to installation config template
2017-04-21 17:19:58 +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
e16fb74b0c
Reworked OStatus communication part to better support Mastodon.
2017-04-19 21:37:00 +00:00
33d5e5b818
Issue 3157: No fulltext anymore
2017-04-18 20:09:05 +00: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
d82684219a
Issue 3331: Removed unneeded table "deliverq"
2017-04-13 04:51:16 +00: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
Sandro Santilli
27cce1e6dc
Add type="text" attribute for openid input field
2017-04-06 21:48:20 +02:00
f6d7ee2781
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 08:28:42 +00:00
0d49143a63
"no_utf" wasn't in use anymore - it is now removed completely
2017-03-25 10:51:00 +00:00
Hypolite Petovan
29fb28de43
Remove Embedly integration
...
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Hypolite Petovan
b9f4a6e4f0
Code cleanup + standards
2017-03-25 01:54:16 -04:00
rabuzarus
0060e2449e
Merge develop into 20170316_-_fix_event_edit
...
Conflicts:
mod/events.php
2017-03-20 16:46:36 +01:00
8dd732a896
Issue 3242: Define a maintenance reason
2017-03-19 13:24:07 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
dfc5dc2e9e
Merge pull request #3223 from annando/1702-no-language
...
The language string isn't displayed anymore
2017-03-13 08:26:43 +01:00
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
b6a4a2ec7f
Merge remote-tracking branch 'upstream/develop' into 1702-no-language
2017-03-12 20:50:20 +00:00
1d667d7a45
tag change
2017-03-03 17:18:09 +01:00
2fa9f76e67
better wording and placeholder for name
2017-03-03 10:28:29 +01:00
Hypolite Petovan
a3cd804ff1
Fix default paginate.tpl
...
Adding missing curly braces
2017-03-01 23:23:14 -05:00
cc86d8ea14
Language data won't be displayed anymore (it was experimental stuff)
2017-02-27 23:59:05 +00:00
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
7442ce3d6d
change Fan/Admirer to Subscriber
2017-02-26 16:47:11 +01:00
cec79ddf2b
See issue 3157: Fulltext is now disabled
2017-02-21 05:23:37 +00:00
