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

16902 Commits

Author SHA1 Message Date
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
Andy H 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
Adam Magness 7938decff3 Private to public 
change function to public as it's called from elsewhere
 2017-11-29 18:37:32 -05:00
hoergen 346820990c added some styles and removed typos 2017-11-30 00:13:16 +01:00
Adam Magness 0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Hypolite Petovan 93e6f5da47
Merge pull request #3984 from annando/best_link_url 
Bugfix for "Call to undefined function best_link_url()"
 2017-11-29 16:39:14 -05:00
Michael 0982b0413b Bugfix for "Call to undefined function best_link_url()" 2017-11-29 21:27:39 +00:00
Hypolite Petovan d42fe4bf5a
Merge pull request #3983 from annando/nogroup 
Small fixes to "nogroup"
 2017-11-29 16:07:27 -05:00
Michael fe348acb49 Small fixes to "nogroup" 2017-11-29 20:59:06 +00:00
Adam Magness eb148cad55 Missed use dba 
added use dba
 2017-11-29 13:04:58 -05:00
Adam Magness 0091d318e5 Function names 
Update function names and corresponding function calls
 2017-11-29 12:17:12 -05:00
Hypolite Petovan 775705acb9
Merge pull request #3981 from hoergen/develop 
added some more minimalism, added annotations, removed some blank lines
 2017-11-29 11:52:46 -05:00
hoergen 52625653d3 removed tabsi, removed some blank lines. 2017-11-29 17:43:09 +01:00
hoergen 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
Tobias Diekershoff 7b5a0fdbe0
Merge pull request #3978 from annando/always-threads 
Threads are now always enabled.
 2017-11-28 20:19:18 +01:00
Michael 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
Tobias Diekershoff 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
Tobias Diekershoff 7eee227698 missing false for the tagcloud settings 2017-11-27 19:20:43 +01:00
Tobias Diekershoff 6f825c5db4 regen credits 2017-11-27 18:42:05 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 67f75a3261 regenerated master messages.po file 2017-11-27 09:26:44 +01:00
Tobias Diekershoff 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
Michael 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
Michael a6de1a1ae8 Posting images to public forums now really does work. 2017-11-26 22:28:46 +00:00
hoergen 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
hoergen b348692a47 added plusminus style sheet and sort the style sheets alphabetically 2017-11-26 20:46:55 +01:00
hoergen 887655c1bd added new style sheet plusminus 2017-11-26 20:46:20 +01:00