friendica
|
fb5f9fd9be
|
Merge pull request #376 from cvogeley/master
Add color picker to theme settings
|
2014-03-24 09:01:55 +11:00 |
|
friendica
|
6a014abe1c
|
Merge https://github.com/friendica/red into zpull
|
2014-03-23 14:45:56 -07:00 |
|
friendica
|
7666aaea6a
|
improve curl error logging
|
2014-03-23 14:45:08 -07:00 |
|
Christian Vogeley
|
c972a94b01
|
Add color picker to theme settings
|
2014-03-23 21:35:20 +01:00 |
|
friendica
|
ff0a07655d
|
Merge pull request #375 from cvogeley/master
Narrow navbar:Switch to bs default on small screens
|
2014-03-23 08:43:19 +11:00 |
|
Christian Vogeley
|
b533e67d52
|
Narrow navbar:Switch to bs default on small screens
|
2014-03-22 22:34:11 +01:00 |
|
friendica
|
f6af20576a
|
Merge pull request #374 from git-marijus/master
add width and height to uploaded photo body
|
2014-03-23 08:07:56 +11:00 |
|
marijus
|
7d90340eda
|
add width and height to uploaded photo body
|
2014-03-22 21:59:32 +01:00 |
|
marijus
|
13916566f0
|
use border-box for everything
|
2014-03-22 21:10:26 +01:00 |
|
marijus
|
c968a18db3
|
re-enable nav opacity and minor style.css cleanup
|
2014-03-21 17:37:23 +01:00 |
|
friendica
|
caa284e786
|
we don't allow forgeries to be received - save some bandwidth by not allowing them to be sent. We do have to figure out how some secondary delivery chains are ending up with posts belonging to the original owner instead of the chain owner, but that's for another day.
|
2014-03-21 01:14:51 -07:00 |
|
friendica
|
78f003e4a5
|
doc update
|
2014-03-21 01:14:35 -07:00 |
|
friendica
|
6d37e41fc3
|
found what I believe is the root cause of issue #230, but don't yet have a workable solution. This one is hard.
|
2014-03-20 22:08:16 -07:00 |
|
friendica
|
1156b141db
|
increase log info to track down source of ownership failures
|
2014-03-20 16:45:19 -07:00 |
|
friendica
|
2dda5d6c70
|
add expire setting, take out unknown mailers and max friend requests per day which aren't implemented
|
2014-03-19 20:40:35 -07:00 |
|
friendica
|
fa5ac26828
|
doco
|
2014-03-19 19:56:21 -07:00 |
|
friendica
|
68fc2a220e
|
prune_hub_reinstalls() and add cron weekly as a side effect
|
2014-03-19 19:53:14 -07:00 |
|
git-marijus
|
afca10a071
|
lesson learned.... dont fix anything on a mobile device
|
2014-03-19 14:03:40 +01:00 |
|
git-marijus
|
804d8bd73b
|
this shouldnt be there
|
2014-03-19 13:56:38 +01:00 |
|
marijus
|
20d47c4478
|
bootstrapify common tabs and make show aside/tabs buttons only appear if there is something to show
|
2014-03-19 09:43:23 +01:00 |
|
friendica
|
8c177fbc4b
|
cleanup
|
2014-03-18 16:50:46 -07:00 |
|
Thomas Willingham
|
c8fb979ed8
|
oops
|
2014-03-18 02:43:36 +00:00 |
|
Thomas Willingham
|
1446cc8096
|
Missed one
|
2014-03-18 02:41:58 +00:00 |
|
friendica
|
aa07edbdd1
|
sprintf error
|
2014-03-17 18:44:01 -07:00 |
|
friendica
|
e7981c8a03
|
remove mysql dependencies from cache api
|
2014-03-16 21:34:51 -07:00 |
|
friendica
|
e57bf86a27
|
mail notification goes to old link
|
2014-03-16 20:49:29 -07:00 |
|
friendica
|
ecb2e52a74
|
little fixes of hopefully nil significance
|
2014-03-16 20:34:21 -07:00 |
|
friendica
|
6f9fde997b
|
this is the correct fix
|
2014-03-16 15:20:04 -07:00 |
|
friendica
|
bc467205a2
|
Merge https://github.com/friendica/red into zpull
|
2014-03-16 14:56:37 -07:00 |
|
friendica
|
074d2839c0
|
doc update
|
2014-03-16 14:56:04 -07:00 |
|
friendica
|
548960ffa0
|
Merge pull request #367 from cvogeley/master
API: statusnet_html:trim was trimming too much
|
2014-03-16 08:42:15 +11:00 |
|
Christian Vogeley
|
521b091779
|
merge
|
2014-03-15 21:54:10 +01:00 |
|
Christian Vogeley
|
f0736fc955
|
API: statusnet_html:trim was trimming too much
|
2014-03-15 21:52:20 +01:00 |
|
Paolo T
|
9b64c6163c
|
Merge pull request #2 from friendica/master
merge from friendica/red
|
2014-03-15 19:14:10 +01:00 |
|
friendica
|
3cb179aff1
|
contact_block() not being shown to unauthenticated visitors - even if perms allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place.
|
2014-03-13 17:13:36 -07:00 |
|
friendica
|
254885c5ee
|
Merge https://github.com/friendica/red into zpull
|
2014-03-13 15:37:29 -07:00 |
|
friendica
|
a8ea919765
|
remove allowed friend domains and allowed email domains from admin settings - as they are not implemented
|
2014-03-13 15:36:35 -07:00 |
|
marijus
|
a8de28cc16
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-03-13 19:50:28 +01:00 |
|
marijus
|
b32f8f0ba7
|
move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again
|
2014-03-13 19:50:22 +01:00 |
|
Thomas Willingham
|
5a8be68900
|
json_return_and_dir isn't a thing
|
2014-03-13 02:09:45 +00:00 |
|
friendica
|
74b8a38645
|
json_return_and_dir is a typo
|
2014-03-12 19:04:20 -07:00 |
|
friendica
|
40b54410b3
|
Merge https://github.com/friendica/red into zpull
|
2014-03-12 16:22:50 -07:00 |
|
friendica
|
b30ddfaaf9
|
fix colors on input elements which bootstrap set to "inherit" and doesn't play nicely with dark themes.
|
2014-03-12 16:21:20 -07:00 |
|
friendica
|
b2e831ce98
|
Merge pull request #366 from beardy-unixer/master
Stick help in a template
|
2014-03-13 10:15:53 +11:00 |
|
Haakon Meland Eriksen
|
c2d520f1be
|
API functions translated into Norwegian bokmål - typo
|
2014-03-12 20:27:22 +01:00 |
|
Haakon Meland Eriksen
|
a3dda80cc3
|
API functions translated into Norwegian bokmål
|
2014-03-12 20:21:56 +01:00 |
|
Thomas Willingham
|
031b888e2c
|
Stick help in a template
|
2014-03-12 17:13:58 +00:00 |
|
friendica
|
3f337dad2c
|
file had wrong extension
|
2014-03-11 21:45:20 -07:00 |
|
friendica
|
d7dcf463ed
|
update acl internal list whenever there is a change - the submit handler seems to be unreliable or is getting into a race condition.
|
2014-03-11 20:17:14 -07:00 |
|
friendica
|
5e41ef9219
|
protect filed conversations from expiration - we check the parent to see if it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected.
|
2014-03-11 17:41:56 -07:00 |
|