aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1810-19/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1714-233/+622
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1610-26/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-157-1138/+1160
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-144-533/+543
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Reorder buttons HMEHaakon Meland Eriksen2015-11-131-45/+43
| | | * | | | | | | | | | | | | | | | | | | | | | | Adding original jot.tpl from GitHubHaakon Meland Eriksen2015-11-131-49/+54
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1316-10/+132
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | Reorder buttonsHaakon Meland Eriksen2015-11-131-53/+48
| | | * | | | | | | | | | | | | | | | | | | | | | | | Reverted changes - got white screenHaakon Meland Eriksen2015-11-131-47/+52
| | | * | | | | | | | | | | | | | | | | | | | | | | | Regrouped post buttonsHaakon Meland Eriksen2015-11-131-7/+8
| | | * | | | | | | | | | | | | | | | | | | | | | | | Regrouped post buttonsHaakon Meland Eriksen2015-11-131-3/+0
| | | * | | | | | | | | | | | | | | | | | | | | | | | Regrouped post buttonsHaakon Meland Eriksen2015-11-121-21/+12
| | | * | | | | | | | | | | | | | | | | | | | | | | | Regrouped post buttonsHaakon Meland Eriksen2015-11-121-31/+29
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-125-10/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Make upload and encrypt easier on phones by editing jot.tplHaakon Meland Eriksen2015-11-121-13/+11
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Promoted upload of images and encryptionHaakon Meland Eriksen2015-11-111-0/+10
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Rearranged comment buttons backHaakon Meland Eriksen2015-11-111-13/+10
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Rearranged comment buttonsHaakon Meland Eriksen2015-11-111-10/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | version and string updateredmatrix2015-12-052-322/+363
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | add hubzilla.nl as fallbackredmatrix2015-12-031-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | srand() is for seeding the PRNG. You want rand() here.ken restivo2015-12-031-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | remove non-working directory server from the project fallback list.redmatrix2015-12-031-1/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | use the std_version where applicable instead of matching to the git.redmatrix2015-12-032-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | time to tag the sucker1.0redmatrix2015-12-032-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | non-functional changes (changes to comments, etc.)redmatrix2015-12-021-9/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | provide correct error if a directory server requires a realm_token and one wa...redmatrix2015-12-021-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | prevent function name re-declaration in widget spaceredmatrix2015-12-021-4/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-0210-13301/+13326
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | es+nl and bluegrid updatejeroenpraat2015-12-035-13295/+13301
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix nav search popup active background colorMario Vavti2015-12-021-0/+7
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix mail attachment and photo permissions. issue #202Mario Vavti2015-12-021-4/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-12-024-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fix attachment rendering for mailMario Vavti2015-12-024-2/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin...redmatrix2015-12-023-5/+17
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | issue #204redmatrix2015-12-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-011-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #200 from anaqreon/update-addon-scriptredmatrix2015-12-021-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-ad...Andrew Manning2015-11-306-122/+177
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Abort addon update if repo does not existAndrew Manning2015-11-301-1/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | usercache is no longer usedredmatrix2015-12-012-5/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fix badge padding in narrow navbarMario Vavti2015-12-012-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | make narrow navbar setting work againMario Vavti2015-12-012-3/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | versionredmatrix2015-11-301-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #201 from wave72/masterWave2015-11-302-6634/+6637
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Updated Italian stringsPaolo Tacconi2015-11-302-6634/+6637
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3 from redmatrix/masterWave2015-11-25525-14424/+116761
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | generalise the site black|white allow lists, also add a channel black|white l...redmatrix2015-11-294-26/+63
| * | | | | | | | | | | | | | | | | | | | | | | | | | | report correct directory mode for standalone directories in siteinforedmatrix2015-11-291-1/+1