1
1
Fork 0
Commit graph

12238 commits

Author SHA1 Message Date
Michael Vogel 572402224f "bd" now always shows the upcoming birthday 2016-06-05 15:03:04 +02:00
Michael Vogel 71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
rabuzarus 84e5276a3a frio: give the contact actions a little transition effect 2016-06-05 09:56:53 +02:00
Tobias Diekershoff 20ab3f13a6 Merge pull request #2562 from friendica/fabrixxm-patch-1
Wild "+" in js/main.js
2016-06-04 19:40:46 +02:00
fabrixxm a0b7a6684f Wild "+" in js/main.js 2016-06-04 18:44:20 +02:00
Michael Vogel 5420c98ff0 removed some copy&paste fragments 2016-06-04 12:30:24 +02:00
Michael Vogel e33defbe3e Added documentation 2016-06-04 12:23:12 +02:00
Michael Vogel 0518f004c2 removed duplicated functions 2016-06-04 12:20:09 +02:00
Michael Vogel b45772ba6e Configurable amount of maximum processes 2016-06-04 11:04:26 +02:00
Michael Vogel 140225b1a8 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-04 10:18:43 +02:00
rabuzarus 33f7513ff3 Merge pull request #2554 from annando/1606-mention-class
Mentions are now having an own class
2016-06-04 09:45:42 +02:00
Michael Vogel df337e57d1 Quit when processlist is too long 2016-06-03 23:10:23 +02:00
Michael Vogel be068a1924 Merge pull request #2560 from rabuzarus/0306-bulk-delete
frio: fix bulk deletion doesn't appear if post item was inserted by js
2016-06-03 19:02:22 +02:00
rabuzarus b53391a975 frio: fix bulk deletion doesn't appear if post item was inserted by js 2016-06-03 18:55:57 +02:00
Michael Vogel 8ce4d5db36 Merge pull request #2559 from rabuzarus/0206-network-content-images-css
frio: give images in the networstream a little border-radius
2016-06-03 07:47:30 +02:00
rabuzarus 030f44b2fe frio: give images in the networstream a little border-radius 2016-06-02 22:11:41 +02:00
Michael Vogel 8ac08652ea Merge pull request #2558 from rabuzarus/0206-share-content
frio: remove js part for shared-content div because it's now done by …
2016-06-02 21:50:38 +02:00
rabuzarus cd0d5d6a18 frio: remove js part for shared-content div because it's now done by core 2016-06-02 20:59:31 +02:00
Michael Vogel 4914e8826b Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-02 07:37:37 +02:00
Tobias Diekershoff 2bd3deb397 Merge pull request #2557 from annando/1606-frio-share
Shared content now has a surrounding div
2016-06-02 06:05:39 +02:00
Michael Vogel d7c0e664f7 Merge pull request #2555 from rabuzarus/0106-contact_actions
frio: adding contact actions on hover for contacts in contact view
2016-06-01 22:05:09 +02:00
Michael Vogel 46659f15d3 One div too much 2016-06-01 21:58:50 +02:00
Michael Vogel 09e63e616a Shared content now has a surrounding div 2016-06-01 21:57:08 +02:00
Michael Vogel 85a9c7d96e The poller now has the logging for processes as well. 2016-06-01 21:54:02 +02:00
Michael Vogel 51f6e09e68 Merge pull request #2556 from tobiasd/shashapes
ShaShape font updated
2016-06-01 21:21:48 +02:00
Tobias Diekershoff b23a253151 ShaShape font updated 2016-06-01 20:03:56 +02:00
rabuzarus 300591560e frio: adding contact actions on hover for contacts in contact view 2016-06-01 17:21:57 +02:00
Michael Vogel 0b766b86ba By setting the "userinfo" class the hovercard in frio works with mentions 2016-06-01 17:10:43 +02:00
Michael Vogel 85f42ad26d Tags are now supported as well 2016-06-01 16:19:53 +02:00
Michael Vogel 5090ec1500 Mentions are now having an own class 2016-06-01 16:04:31 +02:00
Michael Vogel eb3446a8b0 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-01 14:39:08 +02:00
Michael Vogel f69409c398 Merge pull request #2553 from rabuzarus/0106-frio-tooltip-fix
frio: provide a tooltip for nav search
2016-06-01 14:38:42 +02:00
rabuzarus 64c871bf4c frio: give the heading "messages" a class "heading" - This is needed for pm modal where class heading becomes the modal title) 2016-06-01 14:04:39 +02:00
rabuzarus d3369aeca1 frio: provide a tooltip for nav search 2016-06-01 11:59:35 +02:00
Michael Vogel b08c3f20e9 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-01 10:58:09 +02:00
Michael Vogel 85c1796ee8 Merge pull request #2551 from rabuzarus/0106-frio-tooltip-fix
frio: show tooltip only on hover (and not on focus)
2016-06-01 10:57:59 +02:00
Michael Vogel 395e83fa06 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-01 10:55:13 +02:00
rabuzarus d663447e3c frio: show tooltip only on hover (and not on focus) 2016-06-01 09:39:20 +02:00
rabuzarus 4e1c515004 Merge pull request #2550 from annando/1605-frio-github-markread
Frio: Removed github link, changed notification description
2016-06-01 09:21:58 +02:00
Tobias Diekershoff ac48f54920 Merge pull request #2549 from annando/1605-ostatus-repeat
OStatus: repeated items in OStatus had a wrong "edited" date
2016-06-01 07:28:50 +02:00
Michael Vogel e2c0f04eeb Added short description to "mark as seen" 2016-06-01 07:05:44 +02:00
Michael Vogel f07c96ee5f New class "dbm" for the database management 2016-06-01 07:04:31 +02:00
Michael Vogel ef566ecbc3 Changed option description 2016-06-01 07:03:03 +02:00
Michael Vogel 9dd6fec0e0 The user name moved to the central. 2016-05-31 22:27:36 +02:00
Michael Vogel 9a442da852 Removed todo 2016-05-31 22:09:35 +02:00
Michael Vogel de3eb5a1b7 Frio: Removed github link, changed notification description 2016-05-31 22:07:29 +02:00
Michael Vogel 4c53f76c22 OStatus: repeated items in OStatus had a wrong "edited" date 2016-05-31 21:18:14 +02:00
rabuzarus 16da854c2c Merge pull request #2548 from annando/1605-network-widget
Frio: The network widget and the file widget now look better
2016-05-30 21:47:40 +02:00
Michael Vogel 060b7193e6 Indention of the html code 2016-05-30 21:43:49 +02:00
Michael Vogel 58ef15c6c1 The file widget looks now better as well 2016-05-30 21:17:28 +02:00