JC Brand
|
86521d0076
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
1b1bac22ef
Reminify JS
|
11 years ago |
JC Brand
|
95dd2dac4b
Don't use the requirejs task, it doesn't support almond.
|
11 years ago |
JC Brand
|
37f2f8ca0c
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
3bf27e8b5f
New config option ``show_only_online_users``
|
11 years ago |
JC Brand
|
b111e60c1d
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
fcc1f5adf4
A bit of reordering.
|
11 years ago |
JC Brand
|
ef1c834090
Don't check for allow_contact_requests in RosterItemView render method
|
11 years ago |
JC Brand
|
0752a0e2ed
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
feda94178c
Refactor incoming subscription handling code into its own method
|
11 years ago |
JC Brand
|
fe7c297acc
Update docs and regenerate
|
11 years ago |
JC Brand
|
46b36f9e3a
Minified CSS and JS
|
11 years ago |
JC Brand
|
3670ba57e8
Don't use the requirejs task, it doesn't support almond.
|
11 years ago |
JC Brand
|
ff8c509a60
Minify CSS and JS
|
11 years ago |
JC Brand
|
e4a6223b86
Merge pull request #68 from coderhs/minify_dependent_files
|
11 years ago |
coderhs
|
8a795d87ba
Updated information of files, required during minify
|
11 years ago |
JC Brand
|
47bac92f2f
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
feb87bc88b
Mention new languages
|
11 years ago |
JC Brand
|
3a1bd7c4e6
Remove duplicate allow_muc and sort
|
11 years ago |
JC Brand
|
646fcb36c7
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
a5b5e7538f
2 Bugfixes.
|
11 years ago |
JC Brand
|
b6324a24ff
Generate docs
|
11 years ago |
JC Brand
|
cf137c607b
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
7f371b883e
Add config option ``allow_contact_requests`` to toggle user adding
|
11 years ago |
JC Brand
|
b8e096ffd1
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
a57d0e9818
Sort default values
|
11 years ago |
JC Brand
|
0d6e29f067
Add config option ``allow_contact_requests`` to toggle user adding
|
11 years ago |
JC Brand
|
e4c9fcbc4e
Merge branch '0.6.x'
|
11 years ago |
JC Brand
|
6d026f010e
Fix tests that were broken after vCard changes
|
11 years ago |
JC Brand
|
7f4bdb4098
Don't use id for controlbox panes
|
11 years ago |