aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bring the new photo schema into playredmatrix2015-05-185-53/+37
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-182-4/+6
|\
| * this should fix undeletable blocks and layoutsredmatrix2015-05-182-4/+6
* | fix some merge errorsredmatrix2015-05-183-1012/+1270
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-182-8/+16
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-184-385/+446
| |\
| * | fix po2php to handle projectname variables correctlyredmatrix2015-05-182-8/+16
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-187-134/+188
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-05-181-0/+47
| |\ \
| | * \ Merge pull request #326 from sierracircle/patch-1redmatrix2015-05-191-0/+47
| | |\ \
| | | * | Create Primary-DirectoryAdam Robertson2015-05-181-0/+47
| * | | | if block title contains $content but $content title is empty do not show an e...Mario Vavti2015-05-181-1/+1
| |/ / /
| * | | remove dbg codeMario Vavti2015-05-181-2/+0
| * | | allow block title to contain $content titleMario Vavti2015-05-181-2/+11
| |/ /
| * / Update Dutch (Projectname variable not translated yet, because of undefined v...jeroenpraat2015-05-182-383/+390
| |/
| * spellingredmatrix2015-05-172-4/+4
* | 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
| | | |/ / / / / / / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 06:29:15 +0000