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 |
|
Dennis Schubert
|
677bddc3d3
|
Merge branch 'stable' into develop
|
2016-02-09 12:42:26 +01:00 |
|
Steffen van Bergerem
|
ac5a7746e2
|
Remove contacts_title method and translations
closes #6687
|
2016-02-09 12:42:21 +01:00 |
|
Dennis Schubert
|
4f2c6942a5
|
Merge pull request #6686 from svbergerem/remove-stream-faces
Remove stream faces
|
2016-02-08 19:10:37 +01:00 |
|
Dennis Schubert
|
5b21be845e
|
Merge branch 'stable' into develop
|
2016-02-08 08:21:35 +01:00 |
|
Steffen van Bergerem
|
f066daedbb
|
Disable share button in mobile publisher on submit
closes #6682, closes #6330
|
2016-02-08 08:20:24 +01:00 |
|
Dennis Schubert
|
695ca83638
|
Merge branch 'stable' into develop
|
2016-02-08 08:18:33 +01:00 |
|
Steffen van Bergerem
|
f9f5e990f9
|
Remove bidi-override for author names
closes #6680, closes #4785
|
2016-02-08 08:16:37 +01:00 |
|
Dennis Schubert
|
5933c63a4a
|
Merge pull request #6684 from svbergerem/fix-mobile-js-avatar-upload
Fix uncaught type error for mobile avatar upload
|
2016-02-08 08:01:21 +01:00 |
|
Dennis Schubert
|
9f6cc7cf12
|
Merge pull request #6683 from svbergerem/fix-mobile-500-like
Fix 500 for mobile like without javascript
|
2016-02-08 08:00:07 +01:00 |
|
Dennis Schubert
|
73ab7e253e
|
Merge pull request #6681 from svbergerem/mobile-getting-started-completed
Mark getting started as completed on mobile website
|
2016-02-08 07:58:29 +01:00 |
|
Dennis Schubert
|
a87f313927
|
Merge pull request #6679 from svbergerem/post-report-reason-in-mail
Add reason for post report to email sent to admins
|
2016-02-08 07:56:49 +01:00 |
|
Dennis Schubert
|
15d5e0febc
|
Merge branch 'stable' into develop
|
2016-02-07 16:31:53 +01:00 |
|
Steffen van Bergerem
|
785665b9ad
|
Fix mobile registration layout after failed registration
closes #6677
|
2016-02-07 16:31:48 +01:00 |
|
Dennis Schubert
|
c867fb6e26
|
Add mussing hash key in Changelog
[ci skip]
|
2016-02-07 05:57:29 +01:00 |
|
Dennis Schubert
|
d67ec12913
|
Merge branch 'Faldrian-3307-collapse_long_images' into develop
|
2016-02-07 05:55:14 +01:00 |
|
Dennis Schubert
|
26e37c46bd
|
Merge branch 'svbergerem-textarea-autosize' into develop
|
2016-02-07 05:39:49 +01:00 |
|
Dennis Schubert
|
868a45e3e0
|
Merge branch 'svbergerem-unify-ui' into develop
|
2016-02-07 05:29:08 +01:00 |
|
Steffen van Bergerem
|
936460e874
|
Merge branch 'stable' into develop
|
2016-02-06 15:40:16 +01:00 |
|
Dennis Schubert
|
87ef4446e1
|
Remove uma.jpg and wolf.jpg
closes #6673
|
2016-02-06 15:39:38 +01:00 |
|
Steffen van Bergerem
|
0c34452840
|
Merge pull request #6654 from korun/set-default-resize-style-01
CSS: set "resize: vertical" as default for textarea
|
2016-02-06 12:00:44 +01:00 |
|
Steffen van Bergerem
|
0c05b474c5
|
Merge pull request #6509 from AugierLe42e/fix-mobile-comment
Refactor mobile comment section
|
2016-02-05 11:30:04 +01:00 |
|
Jonne Haß
|
32bda8fe20
|
Merge branch 'stable' into develop
|
2016-01-28 18:47:18 +01:00 |
|
Faldrian
|
8e3816e64e
|
let mention-regex only match usable strings
closes #6658
|
2016-01-28 18:47:13 +01:00 |
|
Jonne Haß
|
762299b6ad
|
Merge branch 'stable' into develop
|
2016-01-28 16:36:46 +01:00 |
|
Sayed Abdelhaleem
|
8c0d12b6d3
|
fix NameError: uninitialized constant User::Zip by specifying rubzip gem main file name in Gemfile
closes #6659
|
2016-01-28 16:36:40 +01:00 |
|
Steffen van Bergerem
|
7e297ea18a
|
Add changelog entry for #6641 [ci skip]
|
2016-01-27 00:09:58 +01:00 |
|
Dennis Schubert
|
7c197756dd
|
Merge branch 'stable' into develop
|
2016-01-26 15:19:55 +01:00 |
|
Dennis Schubert
|
211365c169
|
Merge branch 'master' into stable
|
2016-01-26 15:19:27 +01:00 |
|
Dennis Schubert
|
ad20bb052c
|
Fix include_root_in_json misuse
since it is no longer exposed for instances, our post_presenter failed
hard.
|
2016-01-26 15:18:02 +01:00 |
|
Dennis Schubert
|
72fe5a79c2
|
Prepeare 0.5.6.3 hotfix-hotfix
|
2016-01-26 14:59:33 +01:00 |
|
Dennis Schubert
|
8da3cc0852
|
Merge branch 'stable' into develop
|
2016-01-26 14:33:36 +01:00 |
|
Dennis Schubert
|
6153fc7286
|
Merge branch 'hotfix/0.5.6.2' into stable
|
2016-01-26 14:30:34 +01:00 |
|
Dennis Schubert
|
33af30529a
|
Bump rails
|
2016-01-26 14:28:02 +01:00 |
|
Dennis Schubert
|
c04ee239c6
|
Prepare 0.5.6.2 hotfix
|
2016-01-26 14:26:10 +01:00 |
|
Dennis Schubert
|
5f986464da
|
Drop Redis namespace support
|
2016-01-24 07:29:28 +01:00 |
|
cmrd Senya
|
ed61ef6d6a
|
Replace sidetiq with sidekiq-cron
closes #6616
|
2016-01-24 07:20:44 +01:00 |
|
Dennis Schubert
|
515cda7658
|
Merge branch 'stable' into develop
|
2016-01-24 07:15:04 +01:00 |
|
Benjamin Neff
|
44ab0df02b
|
fix suppress_annoying_errors
closes #6653
|
2016-01-24 07:14:58 +01:00 |
|
Dennis Schubert
|
b1aa8aacfd
|
Merge branch 'stable' into develop
|
2016-01-24 07:13:11 +01:00 |
|
Steffen van Bergerem
|
0213bbc028
|
Add podmin email to 500 error page
closes #6652
|
2016-01-24 07:12:06 +01:00 |
|
Dennis Schubert
|
9c7b5bc0ce
|
Merge pull request #6648 from svbergerem/fix-timeago-reshares
Fix timeago tooltips for reshares
|
2016-01-22 02:33:39 +01:00 |
|
Dennis Schubert
|
072ce711d2
|
Merge branch 'master' into stable
|
2016-01-22 01:41:49 +01:00 |
|
Dennis Schubert
|
22fa2c7cc4
|
Merge branch 'hotfix/0.5.6.1' into develop
|
2016-01-22 01:40:29 +01:00 |
|
Steffen van Bergerem
|
f6da6a68f6
|
Merge branch 'stable' into develop
|
2016-01-21 21:13:01 +01:00 |
|
Steffen van Bergerem
|
18a46d9f90
|
Fix Changelog [ci skip]
|
2016-01-21 21:12:37 +01:00 |
|
Dennis Schubert
|
dd93cb6cad
|
Merge pull request #6646 from svbergerem/commenting-when-ignored
Tell user that the author might ignore them when commenting/liking failed
|
2016-01-21 21:07:37 +01:00 |
|
Dennis Schubert
|
ff867cd471
|
Merge branch 'stable' into develop
|
2016-01-21 21:00:32 +01:00 |
|
Steffen van Bergerem
|
749016a7b4
|
Fix keyboard shortcuts on profile pages
closes #6647
|
2016-01-21 21:00:26 +01:00 |
|
Dennis Schubert
|
a8008571b3
|
Bump devise
|
2016-01-21 20:55:46 +01:00 |
|