Commit graph

10861 commits

Author SHA1 Message Date
friendica
1199fe415a doc updates 2014-08-01 01:23:50 -07:00
friendica
56bbf58338 Merge https://github.com/friendica/red into pending_merge 2014-07-31 02:35:16 -07:00
friendica
0e57b6cc8c convert application strings to en-US 2014-07-31 02:33:34 -07:00
Jeroen
28e0e64643 nl: better translation hometown 2014-07-30 23:40:40 +00:00
Jeroen
316ee2febe update/upgrade nl 2014-07-30 22:41:37 +00:00
Jeroen
c7f00422d8 More doc updates 2014-07-30 21:06:18 +00:00
jeroenpraat
da4e2895d3 Inserted text from Network Privacy (changed this to Identity Privacy) 2014-07-30 22:39:43 +02:00
friendica
35ed18967a block channel removal for 48 hours after changing the account password, since the password is required to remove a channel. Somebody looking at an open session on somebody else's computer can simply change the password and then proceed to maliciously remove the channel. This change gives the owner 2 days to discover that something is wrong and recover his/her password and potentially save their channel from getting erased by the vandal. This is most likely to happen if a relationship has gone bad, or something incriminating was found in your private messages when you left your computer briefly unattended. 2014-07-29 20:13:01 -07:00
friendica
c8829e7243 we didn't need the extra query - everything we require is already in memory 2014-07-29 19:52:19 -07:00
friendica
60e7837f00 implement the new friend activity post which has been missing for some time now 2014-07-29 19:26:17 -07:00
friendica
a1ffb5ee72 sql error 2014-07-29 18:34:24 -07:00
Jeroen
ca5992fade Stupid Bluefish 2014-07-29 19:14:01 +00:00
Jeroen
994b6b5258 As talked about earlier: set body font size to 0.8rem and post/comment font size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode. 2014-07-29 19:09:07 +00:00
RedMatrix
f091021570 Merge pull request #548 from tuscanhobbit/master
Chatroom lines are deleted after a while or the chat becomes slow to load
2014-07-29 18:25:25 +10:00
Paolo Tacconi
d6d795efc9 deleted a command with debug code 2014-07-29 09:41:43 +02:00
Paolo Tacconi
87f5544f1f Chatroom lines are deleted after MAX_CHATROOM_HOURS or the chat becomes slow to load 2014-07-29 09:06:04 +02:00
friendica
28c43395dc derivative themes not loading parent theme includes when visiting /cloud 2014-07-28 21:31:30 -07:00
friendica
3a108168c7 Merge https://github.com/friendica/red into pending_merge 2014-07-28 21:03:55 -07:00
friendica
f0f6f1e080 Start of a comprehensive Privacy Policy document 2014-07-28 21:03:10 -07:00
Jeroen
2e6dd91599 14px>12pt as agreed on 075fc67277 - Also fixed empty delete button showing up for channels without edit photo rights. 2014-07-28 12:42:43 +00:00
friendica
1cc83dcaca style the photo like buttons 2014-07-27 19:56:06 -07:00
friendica
34d0490732 re-align the "remember me" button on login page after bootstrap update 2014-07-27 17:34:54 -07:00
friendica
34cc4cdc60 clear floats on photo page (footer content appearing on right of page instead of bottom) 2014-07-27 17:24:09 -07:00
Jeroen
075fc67277 Improved photo view page. Added a delete button, stylized other button and rearangend divs a but. I even made a javascript function (copied is the right word). I changed the application (non-posts) font size (temporary) to 14px, same as button (btn) font size. I like to change all font sizes to 1.0rem (posts) and 0.8rem (application) in the near future, but I will test that first on my hub. 2014-07-27 21:44:34 +00:00
friendica
73a0d8b5a7 restrict categories list to items that aren't deleted 2014-07-27 13:44:12 -07:00
friendica
3d7d6ec21f honour sys channel permissions for who can view the sys owned content 2014-07-26 18:48:25 -07:00
friendica
4f90070e5e Merge https://github.com/friendica/red into pending_merge 2014-07-25 01:13:54 -07:00
friendica
52fa84135c wrong label on icon 2014-07-25 01:13:08 -07:00
marijus
9938f0c52b Merge branch 'master' of https://github.com/friendica/red 2014-07-25 09:42:50 +02:00
marijus
9c40ee9e60 fixes #545 2014-07-25 09:42:10 +02:00
friendica
18f5890cb1 make profile edit pencil stand out a bit on darker backgrounds 2014-07-24 22:29:03 -07:00
friendica
5dcd0654d4 always provide a profile edit entry in the nav usermenu 2014-07-24 21:29:07 -07:00
friendica
1a6973a670 cherry pick pull request #544 2014-07-24 19:07:04 -07:00
friendica
e7d401f387 Merge branch 'master' of https://github.com/RedMatrixCanada/red into RedMatrixCanada-master 2014-07-24 18:57:34 -07:00
friendica
10641b5598 issues #542 #543 - mentions not linked on editing a post if they contained a forum indicator. 2014-07-24 16:48:58 -07:00
mycocham
936f596af4 French Translations 2014-07-24 19:23:03 -04:00
friendica
e331f9f6e7 Merge https://github.com/friendica/red into pending_merge 2014-07-24 15:57:04 -07:00
friendica
5a5190f2ff add an encoding type to formatted zot communication structures so that we can later add alternate encodings. 2014-07-24 15:55:01 -07:00
marijus
9001406346 update to bootstrap-3.2 and minor css adjustments 2014-07-24 13:51:06 +02:00
friendica
0f14dd30db allow jotnets to work with rpost 2014-07-23 21:17:40 -07:00
friendica
ee75efd951 Merge branch 'master' of https://github.com/mrjive/red into mrjive-master
Conflicts:
	view/it/messages.po
2014-07-23 16:46:02 -07:00
friendica
c54ff59a78 Merge https://github.com/friendica/red into pending_merge 2014-07-23 16:42:46 -07:00
friendica
cf2172f9ec rev update 2014-07-23 16:42:23 -07:00
mrjive
aa6d61d3b1 Just a small typo
Fixed a small typo (and also to try if I'm doing right)
2014-07-24 00:29:36 +02:00
Jeroen
02a4dac39b Merge branch 'master' of https://github.com/friendica/red 2014-07-23 13:03:12 +00:00
Jeroen
06470cd114 update nl 2014-07-23 13:02:14 +00:00
friendica
5c6a251213 some backend JS support for an endless scroll directory 2014-07-22 22:15:34 -07:00
friendica
9e500494ff standards compliance 2014-07-22 21:05:18 -07:00
friendica
8dc3446be4 when telling somebody that permissions have changed but not yet submitted, give them a submit button *right there* so they don't have to look for it. 2014-07-22 20:20:01 -07:00
friendica
1476812e90 add another important note 2014-07-22 17:21:13 -07:00