aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Content wrapper breaks feature settings. Get rid of it as a quick fix until ...Thomas Willingham2013-09-161-3/+0
* Upstream mergeChristian Vogeley2013-09-159-1310/+1640
|\
| * Merge https://github.com/friendica/red into zpullfriendica2013-09-141-1303/+1611
| |\
| | * Merge pull request #132 from pixelroot/masterOlaf Conradi2013-09-141-1303/+1611
| | |\
| | | * modified: view/ru/messages.popixelroot2013-09-131-1303/+1611
| * | | this might fix "find channels" but I can't test the keyword search until this...friendica2013-09-141-1/+1
| |/ /
| * | Admin templates.Thomas Willingham2013-09-106-6/+6
| * | Quick and dirty file storage module.Thomas Willingham2013-09-091-0/+22
* | | Search by dateChristian Vogeley2013-09-151-1/+1
|/ /
* | Merge service classChristian Vogeley2013-09-083-1/+9
|\ \
| * | Service classChristian Vogeley2013-09-083-1/+9
* | | More content wrappers.Thomas Willingham2013-09-086-2/+12
* | | filter by category fixesMichael Johnston2013-09-061-1/+1
* | | Fix new menu link.Thomas Willingham2013-09-061-1/+1
* | | Redbasic - optimise mail list.Thomas Willingham2013-09-062-28/+11
* | | Redbasic - some more CSS we don't use.Thomas Willingham2013-09-061-181/+3
* | | Redbasic - clean up nav.Thomas Willingham2013-09-062-64/+5
* | | make displaying the language selector configurablefriendica2013-09-031-1/+1
* | | fix mod/search_ac (sort of)friendica2013-09-021-1/+1
* | | add a layout selectorfriendica2013-09-021-0/+1
* | | Merge pull request #109 from tuscanhobbit/masterThomas Willingham2013-09-022-1258/+1322
|\ \ \
| * | | complete and updated Italian translationtuscanhobbit2013-09-022-1258/+1322
* | | | webpage content-type -- needs cleaning up and a security check once all the i...friendica2013-09-021-0/+3
| |/ / |/| |
* | | silence some warnings at php E_ALL levelsfriendica2013-08-281-5/+1
* | | bring back mail list and cleanup some issues which popped out with full PHP w...friendica2013-08-271-1/+1
* | | Preparatory work for photo conversations (third time). Also take away unused ...friendica2013-08-272-3/+6
* | | get rid of ssl_policy - it's implicit in the site urlfriendica2013-08-271-4/+4
* | | TypoThomas Willingham2013-08-241-1/+1
* | | Another one.Thomas Willingham2013-08-241-0/+2
* | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-2414-8961/+6322
|\ \ \
| * | | Make footers position fixed, so that its content appearsChristian Vogeley2013-08-241-0/+2
| * | | premium/restricted channel connections implemented, configure at yoursite/cha...friendica2013-08-212-0/+31
| * | | progress on generic sellpage - is not yet linked from existing connect button...friendica2013-08-213-0/+15
| |/ /
| * | Merge pull request #101 from tuscanhobbit/masterfriendica2013-08-202-8956/+6225
| |\ \
| | * | First version of Italian translationp.tacconi2013-08-202-5/+5
| | * | First version of Italian translationp.tacconi2013-08-202-8954/+6223
| * | | email attachments (and fix email photos)friendica2013-08-193-3/+33
| * | | if changing primary hub during an import operation - remove the old xchan and...friendica2013-08-191-1/+1
| |/ /
| * | issue #82, posted order not working - also doc updatefriendica2013-08-171-0/+1
| * | fix import from filefriendica2013-08-151-1/+1
| * | move js from matrix pagefriendica2013-08-151-0/+9
| * | Merge pull request #96 from beardy-unixer/masterfriendica2013-08-142-4/+8
| |\ \
| * | | most of expire is now ported from friendica, but the protocol bits to push ou...friendica2013-08-141-0/+4
* | | | Generic wrapper classes makes themeing loads easierThomas Willingham2013-08-246-14/+20
| |/ / |/| |
* | | More progress on pages - extend writepages widget, add pagelist widgetThomas Willingham2013-08-141-4/+5
* | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-1410-457/+593
|\| |
| * | ru strings updatedfriendica2013-08-141-154/+158
| * | Merge pull request #95 from pixelroot/masterfriendica2013-08-141-301/+317
| |\|
| | * modified: view/ru/messages.popixelroot2013-08-121-11/+11
| | * modified: view/ru/messages.popixelroot2013-08-121-297/+313