Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-10-31 19:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
23601 commits 3 branches 64 tags 241 MiB
Commit graph

23601 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
aad00ddc04 Renamed template 2016-06-08 07:11:16 +02:00
Michael Vogel
f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template 2016-06-07 22:40:29 +02:00
Michael Vogel
d034822f07 Merge pull request #2574 from rabuzarus/0607-saved-search 
provide a general content wrapper + frio saved searches
 2016-06-07 22:38:50 +02:00
Michael Vogel
e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +02:00
rabuzarus
26336a60e9 content_wrapper.tpl respects content with no title 2016-06-07 16:38:22 +02:00
rabuzarus
71b30e0651 profice a general content wrapper template. 2016-06-07 16:32:02 +02:00
rabuzarus
3a368214c0 frio: saved_searches_aside & searchbox template 2016-06-07 15:29:38 +02:00
Tobias Diekershoff
03c09e4c3f Merge pull request #2573 from rabuzarus/0606-more-hovercard 
frio: some hover-card css fixes
 2016-06-07 11:32:56 +02:00
rabuzarus
60ca6b7f07 frio: some hover card css fixes (enable on mouseleave again - forgot it) 2016-06-07 10:16:31 +02:00
rabuzarus
d570a90c05 frio: some hover card css fixes 2016-06-07 10:13:08 +02:00
Michael Vogel
1dd77ee443 Merge pull request #2569 from tobiasd/doc-settings-de 
German translation of doc/Settings
 2016-06-07 07:57:29 +02:00
Tobias Diekershoff
68286910a3 Merge pull request #2570 from annando/1606-database 
Some optimized sql queries
 2016-06-07 07:29:01 +02:00
Tobias Diekershoff
04594666dc Typos 2016-06-07 06:53:37 +02:00
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