Dennis Schubert
ad52eaf6d7
Merge branch 'stable' into develop
2015-06-08 04:09:57 +02:00
Benjamin Neff
97153ad08b
update tests for new twitter client
...
closes #6083
2015-06-08 04:08:46 +02:00
Dennis Schubert
0c6ca1d235
Merge branch 'stable' into develop
2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0
retry receive share-visibility when failed while receiving parallel
...
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126closes #6068
2015-06-08 00:58:00 +02:00
Dennis Schubert
e0420d733a
Merge branch 'stable' into develop
2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019
refactor: iterate over visiblities
...
closes #6060
2015-06-08 00:45:16 +02:00
dimana
31d760867c
Issue #4297 : Updated color themes and testing
2015-06-07 19:57:37 +03:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03:00
Jonne Haß
3850118e4e
Merge branch 'stable' into develop
2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e
Set default for post title truncation to 70 characters
...
closes #6022
2015-06-02 12:14:35 +02:00
Dennis Schubert
ffc3cb711f
Merge branch 'stable' into develop
2015-06-02 02:35:21 +02:00
Benjamin Neff
03dbb75dd5
don't save default avatars to the database
2015-06-02 02:32:01 +02:00
Jonne Haß
351f54d74f
Merge branch 'stable' into develop
2015-05-28 11:24:34 +02:00
Sandip Trivedi
2ba2ef1b9c
Replaces the zipzip gem with the rubyzip gem
2015-05-28 11:23:57 +02:00
Jonne Haß
3e35ef0b63
Merge branch 'stable' into develop
2015-05-24 11:16:09 +02:00
Benjamin Neff
986ad0df14
fix validation for status-message when the author is missing
...
closes #5986
2015-05-24 11:16:05 +02:00
Jonne Haß
5a3b62d801
Merge branch 'stable' into develop
2015-05-19 10:42:44 +02:00
Benjamin Neff
9a4a7255e7
remove unused older and newer methods for posts
...
last renamed in 8386179f16closes #5970
2015-05-19 10:42:39 +02:00
Dennis Schubert
2549f44b7c
Merge branch 'stable' into develop
2015-05-19 03:00:56 +02:00
Benjamin Neff
267a1df3c4
fix root_diaspora_id when root was deleted
2015-05-19 02:59:31 +02:00
Dennis Schubert
6a1ec27b3c
Merge branch 'stable' into develop
2015-05-19 02:58:41 +02:00
Steffen van Bergerem
ceec5084af
Use case insensitive unconfirmed email
...
closes #5967
2015-05-19 02:58:37 +02:00
Dennis Schubert
944c57f874
Merge branch 'stable' into develop
2015-05-18 03:23:43 +02:00
Benjamin Neff
7cccb6594f
remove security hax comment
2015-05-18 03:23:15 +02:00
Jonne Haß
f257658e46
Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations""
...
This reverts commit 2c7848e3cb
2015-05-04 00:43:41 +02:00
Jonne Haß
2c7848e3cb
Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"
...
This reverts commit 096fa2ddbbf7d1105148
2015-05-04 00:36:27 +02:00
Benjamin Neff
28c9cfdfd4
write cucumber test and add order_id on create
2015-04-28 02:38:28 +02:00
Marcelo Briones
6636a89118
Add participation counter
2015-04-11 14:41:17 -03:00
Jonne Haß
65a738e604
bump rspec-rails
2015-03-25 02:33: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
Jonne Haß
256d7862b9
Merge pull request #5782 from svbergerem/reshared-poll
...
Display reshared poll
2015-03-15 20:45:51 +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
Marcelo Briones
b154d87070
Exports user photos as zip file
2015-03-03 19:45:57 -03:00
Jonne Haß
99ea156e1c
Refactor User.total_users into a scope
2015-02-27 16:30:51 +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
Jonne Haß
be1ab6c6a3
Merge branch 'collimarco-issue5350' into develop
2015-02-27 15:33:55 +01:00
zachrab
f695b5d3e7
Set disable_mail to true
...
Add #clear_account! disable mail spec
Add migration for disabling mail for all closed accounts
Change migration to use #update_all for disable_mail attribute
Add #clear_account! false fields spec
2015-02-19 16:45:39 -08:00
Steffen van Bergerem
8962d75eb7
Conversations: fix badge count and automatic scrolling
2015-02-10 19:11:20 +01:00
Marc Burt
9f5131b6ec
Fixed #5041 with new User method to find total accounts excluding closed and invitations
2015-02-08 13:49:12 +00:00
Sam Radhakrishnan
a12c0d83c0
Fixed Bug #5593 . Added length validation to location in profile model with maximum length 255.
2015-02-02 19:42:53 +05:30
Marco Colli
eccab62e32
Allow user to enable / disable notifications for a post from stream #5350
2015-01-25 18:40:47 +01:00
Marcelo Briones
63eca447d0
Strip EXIF data as user preference
2015-01-18 10:28:28 -03:00
James Kiesel
1c69dd7752
Add contacts/posts, and GZipping JSON exporter output
2015-01-15 00:20:19 +13:00
margori
e6c605d92b
Destroy conversation when all participants leave it
2014-12-17 11:33:23 -03:00
Marcelo Briones
4e83e4c7ed
BUG: new messages to person that is not sharing
...
Conversation recipient validated
- Conversation foreign recipient not required to be validated.
- Added 'peter' as spec_helper user.
- New fixture, new statistic values.
- Clearer identifier names
2014-12-10 17:02:20 -03:00
Jonne Haß
f4c756cd34
use URI.join in the specs too
2014-12-09 17:27:27 +01:00
Jonne Haß
5af0b1cbdd
don't use 666 as non-existant ID in report model spec
2014-11-30 21:56:27 +01:00
Jonne Haß
f361a0f885
Merge pull request #5288 from jaywink/remove-old-users
...
Maintenance feature to remove old users, scheduled in settings
2014-10-17 01:00:51 +02:00
