Commit graph

9885 commits

Author SHA1 Message Date
Michael Vogel 03214254ff OStatus: Improved duplicate check. 2015-05-26 23:33:38 +02:00
rabuzarus 46338f5e87 using sprintf 2015-05-26 14:49:53 +02:00
rabuzarus f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
Michael Vogel 7e401ca199 Improved check for duplicates. Improvements with reshared Diaspora items. 2015-05-25 19:07:59 +02:00
rabuzarus 3ad674fa67 better space handling 2015-05-25 16:49:57 +02:00
Michael Vogel 0c752a2190 Diaspora: Store the original XML and the object type. 2015-05-25 13:27:45 +02:00
rabuzarus e040b60f67 make the heading of the search result translatable 2015-05-24 20:46:40 +02:00
fabrixxm dc182d508e Merge pull request #1602 from rabuzarus/searchbox
template for searchbox
2015-05-24 20:44:45 +02:00
rabuzarus b3054ee9d0 template for searchbox 2015-05-24 20:01:08 +02:00
rabuzarus b754a79968 event can not end before it has started. 2015-05-24 13:33:07 +02:00
fabrixxm f32ecd4012 Merge pull request #1600 from annando/1505-sql-speedup-events
Events: Query improvement
2015-05-24 12:58:36 +02:00
Michael Vogel c6e605992b Events: Query improvement 2015-05-24 11:46:20 +02:00
fabrixxm 258612d20c update messages.po 2015-05-24 10:39:36 +02:00
fabrixxm 8990a22dc0 duepuntozer: style video delete button 2015-05-24 10:35:55 +02:00
fabrixxm d204e2524b vier: style video delete button 2015-05-24 10:34:17 +02:00
fabrixxm 646ea377ac quattro: readd video delete button styles
because i'm not so good at resolving merge conflicts...
2015-05-24 10:28:15 +02:00
fabrixxm b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm 4554526515 Merge pull request #1570 from rabuzarus/archive-widget
port of red matrix archive widget
2015-05-24 10:18:10 +02:00
fabrixxm 3a71978b0d Merge pull request #1598 from rabuzarus/datepicker
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
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