|
|
52625653d3
|
removed tabsi, removed some blank lines.
|
2017-11-29 17:43:09 +01:00 |
|
|
|
a926c8ce4c
|
added some more minimalism, added annotations, removed some blank lines
|
2017-11-29 17:12:25 +01:00 |
|
Adam Magness
|
54827e7fed
|
Photo to src
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
|
2017-11-29 07:52:27 -05:00 |
|
|
|
7b5a0fdbe0
|
Merge pull request #3978 from annando/always-threads
Threads are now always enabled.
|
2017-11-28 20:19:18 +01:00 |
|
|
|
8bffee43b3
|
Threads are now always enabled.
|
2017-11-28 18:54:39 +00:00 |
|
Michael Vogel
|
3e2888b8d8
|
Merge pull request #3977 from tobiasd/20171128-docde
Events doc is not in DE, but had a from link to the doc home page
|
2017-11-28 19:28:50 +01:00 |
|
|
|
9f845b0279
|
Events doc is not in DE, but had a from link to the doc home page
|
2017-11-28 14:29:50 +01:00 |
|
Michael Vogel
|
e8bac99728
|
Merge pull request #3976 from rabuzarus/20171126_-_acl_forum
acl: only one forum account should be selectable
|
2017-11-28 07:33:46 +01:00 |
|
rabuzarus
|
f5715cece9
|
acl: only one forum account should be selectable
|
2017-11-28 01:08:03 +01:00 |
|
Hypolite Petovan
|
16fb014547
|
Hotfix missing use dba
|
2017-11-27 14:03:47 -05:00 |
|
Hypolite Petovan
|
de3fcb0065
|
Merge pull request #3974 from tobiasd/20171127-credits
regen credits
|
2017-11-27 13:28:28 -05:00 |
|
Hypolite Petovan
|
f983712269
|
Merge pull request #3973 from tobiasd/20171127-utilconfig
config tool needed some touch up to work again
|
2017-11-27 13:28:06 -05:00 |
|
Hypolite Petovan
|
0f086d22ac
|
Merge pull request #3975 from tobiasd/20171127-tagcloud
missing false for the tagcloud settings
|
2017-11-27 13:22:32 -05:00 |
|
|
|
7eee227698
|
missing false for the tagcloud settings
|
2017-11-27 19:20:43 +01:00 |
|
|
|
6f825c5db4
|
regen credits
|
2017-11-27 18:42:05 +01:00 |
|
|
|
25c8db1625
|
config tool needed some touch up to work again
|
2017-11-27 18:27:57 +01:00 |
|
Michael Vogel
|
3f448d9a42
|
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate
Migrate password hashing Part 1: Add User::authenticate
|
2017-11-27 15:14:36 +01:00 |
|
Hypolite Petovan
|
ced1063a10
|
Improved dba calls
- Removed intval calls
- Used boolean values for params when relevant
|
2017-11-27 08:17:56 -05:00 |
|
Michael Vogel
|
3dc7b131fc
|
Merge pull request #3972 from tobiasd/20171127-messages
regenerated master messages.po file
|
2017-11-27 10:28:13 +01:00 |
|
|
|
67f75a3261
|
regenerated master messages.po file
|
2017-11-27 09:26:44 +01:00 |
|
|
|
a2f1414a80
|
Merge pull request #3971 from annando/no_template_escape
The function "template_escape" doesn't exist anymore.
|
2017-11-27 07:49:55 +01:00 |
|
|
|
9612496e9e
|
The function "template_escape" doesn't exist anymore.
|
2017-11-27 06:44:49 +00:00 |
|
Hypolite Petovan
|
88a9e4a904
|
Merge pull request #3969 from annando/bugfix-picture-forum
Posting images to public forums now really does work.
|
2017-11-26 17:47:14 -05:00 |
|
Hypolite Petovan
|
b65247a251
|
Merge pull request #3968 from hoergen/develop
added new style sheet to theme vier
|
2017-11-26 17:46:43 -05:00 |
|
|
|
a6de1a1ae8
|
Posting images to public forums now really does work.
|
2017-11-26 22:28:46 +00:00 |
|
|
|
c32b6000cb
|
removed blank lines
|
2017-11-26 21:56:39 +01:00 |
|
Hypolite Petovan
|
9ddb81ce5f
|
Fix function name typo
|
2017-11-26 15:51:07 -05:00 |
|
Hypolite Petovan
|
2a60146a43
|
Revert "Add new legacy password field"
This reverts commit 2236f60cfa.
|
2017-11-26 15:45:59 -05:00 |
|
Hypolite Petovan
|
456dfbe486
|
Forgotten change in src/Worker/Queue.php
|
2017-11-26 14:56:50 -05:00 |
|
Hypolite Petovan
|
2196a0577b
|
Remove unused upubkey and uprvkey from queries
- Switched queries to new dba::* functions
|
2017-11-26 14:55:47 -05:00 |
|
|
|
b348692a47
|
added plusminus style sheet and sort the style sheets alphabetically
|
2017-11-26 20:46:55 +01:00 |
|
|
|
887655c1bd
|
added new style sheet plusminus
|
2017-11-26 20:46:20 +01:00 |
|
Hypolite Petovan
|
ec6f5193e2
|
Switch to User::authenticate
- Removed hash('whirlpool') to check password
|
2017-11-26 14:46:08 -05:00 |
|
|
|
7a8fb79fc5
|
Adding new stylesheet to theme vier. It aims a more clean visual
|
2017-11-26 20:45:17 +01:00 |
|
Hypolite Petovan
|
483603e77c
|
Add User::authenticate()
|
2017-11-26 14:25:25 -05:00 |
|
Hypolite Petovan
|
90a8ae2cb8
|
Fix formatting
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
|
2017-11-26 14:18:45 -05:00 |
|
|
|
b1b4359fae
|
Merge pull request #3967 from annando/forum-group
Network page: Selecting a forum overrides the group selection
|
2017-11-26 17:19:31 +01:00 |
|
|
|
661f9af93a
|
Network page: Selecting a forum overrides the group selection
|
2017-11-26 16:17:32 +00:00 |
|
Hypolite Petovan
|
3fbf2e3bcf
|
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
A tag cloud widget for the profile page
|
2017-11-26 11:16:14 -05:00 |
|
rabuzarus
|
7d8370a178
|
tag cloud: fix query
|
2017-11-26 16:24:26 +01:00 |
|
rabuzarus
|
ac6b191976
|
tag cloud: use dba for db request
|
2017-11-26 16:14:16 +01:00 |
|
Hypolite Petovan
|
09667dd82b
|
Merge pull request #3965 from tobiasd/20171126-docGettingStarted
this and should be an or
|
2017-11-26 09:23:50 -05:00 |
|
|
|
2bf8ebaab9
|
this and should be an or
|
2017-11-26 15:19:40 +01:00 |
|
|
|
0d7b3b4007
|
Merge pull request #3964 from annando/uexport-json
Avoid empty user export when there are UTF8 problems
|
2017-11-26 15:01:06 +01:00 |
|
|
|
f059b33390
|
Avoid empty user export when there are UTF8 problems
|
2017-11-26 13:58:24 +00:00 |
|
Hypolite Petovan
|
e82bbc75cd
|
Merge pull request #3963 from annando/default-features
Additional features should now work with the forumlist as well
|
2017-11-26 08:51:14 -05:00 |
|
Michael Vogel
|
28594f6d25
|
Merge pull request #3961 from MrPetovan/task/3946-use-random-bytes
Use random_bytes() in random_string()
|
2017-11-26 14:24:48 +01:00 |
|
|
|
e4995dbad5
|
Good looking and better performance
|
2017-11-26 13:12:54 +00:00 |
|
Hypolite Petovan
|
d5c38b9fc9
|
Add odd number of character support to random_string()
|
2017-11-26 07:57:29 -05:00 |
|
Michael Vogel
|
324b2dd014
|
Merge pull request #3962 from tobiasd/20171126-makecredits
add Ratten to the special contributors
|
2017-11-26 12:44:49 +01:00 |
|
