friendica
859b672e37
Merge branch 'master' into trinidad
2015-01-05 21:00:32 -08:00
friendica
43f43d78cf
regression: need float clear on manage page so footer doesn't end up floated,
...
add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
2015-01-05 20:57:30 -08:00
friendica
39459c2d65
undo these bits of trinidad - we're going to do things differently
2015-01-05 18:22:15 -08:00
friendica
2dca165f9b
Merge branch 'master' into trinidad
2015-01-05 16:14:56 -08:00
friendica
3185bfe3ca
detect https coming through reverse proxy or load balancer using x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled
2015-01-05 16:12:55 -08:00
friendica
8a3ef177ce
Merge branch 'master' into trinidad
2015-01-05 14:41:08 -08:00
friendica
3df3ab5630
Merge https://github.com/friendica/red into pending_merge
2015-01-05 14:41:04 -08:00
friendica
05a237b808
revup
2015-01-05 14:40:52 -08:00
RedMatrix
c45456fa33
Merge pull request #820 from pafcu/nomigrate
...
Steps towards not needing jquery-migrate
2015-01-06 09:40:26 +11:00
Stefan Parviainen
5ce5de7305
Remove unneeded divgrow library
2015-01-05 22:11:24 +01:00
Stefan Parviainen
1ac9a4976f
Unbreak readmore
2015-01-05 22:09:05 +01:00
Stefan Parviainen
7c3193e26e
Make slider less ugly
2015-01-05 22:02:48 +01:00
Stefan Parviainen
cf840bee11
Remove reference to non-existing colorbox.css
2015-01-05 21:26:20 +01:00
Stefan Parviainen
6d0832e693
Fix error with undefined profile_uid
2015-01-05 20:29:20 +01:00
Stefan Parviainen
749aef7172
Remove some unneeded libraries
2015-01-05 20:27:01 +01:00
Stefan Parviainen
b320b8cbf3
Replace fancybox with colorbox
2015-01-05 19:49:20 +01:00
Stefan Parviainen
c9f26c8b7b
Update jGrowl
2015-01-05 18:36:24 +01:00
Stefan Parviainen
128b0008ee
Replace jslider with jRange
2015-01-05 18:30:12 +01:00
Stefan Parviainen
7791d28a5d
Replace divgrow with more modern readmore.js
2015-01-05 17:10:08 +01:00
friendica
ed19984534
Merge branch 'master' into trinidad
2015-01-04 20:48:17 -08:00
friendica
074be42e23
regression: autocomplete hovertip with url/address missing - useful for identifying connections based on their site if they have different channels (not clones) on different sites with all other identifying info the same.
2015-01-04 20:45:16 -08:00
friendica
0c0a004e45
Merge branch 'master' into trinidad
2015-01-04 19:57:15 -08:00
pafcu
fc72762f52
Merge pull request #819 from pafcu/acl
...
Fix initEditor on non-wall pages
2015-01-05 01:31:52 +02:00
Stefan Parviainen
c14dc699ae
Fix initEditor on non-wall pages
2015-01-05 00:28:42 +01:00
friendica
aa18a43eff
Merge branch 'master' into trinidad
2015-01-04 14:54:37 -08:00
friendica
3983348b96
the last checkin removed hostname from the address for autocomplete searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
2015-01-04 14:51:41 -08:00
friendica
47526cdecf
Merge branch 'master' into trinidad
2015-01-04 14:48:14 -08:00
friendica
91cb76aa99
Merge https://github.com/friendica/red into pending_merge
2015-01-04 14:48:13 -08:00
friendica
57d8271eba
only check the LHS of xchan_addr for autocomplete, don't match on the hostname.
2015-01-04 14:47:08 -08:00
pafcu
83631ffd23
Merge pull request #817 from pafcu/acl
...
Fix height calculation in acl.js
2015-01-04 23:42:01 +02:00
Stefan Parviainen
a7db0ed071
Fix height calculation in acl.js
2015-01-04 22:37:19 +01:00
friendica
82a37ebae3
Merge branch 'master' into trinidad
2015-01-04 12:30:51 -08:00
RedMatrix
ebb1a61684
Merge pull request #816 from pafcu/acl
...
Autocomplete improvements
2015-01-05 07:30:07 +11:00
Stefan Parviainen
cb181993a8
Fix wrong require
2015-01-04 14:54:52 +01:00
Stefan Parviainen
ac4c17dd4c
Typo
2015-01-04 14:31:27 +01:00
Stefan Parviainen
57809f20a4
Sorting of autocomplete
2015-01-04 14:23:23 +01:00
Stefan Parviainen
386f361855
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
2015-01-04 12:54:23 +01:00
friendica
edd1ad37c4
Merge branch 'master' into trinidad
2015-01-04 00:48:18 -08:00
friendica
9433a0ddc8
Merge https://github.com/friendica/red into pending_merge
2015-01-04 00:48:17 -08:00
friendica
028dff44cc
remove hard-coded url to caterva.eu from events code.
2015-01-04 00:47:44 -08:00
Jeroen
753e6809d9
update NL and text-background-fix in chat for alternatives schemas
2015-01-03 15:51:01 +00:00
marijus
0779e3ae53
provide some info for buttons
2015-01-03 13:42:05 +01:00
friendica
8d590068e9
Merge branch 'master' into trinidad
2015-01-02 23:08:11 -08:00
friendica
3e073f4b62
no newline at end of file
2015-01-02 23:07:37 -08:00
friendica
1ef1d1c2b7
Merge branch 'master' into trinidad
2015-01-02 19:22:46 -08:00
friendica
31648d65c8
some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
2015-01-02 19:20:52 -08:00
friendica
14239970a5
Merge branch 'master' into trinidad
2015-01-02 17:27:12 -08:00
friendica
ed2917118d
doc updates
2015-01-02 17:26:57 -08:00
friendica
3157304bbd
Merge branch 'master' into trinidad
2015-01-02 17:26:38 -08:00
RedMatrix
f6ab246d01
Merge pull request #813 from pafcu/checkboxes
...
Reworked switch to also display text
2015-01-03 09:50:24 +11:00