Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -10/+15 |
|\ | |||||
| * | provide default permissions ('all') for existing and newly created OAuth app ↵ | redmatrix | 2015-05-14 | 1 | -10/+15 |
| | | | | | | | | clients, which will be extended in the future to allow specific permissions. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/DerivedTheme1.md doc/Developers.md doc/Features.md doc/Plugins.md doc/Privacy.md doc/README.md doc/Remove-Account.md doc/Translations.md doc/about.bb doc/account_basics.bb doc/accounts_profiles_channels_basics.bb doc/addons.bb doc/addons_gnusocial.bb doc/bbcode.html doc/campaign.bb doc/classRedmatrix_1_1Import_1_1Import-members.html doc/classRedmatrix_1_1Import_1_1Import.html doc/cloud.bb doc/connecting_to_channels.bb doc/connecting_to_channels.md doc/credits.bb doc/de/channels.bb doc/de/features.bb doc/de/main.bb doc/de/registration.bb doc/developers.bb doc/encryption.bb doc/external-resource-links.bb doc/extra_features.bb doc/faq_admins.bb doc/faq_developers.bb doc/faq_members.bb doc/features.bb doc/hidden_configs.bb doc/history.md doc/html/index.php doc/main.bb doc/permissions.bb doc/plugins.bb doc/problems-following-an-update.bb doc/profiles.bb doc/red2pi.bb doc/registration.bb doc/roadmap.bb doc/sv/main.bb doc/what_is_zot.bb doc/zot.md | ||||
| * | remove project name dependency from most of the doc files to ease project ↵ | redmatrix | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 5 | -7/+11 |
|\| | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | ||||
| * | restrict webpage list to undeleted items | redmatrix | 2015-05-13 | 2 | -3/+3 |
| | | |||||
| * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 3 | -3/+3 |
| | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| * | issue #187 | redmatrix | 2015-05-12 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 1 | -0/+3 |
|\| | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php | ||||
| * | let the site admin import a record directly from the probe diagnostic | redmatrix | 2015-05-11 | 1 | -0/+3 |
| | | |||||
| * | missing translation | redmatrix | 2015-05-11 | 1 | -1/+1 |
| | | |||||
* | | missing merge conflict | redmatrix | 2015-05-11 | 1 | -6/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 1 | -4/+18 |
|\| | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| * | provide drop down submenu suggestions in edit mode | Mario Vavti | 2015-05-10 | 1 | -3/+4 |
| | | |||||
| * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 1 | -2/+10 |
| | | |||||
* | | missed one... | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 13 | -41/+38 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 1 | -1/+1 |
|\| | |||||
| * | avoid double slash after editing layout | Mario Vavti | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | for hubzilla we won't be obscuring items, only private mail, this will allow ↵ | redmatrix | 2015-05-05 | 1 | -8/+0 |
| | | | | | | | | us to search and cache private posts | ||||
* | | second pass name change | redmatrix | 2015-05-05 | 6 | -7/+7 |
| | | |||||
* | | first pass name change | redmatrix | 2015-05-05 | 9 | -20/+20 |
|/ | |||||
* | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 3 | -2/+5 |
| | |||||
* | fix $noloc state in mod editwebpages | Mario Vavti | 2015-04-29 | 1 | -1/+1 |
| | |||||
* | adjust placeholder naming | Mario Vavti | 2015-04-29 | 2 | -2/+3 |
| | |||||
* | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -2/+5 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-24 | 5 | -46/+32 |
|\ | |||||
| * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -1/+3 |
| | | |||||
| * | add title to element array | Mario Vavti | 2015-04-24 | 3 | -3/+5 |
| | | |||||
| * | there is no key named term in this array | Mario Vavti | 2015-04-24 | 1 | -1/+0 |
| | | |||||
| * | copy/paste typo | Mario Vavti | 2015-04-24 | 1 | -1/+1 |
| | | |||||
| * | webpages layout fixes | Mario Vavti | 2015-04-24 | 3 | -43/+26 |
| | | |||||
* | | reset route | friendica | 2015-04-24 | 1 | -1/+1 |
| | | |||||
* | | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵ | friendica | 2015-04-24 | 1 | -0/+42 |
|/ | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. | ||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-23 | 2 | -32/+27 |
|\ | |||||
| * | webpages blocks fixes | Mario Vavti | 2015-04-23 | 2 | -32/+27 |
| | | |||||
* | | disconnect | friendica | 2015-04-23 | 1 | -3/+5 |
|/ | |||||
* | do not show acl button if not owner | Mario Vavti | 2015-04-22 | 1 | -3/+4 |
| | |||||
* | fix webpages profile_tabs | Mario Vavti | 2015-04-22 | 1 | -5/+2 |
| | |||||
* | fix webpage perms | Mario Vavti | 2015-04-22 | 2 | -2/+11 |
| | |||||
* | provide headings for blocks and layouts | Mario Vavti | 2015-04-22 | 3 | -8/+15 |
| | |||||
* | bring lockstate to webpages | Mario Vavti | 2015-04-21 | 1 | -1/+5 |
| | |||||
* | bring lockview to menu items, slightly change the way /lockview is called | Mario Vavti | 2015-04-21 | 2 | -14/+26 |
| | |||||
* | rework and hopefully improve webpage menu creation workflow | Mario Vavti | 2015-04-21 | 2 | -107/+120 |
| | |||||
* | issue #176, sender copy of item not obscured if using private mention | friendica | 2015-04-20 | 1 | -1/+1 |
| | |||||
* | issue #178, searching for words such as 'data' would return private items ↵ | friendica | 2015-04-19 | 1 | -2/+4 |
| | | | | regardless of their unobscured content. | ||||
* | issue #157, provide default directory sort order | friendica | 2015-04-19 | 1 | -1/+5 |
| | |||||
* | switch from IMG_XXX constants to IMAGETYPE_XXX constants | Michael Johnston | 2015-04-19 | 1 | -1/+1 |
| | |||||
* | log this since we may need it to track down failures | friendica | 2015-04-18 | 1 | -0/+1 |
| | |||||
* | allow jot to be displayed expanded, remove deprected datetimepicker js and ↵ | Mario Vavti | 2015-04-17 | 3 | -15/+15 |
| | | | | some random fixes |