Beanow
|
b5b597221f
|
Merge branch 'develop' of github.com:friendica/friendica into develop
|
2015-03-22 15:13:30 +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 |
|
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 |
|
|
Michael Vogel
|
67d39770ed
|
Improved the margins of the headers
|
2015-03-07 21:12:18 +01:00 |
|
|
Michael Vogel
|
e5fc28bb31
|
Removed some unnecessary code
|
2015-03-07 21:10:02 +01:00 |
|
|
Michael Vogel
|
dc380d7800
|
Adding some more data to Diaspora reshares
|
2015-03-07 21:09:32 +01:00 |
|
|
Michael Vogel
|
30548dfeed
|
Improving performance measuring for the bbcode parser.
|
2015-03-07 21:08:22 +01:00 |
|
|
Michael Vogel
|
df880f7fd2
|
Adding performance measuring to the photo functions.
|
2015-03-07 21:07:26 +01:00 |
|
|
fabrixxm
|
a08de687f8
|
Merge pull request #1422 from tobiasd/20150305ro
RO: update to the strings
|
2015-03-06 09:18:00 +01:00 |
|
|
Tobias Diekershoff
|
96a5257d9c
|
RO: update to the strings
|
2015-03-05 22:48:50 +01:00 |
|
|
fabrixxm
|
5d9b4741a9
|
Merge pull request #1419 from annando/1503-hashtag-handling
Improved hashtag handling
|
2015-03-03 19:16:43 +01:00 |
|
|
Michael Vogel
|
4a10cb1b99
|
Disabled the rewriting of hashtag links
|
2015-03-03 14:10:42 +01:00 |
|
|
Michael Vogel
|
027b11ebb5
|
Small bugfix for likes
|
2015-03-02 23:34:59 +01:00 |
|
|
Michael Vogel
|
3b9a8daeeb
|
Merge remote-tracking branch 'upstream/develop' into 1503-hashtag-handling
|
2015-03-02 07:37:31 +01:00 |
|
|
Tobias Diekershoff
|
8f63eb35ac
|
Merge pull request #1418 from annando/1503-no-ssl-check
We have to disable the SSL checks for the network communication
|
2015-03-02 06:30:40 +01:00 |
|
|
Michael Vogel
|
9e55dbf1db
|
There is already a setting for that ...
|
2015-03-02 00:32:46 +01:00 |
|
|
Michael Vogel
|
52e33d50ad
|
Changing header sizes and changing the header type of oembed data.
|
2015-03-01 21:58:31 +01:00 |
|
|
Michael Vogel
|
da49814cbb
|
Use a header element for the oembed data.
|
2015-03-01 21:24:10 +01:00 |
|
|
Michael Vogel
|
579ac83547
|
Fixing problems with single linefeeds in the Markdown conversion.
|
2015-03-01 21:22:06 +01:00 |
|
|
Michael Vogel
|
3f1d186106
|
Remove the old hashtag functions, change it to the new functionality.
|
2015-03-01 20:40:38 +01:00 |
|
|
Michael Vogel
|
bf0f7c3d0a
|
New bbcode elements h1 to h6 for a better conversion of Diaspora content
|
2015-03-01 20:07:56 +01:00 |
|
|
Michael Vogel
|
ac3a4824df
|
Check for hashtags when storing them and eventually adding hashtag links
|
2015-03-01 17:33:55 +01:00 |
|