mexon/friendica
1
0
Fork 0
Code Pull requests Activity
17527 commits 5 branches 60 tags 188 MiB
Commit graph

17527 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
2d66242b4f The delete function is now changed to the new function 2018-01-17 23:22:01 +00:00
Michael
000e6457b4 Merge remote-tracking branch 'upstream/develop' into item-delete 2018-01-17 21:54:17 +00:00
Hypolite Petovan
ab90bd2dd1
Merge pull request #4262 from fabrixxm/frio-login 
Frio: restyle login page episode II • Attack of the Clones
 2018-01-17 11:28:53 -05:00
fabrixxm
f51fda7911 fix for coding standars 2018-01-17 17:27:27 +01:00
Hypolite Petovan
ca0a261e08
Merge pull request #4261 from annando/bugfix-process 
Avoid sql error in process handling
 2018-01-17 10:45:16 -05:00
fabrixxm
fc8e8feec1 Frio: add login background color admin option 2018-01-17 16:33:27 +01:00
fabrixxm
2c8bbea65d frio: tweak login template, fix style 
move lost pwd link and register to submit wrapper,
use flexbox for submit row in login form,
show register link as button
fix form label colors in mobile
 2018-01-17 16:01:34 +01:00
Michael
fbb024d151 Avoid sql error in process handling 2018-01-17 14:10:30 +00:00
Michael
947a1b894f Wall postings need to be treated especially as well. 2018-01-17 14:09:24 +00:00
fabrixxm
9862194914 Frio: fix home page 
Add home.tpl, fix style with custom home.html, fix style with custom page content from addon
 2018-01-17 13:29:04 +01:00
fabrixxm
0aafdab810 Use template home.tpl for mod/home 2018-01-17 13:27:41 +01:00
Michael
2df5a14ce5 Delete could work now, needs testing 2018-01-17 07:08:49 +00:00
Michael
32c1c04a1c Merge remote-tracking branch 'upstream/develop' into item-delete 2018-01-17 06:12:11 +00:00
Michael Vogel
a526573075
Merge pull request #4253 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] App.php / Create Model\Process
 2018-01-17 07:08:51 +01:00
Hypolite Petovan
c1c9a829fa Add missing include in Model\Process 2018-01-17 00:17:58 -05:00
Hypolite Petovan
f193f01a7d Fix issues in changed files 
- Initializes $return in Process::insert
- Update the type hint of dba::fetch
- Remove unused $a parameter in worker_init()
- Fix uses
 2018-01-17 00:17:58 -05:00
Hypolite Petovan
ad88b6e3af Fix issues in App.php 
- Fix formatting
- Add method visibility
- Remove unused properties
- Remove unused methods
- Remove unused parameters
- Fix implode parameter order (?!)
 2018-01-17 00:17:58 -05:00
Hypolite Petovan
78ac7afe9c Move process functions to Model\Process 
- Add start|endProcess functions to Core\Worker
 2018-01-17 00:17:58 -05:00
Hypolite Petovan
b699637ab7
Merge pull request #4260 from annando/item-shadow 
Transfer all item shadow functions to the item class
 2018-01-16 20:26:07 -05:00
Michael
3ecdbb6a59 Standards 2018-01-16 23:20:07 +00:00
Michael
63a4105a59 New item class function for delete 2018-01-16 23:16:53 +00:00
Michael
f30275f6db Oh, standards ... 2018-01-16 22:46:20 +00:00
Michael
c4d3ab6878 Transfer all item shadow functions to the item class 2018-01-16 22:23:19 +00:00
Hypolite Petovan
0c4d7cd1a1
Merge pull request #4258 from zeroadam/BugFixQueue-#4256 
Fix class name issue
 2018-01-16 09:04:43 -05:00
Adam Magness
5d8f798ef7 Fix class name issue 
use Model\Queue as QueueModel and update function calls.
 2018-01-16 08:49:08 -05:00
Hypolite Petovan
17c709aec4
Merge pull request #4257 from strk/openid-fix 
Fix LightOpenID usage
 2018-01-16 08:49:04 -05:00
Sandro Santilli
032c87d718 Do not "pollute" global namespace with LightOpenID symbol 2018-01-16 13:11:38 +01:00
Sandro Santilli
6bc096b150 Fix LightOpenID usage 
otherwise failing with:
PHP Fatal error: Class 'Friendica\\Module\\LightOpenID' not found in src/Module/Login.php on line 68
 2018-01-16 10:48:59 +01:00
Hypolite Petovan
b505f0d4d2
Merge pull request #4254 from zeroadam/Queue-#3878 
Move queue_fn to src
 2018-01-15 20:53:17 -05:00
Adam Magness
c98e558372 Remove old file 
remove include/queue_fn.php
 2018-01-15 20:16:51 -05:00
Adam Magness
920a9b9b12 Remove requires 
remove require_once statements
 2018-01-15 20:16:14 -05:00
Adam Magness
33ac7a529f Update functions and calls 
update function names and calls
 2018-01-15 20:12:07 -05:00
Adam Magness
a5b3f4b2ba Create Queue class 
Create queue class and functions from queue_fn.php
 2018-01-15 19:28:39 -05:00
Hypolite Petovan
286811357a
Merge pull request #4252 from zeroadam/Nav-#3878 
Move nav to src
 2018-01-15 19:14:31 -05:00
Adam Magness
246e673659 Review updates 2018-01-15 17:42:12 -05:00
Adam Magness
bb08f87bba Remove old file 
remove include/nav.php
 2018-01-15 17:12:39 -05:00
Adam Magness
39ff6e9ce9 Merge remote-tracking branch 'origin/Nav-#3878' into Nav-#3878 2018-01-15 17:09:28 -05:00
Adam Magness
bd63a36269 use dba 
add use dba
 2018-01-15 17:09:06 -05:00
Adam Magness
0f546f7f0f Update functions and calls 
Update function names and scope. update calls.
 2018-01-15 17:09:06 -05:00
Adam Magness
ac317060fb Create Nav class 
create nav class and function from include/nav.php
 2018-01-15 17:09:06 -05:00
Adam Magness
d01a31fa4f use dba 
add use dba
 2018-01-15 17:08:36 -05:00
Michael Vogel
26b335ef3d
Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style 
Use short form array syntax everywhere
 2018-01-15 22:51:57 +01:00
Adam Magness
36d891bcad Update functions and calls 
Update function names and scope. update calls.
 2018-01-15 14:51:56 -05:00
Adam Magness
c66c6223b7 Create Nav class 
create nav class and function from include/nav.php
 2018-01-15 14:19:55 -05:00
Hypolite Petovan
99875b15d3 Fix variable name typo in index 2018-01-15 14:07:17 -05:00
Hypolite Petovan
e36f2bb1fb Use short form array syntax everywhere 
- Add short form array syntax to po2php.php generation
 2018-01-15 14:07:17 -05:00
Hypolite Petovan
77dfbaa0bf
Merge pull request #4250 from zeroadam/Mail-#3878 
Move messages to src
 2018-01-15 13:43:16 -05:00
Adam Magness
8c878a7ad3 Remove indexes 
remove [0] from selectFirst objects
 2018-01-15 12:37:44 -05:00
Adam Magness
1bea697fb8 Replace integers 
put integers back where booleans
 2018-01-15 12:28:07 -05:00
Adam Magness
753996c86f Fix backticks 
backtick to single quote in dba calls
 2018-01-15 12:23:18 -05:00