Benjamin Neff
|
fca13efdf2
|
Merge branch 'next-minor' into develop
|
2016-12-08 03:19:45 +01:00 |
|
Benjamin Neff
|
7ce3982b6d
|
Merge branch 'release/0.6.2.0' into next-minor
|
2016-12-08 03:19:23 +01:00 |
|
Flaburgan
|
f785de7484
|
Reformulate CSRF e-mail
closes #7241
|
2016-12-08 03:16:19 +01:00 |
|
Dennis Schubert
|
d74c182e6f
|
Merge branch 'next-minor' into develop
|
2016-12-04 20:14:16 +01:00 |
|
Dennis Schubert
|
991b047be7
|
Start 0.6.3.0 cycle
|
2016-12-04 20:12:00 +01:00 |
|
Dennis Schubert
|
2c68c1f142
|
Merge branch 'next-minor' into develop
|
2016-12-04 20:10:17 +01:00 |
|
Benjamin Neff
|
6c37171f9f
|
Change last sentence and fix specs
closes #7238
|
2016-12-04 20:10:13 +01:00 |
|
Benjamin Neff
|
3b0c1020c0
|
Merge pull request #6818 from cmrd-senya/1851-mentions-in-comments.new
Mentions in comments backend changes
|
2016-11-29 19:31:43 +01:00 |
|
Benjamin Neff
|
855b148ba5
|
Merge branch 'next-minor' into develop
|
2016-11-27 21:36:41 +01:00 |
|
Justin Ramos
|
fa71af71c1
|
require spec_helper in .rspec
closes #7223
|
2016-11-27 21:27:12 +01:00 |
|
Benjamin Neff
|
5c5ef38908
|
Merge branch 'next-minor' into develop
|
2016-11-26 02:38:55 +01:00 |
|
Steffen van Bergerem
|
9f88850faf
|
Fix 500 on mobile commented and liked streams
Fixes #7218, regression from #7036
closes #7219
|
2016-11-26 02:37:33 +01:00 |
|
Benjamin Neff
|
34787043bb
|
Merge branch 'next-minor' into develop
|
2016-11-25 22:37:21 +01:00 |
|
Justin Ramos
|
3586fa6ae7
|
allowing for graceful unicorn restarts
closes #7217
|
2016-11-25 22:37:06 +01:00 |
|
Steffen van Bergerem
|
443d738aee
|
Merge branch 'next-minor' into develop
|
2016-11-25 15:56:39 +01:00 |
|
Justin Ramos
|
2ca42ea5e6
|
adding content_for(:javascript)
closes #7209
|
2016-11-25 15:56:31 +01:00 |
|
Steffen van Bergerem
|
365441ede2
|
Merge branch 'next-minor' into develop
|
2016-11-25 14:11:05 +01:00 |
|
Justin Ramos
|
6c6f9bb982
|
only show community spotlight link on /contacts if it is enabled
closes #7213
|
2016-11-25 14:10:58 +01:00 |
|
Benjamin Neff
|
b6847f76b5
|
Merge branch 'next-minor' into develop
|
2016-11-24 23:30:24 +01:00 |
|
Justin Ramos
|
43b1632148
|
only require fog/aws
closes #7201
|
2016-11-24 23:14:49 +01:00 |
|
Benjamin Neff
|
99b7229d5a
|
Merge branch 'next-minor' into develop
|
2016-11-22 03:55:12 +01:00 |
|
Steffen van Bergerem
|
0051d6a0b8
|
Move comment, like and reshare creation error translations
closes #7202
|
2016-11-22 03:54:56 +01:00 |
|
Steffen van Bergerem
|
b645541d52
|
Update notifications when changing the stream
fixes #6473
closes #7199
|
2016-11-22 03:00:59 +01:00 |
|
Steffen van Bergerem
|
8e345c0335
|
Add avatar fallback on tags page
fixes #6969
closes #7198
|
2016-11-22 02:43:32 +01:00 |
|
Benjamin Neff
|
12a2e312d9
|
Merge branch 'next-minor' into develop
|
2016-11-19 03:40:57 +01:00 |
|
Steffen van Bergerem
|
5660d2f4a8
|
Refactor comment creation in post interactions backbone model
closes #7186
|
2016-11-19 03:40:42 +01:00 |
|
Steffen van Bergerem
|
9ecbac3ee0
|
Merge branch 'next-minor' into develop
|
2016-11-18 16:40:46 +01:00 |
|
Justin Ramos
|
9aac486510
|
use shared partial for desktop and mobile application head
closes #7194
|
2016-11-18 16:40:23 +01:00 |
|
Steffen van Bergerem
|
8cd26054c8
|
Merge branch 'next-minor' into develop
|
2016-11-18 15:29:00 +01:00 |
|
Augier
|
af331bfb30
|
Add collection to app.views.NotificationDropdown and app.views.Notifications
closes #6952
|
2016-11-18 15:27:37 +01:00 |
|
Benjamin Neff
|
73d352920f
|
Merge branch 'next-minor' into develop
|
2016-11-18 02:14:51 +01:00 |
|
Steffen van Bergerem
|
9bca03d5e9
|
Refactor ShareVisibilitesController
closes #7196
|
2016-11-18 02:10:26 +01:00 |
|
Steffen van Bergerem
|
75f95faebe
|
Update typeahead.js, use the version from rails-assets.org
closes #7192
|
2016-11-18 02:05:32 +01:00 |
|
Steffen van Bergerem
|
f27769bcd2
|
Merge branch 'next-minor' into develop
|
2016-11-17 22:52:35 +01:00 |
|
Justin Ramos
|
00ed1c9b39
|
check AppConfig.mail.enable? before displaying some view content
closes #7190
|
2016-11-17 22:52:18 +01:00 |
|
Steffen van Bergerem
|
9b4f73dc77
|
Merge branch 'next-minor' into develop
|
2016-11-17 22:35:01 +01:00 |
|
Justin Ramos
|
c7a0b053fa
|
fixing invitations modal visibility issue
closes #7191
|
2016-11-17 22:34:54 +01:00 |
|
Benjamin Neff
|
b319e0caa2
|
Merge branch 'next-minor' into develop
|
2016-11-15 22:56:06 +01:00 |
|
Steffen van Bergerem
|
37b34237b9
|
Force jasmine fails on syntax errors
closes #7185
|
2016-11-15 22:50:17 +01:00 |
|
Steffen van Bergerem
|
cdce25374f
|
Reduce i18n.load side effects
closes #7184
|
2016-11-15 22:46:06 +01:00 |
|
Steffen van Bergerem
|
a951c40ba0
|
Only reload profile header when changing aspect memberships
closes #7183
fixes #7072
|
2016-11-15 22:37:39 +01:00 |
|
Steffen van Bergerem
|
1863137161
|
Use string-direction gem for rtl detection
closes #7181
|
2016-11-15 22:33:56 +01:00 |
|
Benjamin Neff
|
13869aa75c
|
Merge branch 'next-minor' into develop
|
2016-11-13 20:11:38 +01:00 |
|
Steffen van Bergerem
|
117b17e25e
|
Remove unused conversations modal fixture
closes #7129
|
2016-11-13 20:11:34 +01:00 |
|
Dennis Schubert
|
b04ce82c49
|
Merge branch 'next-minor' into develop
|
2016-11-06 02:44:00 +01:00 |
|
Dennis Schubert
|
fa329cc032
|
Add changelog note for custom changelog URL.
[ci skip]
|
2016-11-06 02:43:32 +01:00 |
|
Dennis Schubert
|
0c78fcaae7
|
Merge branch 'next-minor' into develop
|
2016-11-06 02:34:16 +01:00 |
|
Benjamin Neff
|
08282cea01
|
Add dark theme
Also renamed "Original Dark" to "Original Gray", because it isn't "dark".
closes #7152
|
2016-11-06 02:34:11 +01:00 |
|
Benjamin Neff
|
0b3f10aef2
|
Merge branch 'next-minor' into develop
|
2016-11-03 22:50:08 +01:00 |
|
Steffen van Bergerem
|
a73e1baaed
|
Show spinner when loading comments
closes #7170
|
2016-11-03 22:50:03 +01:00 |
|