aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Setting to undo/clear auto permissionsfriendica2014-04-214-6/+17
|
* subthread is still borked (~75% Friendica code which has never been ↵friendica2014-04-201-5/+5
| | | | translated)- but ported a bit more
* bring back the toolicon colourfriendica2014-04-202-11/+15
|
* fix vcard truncation and escapingfriendica2014-04-202-20/+18
|
* bug fix on wall-item-dislike positionfriendica2014-04-202-4/+3
|
* Merge pull request #422 from cvogeley/mastercvogeley2014-04-201-1/+6
|\ | | | | Position fix in comments
| * Position fix in commentsChristian Vogeley2014-04-201-1/+6
|/
* this should fix mention notification that aren't plus taggedfriendica2014-04-191-4/+20
|
* the comment input box is still a couple pixels off but this aligns the ↵friendica2014-04-191-2/+2
| | | | conversation a bit better on narrow screens.
* another minor position tweakfriendica2014-04-191-1/+1
|
* minor alignment issues after the wall-item-tools button conversionfriendica2014-04-191-1/+2
|
* Merge pull request #418 from jmankiewicz/mod-profpicpermRedMatrix2014-04-203-10/+133
|\ | | | | Patch for Issue #410
| * Merge branch 'master' of https://github.com/friendica/red into mod-profpicpermsirius2014-04-20179-5836/+10970
| |\
| * | Now we also refresh permissions after the user posted connedit.sirius2014-04-202-3/+64
| | |
| * | Added permission handling of profile-photossirius2014-04-202-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 conflictsirius2014-04-1619-94/+129
| |\ \
| * | | Added hackish support for permissions-sync between profile and profile-picturessirius2014-04-142-4/+41
| | | |
* | | | Merge pull request #416 from cvogeley/masterRedMatrix2014-04-202-9/+67
|\ \ \ \ | |_|_|/ |/| | | Bootstrapify item tools …
| * | | cssChristian Vogeley2014-04-201-3/+6
| | | |
| * | | ok we need that divChristian Vogeley2014-04-201-1/+1
| | | |
| * | | Add descriptions to drop downChristian Vogeley2014-04-201-7/+7
| | | |
| * | | More workChristian Vogeley2014-04-191-19/+14
| | | |
| * | | For the moment restore old delete iconChristian Vogeley2014-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | because the integrated button in the the bootstrap menu didn’t work on Firefox
| * | | Move javascript calls to button tagChristian Vogeley2014-04-191-5/+5
| | | | | | | | | | | | | | | | because otherwise it didn’t work in Firefox
| * | | Bootstrapify item toolsChristian Vogeley2014-04-192-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/masterThomas Willingham2014-04-1916-1555/+9479
|\ \ \ \ | | | | | | | | | | Update Swedish translation
| * \ \ \ Merge branch 'master' of https://github.com/f03el/redErik Lundin2014-04-190-0/+0
| |\ \ \ \
| | * | | | Update Swedish stringsErik Lundin2014-04-191-942/+943
| | | | | |
| * | | | | Update Swedish stringsErik Lundin2014-04-192-1152/+1153
| |/ / / /
| * | | | Update Swedish email templatesErik Lundin2014-04-1914-234/+95
| | | | |
| * | | | Add Swedish .po file and update stringsErik Lundin2014-04-182-1321/+9383
| | | | |
* | | | | Clean up legacy smarty3Thomas Willingham2014-04-19127-3224/+0
| | | | |
* | | | | Oepsjeroenpraat2014-04-191-1/+0
| | | | |
* | | | | Workaround alignment notify menu'sjeroenpraat2014-04-193-1/+11
| | | | |
* | | | | remove whitespace at the top of widgets because bootstrap gives us 20 pixels ↵friendica2014-04-181-8/+1
| | | | | | | | | | | | | | | | | | | | above an h3 element and we end up with way too much whitespace
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-184-9/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-04-182-2/+5
| |\ \ \ \ \
| | * | | | | This should fix the preview allignment permantly.jeroenpraat2014-04-182-2/+5
| | | |/ / / | | |/| | |
| * / | | | We know why third party zids didn't work now, so don't use hackyThomas Willingham2014-04-182-5/+2
| |/ / / / | | | | | | | | | | | | | | | workarounds anymore.
| * | | | Little fix and previous fix on a different placejeroenpraat2014-04-181-3/+4
| | | | |
* | | | | move create a new collection below the actual collection list again. failed ↵friendica2014-04-1812-888/+898
|/ / / / | | | | | | | | | | | | experiment.
* | | | more optimisations for discovery mode of zotfeedfriendica2014-04-171-2/+6
| | | |
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-173-3/+32
|\ \ \ \
| * | | | tiny fix hover preview buttonjeroenpraat2014-04-171-0/+4
| |/ / /
| * | | Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now).jeroenpraat2014-04-173-3/+28
| | | |
* | | | improve zotfeed for discover channel so it will send updates to posts you've ↵friendica2014-04-173-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_mergefriendica2014-04-174-9/+58
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-04-1714-78/+114
| |\ \ \
| * | | | Dark schema: fixed code view, ACL window and previewjeroenpraat2014-04-164-9/+58
| | | | |
* | | | | This preserves the alignment work done earlier but provides a more ↵friendica2014-04-174-2/+18
| |/ / / |/| | | | | | | | | | | aesthetically pleasing page.