friendica
|
d5edd89dd2
|
when removing a channel, check to see if there are any valid hublocs remaining before marking the xchan deleted.
Issue #657
|
2014-10-21 17:07:25 -07:00 |
|
friendica
|
35be89ad66
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-21 16:34:14 -07:00 |
|
friendica
|
ed7712cfbf
|
private forum issues
|
2014-10-21 16:33:35 -07:00 |
|
Stefan Parviainen
|
c8666b9076
|
If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648
|
2014-10-21 18:28:47 +02:00 |
|
Thomas Willingham
|
1fb2de6d55
|
Typo
|
2014-10-21 17:27:13 +01:00 |
|
marijus
|
a03c3d5480
|
fix nav double dropdown
|
2014-10-21 13:43:14 +02:00 |
|
friendica
|
e8a7fb3d01
|
strip out the Diaspora quoted reshare markers
|
2014-10-20 21:15:29 -07:00 |
|
friendica
|
34985f7272
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-20 20:10:43 -07:00 |
|
friendica
|
bac947c4dd
|
wrong template loaded issue
|
2014-10-20 20:10:23 -07:00 |
|
RedMatrix
|
bcb4356fe0
|
Merge pull request #652 from beardy-unixer/master
Prevent multiple simultaneous pollers.
|
2014-10-21 13:27:33 +11:00 |
|
friendica
|
577d84b883
|
bb2diaspora wallwall comment - match both bits (ITEM_WALL|ITEM_ORIGIN)
|
2014-10-20 19:06:02 -07:00 |
|
friendica
|
3d47285414
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-20 16:50:02 -07:00 |
|
friendica
|
cb15c73dae
|
move all theme initialisation to one place - just after calling module_init. Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them.
|
2014-10-20 16:47:58 -07:00 |
|
pafcu
|
6fbd77069b
|
Merge pull request #2 from friendica/master
Sync with upstream
|
2014-10-21 00:02:08 +03:00 |
|
marijus
|
d02162ee83
|
minor correction and typo
|
2014-10-20 23:01:58 +02:00 |
|
marijus
|
c080c420ba
|
not quite there yet but getting closer
|
2014-10-20 22:46:14 +02:00 |
|
Thomas Willingham
|
58431f948e
|
Screwed up merge - put Mike's stuff back.
|
2014-10-20 19:35:02 +01:00 |
|
Thomas Willingham
|
48b2eafcaa
|
Prevent more than one instance of the poller running at a time.
|
2014-10-20 19:31:47 +01:00 |
|
marijus
|
11e8fe3085
|
more work on photos
|
2014-10-20 15:05:33 +02:00 |
|
habeascodice
|
fc12123329
|
missing custom/ description
|
2014-10-20 04:49:44 -07:00 |
|
friendica
|
c909b8be06
|
don't auto-archive connections we can't poll.
|
2014-10-19 21:41:38 -07:00 |
|
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 |
|