Steffen van Bergerem
|
1701bc30d0
|
Don't add mentions and reshares to all streams
|
2015-04-01 16:51:08 +02:00 |
|
Jonne Haß
|
548b0d8161
|
Rescue correct constant in Workers::ReceiveLocalBatch
Fixes #5834
|
2015-04-01 04:01:40 +02:00 |
|
Steffen van Bergerem
|
adf9bcf8e8
|
Update markdown-it
|
2015-03-26 00:07:25 +01:00 |
|
Jonne Haß
|
65a738e604
|
bump rspec-rails
|
2015-03-25 02:33:56 +01:00 |
|
Jonne Haß
|
61461db913
|
fix jasmine spec for correct reshare behavior
|
2015-03-24 17:20:33 +01:00 |
|
Jonne Haß
|
73b6c75278
|
On reshare insert the reshare built from the response
Also make sure comments_count and the like is always set in the
response.
|
2015-03-23 23:02:23 +01:00 |
|
Jonne Haß
|
644fc46dee
|
Merge pull request #5792 from MothOnMars/4020-role-specs
added specs and validations for Role model
|
2015-03-20 01:54:04 +01:00 |
|
Steffen van Bergerem
|
d9bf4a2fa6
|
Remove layout 'centered_with_header_with_footer'
|
2015-03-18 21:59:56 +01:00 |
|
Martha
|
d4f1a5dbe8
|
added specs and validations for Role model
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
|
2015-03-18 09:16:15 -07:00 |
|
Steffen van Bergerem
|
a161e4d3a7
|
Uncomment jasmine tests
|
2015-03-18 00:01:22 +01:00 |
|
Jonne Haß
|
256d7862b9
|
Merge pull request #5782 from svbergerem/reshared-poll
Display reshared poll
|
2015-03-15 20:45:51 +01:00 |
|
Jonne Haß
|
5ea90016b3
|
Merge pull request #5783 from visualsayed/5737-too-long-tag-name
5737 too long tag name
|
2015-03-15 18:06:53 +01:00 |
|
Steffen van Bergerem
|
81cd1753e4
|
Improve link to original post in reshared polls
|
2015-03-15 17:07:16 +01:00 |
|
Hincu Petru
|
9589cb2e0f
|
disable poll voting for reshared post
|
2015-03-15 16:46:48 +01:00 |
|
Sayed
|
18a1958ef8
|
fix too long tag name #5737
|
2015-03-15 16:15:33 +02:00 |
|
Augier
|
322ee30005
|
Tests with Jasmine
|
2015-03-15 14:52:49 +01:00 |
|
Augier
|
f4534ec412
|
Refactor notification badge view (again)
|
2015-03-15 11:48:06 +01:00 |
|
Augier
|
673661b798
|
Ported searchbar
|
2015-03-15 11:48:06 +01:00 |
|
Augier
|
2a9fddf7a0
|
Port notifications to backbone part. 2
|
2015-03-15 11:48:06 +01:00 |
|
Steffen van Bergerem
|
2328f64d56
|
Merge pull request #5580 from MothOnMars/5549-password-reset-error
display specific error messages for password change (issue #5549)
|
2015-03-14 03:25:08 +01:00 |
|
Martha
|
985141c0e8
|
display specific error messages for password change (issue #5549)
|
2015-03-13 11:35:21 -07:00 |
|
Steffen van Bergerem
|
1ff644c13e
|
Fix mobile notifications
|
2015-03-12 22:45:04 +01:00 |
|
Steffen van Bergerem
|
52c2a73d83
|
Merge pull request #5707 from AugierLe42e/port-notifications-backbone
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
|
2015-03-11 17:05:14 +01:00 |
|
Steffen van Bergerem
|
f5bf53a004
|
Refactor vendor javascript
|
2015-03-11 15:51:08 +01:00 |
|
Augier
|
95f4675ddf
|
Port of notifications to Backbone
|
2015-03-11 02:11:05 +01:00 |
|
Jonne Haß
|
8ab6f31e0a
|
Merge pull request #5751 from svbergerem/fix-photo-count-profile
Fix photo count in the profile view
|
2015-03-10 17:45:12 +01:00 |
|
Steffen van Bergerem
|
d2222a97e5
|
Fix photo count in the profile view
|
2015-03-10 11:38:49 +01:00 |
|
Steffen van Bergerem
|
1b2b10877a
|
Fix services char counter
|
2015-03-09 21:18:10 +01:00 |
|
Steffen van Bergerem
|
73d04b706e
|
Use entypo icons for left navbar
|
2015-03-09 17:57:50 +01:00 |
|
Steffen van Bergerem
|
3298373a7f
|
Add missing http:// to urls
|
2015-03-09 01:42:40 +01:00 |
|
Jonne Haß
|
f525f9e34d
|
Merge pull request #5730 from Flaburgan/strip-markdown-from-title
Strip markdown from the heading of a post
|
2015-03-06 23:43:13 +01:00 |
|
Steffen van Bergerem
|
2a52f65160
|
Bump markdown-it
|
2015-03-06 20:40:06 +01:00 |
|
flaburgan
|
5dc8642a99
|
Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed...
|
2015-03-04 19:30:00 +01:00 |
|
Marcelo Briones
|
b154d87070
|
Exports user photos as zip file
|
2015-03-03 19:45:57 -03:00 |
|
Jonne Haß
|
dd45b79a98
|
Drop Youtube oembed HTTPS hack
upstream ships it now that way
|
2015-03-02 02:34:51 +01:00 |
|
Steffen van Bergerem
|
e188782a9a
|
Remove blueprint code
|
2015-03-02 00:04:57 +01:00 |
|
Steffen van Bergerem
|
c838389b67
|
Fix invitations and tests
|
2015-03-02 00:04:56 +01:00 |
|
Jonne Haß
|
987281270a
|
bump ruby-oembed
|
2015-02-28 02:36:13 +01:00 |
|
Jonne Haß
|
678033fa23
|
replace deprecated stub syntax in export user spec
|
2015-02-27 17:00:42 +01:00 |
|
Jonne Haß
|
7a741c6dce
|
Ensure deliveries are cleared after each example
|
2015-02-27 17:00:41 +01:00 |
|
Jonne Haß
|
3a90386303
|
deliver needs to be called on the return value of the mailer call
|
2015-02-27 16:58:39 +01:00 |
|
Jonne Haß
|
d295b5d5b5
|
ActiveRecord::Base::reflection returns strings now
|
2015-02-27 16:58:39 +01:00 |
|
Jonne Haß
|
9530f00bd6
|
Don't use a too large invalid id
|
2015-02-27 16:58:39 +01:00 |
|
Jonne Haß
|
1ec3f5caa6
|
Don't pass a model instance where an id is expected
|
2015-02-27 16:58:39 +01:00 |
|
Jonne Haß
|
290aded7f6
|
ActionMailer deliver -> deliver_now
|
2015-02-27 16:58:39 +01:00 |
|
Jonne Haß
|
ed44689670
|
Fix a spec for LikesController
|
2015-02-27 16:36:45 +01:00 |
|
Jonne Haß
|
99ea156e1c
|
Refactor User.total_users into a scope
|
2015-02-27 16:30:51 +01:00 |
|
Jonne Haß
|
6432bbe67b
|
fix
|
2015-02-27 16:29:49 +01:00 |
|
Jonne Haß
|
93c9ad6eba
|
Fix participations controller spec
|
2015-02-27 16:27:55 +01:00 |
|
Jonne Haß
|
95053ccbf2
|
Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts
5041 total user statistic shouldnt include closed accounts
|
2015-02-27 16:02:35 +01:00 |
|