Tobias Diekershoff
|
ee06d2fa3c
|
Merge pull request #2582 from annando/1606-more-avatar-stuff
Some more places where the avatar picture is taken from the database
|
2016-06-10 09:39:01 +02:00 |
|
fabrixxm
|
0f8148a4cb
|
Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop
Enable SSL on standard and well-known HTTP headers
|
2016-06-10 08:36:11 +02:00 |
|
Michael Vogel
|
807fbe173b
|
Some more places where the avatar picture is taken from the database
|
2016-06-10 07:44:32 +02:00 |
|
|
Michael Vogel
|
baf68af735
|
Merge pull request #2581 from tobiasd/adm-workerqueue
show the workerqueue in the admin panel summary
|
2016-06-10 00:03:37 +02:00 |
|
|
Michael Vogel
|
c9342ccf1d
|
Merge pull request #2579 from rabuzarus/0806-content-experimental
content: make experimental mod/content.php work again
|
2016-06-10 00:01:33 +02:00 |
|
|
Tobias Diekershoff
|
e8d39b290a
|
show the workerqueue in the admin panel summary
|
2016-06-09 18:08:40 +02:00 |
|
|
fabrixxm
|
89f4d9f164
|
Merge pull request #2580 from rabuzarus/0906-search-strings
Renamed "Search results for:" in "Results for:" to have more space on…
|
2016-06-09 14:47:05 +02:00 |
|
rabuzarus
|
15959d7767
|
Renamed "Nickname or Email address:" in "Nickname or Email"
|
2016-06-09 13:12:39 +02:00 |
|
|
rabuzarus
|
e4ba493a01
|
Renamed "Search results for:" in "Results for:" to have more space on mobile
|
2016-06-09 13:06:21 +02:00 |
|
rabuzarus
|
30056dd22d
|
Merge pull request #2578 from annando/1606-bugfix-contact
Bugfix: In threads the contact data from users weren't taken.
|
2016-06-09 02:18:54 +02:00 |
|
|
rabuzarus
|
5a48ab5a8c
|
content.php: remove load_contact_links()
|
2016-06-09 01:39:45 +02:00 |
|
|
rabuzarus
|
9e5a4b2050
|
content: make experimental mod/content.php work again
|
2016-06-09 01:35:57 +02:00 |
|
|
Michael Vogel
|
871fa4c777
|
Merge pull request #2577 from rabuzarus/0806-frio-html-cache
frio: improvements in js jot behavior
|
2016-06-08 22:56:47 +02:00 |
|
|
Michael Vogel
|
098a8ac6c2
|
Bugfix: In threads the contact data from users weren't taken.
|
2016-06-08 22:50:57 +02:00 |
|
|
rabuzarus
|
f79a7bc455
|
frio: improvements it js jot behavior
- cache the original jot everytime (to restore it after modal close)
- possibility to edit event items
|
2016-06-08 20:53:01 +02:00 |
|
|
Tobias Diekershoff
|
17f362f4f6
|
Merge pull request #2575 from annando/1606-shared-template
New template for shared content instead of hardcoded stuff in source
|
2016-06-08 09:54:54 +02:00 |
|
|
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 |
|