Commit graph

16447 commits

Author SHA1 Message Date
Steffen van Bergerem
b98af83c9d Sort tag search result by name
closes #6734
2016-03-03 17:57:58 +01:00
Steffen van Bergerem
98d76af318 Remove empty test file, move i18n spec
closes #6720
2016-02-26 11:27:17 +01:00
Dennis Schubert
9f2e5b1868 Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications...
closes #6711
2016-02-23 09:38:34 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page
closes #6710
2016-02-23 06:35:15 +01:00
Dennis Schubert
fbabc541ae updated 111 locale files [ci skip] 2016-02-22 11:26:04 +01:00
Dennis Schubert
523197e779 Merge branch 'master' into stable 2016-02-22 05:00:12 +01:00
Dennis Schubert
56ebcc7600 Remove version number padding
[ci skip]
2016-02-22 04:58:36 +01:00
Dennis Schubert
6713995ebc Merge branch 'master' into stable 2016-02-22 04:53:46 +01:00
Dennis Schubert
81ced55fed Merge branch 'release/0.5.7.0' 2016-02-22 04:53:06 +01:00
Steffen van Bergerem
374679c093 Add rspec test for reset_authentication_token without current_user
closes #6707
2016-02-21 04:26:12 +01:00
Marien Fressinaud
27a8e0fbca Test if user is nil in #reset_authentication_token
Actually it redirects to stream page and says that user is already logged in.

Fix https://github.com/diaspora/diaspora/issues/6326
2016-02-21 04:24:50 +01:00
Steffen van Bergerem
02b330de70 Add jasmine test for aspect name form on contacts page
closes #6706
2016-02-21 04:19:33 +01:00
Saritha
7fe7287928 Fix for Empty input field when editing aspect name Fix #6548 2016-02-21 04:18:07 +01:00
Steffen van Bergerem
9eb0dddb1a Speed up asset serving in development
closes #6702
2016-02-16 11:19:04 +01:00
Dennis Schubert
24c24374bf Start 0.5.8.0 cycle [ci skip] 2016-02-15 01:49:15 +01:00
Steffen van Bergerem
e66ff6973f Bump markdown-it
closes #6695
2016-02-12 22:18:38 +01:00
Steffen van Bergerem
c805ee2cec Remove unused variables, fix undefined variables
closes #6694
2016-02-12 15:51:25 +01:00
Dennis Schubert
cb706010ff Bump sass 2016-02-09 21:32:57 +01:00
Dennis Schubert
b2eeed9ab0 Bump request_store 2016-02-09 21:31:52 +01:00
Dennis Schubert
685884509e Bump rainbow 2016-02-09 21:31:52 +01:00
Dennis Schubert
a1d055dad3 Bump phantomjs 2016-02-09 21:30:41 +01:00
Dennis Schubert
ad83b16b83 Bump parser 2016-02-09 21:29:35 +01:00
Dennis Schubert
b03a010124 Bump oauth2 2016-02-09 21:28:43 +01:00
Dennis Schubert
a987614ac7 Bump nenv 2016-02-09 21:27:09 +01:00
Dennis Schubert
ae257ff137 Bump lumberjack 2016-02-09 21:26:29 +01:00
Dennis Schubert
fc0ba16847 Bump fog-xenserver 2016-02-09 21:25:03 +01:00
Dennis Schubert
07dfb5dcda Bump fog-vsphere 2016-02-09 21:25:03 +01:00
Dennis Schubert
dd382945e6 Bump fog-softlayer 2016-02-09 21:25:03 +01:00
Dennis Schubert
1e3f2556fc Bump fog-radosgw 2016-02-09 21:25:03 +01:00
Dennis Schubert
1ae9869b20 Bump fog-aws 2016-02-09 21:25:03 +01:00
Dennis Schubert
42203b2803 Bump ethon 2016-02-09 21:24:29 +01:00
Dennis Schubert
7c4820cec1 Bump hiredis, em-hiredis and eventmachine 2016-02-09 21:23:54 +01:00
Dennis Schubert
da2ed56f59 Bump childprocess 2016-02-09 21:22:31 +01:00
Dennis Schubert
02f5e29199 Bump byebug 2016-02-09 21:21:38 +01:00
Dennis Schubert
9cf2a9be49 Bump mysql2 ActiveRecord issues seem to be gone. 2016-02-09 21:18:09 +01:00
Dennis Schubert
3bfab029d5 Bump twitter-text 2016-02-09 21:14:35 +01:00
Dennis Schubert
86ed0026f3 Bump twitter 2016-02-09 21:14:35 +01:00
Dennis Schubert
c05ca939b6 Bump spring 2016-02-09 21:13:23 +01:00
Dennis Schubert
ed2564d76d Bump simplecov 2016-02-09 21:13:23 +01:00
Dennis Schubert
98949e3afd Bump rb-inotify 2016-02-09 21:12:29 +01:00
Dennis Schubert
9855385bde Bump rb-fsevent 2016-02-09 21:10:45 +01:00
Dennis Schubert
d3b5215951 Bump mini_magick 2016-02-09 21:10:45 +01:00
Dennis Schubert
66b81e4dd3 Bump json-schema 2016-02-09 21:09:58 +01:00
Dennis Schubert
954697bc9b Bump devise 2016-02-09 21:08:59 +01:00
Dennis Schubert
a11c02fc53 Bump factory_girl_rails 2016-02-09 21:08:12 +01:00
Dennis Schubert
4a75ad43c8 Bump webmock 2016-02-09 21:07:21 +01:00
Dennis Schubert
16fbe061d7 Bump shoulda-matchers 2016-02-09 21:06:27 +01:00
Dennis Schubert
246cba947e Bump rspec-rails and related 2016-02-09 21:04:54 +01:00
Dennis Schubert
8180f6658c Bump capybara 2016-02-09 21:04:54 +01:00
Dennis Schubert
d6a400f8cb Bump cucumber-rails 2016-02-09 21:03:34 +01:00