Commit graph

9616 commits

Author SHA1 Message Date
Tobias Diekershoff
47accd71f7 Merge pull request #1450 from StefOfficiel/patch-2
Update jquery.js
2015-03-27 07:21:15 +01:00
StefOfficiel
f56a025aff Update jquery.js
Update jQuery 1.11.1 to 1.11.2 in good branch
2015-03-26 23:55:32 +01:00
Michael Vogel
dbb164ca4a Merge pull request #1449 from fabrixxm/issue-1370
Create `database.sql` from `include\dbstructure.php`
2015-03-25 22:02:50 +01:00
fabrixxm
c42d6b133e Merge pull request #1448 from annando/issue1432
Removed the special detection for facebook and app.net
2015-03-25 11:13:50 +01:00
fabrixxm
7c33c9cca1 fix SQL generation, update database.sql 2015-03-25 10:03:17 +01:00
fabrixxm
b2b1de5a01 Create database.sql from include\dbstructure.php
add two commands to `dbstructure.php` when called from cli:
'update' updates the database schema
'dumpsql' dump database sql to stdout
2015-03-25 09:47:59 +01:00
Michael Vogel
25dbf26345 Removed the special detection for facebook and app.net since both provide RSS feeds. 2015-03-24 23:08:46 +01:00
Michael Vogel
f1c6d6f1ba Merge pull request #1442 from fabrixxm/issue-1362
Add scheme if missing to url inserted by user in 'insert link' jot button
2015-03-24 12:34:31 +01:00
Michael Vogel
3d297c065e Merge pull request #1444 from fabrixxm/issue-1341
fix paginate url
2015-03-23 15:19:35 +01:00
fabrixxm
8b5d9c32a7 Merge pull request #1446 from annando/issue-905
Diaspora: The signature of likes are checked now correctly
2015-03-23 12:06:46 +01:00
Michael Vogel
63f0177a64 Merge pull request #1443 from fabrixxm/issue-1437
Use correct class name to send post to email recipients. Fix #1437
2015-03-23 06:21:25 +01:00
Michael Vogel
045c78e4a0 Merge pull request #1445 from fabrixxm/issue-1041
ignore tags inside code block
2015-03-22 22:22:49 +01:00
Michael Vogel
b40f19262a Diaspora: The signature of likes are checked now correctly.
enter the commit message for your changes. Lines starting
2015-03-22 21:53:13 +01:00
fabrixxm
a98d2ee387 ignore tags inside code block
should fix issue #1041
2015-03-22 17:12:51 +01:00
fabrixxm
add3411542 fix paginate url
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341
2015-03-22 16:38:05 +01:00
Beanow
e016db8bc6 Version bump, 3.4.0 2015-03-22 15:25:31 +01:00
Beanow
b5b597221f Merge branch 'develop' of github.com:friendica/friendica into develop 2015-03-22 15:13:30 +01:00
fabrixxm
250b466ed3 Fix blank reponse if no siteinfo are fetched 2015-03-22 11:03:46 +01:00
fabrixxm
1cc9e7db0f Add scheme if missing to url inserted by user in 'insert link' jot
button
2015-03-22 10:59:00 +01:00
fabrixxm
86c442f15b Merge branch 'develop' of github.com:friendica/friendica into develop 2015-03-22 10:21:57 +01:00
Beanow
b141a60d5f Merge branch 'release-3.4' into develop 2015-03-22 10:19:35 +01:00
fabrixxm
05d1aaf0ed Use correct class name to send post to email recipients. Fix #1437 2015-03-22 10:12:16 +01:00
hauke
b2a86ceeaa bugfix #1307 2015-03-22 10:02:00 +01:00
fabrixxm
1b2a90a10f Merge pull request #1433 from tugelbend/develop
bugfix #1307
2015-03-22 09:55:45 +01:00
fabrixxm
c18ace5517 Merge pull request #1436 from annando/1503-global-copy-comments
The global copy now copies comments as well
2015-03-22 09:49:49 +01:00
Michael Vogel
81b199cfdc The global copy now copies comments as well. This is important for the search. 2015-03-21 20:23:47 +01:00
fabrixxm
9bdd41b774 Merge pull request #1435 from FlxAlbroscheit/develop
Access a contact directly from the contact-manager-page [UPDATED]
2015-03-20 15:13:17 +01:00
FlxAlbroscheit
1e15cba631 Access a contact directly from the contact-manager-page
Improved my former commit (see: https://github.com/friendica/friendica/pull/1428)
2015-03-20 15:10:55 +01:00
hauke
3212bb3de4 bugfix #1307 2015-03-19 22:04:41 +01:00
Tobias Diekershoff
9f89fbe399 Merge pull request #1431 from thorsten23/develop
Replaced 'q' by 'pagename' so that the basestring is encoded right. The ...
2015-03-14 20:42:33 +01:00
thorsten23
a665ebafa4 Replaced 'q' by 'pagename' so that the basestring is encoded right. The correct basestring is needed to create the right signature in the OAuth authentication process. 2015-03-14 19:55:36 +01:00
Tobias Diekershoff
82abc32a14 Merge pull request #1426 from annando/1503-term-search
The index for the term search is now massively improved
2015-03-12 07:15:05 +01:00
Tobias Diekershoff
1e9e23be61 Merge pull request #1424 from annando/1503-better-guid
Reworked guid function
2015-03-12 07:14:36 +01:00
Tobias Diekershoff
dd21750d90 Merge pull request #1428 from FlxAlbroscheit/develop
Access a contact directly from the contact-manager-page
2015-03-12 07:13:31 +01:00
FlxAlbroscheit
82359bb6cc Give access to contact's profile-URL 2015-03-10 22:47:38 +01:00
FlxAlbroscheit
21237ddba6 Give access to contact's profile-URL 2015-03-10 22:44:57 +01:00
Michael Vogel
bf61620bd2 The index changed, so the database version must be increased as well. 2015-03-10 07:58:49 +01:00
fabrixxm
549eef2710 Merge pull request #1425 from annando/1503-vier-new-screenshot
New screenshot for "vier"
2015-03-10 07:16:18 +01:00
Michael Vogel
7a39626a6c The index for the term search is now massively improved. 2015-03-10 00:23:49 +01:00
Michael Vogel
2eba5a32df New screenshot for "vier". 2015-03-09 23:21:40 +01:00
Michael Vogel
94302a7924 Reworked guid function. 2015-03-09 20:59:57 +01:00
fabrixxm
35f623ae4f Merge pull request #1423 from annando/1503-faster-tags
Improved search speed (for tags)
2015-03-09 08:52:37 +01:00
Michael Vogel
ea06a1ec45 There is now a "global" field in the item table that tells if this item is present as global copy as well. 2015-03-09 00:45:53 +01:00
Michael Vogel
2260415ca9 "global" flag for terms that indicate if the term is present in the global posts. 2015-03-08 03:27:14 +01:00
Michael Vogel
e2965c9ec5 Removed the timestamp for parser. 2015-03-08 03:25:32 +01:00
Michael Vogel
b080eddf8d Improved logging for the search. 2015-03-08 03:24:54 +01:00
Michael Vogel
08696acb18 Merge remote-tracking branch 'upstream/develop' into 1503-faster-tags 2015-03-08 03:23:49 +01:00
Michael Vogel
dbe8275ae5 Added some more timestamp measuring 2015-03-07 23:14:26 +01:00
Michael Vogel
1cf3cb493f removed unneeded code. 2015-03-07 21:39:28 +01:00
Michael Vogel
7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00