aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-0/+1
* API: Tweetdeck is now workingMichael Vogel2012-04-092-54/+51
* Merge commit 'upstream/master'Michael Vogel2012-04-0815-30/+43
|\
| * minor dispy* fixesSimon L'nu2012-04-077-30/+35
| * diabook-themes: small fixtommy tomson2012-04-078-0/+8
* | "vier": Some design stuffMichael Vogel2012-04-071-0/+1
* | Merge commit 'upstream/master'Michael Vogel2012-04-07493-1342/+3345
|\|
| * changelog 1.014 :tommy tomson2012-04-0737-79/+1373
| * Merge pull request #210 from tomtom84/mastertomtom842012-04-06173-51/+126
| |\
| | * new-contacts-introductions in contacts-drop-down and new-messages in messages...tommy tomson2012-04-06173-51/+126
| * | small fixes for the German stringsTobias Diekershoff2012-04-062-19/+19
| |/
| * update to the German stringsTobias Diekershoff2012-04-062-1216/+1850
| * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-05890-5398/+45119
| |\
* | | "vier": Bookmarks now look better.Michael Vogel2012-04-072-0/+10
* | | Merge commit 'upstream/master'Michael Vogel2012-04-0684-4038/+567
|\ \ \ | | |/ | |/|
| * | finish styling category tags and category inputSimon L'nu2012-04-052-0/+20
| * | style categorytagsSimon L'nu2012-04-042-4/+4
| * | update the dispy* templatesSimon L'nu2012-04-0419-131/+188
| * | move alert box away from nav linksfriendica2012-04-041-1/+4
| * | latest changes are the popup menu for notifs, fixesSimon L'nu2012-04-042-20/+38
| * | Merge branch 'pull'friendica2012-04-0324-120/+313
| |\ \
| | * | smal fixtommy tomson2012-04-031-1/+1
| | * | german translation for right_asidetommy tomson2012-04-031-0/+8
| | * | make right_aside translatable and provide german translation...tommy tomson2012-04-0323-119/+304
| * | | remove loozah themes which fell too far behind to recoverfriendica2012-04-0339-3762/+0
| |/ /
* | | API: template for test function addedMichael Vogel2012-04-021-0/+1
* | | Merge commit 'upstream/master'Michael Vogel2012-04-0265-470/+1540
|\| |
| * | diabook-themes: css-fixestommy tomson2012-04-0224-20/+125
| * | diabook-themes: fixes in jstommy tomson2012-04-024-112/+115
| * | diabook-themes: fixed pageheadertommy tomson2012-04-0217-68/+98
| * | diabook-themes: bugfixes / css-fixestommy tomson2012-04-0217-17/+30
| * | allow users to set categories on their postsMichael Johnston2012-04-014-11/+33
| * | diabook-themes: add link to global dir in "find friends" at right_asidetommy tomson2012-04-0212-12/+20
| * | css-fixestommy tomson2012-04-027-12/+13
| * | add new messages-layout in diabooktommy tomson2012-04-0125-8/+683
| * | fix the display of community-plugin in diabook-themestommy tomson2012-04-0116-222/+435
* | | The "vier"-theme is now working again. But there is still work neededMichael Vogel2012-04-025-10/+66
|/ /
* | various bugfixes and css-fixestommy tomson2012-04-0111-46/+69
* | qcomment overflowfriendica2012-04-011-0/+8
* | Merge branch 'pull'friendica2012-04-015-11/+31
|\ \
| * | latest fixes for dispys. tweaking/repairingSimon L'nu2012-04-015-11/+31
* | | send unverified private mail using zrlfriendica2012-04-015-0/+131
|/ /
* | diabook-themes: move "common tabs" to left side on settings pagetommy tomson2012-03-3112-47/+31
* | move the common tabs to right_aside in diabook-derivatestommy tomson2012-03-3112-0/+10514
* | Merge branch 'pull'friendica2012-03-3125-116/+355
|\ \
| * | bug fix in diabook-aerith and -redtommy tomson2012-03-316-22/+22
| * | bug-fixes in diabook-derivatestommy tomson2012-03-3117-40/+249
| * | forgot the css changes for last pushSimon L'nu2012-03-312-14/+2
| * | theme fixes; fix qcomment (finally)Simon L'nu2012-03-314-44/+86
* | | settings for unknown private mail acceptancefriendica2012-03-311-0/+4
|/ /