Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 03:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
22322 commits 3 branches 64 tags 241 MiB
Commit graph

22322 commits

This branch
This branch
All branches
Author SHA1 Message Date
fabrixxm
f384a1d8ab Merge pull request #1593 from annando/1505-api-speedup 
SQL speed increase for query and search.
 2015-05-24 10:12:42 +02:00
fabrixxm
7c2608e07d quattro: style video delete button 2015-05-23 22:51:34 +02:00
fabrixxm
83697cf3e5 Delete attachments on item deletion 
Delete video from videos page
 2015-05-23 22:35:02 +02:00
fabrixxm
3cb4f91807 Merge pull request #1596 from rabuzarus/event-preview 
event preview for frost theme
 2015-05-23 20:15:10 +02:00
fabrixxm
ad2783dbc8 Merge pull request #1597 from fabrixxm/lang_it 
update IT
 2015-05-23 20:12:30 +02:00
fabrixxm
dd9f4439ce update IT 2015-05-23 20:08:57 +02:00
rabuzarus
5e6c140fc1 add double click on calendar day for frost theme 2015-05-23 20:02:57 +02:00
rabuzarus
6731ffbfc8 event preview for frost theme 2015-05-23 19:23:32 +02:00
rabuzarus
3504b3b94f make frost + frost-mobile work with datepicker 2015-05-23 18:49:56 +02:00
rabuzarus
76283ff205 cleanup quattro less file 2015-05-23 17:50:18 +02:00
rabuzarus
9c803f7dbb quattro css changes added to the less file 2015-05-23 17:45:44 +02:00
Michael Vogel
41d5e89f50 Merge pull request #1592 from tobiasd/20150522-de 
DE update to the strings
 2015-05-23 09:21:05 +02:00
Michael Vogel
1de057ca11 Merge pull request #1590 from tobiasd/20150521-nl 
NL update to the strings
 2015-05-23 09:20:45 +02:00
Michael Vogel
ab67788b4e SQL speed increase for query and search. 2015-05-23 01:23:31 +02:00
rabuzarus
2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
Tobias Diekershoff
a9fa049659 DE update to the strings 2015-05-22 16:58:16 +02:00
Tobias Diekershoff
0f0e570aa0 NL update to the strings 2015-05-21 19:03:28 +02:00
fabrixxm
cebe8cb102 Merge pull request #1587 from fabrixxm/lang_it 
update lang IT
 2015-05-21 11:08:59 +02:00
fabrixxm
dbafc917c2 update IT 2015-05-21 10:54:03 +02:00
fabrixxm
8bbffe0a54 update IT 2015-05-21 10:50:29 +02:00
fabrixxm
fd8f25007b update message.po 2015-05-21 10:47:59 +02:00
fabrixxm
914fa4c420 fix run_xgettext.sh 
ignore smarty3/compiled folder
 2015-05-21 10:45:17 +02:00
fabrixxm
51f8427333 Merge pull request #1585 from annando/issue-1572 
Contact requests to a "FREELOVE" account resulted in "read only" contacts
 2015-05-21 08:40:37 +02:00
fabrixxm
b3823939aa Merge pull request #1586 from fabrixxm/lang 
update messages.po
 2015-05-21 08:40:15 +02:00
fabrixxm
b75cd177a7 Merge pull request #1584 from fabrixxm/develop 
merge "master" back in develop
 2015-05-21 08:40:08 +02:00
fabrixxm
506e745dd2 update messages.po 2015-05-20 21:55:52 +02:00
fabrixxm
98bba66dcb Merge branch 'master' into develop 2015-05-20 21:46:05 +02:00
Michael Vogel
1c8b9b73f7 Issue 1572: Contact requests to a "FREELOVE" account resulted in "read only" contacts 2015-05-20 21:35:57 +02:00
Hauke Altmann
beb4980f02 Merge pull request #1551 from friendica/Bugfix-Empty-Reshare 
Bugfix: Empty reshares in Diaspora
 2015-05-20 15:08:47 +02:00
rabuzarus
101804d505 minor polishing 2015-05-19 01:07:40 +02:00
rabuzarus
30348a1bc0 port of red matrix archive-widget 2015-05-19 01:03:08 +02:00
fabrixxm
996224a8a4 Merge pull request #1567 from fabrixxm/feature/map 
Fix stupid typo in include/event.php
 2015-05-18 10:08:30 +02:00
fabrixxm
fc54ee2928 Fix stupid typo in include/event.php 
That leads to blank events page
 2015-05-18 09:54:43 +02:00
fabrixxm
53a2121797 Merge pull request #1566 from annando/1505-bugfix-fetch-url 
Bugfix: The function "z_fetch_url" created warnings
 2015-05-17 15:19:38 +02:00
Michael Vogel
2038e65a57 Bugfix: The function "z_fetch_url" created warnings under certain circumstances. 2015-05-16 22:38:41 +02:00
Tobias Diekershoff
72e3ffbb4d Merge pull request #1563 from annando/1505-no-intelligent-shortening 
Disable intelligent shortening - issue 1540
 2015-05-16 12:04:28 +02:00
Michael Vogel
cd184d2c7b Merge pull request #1565 from tobiasd/20150516-ptbr 
PT-BR: update to the strings
 2015-05-16 10:59:57 +02:00
Tobias Diekershoff
d4cb18538e PT-BR: update to the strings 2015-05-16 07:41:40 +02:00
Tobias Diekershoff
dd2fbb0c9f Merge pull request #1564 from fabrixxm/feature/map 
[map] bbcode
 2015-05-16 07:22:02 +02:00
fabrixxm
19ee5797fa add map to events 2015-05-15 21:10:43 +02:00
Michael Vogel
472a6f1380 Added explanation for shortening. 2015-05-15 21:09:00 +02:00
Michael Vogel
d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
fabrixxm
e75b72caf6 update bbcode doc 2015-05-15 20:54:42 +02:00
fabrixxm
6258a21434 map bbcode tag from Red 2015-05-15 20:41:10 +02:00
Tobias Diekershoff
9575fd4a73 Merge pull request #1560 from rabuzarus/add_event 
Double click on day in calendar creats new event starting that day
 2015-05-15 08:20:15 +02:00
rabuzarus
fc4a76c033 Double click on day in calendar creats new event starting that day 2015-05-15 00:07:41 +02:00
fabrixxm
cbbb5da321 Merge pull request #1558 from rabuzarus/event-preview 
Event preview
 2015-05-14 16:32:24 +02:00
rabuzarus
de197405d0 port of red's event editing preview 2015-05-14 13:20:58 +02:00
Tobias Diekershoff
2dd8db7de8 Merge pull request #1554 from FlxAlbroscheit/develop-1 
Issue #1504: Creating groups directly from the sidebar in contacts-page
 2015-05-13 19:59:58 +02:00
rabuzarus
5837fd4f81 Merge pull request #1 from friendica/develop 
Update from friendica develop branch
 2015-05-13 13:41:37 +02:00