Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-29 | 24 | -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 fix | tommy tomson | 2012-04-29 | 2 | -2/+2 |
| | | |||||
| * | diabook-themes: bug/css-fixes | tommy tomson | 2012-04-29 | 23 | -98/+126 |
| | | |||||
| * | bring back the email and logging of update failures, but without the ↵ | friendica | 2012-04-28 | 1 | -0/+0 |
| | | | | | | | | transactions | ||||
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 1 | -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 rescaled | Christian Vogeley | 2012-04-28 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 6 | -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 processes | friendica | 2012-04-27 | 1 | -0/+1 |
| | | |||||
| * | add tooltip title to common_tabs | friendica | 2012-04-27 | 1 | -1/+1 |
| | | |||||
| * | Diabook-dark update, it's almost useable now (if you're lenient). | Thomas Willingham | 2012-04-28 | 3 | -10/+13 |
| | | |||||
| * | Added "important changes" to admin menu for admins who don't follow | Thomas Willingham | 2012-04-28 | 1 | -0/+1 |
| | | | | | | | | the github properly. | ||||
* | | fix #search-text | Simon L'nu | 2012-04-27 | 4 | -14/+8 |
|/ | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | implement contact archival | friendica | 2012-04-27 | 2 | -1/+4 |
| | |||||
* | another attempt to fix lower tab behaviour on small screens, community back ↵ | Christian Vogeley | 2012-04-27 | 1 | -22/+24 |
| | | | | in tab area | ||||
* | remove extra netsearch-box and fix | Simon L'nu | 2012-04-27 | 4 | -24/+14 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | fix contact-friend stuff on profile sidebar | Simon L'nu | 2012-04-27 | 4 | -12/+46 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 4 | -20/+34 |
|\ | |||||
| * | fix some css errors | Simon L'nu | 2012-04-27 | 4 | -20/+34 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | put community back on the lower tab. It belongs with message streams | friendica | 2012-04-27 | 1 | -4/+3 |
|/ | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 5 | -1/+63 |
|\ | |||||
| * | fix 2 issues. contacts img in finder; wall filer title | Simon L'nu | 2012-04-27 | 5 | -1/+63 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | fix view contacts | friendica | 2012-04-27 | 1 | -1/+1 |
|/ | |||||
* | reset qcomment selector after insert. | friendica | 2012-04-26 | 1 | -0/+1 |
| | |||||
* | put fakelink back in birthday notice | friendica | 2012-04-26 | 1 | -1/+1 |
| | |||||
* | birthday contact link goes to event page instead of remote profile | friendica | 2012-04-26 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-26 | 1 | -5/+5 |
|\ | |||||
| * | fix s/color/colour/g issue | Simon L'nu | 2012-04-26 | 1 | -5/+5 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | make comment edit icons look more like base theme | friendica | 2012-04-26 | 3 | -28/+28 |
|/ | |||||
* | Merge pull request #267 from tomtom84/master | friendica | 2012-04-26 | 1 | -1/+6 |
|\ | | | | | add link "remove account" to /mod/settings.php | ||||
| * | diabook-themes: small-fix | tommy tomson | 2012-04-26 | 1 | -1/+6 |
| | | |||||
* | | announced dipsy change. re-tie your boots, we're in for a wee ride ;) | Simon L'nu | 2012-04-26 | 64 | -1515/+3857 |
|/ | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge pull request #265 from cvogeley/master | friendica | 2012-04-26 | 14 | -2/+999 |
|\ | | | | | cleanzero theme added | ||||
| * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -0/+71 |
| | | | | | | | | to avoid breaking of design | ||||
| * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -2/+5 |
| | | | | | | | | to avoid breaking of design | ||||
| * | added BBCODE thing in comments | Christian Vogeley | 2012-04-25 | 1 | -0/+38 |
| | | |||||
| * | add cleanzero theme | Christian Vogeley | 2012-04-25 | 12 | -0/+885 |
| | | |||||
* | | convert stylesheets to less, and compress output css | Simon L'nu | 2012-04-26 | 4 | -6353/+6793 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Diabook-dark more CSS fixes. | Thomas Willingham | 2012-04-25 | 2 | -5/+16 |
|/ | | | | Slowly getting there. | ||||
* | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |
| | |||||
* | Merge pull request #264 from mschmitt/master | friendica | 2012-04-25 | 2 | -78/+112 |
|\ | | | | | Esperanto at 100% again | ||||
| * | Esperanto at 100% again | Martin Schmitt | 2012-04-25 | 2 | -78/+112 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-25 | 12 | -12/+96 |
|\| | |||||
| * | Merge pull request #263 from tomtom84/master | tomtom84 | 2012-04-24 | 12 | -12/+96 |
| |\ | | | | | | | diabook-themes: fix css to login.tpl | ||||
| | * | diabook-themes: fix css to login.tpl | tommy tomson | 2012-04-25 | 12 | -12/+96 |
| | | | |||||
* | | | cleanup - make bb-buttons vanish when comment closed | friendica | 2012-04-25 | 14 | -374/+16 |
|/ / | |||||
* / | restore qcomment selector | friendica | 2012-04-24 | 7 | -21/+35 |
|/ | |||||
* | zero-themes: add bbcode-toolbar to commentbox | tommy tomson | 2012-04-25 | 22 | -0/+732 |
| | |||||
* | diabook-themes: small fix | tommy tomson | 2012-04-25 | 3 | -8/+31 |
| | |||||
* | Merge pull request #261 from fabrixxm/eventspage | friendica | 2012-04-24 | 5 | -56/+131 |
|\ | | | | | Some tweak on events page and events/bitrhdays reminder | ||||
| * | quattro: small week calendar view for event/birthday reminders | Fabio Comuni | 2012-04-24 | 2 | -0/+40 |
| | |