Commit graph

11682 commits

Author SHA1 Message Date
friendica
e414ed7782 link tag closed prematurely 2014-10-19 21:34:31 -07:00
friendica
8227be0ab0 show true author of wall-to-wall comments to Diaspora viewers just like we did for wall-to-wall posts. 2014-10-19 19:20:25 -07:00
friendica
fd492386bf Tried this once before but had to revert. Basically prevent a comment from being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions. 2014-10-19 17:31:10 -07:00
friendica
26d626efe5 Merge https://github.com/friendica/red into pending_merge 2014-10-19 16:13:39 -07:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
friendica
6d3619c8b1 string update 2014-10-19 16:08:21 -07:00
friendica
88d63d1b77 new doc added to doc checkin 2014-10-19 15:55:22 -07:00
friendica
478e7c4479 doc updates 2014-10-19 15:54:51 -07:00
friendica
e8be2ff8da wall-e random signature failures 2014-10-19 15:54:20 -07:00
RedMatrix
cfd59a9c1b Merge pull request #650 from pafcu/master
Move registration button to before login in nav to avoid problems with m...
2014-10-20 08:54:15 +11:00
Thomas Willingham
281e1fbf6a Merge pull request #651 from 23n/master
remove my second me
2014-10-19 22:46:44 +01:00
23n
eb05a7f39a edit me 2014-10-19 22:04:27 +02:00
Stefan Parviainen
6ee514579f Move registration button to before login in nav to avoid problems with mobile. In the long run a better fix should be found. 2014-10-19 21:08:53 +02:00
Thomas Willingham
fe877b68aa Seventy five people you won't believe contributed to RedMatrix! 2014-10-19 17:09:06 +01:00
RedMatrix
5ded3d5247 Merge pull request #649 from pafcu/master
Improvements to date selection
2014-10-19 20:40:56 +11:00
Stefan Parviainen
a6c4ae186e Don't display date format, it's already in the placeholder text 2014-10-19 11:09:51 +02:00
Stefan Parviainen
519ef48500 Changes in the datetimesel api, prevent user from picking event end date earlier than start date 2014-10-19 10:47:42 +02:00
Stefan Parviainen
d9817779fb Give an error if event is supposed to end before it starts. Closes friendica/red#534 2014-10-19 08:33:18 +02:00
RedMatrix
fb183a29b9 Merge pull request #646 from pafcu/master
Initial stab at better general datetime picker
2014-10-19 08:53:49 +11:00
Stefan Parviainen
7c4f55af9f Oops, forgot one file 2014-10-18 22:17:49 +02:00
Stefan Parviainen
7e091c05a1 Initial stab at better general datetime picker 2014-10-18 15:04:47 +02:00
Thomas Willingham
e5a17b5d77 Doco - if I ever have to touch dozens of files to change one link again,
I'll stab someone - so make sure we don't have to.
2014-10-17 17:42:34 +01:00
Thomas Willingham
17d23a52e2 Policy 2014-10-17 17:16:53 +01:00
Jeroen
0950f90e66 New util/messages.po 2014-10-17 14:19:38 +00:00
Jeroen
5cd6965eef Remote login > Remote authentication as discussed 2014-10-17 14:00:58 +00:00
marijus
7e2a11ddde oups... forgot to remove some debug stuff 2014-10-17 14:32:44 +02:00
marijus
fd48d4d81d make lockview for photos work 2014-10-17 14:28:21 +02:00
friendica
7bbe700f3f mark signature forgeries 2014-10-16 16:19:19 -07:00
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