Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #119 from sasiflo/master | redmatrix | 2015-11-04 | 3 | -5/+5 |
|\ | | | | | Some small rebranding for Hubzilla transition from Red Matrix | ||||
| * | Merge branch 'rebranding' | sasiflo | 2015-11-03 | 3 | -5/+5 |
| |\ | |||||
| | * | Some small rebranding for Hubzilla transition from Red Matrix | sasiflo | 2015-11-03 | 3 | -5/+5 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 4 | -4/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/photo/photo_driver.php include/text.php mod/post.php | ||||
| * | | | Update nl+es | jeroenpraat | 2015-10-31 | 4 | -4/+14 |
| | | | | |||||
* | | | | provide admin setting to change directory server | redmatrix | 2015-11-03 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-03 | 6 | -23/+35 |
|\ \ \ \ | |||||
| * | | | | small update Ducth strings + fix dark schema | jeroenpraat | 2015-11-03 | 3 | -21/+33 |
| | |/ / | |/| | | |||||
| * | | | timeago() works best with iso format. fix #118 | Mario Vavti | 2015-11-03 | 3 | -2/+2 |
| | |/ | |/| | |||||
* / | | implement unfollow thread | redmatrix | 2015-11-03 | 1 | -1/+11 |
|/ / | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-01 | 15 | -1342/+1513 |
|\ \ | |||||
| * | | More Bluegrid fine tuning and generic-content-wrapper-styled added to some ↵ | jeroenpraat | 2015-11-01 | 6 | -9/+47 |
| | | | | | | | | | | | | tpl-files and 2 php files, cause they dont have a tpl file. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-01 | 6 | -1318/+1449 |
| |\ \ | |||||
| | * | | update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. | jeroenpraat | 2015-10-31 | 6 | -1318/+1449 |
| | | | | |||||
| * | | | make attachments appear in a dropdown in wall-item-tools-left | Mario Vavti | 2015-10-31 | 3 | -17/+18 |
| | | | | |||||
| * | | | fix photo item for search_item.tpl and a minor css fix | Mario Vavti | 2015-10-30 | 1 | -0/+1 |
| |/ / | |||||
* / / | improve /locs page with some field notes and the ability to do a forced sync | redmatrix | 2015-11-01 | 1 | -0/+11 |
|/ / | |||||
* | | This may take a few iterations to discover the best way to present the ↵ | redmatrix | 2015-10-29 | 1 | -1/+6 |
| | | | | | | | | information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff. | ||||
* | | More fine tuning bluegrid schema. Extra generic-wrapper-styled. | jeroenpraat | 2015-10-27 | 7 | -14/+58 |
| | | |||||
* | | css fixes | Mario Vavti | 2015-10-27 | 1 | -2/+2 |
| | | |||||
* | | Better -styled. | jeroenpraat | 2015-10-27 | 1 | -1/+1 |
| | | |||||
* | | Another .generic-content-wrapper | jeroenpraat | 2015-10-27 | 1 | -0/+2 |
| | | |||||
* | | NEW: Redbasic schema, based on the Hubzilla project page layout. | jeroenpraat | 2015-10-27 | 2 | -0/+358 |
| | | |||||
* | | 2 more tpl files with generic-content-wrapper-styled | jeroenpraat | 2015-10-26 | 2 | -0/+4 |
| | | |||||
* | | es+nl strings | jeroenpraat | 2015-10-26 | 4 | -2090/+2128 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2015-10-26 | 4 | -19/+28 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-26 | 7 | -16/+20 |
| |\ \ | |||||
| * | | | bring back item transparency | Mario Vavti | 2015-10-26 | 4 | -19/+28 |
| | | | | |||||
* | | | | Update Dark schema | jeroenpraat | 2015-10-26 | 1 | -3/+63 |
| |/ / |/| | | |||||
* | | | Revert this one. This was hub specific. | jeroenpraat | 2015-10-26 | 1 | -11/+5 |
| | | | |||||
* | | | Added a few generic-content-wrapper-styled classes and a button position ↵ | jeroenpraat | 2015-10-26 | 6 | -16/+21 |
| | | | | | | | | | | | | fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that. | ||||
* | | | Fixed connection page. Page was overcrowded on systems with larger fonts. | jeroenpraat | 2015-10-26 | 2 | -5/+10 |
|/ / | |||||
* | | looks like there may be issues with the datetime picker if the local ↵ | redmatrix | 2015-10-25 | 1 | -1/+1 |
| | | | | | | | | timezone isn't the same as your settings. | ||||
* | | new feature: delayed posting | redmatrix | 2015-10-25 | 2 | -0/+41 |
| | | |||||
* | | 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 |
| | |