Thomas Willingham
|
72474b29fc
|
Merge pull request #742 from pafcu/verifieditemclass
Add extra class to verified item icon
|
2014-12-14 12:28:09 +00:00 |
|
Thomas Willingham
|
082ef8b950
|
Merge pull request #741 from dawnbreak/docu
Add security logger to RedDAV.
|
2014-12-14 12:26:08 +00:00 |
|
Stefan Parviainen
|
0f169a1427
|
Add extra class to verified item icon
|
2014-12-14 12:25:08 +01:00 |
|
Klaus Weidenbach
|
233903c844
|
Add security logger to RedDAV.
Some smaller clean ups whitepsaces and tabs, use PHP_EOL, Doxygen, etc.
|
2014-12-14 01:50:56 +01:00 |
|
Thomas Willingham
|
7a19bd7fb3
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-12-13 20:22:40 +00:00 |
|
Thomas Willingham
|
3867081503
|
Let Diaspora hublocs come back by allowing discover_by_webbie() to carry on if
and look for a hubloc even if an xchan is found.
You'll probably need to loop through the missing ones manually.
|
2014-12-13 20:20:55 +00:00 |
|
Thomas Willingham
|
76fdfb7ef5
|
Merge pull request #738 from pafcu/moreids
Add some ids to nav elements
|
2014-12-13 16:40:13 +00:00 |
|
Thomas Willingham
|
5fac8e80de
|
Issue #739
|
2014-12-13 15:00:00 +00:00 |
|
Thomas Willingham
|
13b50610d6
|
Fix WSOD on login
|
2014-12-12 15:28:11 +00:00 |
|
Stefan Parviainen
|
513efc8928
|
Add some ids to nav elements
|
2014-12-12 16:27:45 +01:00 |
|
friendica
|
b30ea4c2c5
|
Merge https://github.com/friendica/red into pending_merge
|
2014-12-12 00:28:46 -08:00 |
|
friendica
|
d3465802d6
|
doc update
|
2014-12-12 00:28:05 -08:00 |
|
friendica
|
452d275b5e
|
don't import to sys channel from self-censored authors
|
2014-12-12 00:26:07 -08:00 |
|
Thomas Willingham
|
967ab871b8
|
Update Smarty
|
2014-12-11 20:15:27 +00:00 |
|
marijus
|
960c35bad3
|
move profile css to mod_profile and minoor fixes
|
2014-12-11 11:44:46 +01:00 |
|
friendica
|
7f1a42340a
|
Merge https://github.com/friendica/red into pending_merge
|
2014-12-10 16:26:36 -08:00 |
|
friendica
|
58067c24fc
|
block adult channels from inclusion in public content feeds
|
2014-12-10 16:24:31 -08:00 |
|
Thomas Willingham
|
c91aa863d8
|
Missing ''
|
2014-12-10 21:56:44 +00:00 |
|
Thomas Willingham
|
355c712763
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-12-10 21:42:36 +00:00 |
|
Thomas Willingham
|
81fdb1cdfc
|
Bring back 'no special theme for mobile'
|
2014-12-10 21:41:59 +00:00 |
|
marijus
|
b86c4156fc
|
some work on profile page - mostly whitespace
|
2014-12-10 22:13:44 +01:00 |
|
Thomas Willingham
|
ad2c8a4cb7
|
Provide censorship.
|
2014-12-10 15:34:18 +00:00 |
|
Thomas Willingham
|
a23af1f5f7
|
Issue #732
|
2014-12-09 19:14:58 +00:00 |
|
marijus
|
cc365513ed
|
adjustment to clear browser location button only if use browser location option is set
|
2014-12-09 15:22:53 +01:00 |
|
marijus
|
242713ebef
|
show clear browser location button only if use browser location option is set and minor css fixes
|
2014-12-09 15:09:19 +01:00 |
|
git-marijus
|
42fc104272
|
Merge pull request #735 from pafcu/jotbtnspacing2
Put some spacing between share types and other buttons in jot
|
2014-12-09 11:56:36 +01:00 |
|
git-marijus
|
1138e41de2
|
Merge pull request #733 from pafcu/rewordoptional
Make it clear that title and categories are optional
|
2014-12-09 11:55:55 +01:00 |
|
Stefan Parviainen
|
e233e386b8
|
Group comment editor icons
|
2014-12-08 22:46:30 +01:00 |
|
Stefan Parviainen
|
d65ad03aec
|
Put some spacing between share types and other buttons in jot
|
2014-12-08 22:37:02 +01:00 |
|
Stefan Parviainen
|
97d1072f9b
|
Make it clear that title and categories are optional
|
2014-12-08 16:49:48 +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 |
|