Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | suggestion widget | friendica | 2013-12-06 | 6 | -3/+60 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-06 | 2 | -188/+189 |
|\ | |||||
| * | Merge pull request #227 from tobiasd/DE20131206 | tobiasd | 2013-12-06 | 2 | -188/+189 |
| |\ | | | | | | | DE: update to the strings | ||||
| | * | DE: update to the strings | Tobias Diekershoff | 2013-12-06 | 2 | -188/+189 |
| | | | |||||
* | | | need include/conversation for events now | friendica | 2013-12-06 | 1 | -0/+1 |
|/ / | |||||
* | | yeah - that's what I'm going to do. we'll just keep system notifications. If ↵ | friendica | 2013-12-06 | 3 | -329/+7178 |
| | | | | | | | | somebody wants web pages for the others we'll start fresh. It's easier than starting with curfty friendica code that doesn't work anymore and will never work without starting over. | ||||
* | | doc updates | friendica | 2013-12-06 | 113 | -2065/+1639 |
| | | |||||
* | | some code cleanup - gad I forgot what a mess the "other" notifications tabs ↵ | friendica | 2013-12-06 | 6 | -7391/+11 |
| | | | | | | | | (everything but system) were in. Maybe I'll just remove them so we can start over. | ||||
* | | move profile tabs and network/matrix tabs to include/conversation | friendica | 2013-12-05 | 3 | -198/+186 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-05 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge pull request #223 from zzottel/master | friendica | 2013-12-05 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Make it possible to change collection visibility without changing name. | ||||
| | * | | Make it possible to change visibility without changing name. | zottel | 2013-12-05 | 1 | -2/+2 |
| | |/ | |||||
* | | | couple of errant SQL queries | friendica | 2013-12-05 | 1 | -2/+2 |
| | | | |||||
* | | | remove some cruft | friendica | 2013-12-05 | 1 | -69/+5 |
|/ / | |||||
* | | make some "selection-is-selected" classes work again | friendica | 2013-12-05 | 3 | -3/+3 |
| | | |||||
* | | issue #224 | friendica | 2013-12-05 | 1 | -0/+6 |
| | | |||||
* | | issue #225 | friendica | 2013-12-05 | 3 | -7/+31 |
| | | |||||
* | | couple of additional checks | friendica | 2013-12-05 | 1 | -1/+12 |
| | | |||||
* | | mod_authtest --- magic-auth diagnostic for those that are too freaking ↵ | friendica | 2013-12-05 | 4 | -10/+147 |
|/ | | | | important to read logs or code and expect others to be able to debug complex authentication transactions with no information beyond "it didn't work". This will provide a transaction report including both sides of the exchange that you can paste into a bug report and that a developer can actually figure out where in the transaction that things went wrong and maybe even be able to then figure out why. | ||||
* | generate a small amount of entropy to avoid duplicate notifications from ↵ | friendica | 2013-12-04 | 3 | -2/+12 |
| | | | | essentially simultaneous deliveries. | ||||
* | add icon_trnalsate | friendica | 2013-12-04 | 2 | -0/+52 |
| | |||||
* | more icon work | friendica | 2013-12-04 | 5 | -9/+5 |
| | |||||
* | add poco and follow to default xchan creation | friendica | 2013-12-04 | 2 | -2/+5 |
| | |||||
* | more icon updates | friendica | 2013-12-04 | 11 | -48/+23 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-04 | 3 | -548/+715 |
|\ | |||||
| * | Merge pull request #222 from git-marijus/master | friendica | 2013-12-04 | 3 | -548/+715 |
| |\ | | | | | | | split conversation.css out of style.css | ||||
| | * | split conversation.css out of style.css | marijus | 2013-12-04 | 3 | -548/+715 |
| |/ | |||||
* / | include re-organisation and more doco, post_to_red fix ampersands in categories | friendica | 2013-12-04 | 7 | -59/+62 |
|/ | |||||
* | add hooks to zot-finger and import_xchan | friendica | 2013-12-03 | 2 | -0/+4 |
| | |||||
* | more documentation work | friendica | 2013-12-03 | 1 | -75/+106 |
| | |||||
* | on successful magic-auth, put remote_service_class and remote_hub into the ↵ | friendica | 2013-12-03 | 2 | -4/+23 |
| | | | | session | ||||
* | reorganise a few included functions - notably identity related functions | friendica | 2013-12-03 | 5 | -768/+770 |
| | |||||
* | rev update | friendica | 2013-12-03 | 1 | -1/+1 |
| | |||||
* | Merge pull request #221 from git-marijus/master | friendica | 2013-12-03 | 3 | -96/+114 |
|\ | | | | | split out mod_message | ||||
| * | should fix typos the right way... | marijus | 2013-12-03 | 1 | -1/+1 |
| | | |||||
| * | this should remain in style.css | marijus | 2013-12-03 | 2 | -2/+7 |
| | | |||||
| * | split out mod_message and a typo | marijus | 2013-12-03 | 3 | -96/+109 |
| | | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2013-12-03 | 11 | -364/+161 |
| |\ | |/ |/| | |||||
* | | undo last change to comment_email - these are checked for validity | friendica | 2013-12-02 | 1 | -1/+1 |
| | | |||||
* | | ensure that every imported channel has a primary hubloc | friendica | 2013-12-02 | 3 | -2/+18 |
| | | |||||
* | | clear floats on the connect button | friendica | 2013-12-02 | 1 | -0/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-02 | 2 | -1365/+1827 |
|\ \ | |||||
* | | | more work on magic-auth | friendica | 2013-12-02 | 2 | -4/+17 |
| | | | |||||
* | | | magic-auth re-factor | friendica | 2013-12-02 | 2 | -173/+122 |
| | | | |||||
* | | | refactor magic-auth | friendica | 2013-12-02 | 8 | -194/+12 |
| | | | |||||
| | * | Revert "update spin.js to latest version" | marijus | 2013-12-02 | 1 | -11/+5 |
| | | | | | | | | | | | | This reverts commit 51cad9cafef228090cc1641a425ba272b1a3b470. | ||||
| | * | Revert "only show user-photo if not local user" | marijus | 2013-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 6a1dfbb218a1e2a48010803906e78bf3b7a16965. | ||||
| | * | Revert "some jot tools structuring and styling" | marijus | 2013-12-02 | 3 | -96/+54 |
| | | | | | | | | | | | | This reverts commit 1ff69605be20d8a7ca721a2a881b15e71d87fa46. | ||||
| | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2013-12-02 | 18 | -2780/+3269 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #220 from tobiasd/20131202 | tobiasd | 2013-12-02 | 2 | -1365/+1827 |
|/| | | | | | | | | DE: update to the strings |