Jason Robinson
|
d7748718f7
|
Merge pull request #4793 from Flaburgan/refactor-right-side-bar
Refactor right side bar, see you, BRs.
|
2014-02-21 20:27:02 +02:00 |
|
Jannik Streek
|
d603ff818c
|
added comment count to statistic to calculate posts/comments ratios
fixeds tests for comment count in statistics
added changelog entry and default entry
|
2014-02-21 12:25:23 +01:00 |
|
Jason Robinson
|
b833d6d647
|
Merge pull request #4796 from Flaburgan/more-photos-than-8
Remove the limit to 8 pictures in the view
|
2014-02-21 13:24:41 +02:00 |
|
flaburgan
|
16309dc832
|
Remove the limit to 8 pictures in the view
|
2014-02-21 01:31:12 +01:00 |
|
Jonne Haß
|
e995491b92
|
Merge pull request #4797 from goobertron/capitalisation
Update English locales to diaspora* instead of Diaspora.
|
2014-02-20 21:09:44 +01:00 |
|
arlogn
|
d1aaf0acba
|
new wordpress icons
|
2014-02-20 20:36:08 +01:00 |
|
goobertron
|
3c2b0a44d4
|
Update English locales to diaspora* instead of Diaspora.
|
2014-02-20 17:48:17 +00:00 |
|
flaburgan
|
a7c7e4b1e3
|
Refactor right side bar, see you, BRs.
|
2014-02-20 13:01:07 +01:00 |
|
Jonne Haß
|
57991187d1
|
Merge branch 'hotfix/0.3.0.3' into develop
Conflicts:
Changelog.md
config/defaults.yml
|
2014-02-19 11:31:02 +01:00 |
|
Jonne Haß
|
46603b02e4
|
Merge branch 'hotfix/0.3.0.3'
|
2014-02-19 11:25:12 +01:00 |
|
Jonne Haß
|
1df3f546c9
|
update rails to 3.2.17
|
2014-02-19 11:09:06 +01:00 |
|
Jason Robinson
|
283e06bd26
|
Merge branch 'hotfix/0.3.0.2' into develop
Conflicts:
Changelog.md
config/defaults.yml
|
2014-02-18 22:13:52 +02:00 |
|
Jason Robinson
|
a8431430f0
|
Merge branch 'hotfix/0.3.0.2'
|
2014-02-18 22:10:09 +02:00 |
|
arlogn
|
659ee3ca82
|
align rightbar icon heart
|
2014-02-18 20:39:13 +01:00 |
|
Jason Robinson
|
2a15339f44
|
Bump version to 0.3.0.2
|
2014-02-15 17:04:48 +02:00 |
|
Jason Robinson
|
d6d97c17b0
|
Changelogs for 0.3.0.2, changelog for #4714
|
2014-02-15 17:04:18 +02:00 |
|
Steffen van Bergerem
|
ab9e7d8035
|
fix hovercards
(cherry picked from commit a51c4f0ddc)
Conflicts:
Changelog.md
|
2014-02-15 16:58:12 +02:00 |
|
Florian Staudacher
|
d8dd727588
|
fix regression caused by updating backbone.js without updating changed parameters
(cherry picked from commit 09a840ea41)
|
2014-02-15 16:54:46 +02:00 |
|
arlogn
|
405b9fd8b9
|
embedding youtube videos over https
(cherry picked from commit 1563d088bc)
|
2014-02-15 16:54:46 +02:00 |
|
Fabian Rodriguez
|
d65fc17223
|
bump kaminari
(cherry picked from commit b5e6c2a149)
|
2014-02-15 16:54:46 +02:00 |
|
Steffen van Bergerem
|
a51c4f0ddc
|
fix hovercards
|
2014-02-15 14:09:03 +01:00 |
|
Jonne Haß
|
adf6c3c009
|
Merge pull request #4775 from dash-rai/move-mentions-input-plugin
Moved jquery.mentionsInput plugin
|
2014-02-10 21:12:12 +01:00 |
|
Darshan Rai
|
1f782dace9
|
Moved mentionsInput.js from vendor/assets to lib/assets
The jquery.mentionsInput plugin upstream is no longer maintained.
|
2014-02-10 23:19:50 +05:30 |
|
Darshan Rai
|
bc264bfa46
|
Issue #4767: Removed space that is inserted following the insertion of a mention
|
2014-02-10 22:21:35 +05:30 |
|
Jonne Haß
|
3ed4467155
|
Merge pull request #4765 from goobertron/jquery_source
Update JQuery source to jquery.com
Conflicts:
Changelog.md
|
2014-02-10 17:02:09 +01:00 |
|
Jonne Haß
|
2e8dc8fb61
|
move PasswordsController specs to the new appropiate location
|
2014-02-10 10:18:20 +01:00 |
|
Jonne Haß
|
3a616469f4
|
Merge pull request #4707 from goobertron/improved_new_password
New reset password form
Conflicts:
Changelog.md
|
2014-02-10 01:35:37 +01:00 |
|
Jonne Haß
|
b59bb75b3d
|
Merge pull request #4772 from svbergerem/image-branding-fix
Fix image branding logo_caps
|
2014-02-09 20:40:33 +01:00 |
|
Steffen van Bergerem
|
29d524d836
|
fix image branding logo_caps
|
2014-02-09 20:31:01 +01:00 |
|
Jonne Haß
|
3e3979cc28
|
Merge pull request #4656 from svbergerem/conversations-add-participants
Add participants to conversations menu
|
2014-02-09 20:20:47 +01:00 |
|
Jonne Haß
|
141438a33e
|
add changelog entry for #4768 [ci skip]
|
2014-02-09 20:08:23 +01:00 |
|
Jonne Haß
|
90784b3b38
|
Merge pull request #4768 from MrZYX/manwithtwowatches-feature/4455-make-help-view-backbone-view
Make help pages a backbone view
|
2014-02-09 20:05:09 +01:00 |
|
Steffen van Bergerem
|
a2b3917505
|
Add participants to conversations menu
|
2014-02-09 19:55:10 +01:00 |
|
goobertron
|
23e8bfa082
|
Update JQuery source to jquery.com
|
2014-02-09 17:36:35 +00:00 |
|
Jonne Haß
|
11b3fe7df4
|
Merge pull request #4673 from Flaburgan/drawer-scrollable
New menu for the mobile version
|
2014-02-09 18:06:43 +01:00 |
|
flaburgan
|
119ed2d8f5
|
Fix nav in header empty with webkit browser
|
2014-02-09 17:42:29 +01:00 |
|
flaburgan
|
c7c1e874b9
|
Fix broken header on the settings page on webkit browsers
|
2014-02-09 17:42:29 +01:00 |
|
flaburgan
|
725fbbf85e
|
Toggle with jquery + link on the whole line of the menu
|
2014-02-09 17:42:29 +01:00 |
|
flaburgan
|
70f305958b
|
Polish the code
|
2014-02-09 17:42:29 +01:00 |
|
flaburgan
|
4d9d35cbfa
|
Add current user avatar in the drawer
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
8c6342170b
|
Add link on aspects and allow to show / hide them in the drawer
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
b8bb7ae857
|
Fix tests
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
e204a9a121
|
Add aspects list and mentions link
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
0a31d61ccc
|
Make the drawer scrollable
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
94888f70be
|
Compose_mobile icon
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
1a52631bd2
|
Remove margin of the nav elem
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
3c5d68dbb4
|
Fix mobile publisher
|
2014-02-09 17:42:28 +01:00 |
|
flaburgan
|
c53afe586b
|
Add new icons to the mobile version
|
2014-02-09 17:42:28 +01:00 |
|
Erwan Guyader
|
754bd8178d
|
add drawer to mobile
- Functional drawer with menu icon
|
2014-02-09 17:42:28 +01:00 |
|
Erwan Guyader
|
1e159a027e
|
Add drawer menu to mobile version
- Added basic drawer menu with JS code working on /stream
|
2014-02-09 17:42:28 +01:00 |
|