]>
git.mxchange.org Git - friendica.git/log
rabuzarus [Fri, 29 May 2015 02:05:41 +0000 (04:05 +0200)]
change the conditions
rabuzarus [Thu, 28 May 2015 17:54:23 +0000 (19:54 +0200)]
block local directory for public access
fabrixxm [Wed, 27 May 2015 09:07:30 +0000 (11:07 +0200)]
Merge pull request #1599 from fabrixxm/issue-1574
Issue #1574
fabrixxm [Wed, 27 May 2015 09:06:47 +0000 (11:06 +0200)]
Merge pull request #1601 from rabuzarus/event-warning
event can not end before it has started warning
fabrixxm [Wed, 27 May 2015 09:06:24 +0000 (11:06 +0200)]
Merge pull request #1603 from rabuzarus/translation
make the heading of the search result translatable
fabrixxm [Wed, 27 May 2015 09:06:10 +0000 (11:06 +0200)]
Merge pull request #1616 from tobiasd/
20150527-cs
CS update to the strings
Tobias Diekershoff [Wed, 27 May 2015 07:58:20 +0000 (09:58 +0200)]
CS update to the strings
rabuzarus [Tue, 26 May 2015 12:49:53 +0000 (14:49 +0200)]
using sprintf
rabuzarus [Mon, 25 May 2015 14:49:57 +0000 (16:49 +0200)]
better space handling
rabuzarus [Sun, 24 May 2015 18:46:40 +0000 (20:46 +0200)]
make the heading of the search result translatable
fabrixxm [Sun, 24 May 2015 18:44:45 +0000 (20:44 +0200)]
Merge pull request #1602 from rabuzarus/searchbox
template for searchbox
rabuzarus [Sun, 24 May 2015 18:01:08 +0000 (20:01 +0200)]
template for searchbox
rabuzarus [Sun, 24 May 2015 11:33:07 +0000 (13:33 +0200)]
event can not end before it has started.
fabrixxm [Sun, 24 May 2015 10:58:36 +0000 (12:58 +0200)]
Merge pull request #1600 from annando/1505-sql-speedup-events
Events: Query improvement
Michael Vogel [Sun, 24 May 2015 09:46:20 +0000 (11:46 +0200)]
Events: Query improvement
fabrixxm [Sun, 24 May 2015 08:39:36 +0000 (10:39 +0200)]
update messages.po
fabrixxm [Sun, 24 May 2015 08:35:55 +0000 (10:35 +0200)]
duepuntozer: style video delete button
fabrixxm [Sun, 24 May 2015 08:34:17 +0000 (10:34 +0200)]
vier: style video delete button
fabrixxm [Sun, 24 May 2015 08:28:15 +0000 (10:28 +0200)]
quattro: readd video delete button styles
because i'm not so good at resolving merge conflicts...
fabrixxm [Sun, 24 May 2015 08:26:21 +0000 (10:26 +0200)]
Merge branch 'develop' into issue-1574
fabrixxm [Sun, 24 May 2015 08:18:10 +0000 (10:18 +0200)]
Merge pull request #1570 from rabuzarus/archive-widget
port of red matrix archive widget
fabrixxm [Sun, 24 May 2015 08:16:29 +0000 (10:16 +0200)]
Merge pull request #1598 from rabuzarus/datepicker
new datetimepicker for event creation
fabrixxm [Sun, 24 May 2015 08:12:42 +0000 (10:12 +0200)]
Merge pull request #1593 from annando/1505-api-speedup
SQL speed increase for query and search.
fabrixxm [Sat, 23 May 2015 20:51:34 +0000 (22:51 +0200)]
quattro: style video delete button
fabrixxm [Sat, 23 May 2015 20:35:02 +0000 (22:35 +0200)]
Delete attachments on item deletion
Delete video from videos page
fabrixxm [Sat, 23 May 2015 18:15:10 +0000 (20:15 +0200)]
Merge pull request #1596 from rabuzarus/event-preview
event preview for frost theme
fabrixxm [Sat, 23 May 2015 18:12:30 +0000 (20:12 +0200)]
Merge pull request #1597 from fabrixxm/lang_it
update IT
fabrixxm [Sat, 23 May 2015 18:08:57 +0000 (20:08 +0200)]
update IT
rabuzarus [Sat, 23 May 2015 18:02:57 +0000 (20:02 +0200)]
add double click on calendar day for frost theme
rabuzarus [Sat, 23 May 2015 17:23:32 +0000 (19:23 +0200)]
event preview for frost theme
rabuzarus [Sat, 23 May 2015 16:49:56 +0000 (18:49 +0200)]
make frost + frost-mobile work with datepicker
rabuzarus [Sat, 23 May 2015 15:50:18 +0000 (17:50 +0200)]
cleanup quattro less file
rabuzarus [Sat, 23 May 2015 15:45:44 +0000 (17:45 +0200)]
quattro css changes added to the less file
Michael Vogel [Sat, 23 May 2015 07:21:05 +0000 (09:21 +0200)]
Merge pull request #1592 from tobiasd/
20150522-de
DE update to the strings
Michael Vogel [Sat, 23 May 2015 07:20:45 +0000 (09:20 +0200)]
Merge pull request #1590 from tobiasd/
20150521-nl
NL update to the strings
Michael Vogel [Fri, 22 May 2015 23:23:31 +0000 (01:23 +0200)]
SQL speed increase for query and search.
rabuzarus [Fri, 22 May 2015 16:53:18 +0000 (18:53 +0200)]
port of red matrix datepicker implementation
Tobias Diekershoff [Fri, 22 May 2015 14:58:16 +0000 (16:58 +0200)]
DE update to the strings
Tobias Diekershoff [Thu, 21 May 2015 17:03:28 +0000 (19:03 +0200)]
NL update to the strings
fabrixxm [Thu, 21 May 2015 09:08:59 +0000 (11:08 +0200)]
Merge pull request #1587 from fabrixxm/lang_it
update lang IT
fabrixxm [Thu, 21 May 2015 08:54:03 +0000 (10:54 +0200)]
update IT
fabrixxm [Thu, 21 May 2015 08:50:29 +0000 (10:50 +0200)]
update IT
fabrixxm [Thu, 21 May 2015 08:47:59 +0000 (10:47 +0200)]
update message.po
fabrixxm [Thu, 21 May 2015 08:45:17 +0000 (10:45 +0200)]
fix run_xgettext.sh
ignore smarty3/compiled folder
fabrixxm [Thu, 21 May 2015 06:40:37 +0000 (08:40 +0200)]
Merge pull request #1585 from annando/issue-1572
Contact requests to a "FREELOVE" account resulted in "read only" contacts
fabrixxm [Thu, 21 May 2015 06:40:15 +0000 (08:40 +0200)]
Merge pull request #1586 from fabrixxm/lang
update messages.po
fabrixxm [Thu, 21 May 2015 06:40:08 +0000 (08:40 +0200)]
Merge pull request #1584 from fabrixxm/develop
merge "master" back in develop
fabrixxm [Wed, 20 May 2015 19:55:52 +0000 (21:55 +0200)]
update messages.po
fabrixxm [Wed, 20 May 2015 19:46:05 +0000 (21:46 +0200)]
Merge branch 'master' into develop
Michael Vogel [Wed, 20 May 2015 19:35:57 +0000 (21:35 +0200)]
Issue 1572: Contact requests to a "FREELOVE" account resulted in "read only" contacts
Hauke Altmann [Wed, 20 May 2015 13:08:47 +0000 (15:08 +0200)]
Merge pull request #1551 from friendica/Bugfix-Empty-Reshare
Bugfix: Empty reshares in Diaspora
rabuzarus [Mon, 18 May 2015 23:07:40 +0000 (01:07 +0200)]
minor polishing
rabuzarus [Mon, 18 May 2015 23:03:08 +0000 (01:03 +0200)]
port of red matrix archive-widget
fabrixxm [Mon, 18 May 2015 08:08:30 +0000 (10:08 +0200)]
Merge pull request #1567 from fabrixxm/feature/map
Fix stupid typo in include/event.php
fabrixxm [Mon, 18 May 2015 07:54:43 +0000 (09:54 +0200)]
Fix stupid typo in include/event.php
That leads to blank events page
fabrixxm [Sun, 17 May 2015 13:19:38 +0000 (15:19 +0200)]
Merge pull request #1566 from annando/1505-bugfix-fetch-url
Bugfix: The function "z_fetch_url" created warnings
Michael Vogel [Sat, 16 May 2015 20:38:41 +0000 (22:38 +0200)]
Bugfix: The function "z_fetch_url" created warnings under certain circumstances.
Tobias Diekershoff [Sat, 16 May 2015 10:04:28 +0000 (12:04 +0200)]
Merge pull request #1563 from annando/1505-no-intelligent-shortening
Disable intelligent shortening - issue 1540
Michael Vogel [Sat, 16 May 2015 08:59:57 +0000 (10:59 +0200)]
Merge pull request #1565 from tobiasd/
20150516-ptbr
PT-BR: update to the strings
Tobias Diekershoff [Sat, 16 May 2015 05:41:40 +0000 (07:41 +0200)]
PT-BR: update to the strings
Tobias Diekershoff [Sat, 16 May 2015 05:22:02 +0000 (07:22 +0200)]
Merge pull request #1564 from fabrixxm/feature/map
[map] bbcode
fabrixxm [Fri, 15 May 2015 19:10:43 +0000 (21:10 +0200)]
add map to events
Michael Vogel [Fri, 15 May 2015 19:09:00 +0000 (21:09 +0200)]
Added explanation for shortening.
Michael Vogel [Fri, 15 May 2015 18:56:05 +0000 (20:56 +0200)]
The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled.
fabrixxm [Fri, 15 May 2015 18:54:42 +0000 (20:54 +0200)]
update bbcode doc
fabrixxm [Fri, 15 May 2015 18:41:10 +0000 (20:41 +0200)]
map bbcode tag from Red
Tobias Diekershoff [Fri, 15 May 2015 06:20:15 +0000 (08:20 +0200)]
Merge pull request #1560 from rabuzarus/add_event
Double click on day in calendar creats new event starting that day
rabuzarus [Thu, 14 May 2015 22:07:41 +0000 (00:07 +0200)]
Double click on day in calendar creats new event starting that day
fabrixxm [Thu, 14 May 2015 14:32:24 +0000 (16:32 +0200)]
Merge pull request #1558 from rabuzarus/event-preview
Event preview
rabuzarus [Thu, 14 May 2015 11:20:58 +0000 (13:20 +0200)]
port of red's event editing preview
Tobias Diekershoff [Wed, 13 May 2015 17:59:58 +0000 (19:59 +0200)]
Merge pull request #1554 from FlxAlbroscheit/develop-1
Issue #1504: Creating groups directly from the sidebar in contacts-page
rabuzarus [Wed, 13 May 2015 11:41:37 +0000 (13:41 +0200)]
Merge pull request #1 from friendica/develop
Update from friendica develop branch
FlxAlbroscheit [Tue, 12 May 2015 12:09:51 +0000 (14:09 +0200)]
Add a group with one click
FlxAlbroscheit [Tue, 12 May 2015 12:04:42 +0000 (14:04 +0200)]
Add a group with one click
Tobias Diekershoff [Tue, 12 May 2015 05:14:16 +0000 (07:14 +0200)]
Merge pull request #1549 from annando/1505-diaspora-fetch-missing
Fetch missing Diaspora posts
Michael Vogel [Sun, 10 May 2015 18:43:41 +0000 (20:43 +0200)]
There was no check for duplicated GUIDs, so doubled posts could occur.
Michael Vogel [Sun, 10 May 2015 08:12:16 +0000 (10:12 +0200)]
Merge pull request #1547 from tobiasd/2014-05-06-match
avoid some contacts from profile match listing
Michael Vogel [Sun, 10 May 2015 08:08:29 +0000 (10:08 +0200)]
Bugfix: Empty reshares in Diaspora
This bugfix was already accepted for the Develop-branch. The bug is very annoying on larger systems. (Single user systems aren't affected by this).
Tobias Diekershoff [Sun, 10 May 2015 07:10:27 +0000 (09:10 +0200)]
dbesc and normalise_link
fabrixxm [Sun, 10 May 2015 06:47:01 +0000 (08:47 +0200)]
Merge pull request #1550 from annando/1505-login-delegated
Set the login date for every identity of the user.
Michael Vogel [Sat, 9 May 2015 21:47:45 +0000 (23:47 +0200)]
Set the login date for every identity of the user.
Michael Vogel [Sat, 9 May 2015 17:39:47 +0000 (19:39 +0200)]
Fetch missing Diaspora posts
Tobias Diekershoff [Wed, 6 May 2015 14:14:27 +0000 (16:14 +0200)]
add procy_url around the profile images
Tobias Diekershoff [Wed, 6 May 2015 11:02:02 +0000 (13:02 +0200)]
avoid some contacts from profile match listing
Tobias Diekershoff [Mon, 4 May 2015 06:02:08 +0000 (08:02 +0200)]
Merge pull request #1546 from annando/1505-diaspora
Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures
Michael Vogel [Sun, 3 May 2015 20:40:20 +0000 (22:40 +0200)]
Missing $
Michael Vogel [Sun, 3 May 2015 20:15:26 +0000 (22:15 +0200)]
Bugfix: There should be no problems anymore with empty Diaspora reshares.
Michael Vogel [Sun, 3 May 2015 19:25:03 +0000 (21:25 +0200)]
Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures
Tobias Diekershoff [Sun, 3 May 2015 07:15:54 +0000 (09:15 +0200)]
Merge pull request #1545 from annando/1503-load-issues
Value for maximum load until the frontend quits service
Tobias Diekershoff [Sun, 3 May 2015 07:14:56 +0000 (09:14 +0200)]
Merge pull request #1544 from annando/1505-oembed-bbcode
OEmbed: Automatic height, changed behaviour in attachments
Michael Vogel [Sat, 2 May 2015 20:05:04 +0000 (22:05 +0200)]
New page setting for the maximum frontend load value.
Michael Vogel [Sat, 2 May 2015 19:47:34 +0000 (21:47 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
Michael Vogel [Fri, 1 May 2015 12:29:53 +0000 (14:29 +0200)]
Automatically resize iframe if no height was provided.
Michael Vogel [Fri, 1 May 2015 09:06:39 +0000 (11:06 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode
Michael Vogel [Fri, 1 May 2015 08:42:43 +0000 (10:42 +0200)]
rich content in oembed now replaces the content in attachments
Tobias Diekershoff [Fri, 1 May 2015 08:34:40 +0000 (10:34 +0200)]
Merge pull request #1543 from annando/1504-oembed-stylesheet
The oembed iframe now has a class name to use it for stylesheets.
Tobias Diekershoff [Fri, 1 May 2015 08:34:14 +0000 (10:34 +0200)]
Merge pull request #1542 from annando/1504-ping
Highlighting of user names should now work in every case
Michael Vogel [Thu, 30 Apr 2015 04:12:21 +0000 (06:12 +0200)]
The oembed iframe now has a class name to use it for stylesheets.
Michael Vogel [Thu, 30 Apr 2015 04:11:05 +0000 (06:11 +0200)]
Highlighting of user names should now work in every case
Tobias Diekershoff [Mon, 27 Apr 2015 05:55:37 +0000 (07:55 +0200)]
Merge pull request #1539 from annando/issue-1536
Redefined the conditions when notifications and introductions are shown.
projects / friendica.git / log