Dennis Schubert
|
fbabc541ae
|
updated 111 locale files [ci skip]
|
2016-02-22 11:26:04 +01:00 |
|
Dennis Schubert
|
11420c20e3
|
Merge branch 'stable' into develop
|
2016-02-22 05:00:18 +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
|
ee52e5110b
|
Merge branch 'stable' into develop
|
2016-02-22 04:53:52 +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
|
b808ac08ef
|
Activate "Stream::Person returns the most recent posts" spec
|
2016-02-21 11:31:40 +01:00 |
|
Dennis Schubert
|
535057aca4
|
Merge branch 'stable' into develop
|
2016-02-21 04:26:25 +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 |
|
Dennis Schubert
|
3d3e82f7f0
|
Merge branch 'stable' into develop
|
2016-02-21 04:20:19 +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 |
|
Jonne Haß
|
086b6e4529
|
Merge branch 'stable' into develop
|
2016-02-16 11:19:10 +01:00 |
|
Steffen van Bergerem
|
9eb0dddb1a
|
Speed up asset serving in development
closes #6702
|
2016-02-16 11:19:04 +01:00 |
|
Steffen van Bergerem
|
f8f05371e0
|
Merge pull request #6394 from AugierLe42e/mobile-js-refactor
Mobile JS refactor
|
2016-02-15 22:22:35 +01:00 |
|
Augier
|
28c509baeb
|
Add jasmine specs for mobile view
|
2016-02-15 12:14:35 +01:00 |
|
Dennis Schubert
|
a416e2708c
|
Merge branch 'stable' into develop
|
2016-02-15 01:49:36 +01:00 |
|
Dennis Schubert
|
24c24374bf
|
Start 0.5.8.0 cycle [ci skip]
|
2016-02-15 01:49:15 +01:00 |
|
Dennis Schubert
|
0282727e4e
|
Merge branch 'stable' into develop
|
2016-02-15 01:45:59 +01:00 |
|
Dennis Schubert
|
780c77e691
|
Start 0.5.8.0 cycle [ci skip]
|
2016-02-15 01:45:22 +01:00 |
|
Dennis Schubert
|
230c075aee
|
Merge pull request #6699 from svbergerem/increase-openid-keysize
Increase keysize for OpenID
|
2016-02-15 01:42:18 +01:00 |
|
Dennis Schubert
|
41ccccb85a
|
Merge pull request #6697 from svbergerem/unify-ui
Unify contacts, notifications and settings UI
|
2016-02-15 01:41:16 +01:00 |
|
Steffen van Bergerem
|
6e685194e9
|
Increase keysize for OpenID
|
2016-02-14 23:35:48 +01:00 |
|
Jonne Haß
|
dfc649e772
|
Merge pull request #6698 from svbergerem/remove-unused-code
Remove unused code
|
2016-02-14 11:24:37 +01:00 |
|
Steffen van Bergerem
|
89f21e87f8
|
Remove unused code
|
2016-02-14 02:48:51 +01:00 |
|
Steffen van Bergerem
|
1ba4357aaa
|
Unify contacts, notifications and settings UI
|
2016-02-14 00:12:11 +01:00 |
|
Jonne Haß
|
2a47b889d1
|
Merge branch 'stable' into develop
|
2016-02-12 22:18:43 +01:00 |
|
Steffen van Bergerem
|
e66ff6973f
|
Bump markdown-it
closes #6695
|
2016-02-12 22:18:38 +01:00 |
|
Jonne Haß
|
e873b6cd4f
|
Merge branch 'stable' into develop
|
2016-02-12 15:51:29 +01:00 |
|
Steffen van Bergerem
|
c805ee2cec
|
Remove unused variables, fix undefined variables
closes #6694
|
2016-02-12 15:51:25 +01:00 |
|
Dennis Schubert
|
bad6d74603
|
Merge pull request #6693 from svbergerem/fix-eye
Fix eye not stopping all processes
|
2016-02-11 10:26:48 +01:00 |
|
Steffen van Bergerem
|
269512c1b8
|
Fix eye not stopping all processes
Fixes #6685. See 866ecd0587
|
2016-02-11 10:22:35 +01:00 |
|
augier
|
cc1faa63ec
|
Mobile JS refactor
|
2016-02-11 10:21:24 +01:00 |
|
Dennis Schubert
|
c9a32563e6
|
Merge branch 'svbergerem-fix-gallery-navigation-arrows' into develop
|
2016-02-10 10:18:04 +01:00 |
|
Steffen van Bergerem
|
be254a7d4d
|
Fix placement of gallery navigation arrows
|
2016-02-10 01:20:05 +01:00 |
|
Dennis Schubert
|
0ee0b31e5c
|
Bump openid_connect
|
2016-02-09 22:22:18 +01:00 |
|
Dennis Schubert
|
a49b7baf36
|
Bump webfinger
|
2016-02-09 22:22:05 +01:00 |
|
Dennis Schubert
|
e42a444d8d
|
Bump swd
|
2016-02-09 22:21:49 +01:00 |
|
Dennis Schubert
|
5262dabbf4
|
Bump rack-oauth2
|
2016-02-09 22:21:36 +01:00 |
|
Dennis Schubert
|
f9de06100d
|
Bump jsonpath
|
2016-02-09 22:21:20 +01:00 |
|
Dennis Schubert
|
ba3eb57ec4
|
Bump json-jwt
|
2016-02-09 22:20:56 +01:00 |
|
Dennis Schubert
|
a9d649e173
|
Bump bindata
|
2016-02-09 22:20:36 +01:00 |
|
Dennis Schubert
|
8d1f03a35b
|
Bump attr_required
|
2016-02-09 22:20:17 +01:00 |
|
Steffen van Bergerem
|
e10f606d7b
|
Merge branch 'stable' into develop
|
2016-02-09 22:19:14 +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 |
|