Robin Ward
|
9ba25b2b61
|
Merge pull request #934 from ZogStriP/fix-upload-specs
Fix upload specs
|
2013-05-31 09:56:45 -07:00 |
|
Robin Ward
|
0af0a214b2
|
Refactor: Back all modals by controllers
|
2013-05-31 12:29:38 -04:00 |
|
Neil Lalonde
|
e0dae88885
|
remove specs for redirect_to_show, i'll figure out how to do this properly later
|
2013-05-31 12:10:07 -04:00 |
|
Neil Lalonde
|
cceac14baf
|
I broke infinite scrolling in a topic
|
2013-05-31 11:55:51 -04:00 |
|
Régis Hanol
|
bf6b846c0b
|
Fix upload specs
|
2013-05-31 17:51:22 +02:00 |
|
Robin Ward
|
830b7805e9
|
Merge pull request #927 from bplexico/extract_invite_redeemer
Extract InviteRedeemer from Invite
|
2013-05-31 08:30:42 -07:00 |
|
Robin Ward
|
f7c0fa0434
|
Merge pull request #932 from sanderdatema/dutch_translation
Updated Dutch translation
|
2013-05-31 08:30:13 -07:00 |
|
Sander Datema
|
00f16b15c5
|
Updated Dutch translation
|
2013-05-31 10:03:07 +02:00 |
|
Sam
|
b35b3da077
|
allow eviction of computer help for @geek
|
2013-05-31 15:09:19 +10:00 |
|
Sam
|
d00ba60ad3
|
file is uploaded but hash is not matching ... why?
|
2013-05-31 15:04:01 +10:00 |
|
Sam
|
b228a7c185
|
Merge pull request #923 from eriko/cas_support
remove hardcoded value and replace with SiteSetting.cas_domainname
|
2013-05-30 21:39:29 -07:00 |
|
Sam
|
d2c1eb090e
|
Merge pull request #921 from nirnanaaa/postgres-truefalse
removed t's and f's from models
|
2013-05-30 21:38:26 -07:00 |
|
Sam
|
41187a5de1
|
Merge pull request #931 from ZogStriP/more-file-upload-test-coverage
added more file uploads test for better coverage
|
2013-05-30 21:36:33 -07:00 |
|
Sam
|
9ecf61d77d
|
Merge pull request #922 from ZogStriP/keep-french-l10n-up-to-date-2013-05-29
[ci-skip] keep French localization up to date
|
2013-05-30 21:35:19 -07:00 |
|
Sam
|
037cbfd648
|
Merge pull request #926 from netzpirat/fix-s3-images
Don't append the base url to absolute image urls without protocol.
|
2013-05-30 21:33:37 -07:00 |
|
Sam
|
e5f8297670
|
Merge pull request #928 from jd-erreape/master
Refactored some class methods to scopes in order to achieve a better 'Rails way'
|
2013-05-30 21:31:53 -07:00 |
|
Sam
|
d6d3f74405
|
Merge pull request #901 from xtream/master
Refactored AvatarLookup
|
2013-05-30 21:30:39 -07:00 |
|
Régis Hanol
|
6cc0f8f2d4
|
added more file uploads test for better coverage
|
2013-05-31 03:13:37 +02:00 |
|
Jeff Atwood
|
e7cd940d2f
|
Merge pull request #930 from nicksahler/patch-1
Added suggestion to reload nginx
|
2013-05-30 16:27:37 -07:00 |
|
Nick Sahler
|
6636aa0895
|
Added suggestion to reload nginx
|
2013-05-30 20:03:06 -03:00 |
|
Sam
|
2e87974cb5
|
fix very wonky logic around hostname calculation
|
2013-05-31 08:48:34 +10:00 |
|
Sam
|
160567e372
|
Revert "fix wonky logic figuring out host name"
This reverts commit 114fcb4734.
|
2013-05-31 08:41:29 +10:00 |
|
Sam
|
114fcb4734
|
fix wonky logic figuring out host name
|
2013-05-31 08:39:52 +10:00 |
|
Neil Lalonde
|
42714b424f
|
For 403 errors, show the same html page as 404
|
2013-05-30 16:39:39 -04:00 |
|
Robin Ward
|
11aad6fe1e
|
Merge pull request #929 from chrishunt/chrishunt/fix-category-search
Only pass search context type and id in search request
|
2013-05-30 13:16:04 -07:00 |
|
Chris Hunt
|
afa519b3ae
|
Only pass searchContext type, id in search request
|
2013-05-30 12:54:34 -07:00 |
|
Juan de Dios Herrero
|
807f763fb0
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-30 21:42:26 +02:00 |
|
DI2uNk
|
24e32092e7
|
Refactored two class methods into scopes (to achieve a better 'rails way')
Also added some tests to the methods
|
2013-05-30 21:21:31 +02:00 |
|
Neil Lalonde
|
b82a5dfd56
|
Move logic to reject slugs that are just numbers into the slug module
|
2013-05-30 11:54:02 -04:00 |
|
Brian Plexico
|
0591d5be11
|
Extract InviteRedeemer from Invite
|
2013-05-30 11:49:11 -04:00 |
|
Michael Kessler
|
d2e45cb8fd
|
Don't append the base url to absolute image urls without protocol.
|
2013-05-30 17:17:07 +02:00 |
|
Neil Lalonde
|
7d5c313456
|
Don't allow category slugs that are numbers
|
2013-05-30 11:09:09 -04:00 |
|
Neil Lalonde
|
5d444be72b
|
Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number
|
2013-05-30 10:39:15 -04:00 |
|
Sam
|
b7c05d8080
|
Merge pull request #925 from netzpirat/update-german-translations
Keep German translations in sync.
|
2013-05-30 05:33:07 -07:00 |
|
Michael Kessler
|
571e62a27a
|
Keep German translations in sync.
|
2013-05-30 13:13:53 +02:00 |
|
Sam
|
3898d90142
|
fix bugs with sync being wonky
|
2013-05-30 20:44:53 +10:00 |
|
Victor Cruz Dueñas
|
5d2a6e3994
|
refactored and tested AvatarLookup
less array copying
Avoid N queries
|
2013-05-30 11:04:05 +02:00 |
|
Sam
|
c2e597c57c
|
missing message format files
|
2013-05-30 17:03:47 +10:00 |
|
Sam
|
c26d70e68a
|
make precompile happier
|
2013-05-30 16:58:31 +10:00 |
|
Sam
|
d20056ad0e
|
correct watcher, live updates for unread
|
2013-05-30 16:49:58 +10:00 |
|
Sam
|
6ad86aa305
|
read state is now published
|
2013-05-30 16:49:58 +10:00 |
|
Sam
|
8874c9ea75
|
Add message format support that can be used on complex localization strings
Add message about new and unread topics at the bottom of topics
move localization helper into lib
|
2013-05-30 16:49:57 +10:00 |
|
Sam
|
e93b7a3b20
|
more progress towards live unread and new counts, unread message implemented, still to implement delete messages
|
2013-05-30 16:49:57 +10:00 |
|
Sam
|
f2da06a78f
|
gmefile lock
|
2013-05-30 16:49:57 +10:00 |
|
Sam
|
90167e427b
|
highlight logic changed
|
2013-05-30 16:49:57 +10:00 |
|
Sam
|
73834370a5
|
work in progress, live unread and new counts
|
2013-05-30 16:49:57 +10:00 |
|
Sam
|
33683715a9
|
work in progress live unread / new counts
|
2013-05-30 16:49:57 +10:00 |
|
Sam
|
33ff87bf44
|
work in progress, live unread / new counters
|
2013-05-30 16:49:57 +10:00 |
|
Jeff Atwood
|
52eeecd460
|
add strong warnings on force_hostname and port
|
2013-05-29 16:27:46 -07:00 |
|
Sam
|
4e2c6f43d1
|
correct broken pm draft
|
2013-05-30 08:55:23 +10:00 |
|