Tobias Diekershoff
|
de5a0dadb0
|
Merge pull request #3534 from AndyHee/20170609-User_settings
Better input hints, user settings, account types
|
2017-06-09 12:39:50 +02:00 |
|
Andy H3
|
ccbb50b589
|
Regenerated master messages.po file
|
2017-06-09 16:44:42 +07:00 |
|
|
Andy H3
|
c8f87e1c28
|
Updated settings.php
|
2017-06-09 16:21:25 +07:00 |
|
|
Andy H3
|
7f0988a103
|
Regenerated master messages.po file
|
2017-06-09 15:42:31 +07:00 |
|
|
Tobias Diekershoff
|
1838024f6d
|
Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators
Replace explicit php logical operators
|
2017-06-09 07:44:19 +02:00 |
|
Hypolite Petovan
|
ad4cdf2a9d
|
Replace lowercase operators
|
2017-06-08 21:03:44 -04:00 |
|
rabuzarus
|
fa27256932
|
Merge pull request #3527 from annando/acl-speedup
Increase the page load speed with Frio
|
2017-06-08 23:09:49 +02:00 |
|
Michael
|
34815de99c
|
Changed documentation
|
2017-06-08 21:00:45 +00:00 |
|
|
Michael
|
f1119b4198
|
Removed commented out line
|
2017-06-08 20:53:21 +00:00 |
|
|
Michael
|
d419962dbf
|
Added documentation
|
2017-06-08 20:50:25 +00:00 |
|
|
Michael
|
8f336bffc2
|
further improvements to the workerqueue
|
2017-06-08 20:43:30 +00:00 |
|
Michael Vogel
|
6f8a48d2de
|
Merge pull request #3530 from tobiasd/20170608-portdocs
added hints how to specify a port for the database connection
|
2017-06-08 21:50:07 +02:00 |
|
|
Tobias Diekershoff
|
0489c04a43
|
spacing not tabs
|
2017-06-08 15:03:04 +02:00 |
|
|
Tobias Diekershoff
|
a9b948d6f9
|
added hints how to specify a port for the database connection
|
2017-06-08 15:00:50 +02:00 |
|
|
Tobias Diekershoff
|
b9b047f2af
|
Merge pull request #3523 from annando/issue-2864
Issue 2864: Create a alternate link for every status
|
2017-06-08 10:45:36 +02:00 |
|
|
Michael
|
388c9de8f7
|
Merge remote-tracking branch 'upstream/develop' into acl-speedup
|
2017-06-08 04:01:55 +00:00 |
|
|
Michael
|
0541a62134
|
The function "construct_acl_data" isn't used at all, it seems. it is deactivated now
|
2017-06-08 03:56:42 +00:00 |
|
|
Hypolite Petovan
|
98d1051583
|
Updated documentation with the new coding standard
|
2017-06-07 22:01:27 -04:00 |
|
|
Hypolite Petovan
|
2281989866
|
Replace && by AND in SQL queries
|
2017-06-07 22:01:14 -04:00 |
|
|
Hypolite Petovan
|
9c0d2c31e8
|
Replace AND and OR in PHP conditions by && and ||
|
2017-06-07 22:00:59 -04:00 |
|
|
Hypolite Petovan
|
bee6ad5916
|
Merge pull request #3526 from annando/bugfix-index
The index mustn't be 192 characters long
|
2017-06-07 20:36:40 -04:00 |
|
|
Michael
|
d5cc757943
|
Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup
|
2017-06-07 20:26:00 +00:00 |
|
|
Michael
|
504ceb2d43
|
We should increase the database version number
|
2017-06-07 20:24:44 +00:00 |
|
|
Michael
|
1916f7858f
|
Increase the page load speed with Frio
|
2017-06-07 19:51:37 +00:00 |
|
|
Michael
|
71a5de40f1
|
The index mustn't be 192 characters long
|
2017-06-07 18:34:17 +00:00 |
|
|
Michael
|
5aee2fde1b
|
Merge remote-tracking branch 'upstream/develop' into issue-2864
|
2017-06-07 18:17:37 +00:00 |
|
|
Michael
|
1b5f1effa0
|
Code beautification
|
2017-06-07 09:51:21 +00:00 |
|
|
Michael
|
97fd47c614
|
Moved include to top
|
2017-06-07 08:46:38 +00:00 |
|
|
Andy H3
|
1c107b2e1f
|
Merge pull request #1 from friendica/develop
Update develop branch
|
2017-06-07 15:06:13 +07:00 |
|
|
Tobias Diekershoff
|
66458d7313
|
Merge pull request #3522 from annando/1706-lock
Some more poller speed and lock functionality
|
2017-06-07 09:29:54 +02:00 |
|
|
Michael Vogel
|
89efc7dd13
|
Merge pull request #3524 from tobiasd/20170607-missingdash
added missing dash in version
|
2017-06-07 08:29:36 +02:00 |
|
|
Michael
|
2ad784d37a
|
Speeded up calling "proc_run"
|
2017-06-07 05:42:30 +00:00 |
|
|
Tobias Diekershoff
|
36630daca6
|
added missing dash in version
|
2017-06-07 07:36:04 +02:00 |
|
|
Michael
|
6161ceff64
|
Merge remote-tracking branch 'upstream/develop' into 1706-lock
|
2017-06-07 05:28:37 +00:00 |
|
|
Hypolite Petovan
|
37a74c993b
|
Merge pull request #3521 from annando/1705-dbclean-advanced
Expire remote items
|
2017-06-06 23:43:40 -04:00 |
|
|
Michael
|
737e40b4d9
|
Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock
|
2017-06-06 22:20:05 +00:00 |
|
|
Michael
|
9c46971aa5
|
The check for blocking processes is deactivated until further checks were performed
|
2017-06-06 22:18:42 +00:00 |
|
|
Michael
|
6e6941a546
|
We have an alternate link
|
2017-06-06 21:56:25 +00:00 |
|
|
Michael
|
4e748668c6
|
Spaces
|
2017-06-06 20:10:47 +00:00 |
|
|
Michael
|
932e14971f
|
Issue 2864: Add a "alternate" link on display page
|
2017-06-06 17:56:22 +00:00 |
|
|
Michael
|
910cca0629
|
Attached pictures in OStatus posts are now displayed
|
2017-06-06 17:55:14 +00:00 |
|
|
Michael
|
e3d5dcf049
|
Beware of camels
|
2017-06-06 17:42:47 +00:00 |
|
|
Michael
|
611d3e3f5d
|
Added documentation
|
2017-06-06 17:41:01 +00:00 |
|
|
Michael
|
929f518e5c
|
Added documentation
|
2017-06-06 17:38:58 +00:00 |
|
|
Michael
|
de9cddc82f
|
Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced
|
2017-06-06 17:30:40 +00:00 |
|
|
Michael
|
286b2da7a9
|
Added documentation and renamed function
|
2017-06-06 17:25:28 +00:00 |
|
|
Michael Vogel
|
f4652d6e50
|
Merge branch 'develop' into 1706-lock
|
2017-06-06 14:16:00 +02:00 |
|
|
Michael
|
f96423feae
|
Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock
|
2017-06-06 12:12:07 +00:00 |
|
|
Michael
|
8d13751d40
|
Increased database version
|
2017-06-06 12:07:27 +00:00 |
|
|
Michael
|
e00105d649
|
Don't fork a new worker
|
2017-06-06 11:59:38 +00:00 |
|