Commit Graph

12139 Commits

Author SHA1 Message Date
Tobias Diekershoff c013ca9d36 Merge pull request #2529 from annando/1605-events
Issue 2277: Events can now be edited and deleted
2016-05-23 18:06:09 +02:00
Tobias Diekershoff b727e0d0c0 Merge pull request #2523 from annando/1605-bugfix-notificatoon
Bugfix: Under certain circumstances notifications were send
2016-05-23 16:57:23 +02:00
Tobias Diekershoff 177fbd2a7c small fixes 2016-05-23 14:05:27 +02:00
Tobias Diekershoff 3df9876d74 remote_self 2016-05-23 09:05:49 +02:00
Tobias Diekershoff 8e89ba7a42 placement of the logfiles 2016-05-23 09:03:57 +02:00
Michael Vogel 39ce023158 Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon 2016-05-23 06:49:31 +02:00
Tobias Diekershoff 1383c73c8d Merge pull request #2527 from annando/1605-entities-link
Bugfix: The url in attachments had problems with entities
2016-05-23 06:13:29 +02:00
Tobias Diekershoff f43b96e079 Merge pull request #2526 from annando/issue-2063
Issue 2063: Define the constant SIGTERM if not defined
2016-05-23 06:11:17 +02:00
Michael Vogel b9e702742c Remove some test logging 2016-05-22 18:22:05 +02:00
Michael Vogel b7f2858486 Issue 2277: changes to events are now distributed. 2016-05-22 18:16:47 +02:00
Michael Vogel 06998f13b6 Events: Now with guid. 2016-05-22 18:05:01 +02:00
Michael Vogel 36063b47ab Bugfix: The url in attachments had problems with entities 2016-05-22 13:46:05 +02:00
Michael Vogel 22676f7e21 Issue 2063: Define the constant SIGTERM if not defined 2016-05-22 12:31:32 +02:00
Michael Vogel a1691664f3 Bugfix: Under certain circumstances notifications were send 2016-05-21 13:19:30 +02:00
Tobias Diekershoff 0a5f70acb9 Typo 2016-05-21 06:02:36 +02:00
Tobias Diekershoff aedbbdc0bf added short intoduction of the term admin panel 2016-05-20 20:09:45 +02:00
Tobias Diekershoff 0d6b49977b rewrite of the doc/settings.md 2016-05-20 20:06:37 +02:00
rabuzarus bd184d14eb private messages: fix 2 - contact photos aren't visible 2016-05-20 03:49:53 +02:00
rabuzarus 6dbc5fb348 private messages: fix - contact photos aren't visible 2016-05-20 03:45:50 +02:00
rabuzarus 57465b2cf8 private messages: some work for the standard messages overview 2016-05-20 03:40:53 +02:00
rabuzarus 625d107550 ohh some spelling mistakes heading is written only with one d :-) 2016-05-20 01:50:56 +02:00
rabuzarus 1e36de54d5 private mail: insert some space between conversation and textarea 2016-05-20 01:46:33 +02:00
Michael Vogel 3ba026b501 Merge pull request #2521 from tobiasd/20160519-de
DE translation THX Abrax
2016-05-19 12:19:57 +02:00
Tobias Diekershoff cf5ca15711 DE translation THX Abrax 2016-05-19 12:01:38 +02:00
Michael Vogel 760e3486d8 Merge pull request #2519 from tobiasd/20160519-messagespo
regenerated master messages.po file
2016-05-19 07:37:31 +02:00
Tobias Diekershoff 29f7cf0110 Merge pull request #2520 from annando/1605-probe_feed
Bugfix: Feeds weren't detected correctly
2016-05-19 06:54:17 +02:00
Michael Vogel 8daa49b233 Bugfix: Feeds weren't detected correctly 2016-05-18 22:50:15 +02:00
Tobias Diekershoff 38495f41dd regenerated master messages.po file 2016-05-18 22:43:49 +02:00
rabuzarus 2935554541 fix missing semicolon in some nbsp 2016-05-18 15:51:08 +02:00
rabuzarus 087b6d2d25 fix missing closing h4 tag in wall_thread.tpl 2016-05-18 15:40:37 +02:00
rabuzarus edb243e698 shared conten divt: move js out from templates into theme.js 2016-05-18 14:59:35 +02:00
rabuzarus 0cafad6d2b jot: show preview only if preview is activatet in the settings 2016-05-18 14:58:15 +02:00
rabuzarus 64884ed918 little js change for network colorbox images 2016-05-17 00:35:32 +02:00
Tobias Diekershoff bb3e957479 Merge pull request #2517 from fabrixxm/feature-2516
Make user table in admin sortable via table headers
2016-05-16 14:56:17 +02:00
Fabrixxm 6734aa5c28 Make user table in admin sortable via table headers
new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.
2016-05-16 14:38:00 +02:00
Tobias Diekershoff 01a491c783 Merge pull request #2513 from annando/1605-diaspora-relay
Support for comments for the Diaspora relay system
2016-05-16 07:57:16 +02:00
Tobias Diekershoff 12e3c9ca59 Merge pull request #2514 from annando/1605-plaintext
Bugfix for shares in the plaintext function
2016-05-16 07:56:42 +02:00
rabuzarus d8cde7ac89 updated README: added Installation Requirements 2016-05-15 14:14:56 +02:00
rabuzarus 64a2f2022b rename the page template modal.php to none.php because it can be used for more than modals 2016-05-15 13:41:37 +02:00
Michael Vogel 247f866655 There were undecoded entities in the title 2016-05-15 10:36:56 +02:00
Michael Vogel af3d10eb0c Merge pull request #2515 from rabuzarus/key_fix
photo.php: correct misspelling of an array key
2016-05-15 10:35:16 +02:00
rabuzarus 7be1c83b0c photo.php: correct misspelling of an array key 2016-05-15 02:37:18 +02:00
Michael Vogel 1b2f67906b Bugfix for shares in the plaintext function 2016-05-13 22:23:46 +02:00
Michael Vogel 6434b5d8ce Support for comments for the Diaspora relay system 2016-05-13 22:19:31 +02:00
Tobias Diekershoff d6a124ee2b Merge pull request #2511 from rabuzarus/1205_photo_live_update
1205 photo live update
2016-05-13 07:57:13 +02:00
rabuzarus 255405c8f3 photos view: fix js error - forgot to delete this testing stuff 2016-05-13 01:34:56 +02:00
rabuzarus 6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +02:00
rabuzarus 8384ba833a infinite scroll: include updated code from friendica develop branch 2016-05-12 20:30:08 +02:00
Tobias Diekershoff 6a0a30ab75 Merge pull request #2510 from rabuzarus/1005_js_pageload
infinite_scroll: move js from index.php to main.js
2016-05-12 07:47:26 +02:00
rabuzarus 12cf9c2914 some more work on private messages mail_display.tpl & mail_conv.tpl 2016-05-12 02:49:55 +02:00