Commit graph

17127 commits

Author SHA1 Message Date
Hypolite Petovan
369fcb7bae
Merge pull request #4060 from annando/system-unavailable
"system_unavailable.php" is unavailable now
2017-12-13 17:01:47 -05:00
Michael
0457bd995f "system_unavailable.php" is unavailable now 2017-12-13 21:55:19 +00:00
Hypolite Petovan
74767ad321
Merge pull request #4059 from annando/maps
The map class is now born as well
2017-12-13 16:44:55 -05:00
Michael
5a0260a10f The Map class is now done 2017-12-13 21:38:14 +00:00
Michael
ea10a7c002 Map is moved to the new place 2017-12-13 21:37:34 +00:00
Hypolite Petovan
35c10ac335
Merge pull request #4058 from annando/mail-stuff
msgclean.php and quoteconvert.php is now integrated into Email.php
2017-12-13 16:00:10 -05:00
Michael
9d574f6666 Forgotten include 2017-12-13 20:58:15 +00:00
Michael
58df57df6e msgclean.php and quoteconvert.php is now integrated into Email.php 2017-12-13 20:36:50 +00:00
Michael Vogel
f58167b000
Merge pull request #4054 from MrPetovan/bug/4041-fix-register
Fix registration
2017-12-13 20:01:03 +01:00
Hypolite Petovan
6362296666
Add INNER JOIN to admin pending user list please @annando 2017-12-13 10:32:59 -05:00
Michael Vogel
77e249effb
Merge pull request #4057 from tobiasd/20171213-fr
update for FR translation - thx Thecross!
2017-12-13 13:29:03 +01:00
Tobias Diekershoff
535a656882
Merge pull request #4056 from annando/missing-crypto
Bugfix for "Call to undefined function Friendica\Network\rsatopem()"
2017-12-13 12:04:10 +01:00
Tobias Diekershoff
1c9d137c28 update for FR translation - thx Thecross! 2017-12-13 12:01:11 +01:00
Michael
44679a73b7 Bugfix for "Call to undefined function Friendica\Network\rsatopem()" 2017-12-13 10:34:51 +00:00
Tobias Diekershoff
f99fb2245e
Merge pull request #4055 from annando/moved-feed
include/feed.php is now moved to /src as well
2017-12-13 10:38:48 +01:00
Michael
785fcd5916 Missing "use" added 2017-12-13 07:09:20 +00:00
Michael
84b85e9198 Removed old include 2017-12-13 07:06:36 +00:00
Michael
74ba0c896a The feed is now a class 2017-12-13 07:03:42 +00:00
Michael
fc55a4b9c0 The feed moved into the new location 2017-12-13 07:02:52 +00:00
Hypolite Petovan
4d72a40aa6 Add Exception support to User::create usages 2017-12-12 21:13:36 -05:00
Hypolite Petovan
9063c830f5 Fix admin pending user list SQL 2017-12-12 21:07:22 -05:00
Hypolite Petovan
fbf57ac98b Replace q() by dba function in User
- Add relevant Exceptions
- Fix admin email checking
2017-12-12 21:07:03 -05:00
Hypolite Petovan
72641e86a8 Add new group added id return to Group::create 2017-12-12 20:52:50 -05:00
Hypolite Petovan
385a36138a Format valid_email function in include/text 2017-12-12 20:52:28 -05:00
Hypolite Petovan
0afdf92ca1 Fix self-contact creation
- Discard useless intval()
- Add proper condition for `self`
2017-12-12 20:44:05 -05:00
Hypolite Petovan
ac3642e76f Add Exceptions to User::create 2017-12-12 20:43:21 -05:00
Hypolite Petovan
af6ca96e66
Merge pull request #4053 from annando/useless_function_exists
Removed useless "function_exists" checks
2017-12-12 03:47:54 -05:00
Tobias Diekershoff
3a1a320dd8
Merge pull request #4052 from annando/issue-3911
Issue 3911: Now the categories are really fetched
2017-12-12 08:06:23 +01:00
Michael
e834f905c6 Issue 3911: Now the categories are really fetched 2017-12-12 05:35:41 +00:00
Michael
88ef61df95 Removed useless "function_exists" checks 2017-12-12 04:52:33 +00:00
Hypolite Petovan
8b4c4572d3
Merge pull request #4051 from annando/remove-duplicates
Fix for duplicate removal in the database structure check
2017-12-11 20:38:54 -05:00
Michael
63b4d84ea9 Fix for duplicate removal in the database structure check 2017-12-11 21:53:52 +00:00
Hypolite Petovan
18b5151405
Merge pull request #4050 from hoergen/develop
removed avatar and name from month/week and fixed time display
2017-12-10 20:10:25 -05:00
hoergen
95309fe5c4 Adjustments events view in timeline/wall 2017-12-11 00:16:23 +01:00
hoergen
6baf7b4da2 removed avatar and name from month/week and fixed time display 2017-12-11 00:03:59 +01:00
Hypolite Petovan
8d57c7c94a
Merge pull request #4049 from annando/bugfix-pr-4046
Bugfix to PR 4046: Repaired query
2017-12-10 16:52:15 -05:00
Michael
48b49dbc4b Bugfix to PR 4046: Repaired query 2017-12-10 20:12:23 +00:00
Michael Vogel
d90c39f54c
Merge pull request #4048 from hoergen/develop
Mostly calendar adjustments
2017-12-10 15:16:55 +01:00
hoergen
f4fdf61f44 Mostly calendar adjustments 2017-12-10 14:18:24 +01:00
Michael Vogel
57f8496c53
Merge pull request #4046 from MrPetovan/bug/4041-fix-register
Move Group to src
2017-12-10 13:32:59 +01:00
Hypolite Petovan
b0fb398844 Fix order parameter for dba::select 2017-12-10 05:37:23 -05:00
Michael Vogel
45ac1b792d
Merge pull request #4047 from tobiasd/20171210-fr
update for FR translation - thx Thecross!
2017-12-10 09:24:44 +01:00
Tobias Diekershoff
9d9840592f update for FR translation - thx Thecross! 2017-12-10 08:42:49 +01:00
Hypolite Petovan
c714ee519f Improve additional condition 2017-12-10 01:07:48 -05:00
Hypolite Petovan
3ea9060259 Fix wrong uses of dba::select
- Improve negative conditions
2017-12-10 01:06:12 -05:00
Hypolite Petovan
dab2669fa4
Merge pull request #4045 from tobiasd/20171209-fr
update for FR translation - thx Thecross!
2017-12-09 14:04:45 -05:00
Hypolite Petovan
33ccd501b9
Merge pull request #4044 from annando/ejabberd-lock
Prevent the running of multiple xmpp auth daemons at a time
2017-12-09 14:04:13 -05:00
Tobias Diekershoff
274b83c9a9 update for FR - thx Thecross! 2017-12-09 19:54:56 +01:00
Hypolite Petovan
4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan
abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05:00