Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11654 commits 7 branches 30 tags 160 MiB
Commit graph

11654 commits

This branch
This branch
All branches
Author SHA1 Message Date
RedMatrix
8391e8b1a1 Merge pull request #645 from pafcu/master 
Turn login button into a menu
 2014-10-17 09:43:36 +11:00
marijus
f290c4b1e4 Merge branch 'master' of https://github.com/friendica/red 2014-10-16 22:53:04 +02:00
marijus
1ee2b631db lighttpd sample conf security enhancement 2014-10-16 22:52:28 +02:00
Stefan Parviainen
e425def2a2 Merge branch 'master' of https://github.com/pafcu/red 2014-10-16 21:37:14 +02:00
Stefan Parviainen
6867a8a7f6 Login menu 2014-10-16 17:21:37 +02:00
pafcu
865f804cfb Merge pull request #1 from friendica/master 
Sync with upstream
 2014-10-16 16:06:20 +03:00
friendica
e1f88fd15d jsonp support (thankxs fabrixxm) 2014-10-16 02:02:11 -07:00
friendica
d4abc91d1f Merge https://github.com/friendica/red into pending_merge 2014-10-15 18:36:48 -07:00
friendica
4cbe696859 remove log statement 2014-10-15 18:36:36 -07:00
friendica
ae9e1fa688 missing event permissions 2014-10-15 18:35:56 -07:00
Thomas Willingham
4af0b717de Merge branch 'master' of https://github.com/friendica/red 2014-10-16 01:58:17 +01:00
Thomas Willingham
11ad127c68 Let's not play security expert. Use Mozillas recommended server 
config, even if it's ridiculously verbose.  Reasoning - they make
the browser, so if they've got it wrong, you're buggered anyway.
 2014-10-16 01:57:04 +01:00
friendica
e80c20d258 Don't recognise hashtags starting with #, e.g. ### 2014-10-15 17:55:20 -07:00
Thomas Willingham
1eb478ba54 SSL is broken you say? Well bah gum. 
Someone probably needs to update Lighttpd and Apache too.
 2014-10-16 00:47:02 +01:00
marijus
997ec0911c $comments > $commentbox 2014-10-15 22:41:42 +02:00
marijus
04a254d94a some work on single photo view comments 2014-10-15 22:23:38 +02:00
marijus
dc23030dcb one more item_id > id 2014-10-15 21:17:07 +02:00
marijus
0c2d9edd83 it seems we do not have an key called item_id here so must be id only 2014-10-15 21:15:20 +02:00
friendica
aa0aa22b8a chanman is now 'locs' and a couple of post handlers have been defined. 2014-10-14 20:33:38 -07:00
friendica
65b84e839a back to wrestling with the !@#$ diaspora recursive reshare from hell 2014-10-14 18:47:08 -07:00
friendica
5362943330 missing quote 2014-10-14 18:05:32 -07:00
friendica
2db7d88e28 this is the reason Diaspora forum tagging was broken 2014-10-14 18:02:34 -07:00
friendica
903f7e73fb if a hubloc primary change results in an xchan primary change, create a directory update packet. 2014-10-13 21:44:46 -07:00
friendica
0057612a9f figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust. 2014-10-13 21:38:36 -07:00
friendica
79684e05cc fix import sql error 2014-10-13 21:24:06 -07:00
friendica
19e1b95837 don't use cached data 2014-10-13 21:01:51 -07:00
friendica
bd4dd85fbb there's the problem 2014-10-13 20:53:34 -07:00
friendica
8a907a789f more diagnostic when changing primary 2014-10-13 17:59:03 -07:00
friendica
3d56bb5cd7 this bug has been there for a *long* time. First time I've ever seen it triggered. 2014-10-13 16:21:02 -07:00
friendica
b740baf6a9 Merge https://github.com/friendica/red into pending_merge 2014-10-13 16:13:13 -07:00
friendica
6503b91131 sql 2014-10-13 16:12:32 -07:00
RedMatrix
b9457c06af Merge pull request #638 from dawnbreak/RedDAV 
When you delete something in /cloud stay in the right folder.
 2014-10-14 09:40:43 +11:00
friendica
8710496689 Merge https://github.com/friendica/red into pending_merge 2014-10-13 15:28:40 -07:00
friendica
1b0390af06 new function hubloc_change_primary() 2014-10-13 15:27:56 -07:00
Klaus Weidenbach
bc2ad74813 When you delete something in /cloud stay in the right folder. 
When you deleted a file in /cloud you was always jumped back to /cloud/[channel],
now you will stay in the parent folder.
Some more doxygen documentation.
Removed duplicate data from logging output and reduced logging in RedDAV in general.
 2014-10-14 00:15:41 +02:00
RedMatrix
1eefed0333 Merge pull request #637 from tuscanhobbit/dev 
one more hidden config option
 2014-10-14 06:36:35 +11:00
tuscanhobbit
9f95162593 one more hidden config 2014-10-13 21:29:47 +02:00
tuscanhobbit
9dc3b01959 Merge from master 2014-10-13 21:19:07 +02:00
tuscanhobbit
240cbc8798 Merge from origin 2014-10-13 21:18:59 +02:00
marijus
a7aa4efc08 Merge branch 'master' of https://github.com/friendica/red 2014-10-13 12:52:41 +02:00
marijus
c41f314302 really fix connedit > collection > checkbox 2014-10-13 12:52:21 +02:00
friendica
a512d1a4aa tinymce still seems to be referenced. Can't quite get rid of it. 2014-10-13 03:15:03 -07:00
friendica
8d27482374 Merge https://github.com/friendica/red into pending_merge 2014-10-13 03:08:58 -07:00
friendica
7abaccaf7f bring back PM upload functionality and why oh why are we still loading tinymce? 2014-10-13 03:07:36 -07:00
marijus
8406046c5b fix connedit > collection > checkbox position also for webkit - this will need a better solution though 2014-10-13 11:58:49 +02:00
friendica
6e238ce5af context check 2014-10-12 21:59:22 -07:00
friendica
41b74dd7ac diaspora_send_status() - recalculate markdown translation to pickup any later message changes after original submission like wall-to-wall attributions for instance. Normally this would've come from our cached version which was stored prior to tag_deliver being run and therefore isn't yet aware that wall-to-wall status may have changed after delivery. 2014-10-12 21:20:08 -07:00
friendica
084cddb32c Merge https://github.com/friendica/red into pending_merge 2014-10-12 18:00:01 -07:00
friendica
1f976fbfe6 bit of cleanup of hidden_configs. This is a start - we've got hundreds more. 2014-10-12 17:59:03 -07:00
RedMatrix
b1ea4f9e11 Merge pull request #636 from dawnbreak/RedDAV 
Moved classes from reddav.php into own files.
 2014-10-13 09:59:01 +11:00