aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add ability to disable newmember widget ahead of timeMario Vavti2018-03-131-2/+3
|
* Merge pull request #1000 from mrjive/devgit-marijus2018-03-134-8492/+13225
|\ | | | | Connections page filtering for active connections
| * Merge pull request #18 from redmatrix/devmrjive2018-03-13957-144104/+10091
| |\ | | | | | | Dev
| * | small work on connections pagemrjive2018-03-132-11/+33
| | |
| * | Partial italina translationhmessages.po hstrings.phpmrjive2018-03-052-8482/+13199
| | |
| * | Merge pull request #15 from redmatrix/devmrjive2018-02-21284-4563/+6296
| |\ \ | | | | | | | | Dev
| * \ \ Merge pull request #14 from redmatrix/devmrjive2018-02-0210-65/+104
| |\ \ \ | | | | | | | | | | Dev
| * \ \ \ Merge pull request #13 from redmatrix/devmrjive2018-01-3034-132/+450
| |\ \ \ \ | | | | | | | | | | | | Dev
| * | | | | small changesmrjive2018-01-291-1/+1
| | | | | | | | | | | | | | | | | | changed icon from sort to filter and changed id to class in content-wrapper clearfix
| * | | | | Update connections.tplmrjive2018-01-291-1/+1
| | | | | |
| * | | | | Merge pull request #12 from redmatrix/devmrjive2018-01-2628-1004/+999
| |\ \ \ \ \ | | | | | | | | | | | | | | Dev
| * \ \ \ \ \ Merge pull request #11 from redmatrix/devmrjive2018-01-24171-9879/+35010
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Dev
| * \ \ \ \ \ \ Merge pull request #10 from redmatrix/devmrjive2018-01-2226-300/+274
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Dev
| * \ \ \ \ \ \ \ Merge pull request #8 from redmatrix/devmrjive2018-01-181-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | section-content-info-wrapper for register text
| * \ \ \ \ \ \ \ \ Merge pull request #7 from redmatrix/devmrjive2018-01-16569-20244/+34966
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Dev
* | \ \ \ \ \ \ \ \ \ Merge pull request #999 from mjfriaza/devgit-marijus2018-03-132-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Spanish translation: adapted the new timeago's stuff
| * | | | | | | | | | Spanish translation: adapted the new timeago's stuffManuel Jiménez Friaza2018-03-132-9/+9
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #997 from mjfriaza/devgit-marijus2018-03-132-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spanish translation: added "el" before "artículo", which is the correct construction
| * | | | | | | | | | Spanish translation: added el before artículo, which is the correct ↵Manuel Jiménez Friaza2018-03-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | construction.
* | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-136-6/+46
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | unicode/emoji usernames. Warning: experimental feature, unstable, untested, ↵zotlabs2018-03-124-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled by default, use at your own risk, may not federate to other platforms and protocols. May not clone correctly. Bug reports which neglect to include detailed roubleshooting information and patches/pull requests will be ignored.
| * | | | | | | | | | | obscure permission issue with custom permissions when using the highly ↵zotlabs2018-03-122-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discouraged advisory privacy modes
* | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-124-20/+30
|\| | | | | | | | | | |
| * | | | | | | | | | | Setup - .htconfig.php write access is now required for automated ↵zotlabs2018-03-111-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installation. [String change - leave in dev for the next release]
| * | | | | | | | | | | remove debuggingzotlabs2018-03-101-2/+0
| | | | | | | | | | | |
| * | | | | | | | | | | trim expects error ... in admin/sitezotlabs2018-03-103-13/+20
| | | | | | | | | | | |
* | | | | | | | | | | | update mysql schemaMario Vavti2018-03-111-3/+0
| | | | | | | | | | | |
* | | | | | | | | | | | do not use trim on arrayMario Vavti2018-03-101-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | update changelogMario Vavti2018-03-091-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #994 from Reylak/devgit-marijus2018-03-091-15/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | RedBasic theme dark schema update
| * | | | | | | | | | | | Uniformize title input with other input fieldsMathieu "Matbac" Bacou2018-03-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rounded corners to mimic categories input field and main text area.
| * | | | | | | | | | | | Remove useless background spec for category fieldMathieu "Matbac" Bacou2018-03-081-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix background of tags fieldMathieu "Matbac" Bacou2018-03-081-15/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix code background in wiki pagesMathieu "Thrar" Bacou2018-03-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix needed after commit c444e40c016c0faaec604335093b19661b3585b7
* | | | | | | | | | | | | remove redundant commaMario Vavti2018-03-091-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | notifications-btn-1 does not actually require the text-white class and this ↵zotlabs2018-03-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is known to cause issues on dark themes
* | | | | | | | | | | | use dbunescbin() for cover photosMario2018-03-081-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | fix syntax error in postgres updateMario2018-03-081-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-086-3/+74
|\| | | | | | | | | | |
| * | | | | | | | | | | remove extraneous loggingzotlabs2018-03-071-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | hashtag autocompletezotlabs2018-03-072-1/+44
| | | | | | | | | | | |
| * | | | | | | | | | | federated polls: GNU-Social requires us to preserve the original order of ↵zotlabs2018-03-074-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the poll answers for use in making a vote, unlike diaspora (which selects by guid) and activitypub (which selects by non-localisable text).
* | | | | | | | | | | | we need the javascript in the template since strings are involvedMario Vavti2018-03-076-162/+181
| | | | | | | | | | | |
* | | | | | | | | | | | more bootstrap accordion fixesMario Vavti2018-03-072-10/+10
| | | | | | | | | | | |
* | | | | | | | | | | | we do not support separate mobile themes anymoreMario Vavti2018-03-072-8/+8
|/ / / / / / / / / / /
* | | | | | | | | | | federated polls: add poll_author which will be necessary for Diaspora federationzotlabs2018-03-064-1/+31
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-062-0/+144
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update changelogMario Vavti2018-03-061-0/+126
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #991 from anaqreon/devgit-marijus2018-03-061-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Improve rendering of Readme files in plugin settings