Michael Vogel
|
ae1227c9ca
|
Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change
Fix password change
|
2017-12-03 14:49:10 +01:00 |
|
|
|
f988ed5d15
|
Merge remote-tracking branch 'upstream/develop' into onepoll
|
2017-12-03 13:45:48 +00:00 |
|
Hypolite Petovan
|
239a0d70ad
|
Merge pull request #3996 from annando/no-zot
Zot was never really supported, so it is now removed completely
|
2017-12-03 08:40:29 -05:00 |
|
Hypolite Petovan
|
1eb8355ac8
|
Fix wrong condition
Grmbl
|
2017-12-03 08:37:01 -05:00 |
|
Hypolite Petovan
|
3359f3f5c7
|
Fix formatting in mod/settings
|
2017-12-03 08:36:39 -05:00 |
|
|
|
df89e0384d
|
Added description to networks, renaming some network names
|
2017-12-03 13:26:52 +00:00 |
|
Michael Vogel
|
168c374029
|
Merge pull request #4000 from hoergen/develop
plusminus - removed blockquote borders, adjusted font size on several…
|
2017-12-03 14:16:39 +01:00 |
|
|
|
0b752324b5
|
plusminus - removed blockquote borders, adjusted font size on several elements and classes
|
2017-12-03 13:39:56 +01:00 |
|
Michael Vogel
|
e4ac2ff429
|
Merge pull request #3998 from tobiasd/20171203-install
missing word
|
2017-12-03 10:31:12 +01:00 |
|
|
|
ffd04fed85
|
missing word
|
2017-12-03 10:26:26 +01:00 |
|
|
|
6f7510550d
|
NETWORK_MAIL2 was never finished, so remove it as well
|
2017-12-03 09:19:58 +00:00 |
|
|
|
cd55c742e8
|
Check Diaspora contacts, don't poll unreachable contacts too often
|
2017-12-03 08:59:24 +00:00 |
|
Michael Vogel
|
b6b36d49da
|
Merge pull request #3997 from tobiasd/20171203-admin
wrong URL in directory
|
2017-12-03 09:23:58 +01:00 |
|
|
|
2aca406f52
|
wrong URL in directory
|
2017-12-03 08:27:15 +01:00 |
|
|
|
adf802474b
|
Zot was never really supported, so it is now removed completely
|
2017-12-02 21:57:39 +00:00 |
|
Michael Vogel
|
2ca03acb45
|
Merge pull request #3986 from MrPetovan/task/admin-block-list
Admin remote contact block list
|
2017-12-02 22:09:04 +01:00 |
|
Hypolite Petovan
|
74973d1ae0
|
Merge pull request #3994 from zeroadam/Salmon-#3878
Salmon move to src
|
2017-12-02 10:21:08 -05:00 |
|
Adam Magness
|
2b121779a6
|
Salmon move to src
Salmon class, update function name and function calls. Some standards as well.
|
2017-12-02 09:32:45 -05:00 |
|
Hypolite Petovan
|
7bd0ab8360
|
Move includes around in global_community_block
|
2017-12-02 08:43:13 -05:00 |
|
Hypolite Petovan
|
4d10f3b3b7
|
Remove unused use statement
|
2017-12-02 08:42:44 -05:00 |
|
Michael Vogel
|
b5d24b5ac3
|
Merge pull request #3993 from zeroadam/Email-#3878
Email to src
|
2017-12-02 13:03:43 +01:00 |
|
|
|
53e0dc7f87
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-12-02 12:57:27 +07:00 |
|
Hypolite Petovan
|
75181322ba
|
Improve page contacblock for frio theme
|
2017-12-01 22:33:04 -05:00 |
|
Hypolite Petovan
|
8826ece55e
|
Use Contact::getIdForURL instead of probing
- Add change to mod/admin
- Add change to util/global_community_block
|
2017-12-01 22:32:24 -05:00 |
|
Hypolite Petovan
|
843ec842c3
|
Merge branch 'develop' into task/admin-block-list
|
2017-12-01 21:39:20 -05:00 |
|
Adam Magness
|
9a4e741d1a
|
Review Changes
renamed some functions and adjusted corresponding calls.
|
2017-12-01 21:05:06 -05:00 |
|
Hypolite Petovan
|
558f9d263d
|
Merge pull request #3992 from zeroadam/Photo-hotfix
Use Exception
|
2017-12-01 19:07:29 -05:00 |
|
Adam Magness
|
508ce4a5be
|
Use Exception
use exception
|
2017-12-01 18:47:52 -05:00 |
|
Adam Magness
|
e90b0748aa
|
Code Cleanup
Standards clean up
|
2017-12-01 18:13:39 -05:00 |
|
Adam Magness
|
f21feb975d
|
Require Cleanup
Remove instances of require_once for email.php
|
2017-12-01 14:57:13 -05:00 |
|
Adam Magness
|
6008e3df11
|
Email to src
Create Email class and update/rename functions and function calls.
|
2017-12-01 14:41:27 -05:00 |
|
Michael Vogel
|
de4a2e6fd0
|
Merge pull request #3991 from MrPetovan/bug/undefined-variables
Fix undefined variables messages
|
2017-12-01 15:10:29 +01:00 |
|
Hypolite Petovan
|
58ac3532b7
|
Fix undefined variables messages
|
2017-12-01 08:32:21 -05:00 |
|
|
|
c9c103bdd7
|
Merge pull request #3987 from friendica/fabrixxm-patch-1
Missing 'use' in scripts/dbstructure
|
2017-12-01 10:14:15 +01:00 |
|
fabrixxm
|
0b85169e10
|
Missing 'use' in scripts/dbstructure
|
2017-12-01 09:35:05 +01:00 |
|
|
|
7fe549b8d2
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-12-01 13:16:59 +07:00 |
|
Hypolite Petovan
|
2fe80e051b
|
Merge branch 'develop' into task/admin-block-list
|
2017-12-01 00:51:02 -05:00 |
|
Hypolite Petovan
|
ff459441cf
|
Merge branch 'develop' into task/admin-block-list
|
2017-12-01 00:48:13 -05:00 |
|
Hypolite Petovan
|
dc09319695
|
Add admin/contactblock page
- Add page template
|
2017-12-01 00:43:39 -05:00 |
|
Hypolite Petovan
|
5fd4086fdc
|
Add block/unblock methods to Contact class
|
2017-12-01 00:41:26 -05:00 |
|
Hypolite Petovan
|
16d0c30328
|
Move admin templates to dedicated sub-folder
|
2017-12-01 00:40:55 -05:00 |
|
Hypolite Petovan
|
052ba729d7
|
Improved translation functions
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
|
2017-12-01 00:35:40 -05:00 |
|
Hypolite Petovan
|
84418860bd
|
Improve dba
- Add dba::count
- Add support for LIMIT X,X
|
2017-12-01 00:34:54 -05:00 |
|
Hypolite Petovan
|
0ae6f571da
|
Merge pull request #3982 from zeroadam/Photo-#3878
Photo to src
|
2017-11-30 20:33:48 -05:00 |
|
Adam Magness
|
d04d2cb838
|
Static
update functions and check calls.
|
2017-11-30 13:51:04 -05:00 |
|
Adam Magness
|
cddadb4b17
|
Object error
Uncaught Error: Using $this when not in object context
|
2017-11-30 07:48:47 -05:00 |
|
Adam Magness
|
00ad255540
|
Replace function
Replace function used by addon
|
2017-11-30 07:40:20 -05:00 |
|
|
|
a21f6135fc
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-11-30 14:01:18 +07:00 |
|
Hypolite Petovan
|
3cebdee867
|
Fix mod/admin.php formatting
|
2017-11-29 20:28:30 -05:00 |
|
Hypolite Petovan
|
a5e9117524
|
Merge pull request #3985 from hoergen/develop
Plusminus vier theme: Added some styles and removed typos
|
2017-11-29 18:59:58 -05:00 |
|
