Commit graph

17428 commits

Author SHA1 Message Date
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
Steffen van Bergerem
9cc40af69c Fix 500 for mobile like without javascript 2016-02-08 03:11:55 +01:00
Steffen van Bergerem
6e895532c5 Fix uncaught type error for mobile avatar upload 2016-02-08 02:46:50 +01:00
Steffen van Bergerem
77d45c28c9 Mark getting started as completed on mobile website 2016-02-07 23:21:38 +01:00
Steffen van Bergerem
482cbe7fcc Add reason for post report to email sent to admins 2016-02-07 17:58:03 +01:00
Dennis Schubert
0c1483b16a Merge pull request #6678 from svbergerem/mobile-registration
Fix mobile registration design
2016-02-07 16:33:17 +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
Steffen van Bergerem
b06981c031 Fix mobile registration design 2016-02-07 13:42:52 +01:00
Takashi Kokubun
3028f8e9ad Use Hamlit to render Haml 2016-02-07 14:39:25 +09: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
3f72b231d4 Enable autosize for all textareas 2016-02-06 15:10:32 +01:00
Steffen van Bergerem
0f33a7e9b0 Enforce comments before temporary linter rule changes 2016-02-06 14:15:04 +01:00
Steffen van Bergerem
ada0ad6eb5 Unify settings ui 2016-02-06 14:15:04 +01:00
Steffen van Bergerem
03ef5bd064 Set max-width to 1200px for container-fluid 2016-02-06 14:15:04 +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
Faldrian
6da2720168 Check for collapsible content_view again after images are loaded 2016-02-04 21:39:28 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
Jonne Haß
1832c2956e Merge branch 'stable' into develop 2016-02-01 11:27:06 +01:00
Sayed Abdelhaleem
fa97a5a5a2 Issue #6662: fix refresh my photos routing error
closes #6667
2016-02-01 11:24:16 +01:00
Jonne Haß
1b34d01ba5 Merge pull request #6666 from svbergerem/fix-blueimp-gallery-indicators
Fix blueimp gallery indicators
2016-02-01 10:37:08 +01:00
Steffen van Bergerem
17e8d2fcbb Fix blueimp gallery indicators 2016-02-01 02:32:49 +01:00
Steffen van Bergerem
ef31b441e8 Bump rails-assets-blueimp-gallery 2016-02-01 00:20:06 +01:00
Steffen van Bergerem
461a337cc6 Bump rails-assets-autosize 2016-02-01 00:19:48 +01:00
Steffen van Bergerem
6fa0fe5202 Bump sidekiq-cron 2016-02-01 00:18:32 +01:00
Steffen van Bergerem
53bf478f24 Bump sidekiq 2016-02-01 00:17:24 +01:00
Steffen van Bergerem
02a0650b0e Bump eye 2016-02-01 00:14:21 +01:00
Jonne Haß
3a1ead1b21 Merge branch 'stable' into develop 2016-02-01 00:06:06 +01:00
Steffen van Bergerem
2f66c7c89a Bump rails-assets-perfect-scrollbar 2016-01-31 23:56:56 +01:00
Steffen van Bergerem
f1aad6512a Bump rails-assets-highlightjs 2016-01-31 23:42:58 +01:00
Steffen van Bergerem
89dedb8ba1 Bump will_paginate 2016-01-31 23:36:21 +01:00
Steffen van Bergerem
3065e1bf21 Bump sinatra 2016-01-31 23:33:23 +01:00
Steffen van Bergerem
80088fa2a0 Bump simple_captcha2 2016-01-31 23:27:09 +01:00
Steffen van Bergerem
0540a14056 Bump js-routes 2016-01-31 23:19:14 +01:00
Steffen van Bergerem
809763f653 Bump jquery-rails and rails-assets-jquery 2016-01-31 23:19:14 +01:00
Steffen van Bergerem
ce8e8716b9 Bump handlebars_assets 2016-01-31 23:19:14 +01:00
Steffen van Bergerem
3782935b19 Bump devise 2016-01-31 23:16:25 +01:00
Steffen van Bergerem
5995afbd36 Bump autoprefixer-rails 2016-01-31 23:13:57 +01:00
Jonne Haß
f4454f4488 Merge branch 'stable' into develop 2016-01-30 15:04:29 +01:00
Sayed Abdelhaleem
2af9ccddf1 Improve photo export download integration test
closes #6663
2016-01-30 15:03:26 +01:00
Jonne Haß
bf154a122e Merge pull request #6660 from SuperTux88/fix-sidekiq-cron-queues
fix queues for cron jobs
2016-01-29 13:05:45 +01:00