Stefan Parviainen
513efc8928
Add some ids to nav elements
2014-12-12 16:27:45 +01:00
Thomas Willingham
81f3b20610
Merge pull request #726 from pafcu/tagsinotherchannels
...
Show tags in other channels profile field to make it easier to navigate ...
2014-12-08 13:43:06 +00:00
Thomas Willingham
934172c2fc
Merge pull request #724 from pafcu/suggestionsindir
...
Show suggestions in directory
2014-12-08 13:34:56 +00:00
Thomas Willingham
99b5bef68e
Merge pull request #723 from pafcu/diropts
...
Directory sorting as a dropdown, forum filter as checkbox, option to sor...
2014-12-08 13:31:34 +00:00
Thomas Willingham
a007426965
Merge pull request #727 from dawnbreak/docu
...
Some Doxygen comments and small cleanups.
2014-12-08 13:19:46 +00:00
zzottel
88cfdb864c
Merge pull request #731 from zzottel/master
...
add main_footer include to all .md files except TOS and README
2014-12-08 11:13:11 +01:00
zottel
8ddf16f1ee
add main_footer include to all .md files except TOS and README
2014-12-08 11:06:37 +01:00
mrjive
ec1a8d4e10
Merge pull request #728 from cvogeley/master
...
Remove channel cloud files from file system when the channel is removed
2014-12-08 08:51:21 +01:00
Christian Vogeley
10d5f0eed7
small change
2014-12-07 23:29:23 +01:00
Christian Vogeley
406e97c9ad
Remove channel cloud files from file system when
...
the channel is removed
2014-12-07 21:20:52 +01:00
Klaus Weidenbach
63646a1440
Some Doxygen comments and small cleanups.
2014-12-07 19:27:14 +01:00
Stefan Parviainen
62dabecf97
Show tags in other channels profile field to make it easier to navigate to the channels
2014-12-07 16:19:22 +01:00
Christian Vogeley
f3789b1aeb
merge
2014-12-07 16:09:03 +01:00
Christian Vogeley
098eb66ba0
merge
2014-12-07 16:07:34 +01:00
Stefan Parviainen
c8818d8349
Suggestions in dir redux. Suggestions are now showed in directory if suggest=1 parameter is given to directory.
2014-12-07 13:40:21 +01:00
Stefan Parviainen
83ea120ac9
Revert "Revert "Directory shows channel suggestions by default""
...
This reverts commit bfde28f28e
2014-12-07 13:40:21 +01:00
Stefan Parviainen
647311db3e
Directory sorting as a dropdown, forum filter as checkbox, option to sort oldest first
2014-12-07 12:31:12 +01:00
Thomas Willingham
f1367cb9f9
Missing include if photo album widget called from not-the-photos page.
2014-12-04 21:52:22 +00:00
RedMatrix
6df5c5a8e1
Merge pull request #721 from magicoli/master
...
update fr
2014-12-04 22:12:42 +11:00
Olivier van Helden
82a4416dc7
update fr: 'to prod', better translated by 'encourager'
2014-12-04 01:20:38 -04:00
Olivier van Helden
d393f11dcb
update fr: checked mail templates and another bunch of typoes in strings
2014-12-04 01:09:55 -04:00
Olivier van Helden
f362d40785
update fr: use prefixFromNow to display time delta in the most used, natural form ("Il y a 2 jours" and not "2 jours auparavant")
2014-12-04 00:46:22 -04:00
Olivier van Helden
1391fdfa7c
update fr - sorry for multiple posts, I will try to find time to check the whole french translation and submit once.
2014-12-04 00:31:58 -04:00
Olivier van Helden
3848333172
update fr
...
- resubmitted, after online tests, correct translations for poked, pinged, etc
- fix wrong sense for poked
- there were two different translations for [red:notify], changed to the most used (Red:Notification) everywhere.
2014-12-04 00:08:20 -04:00
Olivier van Helden
4d1a0cd35e
Merge pull request #2 from friendica/master
...
Pull from friendica/master
2014-12-03 23:49:28 -04:00
Thomas Willingham
7ad022ef7a
Merge pull request #720 from magicoli/master
...
update fr
2014-12-04 01:39:56 +00:00
Thomas Willingham
78c37bc325
Put dir back - the fat lady didn't sing afterall.
2014-12-04 01:34:58 +00:00
Olivier van Helden
bbd5cb7367
update fr: fix typo and ambiguous changes in 1ea73a55e8
2014-12-03 18:37:51 -04:00
Olivier van Helden
1ea73a55e8
update fr typoes
2014-12-03 18:26:17 -04:00
Olivier van Helden
e523061b72
Merge pull request #1 from friendica/master
...
Merge master from friendica
2014-12-03 17:54:07 -04:00
friendica
b71b45aafc
add comodo intermediate certs and a method to add other intermediate certs.
2014-12-03 10:51:47 -08:00
friendica
8e4e56b566
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
2014-12-01 18:59:38 -08:00
friendica
f3b92c0ef2
Merge https://github.com/friendica/red into pending_merge
...
Conflicts:
version.inc
2014-12-01 18:53:49 -08:00
friendica
0b84ba1eab
rev update
2014-12-01 18:52:18 -08:00
Thomas Willingham
460d379e7e
Don't allow affinity of 0 in connedit.
2014-12-02 00:59:20 +00:00
Thomas Willingham
def10df816
Somewhat subtle process_delivery() bug - $public was not being reset if a sys
...
channel is reached but then the loop iterated over another channel.
2014-12-01 19:09:50 +00:00
Paolo T
c8db34806e
Merge pull request #718 from tuscanhobbit/dev
...
Italian translation
2014-12-01 16:24:29 +01:00
Paolo Tacconi
2eaf86b575
Italian translation
2014-12-01 16:22:11 +01:00
Thomas Willingham
2aaa33c135
The other half of 'any theme for any device'. Closes #71
2014-11-30 18:57:58 +00:00
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
Thomas Willingham
5087d783b7
Whitespace. Stupid £#@£@$ editor.
2014-11-29 22:06:04 +00:00
Thomas Willingham
d4539b415a
Merge branch 'master' of https://github.com/friendica/red
2014-11-29 22:01:45 +00:00
Thomas Willingham
bc5a4f19d0
Fix abook_toggle_flag from postgres stuff
2014-11-29 22:01:09 +00:00
marijus
f5734582cd
Merge branch 'master' of https://github.com/friendica/red
2014-11-29 20:50:00 +01:00
marijus
7be6afd733
readd link_colour again
2014-11-29 20:49:22 +01:00
Jeroen
698e6f00fc
update nl (typo)
2014-11-29 18:53:20 +00:00
Jeroen
306cb33a4a
update nl
2014-11-29 18:51:07 +00:00
Thomas Willingham
43c2305ad2
Merge pull request #715 from f03el/master
...
Update Swedish strings
2014-11-29 18:21:59 +00:00
marijus
3855be4910
bootstrap-3.3.1 and minor css fixes
2014-11-29 14:33:36 +01:00
Erik Lundin
545d816093
Update Swedish strings
2014-11-29 11:45:17 +01:00
