Commit graph

11403 commits

Author SHA1 Message Date
Christian Vogeley
89fec0e085 Allow ordering by created 2014-09-20 23:28:42 +02:00
marijus
69a10e8ca7 oups... 2014-09-20 17:30:11 +02:00
marijus
6c806f6f48 aalso change the way we check for number of chatrooms 2014-09-20 17:28:42 +02:00
marijus
bd54358aa6 show bookmarks menu only if we have any bookmarks already 2014-09-20 16:31:56 +02:00
marijus
9feb619bea update jg to latest preview release and try once more to really justify the whole gallery 2014-09-20 15:40:40 +02:00
friendica
1c56442818 Repeat after me - we always refer to our clientelle as 'members'. If your software calls you a "user" - get rid of it. 2014-09-19 23:35:16 -07:00
friendica
302483790c Merge https://github.com/friendica/red into pending_merge 2014-09-19 16:51:05 -07:00
friendica
cb434818f8 closing tag 2014-09-19 16:50:43 -07:00
Jeroen
6923557ecb Bit tweaking 2014-09-19 21:23:41 +00:00
Jeroen
017726f069 Another piece that didn't fit well in the dark schema. Hopefully this is the last. 2014-09-19 21:16:55 +00:00
Jeroen
de45f42f9f update nl.2 2014-09-19 20:43:43 +00:00
Jeroen
eedc0e50c1 update nl 2014-09-19 15:54:19 +00:00
friendica
87a6f25769 try to sort out walltowall translation for diaspora recipients 2014-09-19 02:22:24 -07:00
friendica
083b5da967 doc updates 2014-09-19 02:22:12 -07:00
friendica
45df73d456 add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly. 2014-09-18 17:06:15 -07:00
friendica
3191432c40 add stylish_select library to provide a way to clean up and theme all the ugly select boxes 2014-09-18 16:46:17 -07:00
friendica
c824e426e2 Merge https://github.com/friendica/red into pending_merge 2014-09-18 16:33:31 -07:00
friendica
d4759a5883 repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) 2014-09-18 16:32:05 -07:00
RedMatrix
caabc69e08 Merge pull request #596 from beardy-unixer/master
Allow syschan use and extend ping
2014-09-19 06:25:58 +10:00
Thomas Willingham
5c8f5e2aa3 Catch the settings too 2014-09-18 18:14:52 +01:00
Thomas Willingham
fc93ee89a9 If a short ping causes lots of issues, and anyone who has been here
a while tends to have a longer ping, we should probably have a longer
ping
2014-09-18 18:09:54 +01:00
Thomas Willingham
bdfe2c7786 Merge remote-tracking branch 'upstream/master' 2014-09-18 18:07:38 +01:00
Thomas Willingham
595be9919b Merge branch 'master' of https://github.com/friendica/red 2014-09-18 17:08:23 +01:00
Thomas Willingham
65441b95bb Doco - permissions needs some work, but this is a relative whopper. 2014-09-18 17:07:47 +01:00
friendica
0b47fb9a91 keep the language consistent 2014-09-17 22:59:56 -07:00
friendica
0deb592cb5 typo 2014-09-17 22:55:27 -07:00
friendica
8eb21cceb3 use 24-hour clock for non-American dates 2014-09-17 22:53:38 -07:00
friendica
7167208345 forgot this one... 2014-09-17 22:30:25 -07:00
friendica
c6062d7872 usability tweaks 2014-09-17 21:52:30 -07:00
friendica
22aa5aca14 add a spinner or two to the new channel page so folks have a clue that we're doing something in the background - trying to complete the nick field for them (and then check it before they submit). 2014-09-17 21:27:02 -07:00
friendica
51d9f0d97a channel permission roles 2014-09-17 21:16:15 -07:00
friendica
eca420ec96 defined several permission roles - these will probably require some review and adjustment.
social
social_restricted
social_private
forum
forum_restricted
forum_private
feed
feed_restricted
soapbox
2014-09-17 19:46:55 -07:00
friendica
02fa970569 make the output a bit more readable 2014-09-17 19:14:23 -07:00
friendica
618b93d42e let the xchan diagnostic accept a webbie 2014-09-17 19:08:15 -07:00
friendica
4014093572 implement permission roles - the backend should be done except for maybe a couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. 2014-09-17 17:59:46 -07:00
friendica
cd79044778 no sense maintaining 2 to-do files. I think the one I'm removing is referenced online somewhere - which is why it wasn't done earlier. Can't find it, so just note that somebody will complain and we'll have to edit the pointer someday. 2014-09-16 23:12:50 -07:00
RedMatrix
fd37d9c92a Merge pull request #595 from solstag/master
Fix name attribute of button elements so jquery '.submit()' doesn't brea...
2014-09-17 16:07:00 +10:00
friendica
0090cbf84b that's why bb2diaspora_itemwallwall() wasn't doing its thang. 2014-09-16 22:26:52 -07:00
friendica
19e8d10b7a still some old Friendica database queries in diaspora_signed_retraction 2014-09-16 21:08:34 -07:00
friendica
53d0e855df z_post_url_json() added to easily deal with JSON post APIs; without getting content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers. 2014-09-16 20:46:44 -07:00
friendica
ce36e8a8bb Merge https://github.com/friendica/red into pending_merge 2014-09-16 19:09:30 -07:00
friendica
c4608d4c82 just mark dead hubloc deleted - don't remove them. This could cause problems. Also clean up fetch_url/post_url header option 2014-09-16 19:07:19 -07:00
Alexandre Hannud Abdo
5bdfc2f647 Fix name attribute of button elements so jquery '.submit()' doesn't break
According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
2014-09-16 19:00:53 -03:00
marijus
eed6cbfb2a Merge branch 'master' of https://github.com/friendica/red 2014-09-16 14:24:25 +02:00
marijus
b5bb2230eb this still has less issues 2014-09-16 14:18:03 +02:00
friendica
6a82ccecd0 when importing channels - use the new location notification message to tell your original site where it sits in terms of primary. 2014-09-16 05:14:06 -07:00
friendica
a1b66f56f0 use the more portable encoded_item format for exported items - but with added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this. 2014-09-16 03:33:48 -07:00
friendica
b2f2424b52 push individual block to directory 2014-09-15 23:11:08 -07:00
friendica
4d91b6e6d2 fat finger - must have been here a while 2014-09-15 22:53:33 -07:00
friendica
6c0133be1f change platform name to redmatrix (lowercase, one word) for use in meta tags and stuff, move yet another oauth1 library to library instead of having it in plugins where we'll end up with a white screen if we re-use it in another plugin; which I plan to do. 2014-09-15 22:23:07 -07:00