Commit Graph

3914 Commits

Author SHA1 Message Date
Thomas Willingham
d67c5a6ffd Handle included txt files (ie, install doco) as BBCode, otherwise it strips all
white space.  Was going to use Markdown, but lots of not-markdown gets parsed
then, so...
2014-11-30 00:36:30 +00:00
Habeas Codice
d3ffdbf2a4 Merge remote-tracking branch 'upstream/master' 2014-11-26 11:02:30 -08:00
Habeas Codice
1a57f3ed51 fix true toggle 2014-11-26 11:01:18 -08:00
friendica
ddc8557b69 hide online presence maps to DNT 2014-11-24 15:36:11 -08:00
friendica
756abd6678 add event export (this month) to event UI 2014-11-24 02:50:14 -08:00
friendica
79e5c2456b add link to search forums in the directory 2014-11-23 18:54:33 -08:00
friendica
5bb794cc28 allow directory searches to be filtered by (public forums) and/or (! public forums) 2014-11-23 18:22:19 -08:00
friendica
38aa8204cc Merge https://github.com/friendica/red into pending_merge 2014-11-23 14:51:20 -08:00
friendica
d191e7c348 project roadmap 2014-11-23 14:51:04 -08:00
Habeas Codice
8ac3b938fd added dbdriver to siteinfo json to better track affected sites 2014-11-22 13:27:52 -08:00
Habeas Codice
cf739c0361 Merge remote-tracking branch 'upstream/master' 2014-11-21 15:39:14 -08:00
Habeas Codice
db29dc6bff implicit type conversion 2014-11-21 15:33:21 -08:00
friendica
e74a3926fe yet another option for the homepage 2014-11-20 17:38:41 -08:00
Habeas Codice
c8af19c69c Merge remote-tracking branch 'upstream/master' 2014-11-19 21:11:11 -08:00
Habeas Codice
92d0a9404f Should fix issue #704
submitter please verify and close
2014-11-19 21:10:19 -08:00
friendica
50244f943d minor photo flag issue - and some more whitespace edits 2014-11-19 16:29:35 -08:00
friendica
3224848bad turn the "adult photo flagging" (which prevents a particularly flagged photo from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. 2014-11-18 19:02:28 -08:00
friendica
11f0b45a90 blog mode - turn the comment link into a button and group with the likes/dislikes 2014-11-18 16:58:36 -08:00
friendica
38d50cabd4 private mail buttons 2014-11-18 15:13:37 -08:00
RedMatrix
bfde28f28e Revert "Directory shows channel suggestions by default" 2014-11-19 09:15:24 +11:00
RedMatrix
3917880673 Merge pull request #702 from pafcu/master
Directory shows channel suggestions by default
2014-11-19 09:06:36 +11:00
RedMatrix
fd10b49fbf Merge pull request #699 from pafcu/master
Fix dirsearch with quoted single-word term
2014-11-19 08:55:06 +11:00
Stefan Parviainen
e0ab1e24e4 Directory shows channel suggestions by default 2014-11-18 19:42:13 +01:00
Stefan Parviainen
c8c061d0cf Fix dirsearch with quoted single-word term 2014-11-18 13:48:22 +01:00
friendica
db3015e34e allow members to set the per-item "show more" height (separately for network and matrix, display and search are system pages and therefore set at 400) 2014-11-17 23:48:03 -08:00
friendica
7e8f3e4dfb requote ignore 2014-11-17 18:46:57 -08:00
RedMatrix
913dafc593 Merge pull request #698 from habeascodice/master
some sql fixes
2014-11-18 13:00:26 +11:00
Habeas Codice
e61dbf722d implicit type conversion 2014-11-17 16:49:17 -08:00
Habeas Codice
d0e0a8fb27 implicit type conversion 2014-11-17 16:37:47 -08:00
Habeas Codice
4fa0df2927 another one 2014-11-17 16:01:17 -08:00
friendica
65a6121014 fix the update_unseen stuff on the channel page also 2014-11-17 15:43:03 -08:00
friendica
064b48fa71 Merge https://github.com/friendica/red into pending_merge 2014-11-17 15:27:18 -08:00
friendica
13a7637d9d whitespace 2014-11-17 15:26:32 -08:00
friendica
c0ad4763b3 add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode. 2014-11-17 15:18:06 -08:00
Habeas Codice
96427a23a3 Merge branch 'master' of https://github.com/habeascodice/red 2014-11-17 15:15:02 -08:00
Habeas Codice
bcaa32a83a fix boolean 2014-11-17 15:13:49 -08:00
RedMatrix
e59f7cc198 Merge pull request #697 from pafcu/master
Fix dirsearch parser to not get confused by logic terms in values and to ...
2014-11-18 08:49:54 +11:00
RedMatrix
5aba2e82df Merge pull request #695 from pafcu/master
Switch to a better datetime picker widget
2014-11-18 08:33:04 +11:00
Stefan Parviainen
ece9819b4d Fix dirsearch parser to not get confused by logic terms in names and to handle quoted single word names 2014-11-17 18:51:37 +01:00
friendica
b11ed7f88e allow somebody to access the "home page content" (whatever that may be) even after logging in by including a home/splash argument. It appears that nothing else is required to provide 'sys' channel webpage contents except a link in the admin page to create them. There *may* be an issue with comanche theme selection but we'll cross that bridge when we come to it. Also thinking that we might want to map /home/foo to /page/sys/foo in the longer term scheme of things. 2014-11-16 22:46:52 -08:00
friendica
591f10e235 module cleanup 2014-11-16 19:08:10 -08:00
friendica
18cedf4def blog/list mode display settings 2014-11-16 16:48:35 -08:00
friendica
cbaee76dd9 "list mode" (forum and blog mode, no comments or comment boxes displayed on the summary page) 2014-11-16 16:19:24 -08:00
Stefan Parviainen
c1b8608940 Switch to a better datetime picker widget 2014-11-16 13:56:45 +01:00
friendica
7e58bfe931 Merge https://github.com/friendica/red into pending_merge 2014-11-15 14:04:20 -08:00
friendica
f299922df3 minor changes to support forum mode 2014-11-15 14:03:41 -08:00
marijus
8b1e83128a fix lost $sql_extra in recent sql query changes 2014-11-15 14:39:36 +01:00
RedMatrix
71237860c9 Merge pull request #691 from dawnbreak/master
Changed two strange looking places in boot.php.
2014-11-14 12:22:25 +11:00
Klaus Weidenbach
e8b77fbdff Fixed a variable conflict in mod/xchan.php.
A variable $rr inside the foreachs was used twice.
Add translation to mod/xchan.php.
2014-11-14 00:45:25 +01:00
Habeas Codice
a2d9dd1882 violates new sql standards
missed during merge
2014-11-13 13:58:04 -08:00