aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Documenting the need to change database server address from 127.0.0.1 to loca...Haakon Meland Eriksen2015-11-221-1/+1
| | * | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-224-346/+886
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-214-2/+11
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-213-6/+25
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-219-27/+75
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-1/+1
| | * | | | | | | | | | | | Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-0/+2
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2020-4575/+4735
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-1/+1
| | * | | | | | | | | | | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-10/+3
| | * | | | | | | | | | | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-3/+5
| | * | | | | | | | | | | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-6/+8
| | * | | | | | | | | | | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-6/+6
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2013-13/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-196-3/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-192-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1926-5770/+16731
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-184-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-183-3/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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