Commit graph

16618 commits

Author SHA1 Message Date
Régis Hanol
acf9334ea5 Merge pull request #3378 from techAPJ/patch-1
FIX: show error message if user already exist in group
2015-04-15 11:05:32 +02:00
Arpit Jalan
499bed69e2 FIX: show error message if user already exist in group 2015-04-15 14:15:58 +05:30
Simon Cossar
b0a3401186 Fix if defined? conditional for R2 2015-04-14 20:14:04 -07:00
Simon Cossar
51ebc56f89 Move 'if defined?' conditional to before 'require' statement for r2 gem 2015-04-14 19:50:55 -07:00
Simon Cossar
4b8ad7637c Remove old styles from rtl.scss. Add new styles to fix some positioning. 2015-04-14 19:19:11 -07:00
Simon Cossar
9b7f98edc5 Add to html element - this needs to be explicit so it can be reversed by r2 2015-04-14 19:07:23 -07:00
Simon Cossar
e52ab2ecf1 Update rtl conditional check in DiscourseSassCompiler 2015-04-14 19:02:52 -07:00
Simon Cossar
0ed67e919c Add r2 gem for rtl stylesheet conversion 2015-04-14 18:53:02 -07:00
Simon Cossar
6fc7371079 Add memory to VM 2015-04-14 18:43:49 -07:00
Sam
9191fbe9fb Upgrade ruby racer so we can remove our freedom patch 2015-04-15 09:21:52 +10:00
Sam
2a3f71a9a1 SECURITY: log off all existing sessions when resetting password 2015-04-15 08:57:43 +10:00
Sam
6a0cce8571 UX: tweak copy and position of tracking and new prefs 2015-04-15 08:38:42 +10:00
Kris Aubuchon
a87bf1d9aa some fixes for tag alignment 2015-04-14 15:54:17 -04:00
Régis Hanol
32e02411bd add custom importer for sfn.org 2015-04-14 18:16:42 +02:00
Robin Ward
869d8e25ad Promotion fails if the user account isn't old enough yet. 2015-04-14 12:14:59 -04:00
Robin Ward
eaf5d21c41 Don't store post timings that are greater than the account lifetime 2015-04-14 11:49:44 -04:00
Régis Hanol
a57bbd5000 Merge pull request #3373 from savef/fix-user-card-avatar-alt
Add blank alt attribute to user card avatars.
2015-04-14 16:10:35 +02:00
Ben Hadley-Evans
c3b461f58d Add blank alt attribute to avatars.
This was giving an ugly border to avatars in the user card as the full size version loaded in Firefox.
2015-04-14 14:39:40 +01:00
Marcus Rückert
dba8cbc6ce Update poll readme to include warning
about the topic prefix.
2015-04-14 13:56:56 +02:00
Jeff Atwood
f996b77470 Merge pull request #3372 from techAPJ/patch-3
FIX: scale large vertial images for onebox
2015-04-13 20:02:00 -07:00
Arpit Jalan
64d0eb567d FIX: scale large vertial images for onebox 2015-04-14 08:02:01 +05:30
Neil Lalonde
334f89ca16 Version bump to v1.3.0.beta5 2015-04-13 14:59:46 -04:00
Neil Lalonde
832ec801ee Merge pull request #3371 from techAPJ/update-translations
Update Translations
2015-04-13 14:43:48 -04:00
Arpit Jalan
77baae13bc Update Translations 2015-04-13 23:58:48 +05:30
Robin Ward
3c189c9064 Updates to the Drupal import script
- Allow the VID and DB to be configurable by ENV vars.
- Make importing the blog optional.
2015-04-13 13:06:26 -04:00
Robin Ward
db4c04d606 FIX: Moderators shouldn't be able to see secure deleted posts 2015-04-13 11:48:31 -04:00
Régis Hanol
627bd08477 Merge pull request #3367 from edgibbs/sort_page_views_report
FIX: Sort page views report records
2015-04-12 22:08:22 +02:00
Ed Gibbs
5650428052 FIX: Sort page views report records
Adding a sort ascending by date to the page views report.
2015-04-12 10:46:13 -07:00
Régis Hanol
076bfeeb22 Merge pull request #3366 from tancnle/email-retry-jobs-count
A shorter and more concise version of select..size
2015-04-12 17:26:38 +02:00
Tan Le
c55fdc7a75 A shorter and more concise version of select..size 2015-04-12 22:26:48 +10:00
Ruben Barkow
d9d3ed5604 Keeping your VM up to date (and first install)
The title was irritating, because you also have to call this the first time you access your VM
2015-04-12 11:40:49 +02:00
Neil Lalonde
0ba2ac97f2 Merge pull request #3358 from techAPJ/update-translations
Update Translations
2015-04-10 12:43:54 -04:00
Robin Ward
afe0781c50 FIX: Topic bulk actions refresh was broken 2015-04-10 12:43:14 -04:00
Régis Hanol
da8e5fbda3 search template clean-up 2015-04-10 16:09:16 +02:00
Régis Hanol
ae953e8087 FIX: missing username in the IP Lookup dialog 2015-04-10 15:56:40 +02:00
Régis Hanol
a68868e7e9 Merge pull request #3361 from techAPJ/patch-2
FIX: add email reply error message for topic not getting created in restricted category
2015-04-10 13:59:11 +02:00
Arpit Jalan
e6df97f01d FIX: add email reply error message for topic not getting created in restricted category 2015-04-10 17:11:52 +05:30
Sam
75890aed26 FEATURE: allow admins to choose a group as a primary group
FEATURE: allow admins to set a default title for a group
2015-04-10 12:17:28 +10:00
Sam
e143eb595f UX: add link to group member from groups admin page
UX: remove uneeded refresh button from custom groups
2015-04-10 09:49:26 +10:00
Sam
eed8ddbb5c UX: select on blur if there are no choices for select2 2015-04-10 09:13:51 +10:00
Neil Lalonde
930937cfd5 FIX: mobile categories page should show the same dates as desktop categories page 2015-04-09 17:06:44 -04:00
Robin Ward
0d90b495a8 FIX: Plugins were broken for initial payloads
Our plugins use rails engines which are mounted against the main
application's `ApplicationController`. This works great but path helpers
need to reference `main_app` in order for it not to blow up.
2015-04-09 12:26:24 -04:00
Arpit Jalan
8623f179ff Update Translations 2015-04-09 20:58:06 +05:30
Régis Hanol
4a9587fa23 FIX: auto-load all plugin locales so that they can be used in PrettyText 2015-04-09 17:04:14 +02:00
Régis Hanol
77dc5f2f58 Merge pull request #3355 from Qasem-h/other
change fa key to fa_IR in plurals.rb
2015-04-09 09:17:39 +02:00
Qasem Hajizadeh
f89b1002f0 change fa key to fa_IR in plurals.rb
change fa key to fa_IR in plurals.rb
2015-04-09 01:39:59 +04:30
Régis Hanol
797a95cfc1 Merge pull request #3353 from awesomerobot/master
rounding the post-count squares in topic summaries
2015-04-08 22:39:15 +02:00
Kris Aubuchon
cd552170a4 rounding the post-count squares in topic summaries 2015-04-08 16:31:19 -04:00
Régis Hanol
ea87212104 Merge pull request #3348 from Elberet/patch-1
Remove white corners from avatars
2015-04-08 11:27:55 +02:00
Jens Maier
5d4a22920e Remove white corners from avatars
See https://meta.discourse.org/t/round-avatars-in-topic-list/27098/103?u=elberet
2015-04-08 11:14:06 +02:00