1
1
Fork 0
Commit graph

3880 commits

Author SHA1 Message Date
rabuzarus
8ed6b037cf Merge pull request #3561 from annando/issue-3560
Guests should be able to use the search as well
2017-07-04 01:09:01 +02:00
e26991ba26 Guests should be able to use the search as well 2017-07-03 20:48:44 +00:00
Michael Vogel
2b161108fe Merge pull request #3439 from tobiasd/20170506-token
[Needs OpenID testing] Add token to register
2017-07-02 21:31:53 +02:00
Michael Vogel
578cb0a55c Merge pull request #3539 from AndyHee/20170617-admin_settings
Corrected names for counting/ listing account-types in admin panel
2017-06-28 07:24:41 +02:00
be3bfaec80 Only show the number of workerqueue entries that aren't done 2017-06-20 02:05:16 +00:00
cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
d7b411e9bc Corrected names of account-types 2017-06-17 12:36:14 +07:00
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
c8f87e1c28 Updated settings.php 2017-06-09 16:21:25 +07:00
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
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
97fd47c614 Moved include to top 2017-06-07 08:46:38 +00:00
6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
932e14971f Issue 2864: Add a "alternate" link on display page 2017-06-06 17:56:22 +00:00
21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
f6d10198cc Bugfix: The poller often couldn't store the pid in the workerqueue 2017-05-30 13:20:29 +00:00
f3c3c57a0e Merge pull request #3497 from annando/1705-dbstructure-admin-page
The database structure is now checked ad the admin summary page
2017-05-28 11:07:45 +02:00
104acec09c The database structure is now checked ad the admin summary page 2017-05-28 08:39:41 +00:00
Hypolite Petovan
e762531134 Restore missing include 2017-05-27 21:47:54 -04:00
e37b6bcd41 Probing via web frontend shouldn't use the cache. 2017-05-23 19:38:47 +00:00
6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
192a5e254a Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail 2017-05-17 19:56:38 +00:00
696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
80103f8ad9 Issue 3309: Avatar update should work now 2017-05-16 21:21:54 +00:00
e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
Conflicts:
	include/uimport.php
2017-05-13 04:13:07 +00:00
74a0a92742 Just some more dba::delete 2017-05-13 04:04:17 +00:00
Hypolite Petovan
2bbcbdc704 Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2
Coding convention applied split 2-4-2 (of 2-14-2)
2017-05-12 21:40:30 -04:00
6ef24890bb dbclean is now using the new database functions / new functions for commit, rollback and transaction 2017-05-11 20:13:45 +00:00
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
Michael Vogel
bc724f2b68 Merge pull request #3458 from Hypolite/bug/missing-require-poco
Missing require for poco_serverlist
2017-05-09 06:56:32 +02:00
Hypolite Petovan
108f0b2d1e Improve refactoring
- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion
2017-05-08 23:03:52 -04:00
Hypolite Petovan
d5b660a72f Add missing require for poco_serverlist 2017-05-08 21:55:19 -04:00
Hypolite Petovan
70cc2ccc7a Fix standards + refactored variables with meaningful names 2017-05-08 21:55:04 -04:00
rabuzarus
cc8a3a4101 rename methods of the Probe class to camelCase 2017-05-08 16:19:10 +02:00
Michael Vogel
6680ce1dd7 Merge pull request #3445 from Hypolite/improvement/move-probe-to-src
Move Probe to src
2017-05-07 23:14:22 +02:00
Hypolite Petovan
74479c4020 Merge pull request #3448 from annando/1705-dba-functions
The first queries are replaced with the new functions. More to come ...
2017-05-07 17:10:39 -04:00
Hypolite Petovan
45ec3fb5d8 Add missing include/probe require for probe_url support 2017-05-07 17:08:32 -04:00
2c11e91e65 The first queries are replaced with the new functions. More to come ... 2017-05-07 20:52:00 +00:00
Alexandre Alapetite
02faf42403 Fix SQL syntax bug in mod message 2017-05-07 21:39:00 +02:00
Hypolite Petovan
3a2988c3fd Rename include/Scrape to include/probe 2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d Move Probe to src 2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac Fix require_once format 2017-05-07 14:40:23 -04:00
Hypolite Petovan
86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
c52b2f392f Probing has to be done uncached 2017-05-07 16:33:54 +00:00
aa88691bc1 Diaspora: Accept new Salmon format 2017-05-07 13:11:11 +00:00
dacef3683a add token to register 2017-05-06 14:49:53 +02:00
20d69dee27 missing translation call 2017-05-03 07:11:21 +02:00
Hypolite Petovan
dfd4c8528e Add new documentation page about moving classes to src 2017-05-02 23:37:40 -04:00
Hypolite Petovan
70563e0324 Minor fixes, including overzealous replacement of app -> App 2017-05-02 23:37:30 -04:00
Hypolite Petovan
ce866ad39b Remove unrecommended leading backslash for fully qualified namespaces 2017-05-02 23:37:06 -04:00
Hypolite Petovan
1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan
4b16de6d80 Fix wrong class name case
- Use leading backslash for non-namespace class names in App
2017-05-02 23:36:46 -04:00
Hypolite Petovan
20043914e6 Move App to src
- Add `use Friendica\App;` wherever needed
2017-05-02 22:59:36 -04:00
Hypolite Petovan
56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Hypolite Petovan
9ff4fed7d2 Merge pull request #3408 from annando/1704-conversation-2
Conversation data is stored for own posts as well/improved function dba:update
2017-04-29 16:37:53 -04:00
Hypolite Petovan
f3a64ebfcb Merge pull request #3411 from annando/1704-ping-order
Unread notifications are now always on top
2017-04-29 16:36:03 -04:00
1088e51d69 Remove commented code. 2017-04-29 20:21:54 +00:00
715e15cbe1 There is now a memory limit for the poller 2017-04-29 17:36:46 +00:00
96afaaa0d5 Unread notifications are now always on top 2017-04-29 14:22:49 +00:00
edbbdf9761 Store conversation data for self created posts as well 2017-04-29 05:44:13 +00:00
ba5780c4a1 Remove the "discard" button for contact requests from Diaspora. 2017-04-28 08:36:10 +00:00
Hypolite Petovan
4493f37af3 Merge pull request #3390 from annando/1704-cleaned_install
Added a PDO check in the install routine and cleaned it up
2017-04-27 21:17:13 -04:00
7adb968653 removed commented out line 2017-04-27 07:31:57 +02:00
ae580e5829 Merge pull request #3393 from Shnoulle/develop_feature3334
Simple robots.txt for server 404 log
2017-04-27 07:23:01 +02:00
Denis Chenu
20d4fbffef Coding standards : doxygen + tab + single quote 2017-04-26 17:26:13 +02:00
Denis Chenu
e354a75dc8 Doxygen standard 2017-04-26 17:09:10 +02:00
Denis Chenu
6ef8d18297 Coding standards part and bad empty Disallow
- Unsure PHP_EOL is the best here : PHP_EOL are not the same on *nux and win, it's not for server , but for browser
- _content vs _init : seems not really a web content ?
2017-04-26 17:07:24 +02:00
Denis Chenu
4942c97785 Simple robots.txt for server 404 log 2017-04-26 15:39:35 +02:00
Hypolite Petovan
188d3a6f5e Renamed check_domain_blocklist to blocked_url
- Remove debug
2017-04-26 00:23:01 -04:00
Hypolite Petovan
c7e1a8e871 Added check_domain_blocklist 2017-04-25 22:45:56 -04:00
Hypolite Petovan
7d9d22914f Refactor "URL" to "domain" for blocklist
- Add slash trimming to domain
- Reformatted mod/friendica
2017-04-25 22:45:42 -04:00
Hypolite Petovan
0b8f80c747 Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel
blocklist front end for the admin panel
2017-04-25 21:23:20 -04:00
f146c85e75 standards 2017-04-25 18:57:50 +02:00
efcb166c2d Added check for MySQL driver for PDO. 2017-04-25 06:10:14 +00:00
49ba2f9d6d Added a PDO check in the install routine and cleaned it up 2017-04-25 05:55:20 +00:00
Hypolite Petovan
82ea7ead66 Merge pull request #3374 from rabuzarus/20170407_-_group_edit
Frio: provide own group template + some restructuring in group.php
2017-04-24 19:50:46 -04:00
eeb72bd879 docstrings for the admin panel functions 2017-04-24 23:47:05 +02:00
f969f44603 added subpage for blocklist management to the admin panel 2017-04-24 23:45:05 +02:00
7f837a9205 add the contents from the blocklist to the /friendica page 2017-04-24 23:43:39 +02:00
Hypolite Petovan
bc2dd690fd Merge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2
improve profile page (wall) update for non logged in users and remote users
2017-04-23 21:43:27 -04:00
rabuzarus
88602de604 fall back to unseen items if no timestamp is available 2017-04-23 16:22:53 +02:00
Sandro Santilli
cd521b2dcc Urlencode query parameters 2017-04-23 13:50:33 +02:00
Sandro Santilli
ebc926a716 Add missing query string introducing character
Fixes #3383
2017-04-23 13:50:18 +02:00
2628ff91f4 Call it "toinnodb" 2017-04-22 21:55:16 +00:00
aaa558f7ea New command in dbstructure.php to convert all tables from MyISAM to InnoDB 2017-04-22 21:36:01 +00:00
rabuzarus
5a7b9676ff fixed typo 2017-04-22 22:10:43 +02:00
rabuzarus
53c1bf6ba3 improve profile update for non logged in ussers and remote users 2017-04-22 22:08:05 +02:00
rabuzarus
b273165873 Remove unused function 2017-04-21 16:13:16 +02:00
rabuzarus
f99bb958f6 Merge develop into 20170407_-_group_edit
Conflicts:
	mod/group.php
2017-04-21 16:09:48 +02:00
rabuzarus
40e5436604 some restructuring in groups.php + Frio: provide own group template 2017-04-21 16:04:29 +02:00
Alexandre Alapetite
5b80a1fcaa mod photos compatibility only_full_group_by
Related to https://github.com/friendica/friendica/pull/3323
2017-04-20 21:23:45 +02:00
3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
Conflicts:
	include/bbcode.php
2017-04-20 05:44:31 +00:00
Michael Vogel
83cc56e713 Merge pull request #3326 from Alkarex/utf8mb4
Default to utf8mb4
2017-04-20 05:28:16 +02:00
e16fb74b0c Reworked OStatus communication part to better support Mastodon. 2017-04-19 21:37:00 +00:00
Hypolite Petovan
2c69d36886 Remove extra htmlentities in notifications 2017-04-18 19:34:46 -04:00
33d5e5b818 Issue 3157: No fulltext anymore 2017-04-18 20:09:05 +00:00
47fd9226c3 Resubmit all profiles on directory change 2017-04-17 21:39:11 +00:00
Alexandre Alapetite
d1888ac05c SQL AS for messages
Fix bug introduced in https://github.com/friendica/friendica/pull/3323
2017-04-17 15:01:05 +02:00
Alexandre Alapetite
07faa14361 Merge branch 'develop' into utf8mb4 2017-04-16 22:08:48 +02:00