Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 3 | -82/+68 |
|\ | |||||
| * | move moment.min.js and remove unneeded files | Mario Vavti | 2015-11-18 | 1 | -1/+1 |
| | | |||||
| * | some events refacturing | Mario Vavti | 2015-11-18 | 3 | -82/+68 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 2 | -2/+2 |
|\| | |||||
| * | more css fixes | Mario Vavti | 2015-11-17 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-17 | 1 | -14/+10 |
|\| | |||||
| * | show jotnets toggle button only if there are jotnets and whitespace fixes | Mario Vavti | 2015-11-17 | 1 | -14/+10 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-15 | 1 | -0/+2 |
|\| | |||||
| * | nl+es and some other bits | jeroenpraat | 2015-11-14 | 1 | -0/+2 |
| | | |||||
* | | Reorder buttons HME | Haakon Meland Eriksen | 2015-11-13 | 1 | -45/+43 |
| | | |||||
* | | Adding original jot.tpl from GitHub | Haakon Meland Eriksen | 2015-11-13 | 1 | -49/+54 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-13 | 1 | -0/+2 |
|\| | |||||
| * | really basic photo album widget for content regions | redmatrix | 2015-11-12 | 1 | -0/+2 |
| | | |||||
* | | Reorder buttons | Haakon Meland Eriksen | 2015-11-13 | 1 | -53/+48 |
| | | |||||
* | | Reverted changes - got white screen | Haakon Meland Eriksen | 2015-11-13 | 1 | -47/+52 |
| | | |||||
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-13 | 1 | -7/+8 |
| | | |||||
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-13 | 1 | -3/+0 |
| | | |||||
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-12 | 1 | -21/+12 |
| | | |||||
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-12 | 1 | -31/+29 |
| | | |||||
* | | Make upload and encrypt easier on phones by editing jot.tpl | Haakon Meland Eriksen | 2015-11-12 | 1 | -13/+11 |
| | | |||||
* | | Promoted upload of images and encryption | Haakon Meland Eriksen | 2015-11-11 | 1 | -0/+10 |
| | | |||||
* | | Rearranged comment buttons back | Haakon Meland Eriksen | 2015-11-11 | 1 | -13/+10 |
| | | |||||
* | | Rearranged comment buttons | Haakon Meland Eriksen | 2015-11-11 | 1 | -10/+13 |
|/ | |||||
* | remove list bullets from extended like list | redmatrix | 2015-11-09 | 1 | -1/+1 |
| | |||||
* | This is better | jeroenpraat | 2015-11-09 | 1 | -2/+2 |
| | |||||
* | Using bootstrap classes, so other themes/schemas also work. Plus margin when ↵ | jeroenpraat | 2015-11-09 | 1 | -1/+1 |
| | | | | collapsed. | ||||
* | make jotnets modal | redmatrix | 2015-11-08 | 1 | -3/+10 |
| | |||||
* | Quick fix: Moved Twitter select box to the top of ACL selector | Tobias Luther | 2015-11-08 | 1 | -3/+6 |
| | |||||
* | Firefox share (that seems now the official name) button added to misc. settings. | jeroenpraat | 2015-11-05 | 1 | -5/+9 |
| | |||||
* | Chat page improved (I think). Works now better with diff. resolutions, font ↵ | jeroenpraat | 2015-11-04 | 2 | -13/+17 |
| | | | | sizes and languages. Fixed follow field on conn. page. Small schemas updates. | ||||
* | provide admin setting to change directory server | redmatrix | 2015-11-03 | 1 | -1/+3 |
| | |||||
* | timeago() works best with iso format. fix #118 | Mario Vavti | 2015-11-03 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-01 | 9 | -21/+32 |
|\ | |||||
| * | More Bluegrid fine tuning and generic-content-wrapper-styled added to some ↵ | jeroenpraat | 2015-11-01 | 5 | -4/+12 |
| | | | | | | | | 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 | 1 | -0/+2 |
| |\ | |||||
| | * | update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. | jeroenpraat | 2015-10-31 | 1 | -0/+2 |
| | | | |||||
| * | | make attachments appear in a dropdown in wall-item-tools-left | Mario Vavti | 2015-10-31 | 3 | -17/+18 |
| |/ | |||||
* / | 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 | 6 | -3/+12 |
| | |||||
* | 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 |
| | |||||
* | 2 more tpl files with generic-content-wrapper-styled | jeroenpraat | 2015-10-26 | 2 | -0/+4 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-26 | 6 | -11/+11 |
|\ | |||||
| * | 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 | 1 | -0/+1 |
| | | |||||
* | | bring back item transparency | Mario Vavti | 2015-10-26 | 2 | -10/+14 |
|/ | |||||
* | 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. |