Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 6 | -3/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 2 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 26 | -5770/+16731 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 4 | -9/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 3 | -3/+25 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 10 | -19/+23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-17 | 14 | -233/+622 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-16 | 10 | -26/+51 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-15 | 7 | -1138/+1160 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-14 | 4 | -533/+543 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | 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 | 16 | -10/+132 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-12 | 5 | -10/+34 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | version and string update | redmatrix | 2015-12-05 | 2 | -322/+363 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | add hubzilla.nl as fallback | redmatrix | 2015-12-03 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | srand() is for seeding the PRNG. You want rand() here. | ken restivo | 2015-12-03 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | remove non-working directory server from the project fallback list. | redmatrix | 2015-12-03 | 1 | -1/+0 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | use the std_version where applicable instead of matching to the git. | redmatrix | 2015-12-03 | 2 | -7/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | time to tag the sucker1.0 | redmatrix | 2015-12-03 | 2 | -2/+2 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | non-functional changes (changes to comments, etc.) | redmatrix | 2015-12-02 | 1 | -9/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | provide correct error if a directory server requires a realm_token and one wa... | redmatrix | 2015-12-02 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | prevent function name re-declaration in widget space | redmatrix | 2015-12-02 | 1 | -4/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-02 | 10 | -13301/+13326 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | es+nl and bluegrid update | jeroenpraat | 2015-12-03 | 5 | -13295/+13301 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | fix nav search popup active background color | Mario Vavti | 2015-12-02 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | fix mail attachment and photo permissions. issue #202 | Mario Vavti | 2015-12-02 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-12-02 | 4 | -7/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fix attachment rendering for mail | Mario Vavti | 2015-12-02 | 4 | -2/+13 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin... | redmatrix | 2015-12-02 | 3 | -5/+17 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | issue #204 | redmatrix | 2015-12-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-01 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #200 from anaqreon/update-addon-script | redmatrix | 2015-12-02 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-ad... | Andrew Manning | 2015-11-30 | 6 | -122/+177 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Abort addon update if repo does not exist | Andrew Manning | 2015-11-30 | 1 | -1/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | usercache is no longer used | redmatrix | 2015-12-01 | 2 | -5/+4 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | fix badge padding in narrow navbar | Mario Vavti | 2015-12-01 | 2 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | make narrow navbar setting work again | Mario Vavti | 2015-12-01 | 2 | -3/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | version | redmatrix | 2015-11-30 | 1 | -1/+1 |