aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2924-98/+126
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: the heart should really be red. fix location change notification enhanced profile reporting for single values add db field for removed account, which will also be the first test of update error checking toggle to archive unfriends, though render them useless indicate successful updates diabook-themes: small fix diabook-themes: bug/css-fixes some constants for the db update failure possibilities bring back the email and logging of update failures, but without the transactions * master:
| * 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 ↵friendica2012-04-281-0/+0
| | | | | | | | transactions
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-281-1/+1
|\| | | | | | | | | | | | | | | * remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master:
| * 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
|\| | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: break up poller into separate processes add tooltip title to common_tabs PRIVACY: if wall is blocked, don't provide public keywords in HTML meta Diabook-dark update, it's almost useable now (if you're lenient). Added "important changes" to admin menu for admins who don't follow the github properly. * master:
| * 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
| | | | | | | | the github properly.
* | fix #search-textSimon L'nu2012-04-274-14/+8
|/ | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* implement contact archivalfriendica2012-04-272-1/+4
|
* another attempt to fix lower tab behaviour on small screens, community back ↵Christian Vogeley2012-04-271-22/+24
| | | | in tab area
* remove extra netsearch-box and fixSimon L'nu2012-04-274-24/+14
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* fix contact-friend stuff on profile sidebarSimon L'nu2012-04-274-12/+46
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-274-20/+34
|\
| * fix some css errorsSimon L'nu2012-04-274-20/+34
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | 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
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | 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
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | make comment edit icons look more like base themefriendica2012-04-263-28/+28
|/
* Merge pull request #267 from tomtom84/masterfriendica2012-04-261-1/+6
|\ | | | | add link "remove account" to /mod/settings.php
| * 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
|/ | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* Merge pull request #265 from cvogeley/masterfriendica2012-04-2614-2/+999
|\ | | | | cleanzero theme added
| * duepuntozero: move community and manage link to upper right area + css fixes ↵Christian Vogeley2012-04-251-0/+71
| | | | | | | | to avoid breaking of design
| * duepuntozero: move community and manage link to upper right area + css fixes ↵Christian Vogeley2012-04-251-2/+5
| | | | | | | | to avoid breaking of design
| * 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
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Diabook-dark more CSS fixes.Thomas Willingham2012-04-252-5/+16
|/ | | | Slowly getting there.
* 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% again
| * 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.tpl
| | * diabook-themes: fix css to login.tpltommy tomson2012-04-2512-12/+96
| | |
* | | cleanup - make bb-buttons vanish when comment closedfriendica2012-04-2514-374/+16
|/ /
* / restore qcomment selectorfriendica2012-04-247-21/+35
|/
* zero-themes: add bbcode-toolbar to commentboxtommy tomson2012-04-2522-0/+732
|
* diabook-themes: small fixtommy tomson2012-04-253-8/+31
|
* Merge pull request #261 from fabrixxm/eventspagefriendica2012-04-245-56/+131
|\ | | | | Some tweak on events page and events/bitrhdays reminder
| * quattro: small week calendar view for event/birthday remindersFabio Comuni2012-04-242-0/+40
| |