Michael Vogel
|
c7ab2d2482
|
Merge remote-tracking branch 'upstream/develop' into 1606-database
|
2016-06-07 06:12:28 +02:00 |
|
|
Michael Vogel
|
bd01a1c63a
|
Merge pull request #2572 from rabuzarus/0606-more-hovercard
frio: fix close hovercard on mousleave
|
2016-06-07 06:10:46 +02:00 |
|
|
Michael Vogel
|
69695608ba
|
Merge pull request #2571 from rabuzarus/0706-widgets
frio: some more widget templates
|
2016-06-07 06:10:05 +02:00 |
|
rabuzarus
|
d752ea9abc
|
frio: fix close hovercard on mousleave
|
2016-06-07 01:42:01 +02:00 |
|
rabuzarus
|
615db43736
|
frio: add group_side widget template
|
2016-06-07 01:28:38 +02:00 |
|
|
rabuzarus
|
c87d426d5f
|
frio: follow & peoplefind widget template
|
2016-06-07 00:38:39 +02:00 |
|
|
Michael Vogel
|
fc66a86dc5
|
Some optimized sql queries
|
2016-06-06 22:57:27 +02:00 |
|
Tobias Diekershoff
|
06c0588817
|
German translation of doc/Settings, part of #2194
|
2016-06-06 22:17:40 +02:00 |
|
|
Tobias Diekershoff
|
8feeb8200d
|
Merge pull request #2568 from annando/1606-process2
"system unavailable" when the maximum number of processes is reached
|
2016-06-06 21:48:59 +02:00 |
|
|
Michael Vogel
|
db44ea0482
|
Merge pull request #2567 from rabuzarus/0606-photo-menu
photo_menu: now the photo_menu does have at all places the same struc…
|
2016-06-06 21:28:25 +02:00 |
|
|
Michael Vogel
|
79fd49f611
|
Exit with "system unavailable" when the maximum number of processes is reached
|
2016-06-06 21:22:54 +02:00 |
|
|
Tobias Diekershoff
|
9d72c3d170
|
Merge pull request #2565 from rabuzarus/0606-confic-docu
move pconfig to its own class
|
2016-06-06 18:31:37 +02:00 |
|
|
Tobias Diekershoff
|
9d3ca5a463
|
Merge pull request #2566 from rabuzarus/0606-more-hovercard
frio: extend hover card to wall-item-responses (likes, attendend) and …
|
2016-06-06 18:29:34 +02:00 |
|
|
Tobias Diekershoff
|
d80c21b15f
|
Merge pull request #2561 from annando/1606-dbm
Check the maximum number of database processes
|
2016-06-06 18:11:39 +02:00 |
|
|
rabuzarus
|
5c52736221
|
photo_menu: now the photo_menu does have at all places the same structure
|
2016-06-06 16:54:29 +02:00 |
|
|
rabuzarus
|
33ad8bdc53
|
frio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom mentions
|
2016-06-06 11:05:29 +02:00 |
|
|
rabuzarus
|
fa02d0f2f8
|
rename PConfig::del to PConfig:delete
|
2016-06-06 10:46:33 +02:00 |
|
|
rabuzarus
|
f10011c282
|
move pconfig to it's own class PConfig
|
2016-06-06 10:22:14 +02:00 |
|
|
rabuzarus
|
5f081cc47b
|
add doxygen to config functions
|
2016-06-06 10:01:14 +02:00 |
|
|
Michael Vogel
|
3d27ebcb34
|
Added documentation
|
2016-06-06 06:29:03 +02:00 |
|
|
Michael Vogel
|
a25d58b2ee
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-06 06:21:36 +02:00 |
|
|
Tobias Diekershoff
|
ec89274cd8
|
Merge pull request #2563 from rabuzarus/0506-contact-transition
frio: give the contact actions a little transition effect
|
2016-06-06 06:07:09 +02:00 |
|
|
Tobias Diekershoff
|
8932bec614
|
Merge pull request #2564 from annando/1606-contact-handling
Fix for mismatching avatars
|
2016-06-06 06:06:21 +02:00 |
|
|
Michael Vogel
|
8fbcba0096
|
The local contact search now uses local data if present
|
2016-06-05 22:21:34 +02:00 |
|
|
Michael Vogel
|
3e7e866e13
|
Baseurl removed
|
2016-06-05 21:22:14 +02:00 |
|
|
Michael Vogel
|
4b640dbd97
|
Fetching of profile data improved
|
2016-06-05 21:17:55 +02:00 |
|
|
Michael Vogel
|
ea3a6ec6eb
|
Some more cleanup and code removal.
|
2016-06-05 20:01:38 +02:00 |
|
|
rabuzarus
|
43b0550094
|
frio: remove legacy transition css
|
2016-06-05 17:12:13 +02:00 |
|
|
Michael Vogel
|
98272fe386
|
Some better handling of "bd" and "birthday"
|
2016-06-05 15:09:40 +02:00 |
|
|
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 |
|