Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-01 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-07-31 | 7 | -23/+25 |
| |\ | |||||
| * | | Font sizes (temporary?) scaled down a bit. See ↵ | Jeroen | 2014-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | https://github.com/friendica/red/commit/994b6b5258856a97cf6863de74e5a8baddf59b49 | ||||
* | | | make the profile minimal by default. Use features to enable the advanced form. | friendica | 2014-08-01 | 6 | -325/+392 |
| | | | |||||
* | | | doc updates | friendica | 2014-08-01 | 31 | -198/+238 |
| |/ |/| | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-31 | 8 | -265/+250 |
|\| | |||||
| * | nl: better translation hometown | Jeroen | 2014-07-30 | 2 | -5/+5 |
| | | |||||
| * | update/upgrade nl | Jeroen | 2014-07-30 | 4 | -238/+226 |
| | | |||||
| * | More doc updates | Jeroen | 2014-07-30 | 4 | -24/+12 |
| | | |||||
| * | Inserted text from Network Privacy (changed this to Identity Privacy) | jeroenpraat | 2014-07-30 | 1 | -0/+9 |
| | | |||||
* | | convert application strings to en-US | friendica | 2014-07-31 | 7 | -23/+25 |
|/ | |||||
* | block channel removal for 48 hours after changing the account password, ↵ | friendica | 2014-07-29 | 5 | -4/+24 |
| | | | | 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. | ||||
* | we didn't need the extra query - everything we require is already in memory | friendica | 2014-07-29 | 1 | -37/+26 |
| | |||||
* | implement the new friend activity post which has been missing for some time now | friendica | 2014-07-29 | 2 | -10/+54 |
| | |||||
* | sql error | friendica | 2014-07-29 | 3 | -4/+6 |
| | |||||
* | Stupid Bluefish | Jeroen | 2014-07-29 | 1 | -1/+1 |
| | |||||
* | As talked about earlier: set body font size to 0.8rem and post/comment font ↵ | Jeroen | 2014-07-29 | 3 | -10/+10 |
| | | | | 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. | ||||
* | Merge pull request #548 from tuscanhobbit/master | RedMatrix | 2014-07-29 | 2 | -0/+21 |
|\ | | | | | Chatroom lines are deleted after a while or the chat becomes slow to load | ||||
| * | deleted a command with debug code | Paolo Tacconi | 2014-07-29 | 1 | -0/+1 |
| | | |||||
| * | Chatroom lines are deleted after MAX_CHATROOM_HOURS or the chat becomes slow ↵ | Paolo Tacconi | 2014-07-29 | 2 | -0/+20 |
| | | | | | | | | to load | ||||
* | | derivative themes not loading parent theme includes when visiting /cloud | friendica | 2014-07-28 | 1 | -0/+11 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-28 | 2 | -3/+2 |
|\ \ | |||||
| * | | 14px>12pt as agreed on ↵ | Jeroen | 2014-07-28 | 2 | -3/+2 |
| | | | | | | | | | | | | https://github.com/friendica/red/commit/075fc6727762d4e45ddcae5843eec0100ad3ab72 - Also fixed empty delete button showing up for channels without edit photo rights. | ||||
* | | | Start of a comprehensive Privacy Policy document | friendica | 2014-07-28 | 4 | -4/+72 |
|/ / | |||||
* | | style the photo like buttons | friendica | 2014-07-27 | 1 | -2/+2 |
| | | |||||
* | | re-align the "remember me" button on login page after bootstrap update | friendica | 2014-07-27 | 1 | -0/+2 |
| | | |||||
* | | clear floats on photo page (footer content appearing on right of page ↵ | friendica | 2014-07-27 | 1 | -0/+2 |
| | | | | | | | | instead of bottom) | ||||
* | | Improved photo view page. Added a delete button, stylized other button and ↵ | Jeroen | 2014-07-27 | 5 | -13/+59 |
| | | | | | | | | 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. | ||||
* | | restrict categories list to items that aren't deleted | friendica | 2014-07-27 | 2 | -1/+2 |
| | | |||||
* | | honour sys channel permissions for who can view the sys owned content | friendica | 2014-07-26 | 3 | -4/+19 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-25 | 1 | -0/+4 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-07-25 | 29 | -6024/+6896 |
| |\ \ | |||||
| * | | | fixes #545 | marijus | 2014-07-25 | 1 | -0/+4 |
| | | | | |||||
* | | | | wrong label on icon | friendica | 2014-07-25 | 5 | -91/+95 |
| |/ / |/| | | |||||
* | | | make profile edit pencil stand out a bit on darker backgrounds | friendica | 2014-07-24 | 2 | -1/+2 |
| | | | |||||
* | | | always provide a profile edit entry in the nav usermenu | friendica | 2014-07-24 | 4 | -16/+32 |
| | | | |||||
* | | | cherry pick pull request #544 | friendica | 2014-07-24 | 6 | -68/+15 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/RedMatrixCanada/red into ↵ | friendica | 2014-07-24 | 22 | -5992/+6892 |
|\ \ \ | | | | | | | | | | | | | RedMatrixCanada-master | ||||
| * | | | French Translations | mycocham | 2014-07-24 | 22 | -5992/+6892 |
| |/ / | |||||
* | | | issues #542 #543 - mentions not linked on editing a post if they contained a ↵ | friendica | 2014-07-24 | 1 | -0/+9 |
| | | | | | | | | | | | | forum indicator. | ||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-24 | 8 | -1026/+1680 |
|\| | | |||||
| * | | update to bootstrap-3.2 and minor css adjustments | marijus | 2014-07-24 | 8 | -1026/+1680 |
| | | | |||||
* | | | add an encoding type to formatted zot communication structures so that we ↵ | friendica | 2014-07-24 | 4 | -6/+5 |
|/ / | | | | | | | can later add alternate encodings. | ||||
* | | allow jotnets to work with rpost | friendica | 2014-07-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mrjive/red into mrjive-master | friendica | 2014-07-23 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Conflicts: view/it/messages.po | ||||
| * | | Just a small typo | mrjive | 2014-07-24 | 1 | -1/+1 |
| | | | | | | | | | Fixed a small typo (and also to try if I'm doing right) | ||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-23 | 2 | -1095/+1154 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-07-23 | 6 | -25/+122 |
| |\ \ \ | |||||
| * | | | | update nl | Jeroen | 2014-07-23 | 2 | -1095/+1154 |
| | | | | | |||||
* | | | | | rev update | friendica | 2014-07-23 | 1 | -1/+1 |
| |/ / / |/| | | |