aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make colorbox work again - it worked on the test site but not in productionfriendica2014-03-052-7/+9
|
* missing mod/blockfriendica2014-03-051-0/+86
|
* assets updatefriendica2014-03-052-45/+138
|
* Merge https://github.com/friendica/red into zpullfriendica2014-03-052-8/+12
|\
| * Merge pull request #355 from git-marijus/masterfriendica2014-03-062-8/+12
| |\ | | | | | | improve navbar collapsed state a little
| | * improve navbar collapsed state a littlemarijus2014-03-052-8/+12
| | |
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-0528-59/+340
| | |\ | | |/ | |/|
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-0423-1072/+1289
| | |\
| | * \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-032-1/+9
| | |\ \
* | | | | add new templatefriendica2014-03-051-0/+18
| | | | |
* | | | | lots of little fixes to blocksfriendica2014-03-052-51/+42
|/ / / /
* | | | add clock widget and correct some docofriendica2014-03-054-8/+68
| | | |
* | | | move language selector to a modulefriendica2014-03-056-11/+10
| | | |
* | | | add Comanche help link to pdleditfriendica2014-03-042-0/+8
| | | |
* | | | add pdl editor to settings/displayfriendica2014-03-042-0/+5
| | | |
* | | | basic widget referencefriendica2014-03-042-0/+70
| | | |
* | | | Red API: /api/red/item/new ; which is like /api/statuses/update except it ↵friendica2014-03-043-3/+51
| | | | | | | | | | | | | | | | uses Red semantics and returns success/failure indication.
* | | | stopgap solution until somebody implements endless scroll on the directoryfriendica2014-03-041-1/+1
| | | |
* | | | spacing issue after template workfriendica2014-03-041-2/+2
| | | |
* | | | add system PDL editor (lets you change/personalise the layout for any module ↵friendica2014-03-042-0/+75
| | | | | | | | | | | | | | | | which has a system PDL file.)
* | | | undofriendica2014-03-041-2/+2
| | | |
* | | | Merge https://github.com/friendica/red into zpullfriendica2014-03-041-3/+3
|\ \ \ \
| * | | | Make zid() work for observers as well as local usersThomas Willingham2014-03-041-3/+3
| | | | |
* | | | | fix third-party zid'sfriendica2014-03-042-0/+3
|/ / / /
* | | | Merge https://github.com/friendica/red into zpullfriendica2014-03-042-1001/+1114
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #354 from tuscanhobbit/masterPaolo T2014-03-042-1001/+1114
| |\ \ \ | | | | | | | | | | IT: strings updated
| | * | | IT: strings updatedPaolo Tacconi2014-03-042-1001/+1114
| | | | |
* | | | | change flags for one-way connections from hidden to unconnected so we can ↵friendica2014-03-045-33/+46
|/ / / / | | | | | | | | | | | | still use hidden for - well hiding connections
* | | | minor template and doc fixesfriendica2014-03-043-0/+27
| | | |
* | | | !@#$% pay~!@#$palfriendica2014-03-042-19/+1
| | | |
* | | | directory sync issuesfriendica2014-03-035-14/+28
| | | |
* | | | layout export to filefriendica2014-03-033-3/+38
| | | |
* | | | enable network/matrix expiration, this should be functional but the options ↵friendica2014-03-033-29/+32
| | | | | | | | | | | | | | | | have been reduced/restricted so we're only looking at network posts and ignore anything that is filed, starred, or is resource_type 'photo' (which should not be possible in non-wall posts, but we just want to be sure). Will require the adventurous tester(s) to set 'channel_expire_days' in their channel record.
* | | | item widget - displays one (webpage) item by mid. This is how you could put ↵friendica2014-03-031-0/+27
| | | | | | | | | | | | | | | | multiple content blobs on a page without turning them all into blocks.
* | | | remove test menufriendica2014-03-031-1/+0
| | | |
* | | | implement horizontal menu class in redbasicfriendica2014-03-033-1/+21
| | | |
* | | | Merge https://github.com/friendica/red into zpullfriendica2014-03-033-5/+15
|\ \ \ \
| * \ \ \ Merge pull request #353 from git-marijus/masterfriendica2014-03-043-5/+15
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | little css fixes
| | * | var updatemarijus2014-03-031-1/+1
| | | |
| | * | one got lost and a typomarijus2014-03-031-1/+3
| | | |
| | * | little css fixesmarijus2014-03-032-3/+11
| | | |
* | | | revert the temporary fix for the missing hdr.tpl and add the ability to ↵friendica2014-03-032-5/+2
|/ / / | | | | | | | | | provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated.
* | | Merge https://github.com/friendica/red into zpullfriendica2014-03-031-0/+3
|\| |
| * | Partially revert 895c9411d93Thomas Willingham2014-03-031-0/+3
| | | | | | | | | | | | | | | Not entirely sure why the lines in question were removed, but this is required as a quick fix for broken notifications.
* | | missing filefriendica2014-03-032-1/+9
|/ /
* | some anomolies found when viewing connections in various cases.friendica2014-03-025-8/+78
| |
* | disable the right_aside on choklet two-column layoutsfriendica2014-03-022-0/+8
| |
* | add choklet to the comanche docsfriendica2014-03-022-3/+41
| |
* | add choklet template with several defined flavours, two and three column ↵friendica2014-03-0210-48/+248
| | | | | | | | fluid layouts with optional side margins and a region for a blog-style header photo
* | first cut at choklet templatefriendica2014-03-023-14/+105
| |