Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-24 | 3 | -5239/+5492 |
|\ | |||||
| * | Merge pull request #97 from wave72/master | Wave | 2015-10-24 | 3 | -5239/+5492 |
| |\ | | | | | | | Italian strings updated | ||||
| | * | Italian strings updated | wave72 | 2015-10-24 | 3 | -5239/+5492 |
| | | | |||||
* | | | another try to avoid dubble photo deletion. allow to set a photo caption and ↵ | Mario Vavti | 2015-10-24 | 3 | -7/+23 |
|/ / | | | | | | | simple status body (if create status post is enabled) on upload | ||||
* | | fix app.tpl missing </div> tag if not authenticated | Mario Vavti | 2015-10-23 | 1 | -20/+22 |
| | | |||||
* | | fix placeholder font-family | mcnesium | 2015-10-22 | 1 | -2/+2 |
| | | | | | | [Imgur](http://i.imgur.com/Cegabd5.png) | ||||
* | | photo object fixes | Mario Vavti | 2015-10-22 | 2 | -0/+10 |
| | | |||||
* | | experiment: put the photo-item photo on top of the post | Mario Vavti | 2015-10-22 | 2 | -6/+13 |
| | | |||||
* | | move photo object stuff from itemObject to prepare_body() so we can do more ↵ | Mario Vavti | 2015-10-22 | 3 | -8/+6 |
| | | | | | | | | stuff with it | ||||
* | | warn if quota exceeds 90% of storage limit | Mario Vavti | 2015-10-21 | 1 | -1/+1 |
| | | |||||
* | | move file storage quota display to upload section. add a warning if ↵ | Mario Vavti | 2015-10-21 | 2 | -1/+1 |
| | | | | | | | | remaining space is less than 100MB and fix % calculation | ||||
* | | move quota display to where it's visible on a tablet | redmatrix | 2015-10-20 | 1 | -2/+3 |
| | | |||||
* | | css cleanup | Mario Vavti | 2015-10-20 | 1 | -4/+0 |
| | | |||||
* | | create photo object if feature large photos is enabled and display those ↵ | Mario Vavti | 2015-10-20 | 4 | -8/+19 |
| | | | | | | | | slightly different | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 4 | -6816/+7110 |
|\ \ | |/ |/| | | | | | | | | | | | | | Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php | ||||
| * | Update es+nl | jeroenpraat | 2015-10-18 | 4 | -6816/+7110 |
| | | |||||
* | | Replaced some old redmatrix branding | Paolo Tacconi | 2015-10-19 | 1 | -1/+1 |
| | | |||||
* | | Update nl+es | jeroenpraat | 2015-10-18 | 4 | -3494/+3500 |
| | | |||||
* | | tweak justify gallery options to not load to large previews | Mario Vavti | 2015-10-18 | 1 | -2/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-17 | 2 | -7592/+7664 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | Update Dutch strings | jeroenpraat | 2015-10-16 | 2 | -6865/+6775 |
| | | |||||
| * | Redesigned the export page. Please fix my English if I made some mistakes. | jeroenpraat | 2015-10-09 | 1 | -4/+9 |
| | | |||||
| * | There is no mod/import_items tool in RedMatrix | Andrew Manning | 2015-10-07 | 1 | -2/+0 |
| | | |||||
| * | Add message about exporting by year/month to uexport | Andrew Manning | 2015-10-06 | 1 | -0/+7 |
| | | |||||
| * | Final Spanish strings for Redmatrix | jeroenpraat | 2015-10-05 | 2 | -25/+25 |
| | | |||||
* | | bring back chat expiration setting and adjust chat size for our now smaller ↵ | redmatrix | 2015-10-17 | 2 | -1/+2 |
| | | | | | | | | content region | ||||
* | | we now provide images for all suffixes (0-3) -> simplify photo item body ↵ | Mario Vavti | 2015-10-16 | 1 | -1/+2 |
| | | | | | | | | creation and provide width x height for any size | ||||
* | | (re)add default image-size 320px - it is good for gallery preview. this size ↵ | Mario Vavti | 2015-10-15 | 1 | -3/+3 |
| | | | | | | | | has the suffix -3 now | ||||
* | | update conv_list.tpl | Mario Vavti | 2015-10-15 | 1 | -19/+33 |
| | | |||||
* | | double up default photo sizes - even the mos simple camera can now do images ↵ | Mario Vavti | 2015-10-15 | 2 | -4/+5 |
| | | | | | | | | > 1024px | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-15 | 1 | -5/+5 |
|\ \ | |||||
| * | | issue #86 - like/dislike in photos not working | redmatrix | 2015-10-14 | 1 | -5/+5 |
| | | | |||||
* | | | allow photo-items to appear full width if large photos feature is enabled. ↵ | Mario Vavti | 2015-10-14 | 6 | -85/+104 |
|/ / | | | | | | | in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. | ||||
* | | Merge pull request #81 from tuscanhobbit/master | Wave | 2015-10-14 | 2 | -627/+653 |
|\ \ | | | | | | | Italian strings updated | ||||
| * | | Italian strings updated | Paolo Tacconi | 2015-10-14 | 2 | -627/+653 |
| | | | |||||
* | | | do not collapse content which is just slightly higher than we allow | Mario Vavti | 2015-10-13 | 1 | -0/+1 |
| | | | |||||
* | | | update es + nl strings | jeroenpraat | 2015-10-13 | 4 | -846/+854 |
| | | | |||||
* | | | another collapseHeight() fix | Mario Vavti | 2015-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | fix an issue with collapseHeight() and css margins/paddings in directory | Mario Vavti | 2015-10-11 | 1 | -0/+3 |
| | | | |||||
* | | | some conv-item restructuring to allow full width elements | Mario Vavti | 2015-10-11 | 5 | -74/+71 |
| | | | |||||
* | | | Updated Spanish strings | jeroenpraat | 2015-10-05 | 4 | -54/+54 |
| | | | |||||
* | | | bring our bbcode tools to private mail | Mario Vavti | 2015-10-05 | 4 | -24/+77 |
| | | | |||||
* | | | do not show delete conversation in single message view | Mario Vavti | 2015-10-04 | 1 | -0/+2 |
| | | | |||||
* | | | bring single message view to inbox/outbox view | Mario Vavti | 2015-10-04 | 2 | -2/+1 |
| | | | |||||
* | | | add anchors to messages and links | Mario Vavti | 2015-10-04 | 2 | -1/+2 |
| | | | |||||
* | | | remove check mail - it just reloads the page. we get a notification in the ↵ | Mario Vavti | 2015-10-04 | 1 | -1/+0 |
| | | | | | | | | | | | | panel if we get new mail | ||||
* | | | Updated Spanish and Dutch language strings | jeroenpraat | 2015-10-03 | 8 | -7568/+7735 |
| | | | |||||
* | | | get rid of the unnecessary blank space after mail recipient completion | redmatrix | 2015-10-02 | 3 | -2/+36 |
| | | | |||||
* | | | private mail compositor changes | Mario Vavti | 2015-10-02 | 5 | -89/+68 |
| | | | |||||
* | | | whitespace | Mario Vavti | 2015-10-02 | 1 | -3/+0 |
| | | |