aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-309-1652/+1434
|\|
| * Merge pull request #277 from mschmitt/masterfriendica2012-04-302-784/+649
| |\
| | * Update Esperanto to 100%Martin Schmitt2012-04-302-784/+649
| * | adding META viewport tag for better look on tabletsMax Weller2012-04-301-0/+1
| |/
| * DE update to the stringsTobias Diekershoff2012-04-304-868/+766
| * admin page to manage failed updatesfriendica2012-04-292-0/+18
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2924-98/+126
|\|
| * diabook-themes: small fixtommy tomson2012-04-292-2/+2
| * diabook-themes: bug/css-fixestommy tomson2012-04-2923-98/+126
| * bring back the email and logging of update failures, but without the transact...friendica2012-04-281-0/+0
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-281-1/+1
|\|
| * small bugfix. sometimes also avatar pics were rescaledChristian Vogeley2012-04-281-1/+1
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-286-11/+16
|\|
| * break up poller into separate processesfriendica2012-04-271-0/+1
| * add tooltip title to common_tabsfriendica2012-04-271-1/+1
| * Diabook-dark update, it's almost useable now (if you're lenient).Thomas Willingham2012-04-283-10/+13
| * Added "important changes" to admin menu for admins who don't followThomas Willingham2012-04-281-0/+1
* | fix #search-textSimon L'nu2012-04-274-14/+8
|/
* implement contact archivalfriendica2012-04-272-1/+4
* another attempt to fix lower tab behaviour on small screens, community back i...Christian Vogeley2012-04-271-22/+24
* remove extra netsearch-box and fixSimon L'nu2012-04-274-24/+14
* fix contact-friend stuff on profile sidebarSimon L'nu2012-04-274-12/+46
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-274-20/+34
|\
| * fix some css errorsSimon L'nu2012-04-274-20/+34
* | put community back on the lower tab. It belongs with message streamsfriendica2012-04-271-4/+3
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-275-1/+63
|\
| * fix 2 issues. contacts img in finder; wall filer titleSimon L'nu2012-04-275-1/+63
* | fix view contactsfriendica2012-04-271-1/+1
|/
* reset qcomment selector after insert.friendica2012-04-261-0/+1
* put fakelink back in birthday noticefriendica2012-04-261-1/+1
* birthday contact link goes to event page instead of remote profilefriendica2012-04-261-1/+1
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-261-5/+5
|\
| * fix s/color/colour/g issueSimon L'nu2012-04-261-5/+5
* | make comment edit icons look more like base themefriendica2012-04-263-28/+28
|/
* Merge pull request #267 from tomtom84/masterfriendica2012-04-261-1/+6
|\
| * diabook-themes: small-fixtommy tomson2012-04-261-1/+6
* | announced dipsy change. re-tie your boots, we're in for a wee ride ;)Simon L'nu2012-04-2664-1515/+3857
|/
* Merge pull request #265 from cvogeley/masterfriendica2012-04-2614-2/+999
|\
| * duepuntozero: move community and manage link to upper right area + css fixes ...Christian Vogeley2012-04-251-0/+71
| * duepuntozero: move community and manage link to upper right area + css fixes ...Christian Vogeley2012-04-251-2/+5
| * added BBCODE thing in commentsChristian Vogeley2012-04-251-0/+38
| * add cleanzero themeChristian Vogeley2012-04-2512-0/+885
* | convert stylesheets to less, and compress output cssSimon L'nu2012-04-264-6353/+6793
* | Diabook-dark more CSS fixes.Thomas Willingham2012-04-252-5/+16
|/
* this turns out to be harder than I thoughtfriendica2012-04-252-2/+2
* Merge pull request #264 from mschmitt/masterfriendica2012-04-252-78/+112
|\
| * Esperanto at 100% againMartin Schmitt2012-04-252-78/+112
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2512-12/+96
|\|
| * Merge pull request #263 from tomtom84/mastertomtom842012-04-2412-12/+96
| |\
| | * diabook-themes: fix css to login.tpltommy tomson2012-04-2512-12/+96