aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tres'redmatrix2015-05-1869-843/+657
|\
| * Merge branch 'master' into tresredmatrix2015-05-1731-421/+612
| |\
| * \ Merge branch 'master' into tresredmatrix2015-05-1419-18/+537
| |\ \
| * \ \ Merge branch 'master' into tresredmatrix2015-05-14187-9453/+9692
| |\ \ \
| * \ \ \ Merge branch 'master' into tresfriendica2015-05-015-3/+37
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into tresfriendica2015-04-2926-1122/+1210
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into tresfriendica2015-04-231727-201129/+48987
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into tresfriendica2015-02-0897-6382/+7723
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into tresfriendica2015-02-0545-5364/+6398
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into tresfriendica2015-02-0112-10/+108
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into tresfriendica2015-01-31108-4218/+5439
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cleanup event form and various required indicators on inputsfriendica2015-01-295-9/+28
| * | | | | | | | | | | Merge branch 'master' into tresfriendica2015-01-29167-954/+1001
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | more message restrict conversionsfriendica2015-01-2918-75/+78
| * | | | | | | | | | | | Merge branch 'master' into tresfriendica2015-01-2720-166/+302
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sql typofriendica2015-01-271-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into tres and add some work on the item_deleted flag re...friendica2015-01-2699-1998/+1864
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | onedirsync mergefriendica2015-01-261-3/+2
| * | | | | | | | | | | | | | start on item_restrict conversionfriendica2015-01-229-54/+53
| * | | | | | | | | | | | | | more expanding item flagsfriendica2015-01-2212-73/+37
| * | | | | | | | | | | | | | heavy lifting converting item flag bitsfriendica2015-01-2228-192/+129
| * | | | | | | | | | | | | | slow progress removing bitfields on item tablefriendica2015-01-2120-179/+156
| * | | | | | | | | | | | | | working through the xchan table to remove bitfields, mostly complete except f...friendica2015-01-2020-203/+107
| * | | | | | | | | | | | | | that should take care of the bitfields in hublocfriendica2015-01-2011-100/+51
| * | | | | | | | | | | | | | first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_del...friendica2015-01-207-58/+33
* | | | | | | | | | | | | | | provide a warningredmatrix2015-05-172-0/+8
* | | | | | | | | | | | | | | here's a fair chunk of the new schema - still a lot of bits missing and no mi...redmatrix2015-05-171-414/+107
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1729-415/+602
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | missing $redmatrix2015-05-171-1/+1
| * | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-172-32/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #322 from dawnbreak/masterredmatrix2015-05-181-0/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add functions to parse and get some values from php.ini.Klaus Weidenbach2015-05-161-0/+66
| | * | | | | | | | | | | | | | | Merge pull request #323 from dawnbreak/docuredmatrix2015-05-181-32/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Add some more documentation to attach_store()Klaus Weidenbach2015-05-171-32/+39
| | | |/ / / / / / / / / / / / / /
| * | / / / / / / / / / / / / / / Implement permission checking for OAuth clients using the xperm table. Curren...redmatrix2015-05-175-6/+106
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-176-25/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #324 from Razlo/masterKlaus2015-05-174-23/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | updated the templates to the {{}}, compared toRazlo2015-05-174-23/+23
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | allow a block to contain $contentMario Vavti2015-05-151-1/+8
| | * | | | | | | | | | | | | | preserve htmlhead in case somebody needs itMario Vavti2015-05-151-1/+3
| * | | | | | | | | | | | | | | new string file - isolating the projectname from translated strings so that t...redmatrix2015-05-171-30/+31
| * | | | | | | | | | | | | | | more work isolating the projectname from core.redmatrix2015-05-1716-321/+325
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | update to_doredmatrix2015-05-141-0/+1
* | | | | | | | | | | | | | | update readmeredmatrix2015-05-172-6/+10
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-144-14/+40
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-1415-4/+497
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | provide default permissions ('all') for existing and newly created OAuth app ...redmatrix2015-05-144-14/+40
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1415-4/+497
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #320 from dawnbreak/masterredmatrix2015-05-1515-4/+497
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add sprintf.js v1.0.2.Klaus Weidenbach2015-05-1415-4/+497
| |/ / / / / / / / / / / /