Jonne Haß
|
0cbe7ec9a8
|
Merge branch 'stable' into develop
|
2015-07-22 10:05:46 +02:00 |
|
Steffen van Bergerem
|
f8bbe71f54
|
Remove correlations
closes #6223
|
2015-07-22 09:46:52 +02:00 |
|
Steffen van Bergerem
|
c8f482064c
|
Remove rake_helpers
|
2015-07-22 09:41:53 +02:00 |
|
Jonne Haß
|
d6587469e4
|
Merge pull request #6218 from svbergerem/mobile-entypo
Entypo on mobile website
|
2015-07-22 00:11:55 +02:00 |
|
Steffen van Bergerem
|
839d76c15e
|
Moar entypo on mobile website
|
2015-07-21 21:16:46 +02:00 |
|
Jonne Haß
|
2ae1d0215a
|
Merge pull request #6219 from svbergerem/admin-dashboard-improve-wording
Improve wording for admin dashboard
|
2015-07-21 20:45:56 +02:00 |
|
Steffen van Bergerem
|
8f27e8fae8
|
Improve wording for admin dashboard
|
2015-07-21 20:43:18 +02:00 |
|
Jonne Haß
|
dbbaf90c27
|
Merge pull request #6216 from svbergerem/admin-page-update-notifications
Add dashboard to admin page
|
2015-07-21 16:55:27 +02:00 |
|
Steffen van Bergerem
|
484e70a68f
|
Add dashboard to admin page
|
2015-07-21 14:36:41 +02:00 |
|
Jonne Haß
|
3d6ae08e84
|
Merge branch 'stable' into develop
|
2015-07-20 17:49:01 +02:00 |
|
Jonne Haß
|
1dd76d7c60
|
Merge branch 'release/0.5.2.0' into stable
|
2015-07-20 17:48:10 +02:00 |
|
Jonne Haß
|
c0a0f5e076
|
updated 24 locale files [ci skip]
|
2015-07-20 17:45:09 +02:00 |
|
Jonne Haß
|
7c233aa216
|
Drop rails-assets-autosize from Gemfile.lock
|
2015-07-20 17:42:42 +02:00 |
|
Dennis Schubert
|
b4bc7d8198
|
Merge branch 'stable' into develop
|
2015-07-20 03:56:59 +02:00 |
|
Dennis Schubert
|
53c3ef1d2b
|
Merge branch 'release/0.5.2.0' into stable
|
2015-07-20 03:52:22 +02:00 |
|
Steffen van Bergerem
|
b707ec9622
|
Update jasmine-ajax
|
2015-07-20 03:52:03 +02:00 |
|
Steffen van Bergerem
|
cf4143f4a1
|
Remove jquery-idletimer
|
2015-07-20 03:51:03 +02:00 |
|
Steffen van Bergerem
|
aa75572815
|
Update perfect-scrollbar
|
2015-07-20 03:44:48 +02:00 |
|
Steffen van Bergerem
|
7a8269ce05
|
Update jquery-placeholder
|
2015-07-20 03:42:58 +02:00 |
|
Steffen van Bergerem
|
60e3b0c55f
|
Update highlightjs
|
2015-07-20 03:39:08 +02:00 |
|
Steffen van Bergerem
|
032e292e82
|
Update markdown-it
|
2015-07-20 03:39:08 +02:00 |
|
Steffen van Bergerem
|
94b745d5c8
|
Merge branch 'stable' into develop
|
2015-07-20 01:31:33 +02:00 |
|
Ivan Korunkov
|
5ca9ca9844
|
Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource.
closes #6212
|
2015-07-20 01:31:22 +02:00 |
|
Ivan Korunkov
|
c98dacdfab
|
Default home page: fix indent level; fix indentation level for configuration message block to make it looks like other blocks.
|
2015-07-20 01:29:00 +02:00 |
|
Jonne Haß
|
3e841905ec
|
Merge branch 'stable' into develop
|
2015-07-20 00:58:33 +02:00 |
|
Jonne Haß
|
ccf2fad903
|
Start 0.5.3.0 development cycle
|
2015-07-20 00:57:24 +02:00 |
|
Jonne Haß
|
3a4815996f
|
Merge branch 'stable' into develop
|
2015-07-17 20:21:19 +02:00 |
|
Rich**
|
48f5aed63e
|
Make default conversation subject translatable and properly capitalize it
closes #6206, closes #6205
|
2015-07-17 20:20:00 +02:00 |
|
Jonne Haß
|
00fc14e265
|
Merge pull request #6204 from svbergerem/fix-profile-visibility-icon
Fix profile visibility icon
|
2015-07-17 15:39:49 +02:00 |
|
Steffen van Bergerem
|
295c8533a1
|
Fix profile visibility icon
|
2015-07-17 14:37:22 +02:00 |
|
Jonne Haß
|
0e439f6c1c
|
Merge branch 'stable' into develop
|
2015-07-16 11:12:16 +02:00 |
|
JoeBew42
|
e21dad780d
|
Refactoring tests on photo saved with and without EXIF data
closes #6183
|
2015-07-16 11:12:12 +02:00 |
|
Jonne Haß
|
99aa354052
|
Merge branch 'stable' into develop
|
2015-07-16 10:47:36 +02:00 |
|
Dennis Schubert
|
e7a2775cb5
|
Bump redcarpet
|
2015-07-16 10:45:32 +02:00 |
|
Dennis Schubert
|
0f51d89ba5
|
Merge pull request #6200 from AugierLe42e/fix-stream-faces
Better display for stream faces
|
2015-07-16 03:39:21 +02:00 |
|
Dennis Schubert
|
201a3ec1cf
|
Merge branch 'stable' into develop
|
2015-07-16 03:11:25 +02:00 |
|
realtin
|
d0b290ea4d
|
refactor hash indentation and add double quotes
this is the suggested styling according to hound/pronto/rubocop
(#6192)
|
2015-07-16 03:08:34 +02:00 |
|
zaziemo
|
c5a2334fbe
|
refactor tests to use let
instead of before blocks creating instance variables
pronto checked
#6192
|
2015-07-16 03:05:21 +02:00 |
|
realtin
|
8823bb01a2
|
refactor test to use let and better indentation
(#6192)
|
2015-07-16 03:05:20 +02:00 |
|
zaziemo
|
56e0d3d57d
|
Remove one comment and change hash syntax
#6192
|
2015-07-16 03:05:20 +02:00 |
|
zaziemo
|
f52260ec68
|
Delete test because it didn't have an expectation
and dipatch is also called in the following test
#6192
|
2015-07-16 03:05:20 +02:00 |
|
realtin
|
62b375bb8e
|
refactor test to use let
instead of instance variables
(#6192)
|
2015-07-16 03:05:20 +02:00 |
|
realtin
|
1503376fa6
|
refactor test to not use send method
since dispatch method is not private
(#6192)
|
2015-07-16 03:05:20 +02:00 |
|
realtin
|
880886bbad
|
refactor test to use let instead of instance variables
|
2015-07-16 03:05:20 +02:00 |
|
zaziemo
|
5fba53a105
|
refactor even more tests
|
2015-07-16 03:05:20 +02:00 |
|
realtin
|
3ff33d355f
|
refactor test to use let
|
2015-07-16 03:05:20 +02:00 |
|
zaziemo
|
e1e8856e8d
|
refactor more specs
|
2015-07-16 03:05:20 +02:00 |
|
zaziemo
|
e3fe375849
|
correct indentation and use new hash syntax
|
2015-07-16 03:05:20 +02:00 |
|
zaziemo
|
fccb5dae23
|
refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests
|
2015-07-16 03:04:41 +02:00 |
|
realtin
|
a9919fabd1
|
refactor test to use let and rm unused variables
|
2015-07-16 03:00:08 +02:00 |
|