Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #418 from jmankiewicz/mod-profpicperm | RedMatrix | 2014-04-20 | 3 | -10/+133 |
|\ | | | | | Patch for Issue #410 | ||||
| * | Merge branch 'master' of https://github.com/friendica/red into mod-profpicperm | sirius | 2014-04-20 | 179 | -5836/+10970 |
| |\ | |||||
| * | | Now we also refresh permissions after the user posted connedit. | sirius | 2014-04-20 | 2 | -3/+64 |
| | | | |||||
| * | | Added permission handling of profile-photos | sirius | 2014-04-20 | 2 | -16/+29 |
| | | | | | | | | | | | | Now we automatically set the appropiate viewing-permissions on profile edit and revert photos chosen as default profile picture bacl to public access. | ||||
| * | | Merging in conflict | sirius | 2014-04-16 | 19 | -94/+129 |
| |\ \ | |||||
| * | | | Added hackish support for permissions-sync between profile and profile-pictures | sirius | 2014-04-14 | 2 | -4/+41 |
| | | | | |||||
* | | | | Merge pull request #416 from cvogeley/master | RedMatrix | 2014-04-20 | 2 | -9/+67 |
|\ \ \ \ | |_|_|/ |/| | | | Bootstrapify item tools … | ||||
| * | | | css | Christian Vogeley | 2014-04-20 | 1 | -3/+6 |
| | | | | |||||
| * | | | ok we need that div | Christian Vogeley | 2014-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add descriptions to drop down | Christian Vogeley | 2014-04-20 | 1 | -7/+7 |
| | | | | |||||
| * | | | More work | Christian Vogeley | 2014-04-19 | 1 | -19/+14 |
| | | | | |||||
| * | | | For the moment restore old delete icon | Christian Vogeley | 2014-04-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | because the integrated button in the the bootstrap menu didn’t work on Firefox | ||||
| * | | | Move javascript calls to button tag | Christian Vogeley | 2014-04-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | because otherwise it didn’t work in Firefox | ||||
| * | | | Bootstrapify item tools | Christian Vogeley | 2014-04-19 | 2 | -15/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show the like buttons and the delete button permanently hide everything else in a drop down. This will break non bootstrap themes. So may be we also want to move this into the red basic folder. It still a little bit work in progress. Allignment is not 100% correct. May be we want to add text into the drop down. | ||||
* | | | | Merge pull request #417 from f03el/master | Thomas Willingham | 2014-04-19 | 16 | -1555/+9479 |
|\ \ \ \ | | | | | | | | | | | Update Swedish translation | ||||
| * \ \ \ | Merge branch 'master' of https://github.com/f03el/red | Erik Lundin | 2014-04-19 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | Update Swedish strings | Erik Lundin | 2014-04-19 | 1 | -942/+943 |
| | | | | | | |||||
| * | | | | | Update Swedish strings | Erik Lundin | 2014-04-19 | 2 | -1152/+1153 |
| |/ / / / | |||||
| * | | | | Update Swedish email templates | Erik Lundin | 2014-04-19 | 14 | -234/+95 |
| | | | | | |||||
| * | | | | Add Swedish .po file and update strings | Erik Lundin | 2014-04-18 | 2 | -1321/+9383 |
| | | | | | |||||
* | | | | | Clean up legacy smarty3 | Thomas Willingham | 2014-04-19 | 127 | -3224/+0 |
| | | | | | |||||
* | | | | | Oeps | jeroenpraat | 2014-04-19 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Workaround alignment notify menu's | jeroenpraat | 2014-04-19 | 3 | -1/+11 |
| | | | | | |||||
* | | | | | remove whitespace at the top of widgets because bootstrap gives us 20 pixels ↵ | friendica | 2014-04-18 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | above an h3 element and we end up with way too much whitespace | ||||
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-18 | 4 | -9/+10 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-04-18 | 2 | -2/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | This should fix the preview allignment permantly. | jeroenpraat | 2014-04-18 | 2 | -2/+5 |
| | | |/ / / | | |/| | | | |||||
| * / | | | | We know why third party zids didn't work now, so don't use hacky | Thomas Willingham | 2014-04-18 | 2 | -5/+2 |
| |/ / / / | | | | | | | | | | | | | | | | workarounds anymore. | ||||
| * | | | | Little fix and previous fix on a different place | jeroenpraat | 2014-04-18 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | move create a new collection below the actual collection list again. failed ↵ | friendica | 2014-04-18 | 12 | -888/+898 |
|/ / / / | | | | | | | | | | | | | experiment. | ||||
* | | | | more optimisations for discovery mode of zotfeed | friendica | 2014-04-17 | 1 | -2/+6 |
| | | | | |||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-17 | 3 | -3/+32 |
|\ \ \ \ | |||||
| * | | | | tiny fix hover preview button | jeroenpraat | 2014-04-17 | 1 | -0/+4 |
| |/ / / | |||||
| * | | | Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now). | jeroenpraat | 2014-04-17 | 3 | -3/+28 |
| | | | | |||||
* | | | | improve zotfeed for discover channel so it will send updates to posts you've ↵ | friendica | 2014-04-17 | 3 | -17/+16 |
|/ / / | | | | | | | | | | already received. Incidentally I discovered why we had the meltdown replying to discover channel items the other day - but can't fix it easily. | ||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-17 | 4 | -9/+58 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2014-04-17 | 14 | -78/+114 |
| |\ \ \ | |||||
| * | | | | Dark schema: fixed code view, ACL window and preview | jeroenpraat | 2014-04-16 | 4 | -9/+58 |
| | | | | | |||||
* | | | | | This preserves the alignment work done earlier but provides a more ↵ | friendica | 2014-04-17 | 4 | -2/+18 |
| |/ / / |/| | | | | | | | | | | | aesthetically pleasing page. | ||||
* | | | | saved search adjustments | friendica | 2014-04-16 | 2 | -13/+9 |
| | | | | |||||
* | | | | a few more alignment issues | friendica | 2014-04-16 | 3 | -13/+16 |
| | | | | |||||
* | | | | clean up the group selector on the connedit page | friendica | 2014-04-16 | 1 | -1/+4 |
| | | | | |||||
* | | | | Lots of positional changes on sidebar menus - reduce indented margins | friendica | 2014-04-16 | 10 | -59/+351 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into ruler Conflicts: view/css/widgets.css | ||||
| * \ \ \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-16 | 4 | -39/+313 |
| |\ \ \ \ | |||||
| | * | | | | Doc - missing closing tag | Thomas Willingham | 2014-04-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #415 from encyclomundi/master | Thomas Willingham | 2014-04-17 | 1 | -0/+4 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | added "network" as another user group for davfs | ||||
| | | * | | | added "network" as another user group for davfs | Charles | 2014-04-16 | 1 | -0/+4 |
| | |/ / / | |||||
| | * | | | Doco - Add some troubleshooting for 0 byte files in Davfs2 | Thomas Willingham | 2014-04-16 | 1 | -1/+20 |
| | | | | | |||||
| | * | | | Merge pull request #414 from jeroenpraat/patch-2 | RedMatrix | 2014-04-16 | 3 | -38/+289 |
| | |\ \ \ | | | | | | | | | | | | | Large update dark schema | ||||
| | | * | | | Needed for large update dark schema and minor fixes default. | jeroenpraat | 2014-04-15 | 1 | -18/+98 |
| | | | | | |