friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
17,040 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

17040 Commits

Author SHA1 Message Date
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
Hypolite Petovan fe89e7760e Fix formatting all around 2017-12-09 13:42:02 -05:00
Hypolite Petovan 669c7dea59 Add new method from include/group in relevant Model classes 2017-12-09 13:31:00 -05:00
Michael 38d5932156 Reworked the pidfile class 2017-12-09 17:49:11 +00:00
Michael 0f149a691e Faster credentials check 2017-12-09 12:23:15 +00:00
Michael 8db5b121ff Prevent the running of multiple xmpp auth daemons at a time 2017-12-09 09:46:21 +00:00
Tobias Diekershoff bd0c0eea4c
Merge pull request #4043 from hoergen/develop 
added more styles for setting page and fixed input pointer
 2017-12-09 07:03:23 +01:00
hoergen 6bf75a2f31 added more styles for setting page and fixed input pointer 2017-12-09 04:03:18 +01:00
Hypolite Petovan e44abb6c2a Fix formatting of mod/register 2017-12-08 19:26:48 -05:00
Hypolite Petovan 3c2d3d5073
Merge pull request #4040 from tobiasd/20171209-en 
EN US and GB translation updates
 2017-12-08 04:05:00 -05:00
Tobias Diekershoff 6d48f5578d EN US and GB translation updates 2017-12-08 09:42:24 +01:00
Michael Vogel 0ef2425a3e
Merge pull request #4039 from annando/third-4036 
And now for the third bugfix to PR 4036
 2017-12-08 07:35:55 +01:00
Michael 14d4ffbe7a And now for the third bugfix to PR 4036 2017-12-08 06:32:14 +00:00
Michael Vogel 23ca4f92af
Merge pull request #4038 from annando/second-bugfix-4036 
Second bugfix to PR 4036
 2017-12-08 07:19:20 +01:00
Michael 0a946587b5 Second bugfix to PR 4036 2017-12-08 06:15:06 +00:00
Michael Vogel 6287e46650
Merge pull request #4037 from annando/bugfix-4036 
Bugfix to PR 4036
 2017-12-08 06:48:35 +01:00
Michael 79c841a260 Bugfix to PR 4036 2017-12-08 05:44:43 +00:00
Michael Vogel 5ba6c7717a
Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model 
Move objects to model (redux)
 2017-12-08 06:20:24 +01:00
Hypolite Petovan d3182d93ac Move Object\Profile to Model\Profile 2017-12-07 23:58:20 -05:00
Hypolite Petovan bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05:00
Hypolite Petovan 3772cf7544 Move Object\Conversation to Object\Thread 
- Move Object\Item to Object\Post
 2017-12-07 23:57:37 -05:00
Hypolite Petovan a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan 6b60b89385 Move Object\Profile to Model\Profile 2017-12-07 23:55:05 -05:00
Hypolite Petovan 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Hypolite Petovan 7499824381 Merge branch 'task/3878-move-objects-to-model' of https://github.com/MrPetovan/friendica into task/3878-move-objects-to-model 2017-12-07 23:51:03 -05:00
Hypolite Petovan 79ed1568b6 Fix class Object\Item not found in Object\Post 2017-12-07 23:50:38 -05:00
Hypolite Petovan 4b0f83a12b Finish renaming Object\Item to Object\Post 2017-12-07 23:50:38 -05:00
Hypolite Petovan ee273e6548 Fix class Object\Item not found in Object\Post 2017-12-07 23:36:33 -05:00
Hypolite Petovan d50d693fe3 Finish renaming Object\Item to Object\Post 2017-12-07 23:33:36 -05:00
Hypolite Petovan 3810b483cf Fix undefined Imagick::scaleDown error 2017-12-07 23:32:49 -05:00
Michael Vogel 0dce57d400
Merge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model 
Revert "Move Objects to Model"
 2017-12-08 05:24:34 +01:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Michael Vogel e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model 
Move Objects to Model
 2017-12-08 05:02:21 +01:00
Hypolite Petovan b0c7cc0211
Merge pull request #4034 from hoergen/develop 
Style buttons, lists, inputs and some cleanup
 2017-12-07 20:49:33 -05:00
hoergen 0e2355039f Style buttons, lists, inputs and some cleanup 2017-12-08 02:16:50 +01:00
Hypolite Petovan 16140c8f9f
Merge pull request #4033 from annando/diaspora-autofriend 
Possible fix for issue 4013
 2017-12-07 16:12:49 -05:00
Michael a7b004a727 Commented out the functionality 2017-12-07 20:10:09 +00:00
Michael 3824ad5590 Possible fix for issue 4013 2017-12-07 19:39:55 +00:00