Sam Saffron
b7c5687b10
Merge branch 'master' of github.com:discourse/discourse
2013-02-13 20:38:59 +11:00
Sam Saffron
161420fac0
Added method for testing ember stuff
...
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
Jeff Atwood
48e2b8c269
require 50 read posts, not 100, for basic user
2013-02-13 01:23:02 -08:00
Jeff Atwood
e380ebde40
no uppercasin'
2013-02-13 01:20:02 -08:00
Jeff Atwood
ae034a438c
scope google search on 404 to domain
2013-02-13 01:05:35 -08:00
xdite
67cc766f0c
using redis as backend store
2013-02-13 16:48:44 +08:00
Jeff Atwood
ee75980f23
first step of variable-izing the /tos
2013-02-13 00:35:18 -08:00
Jeff Atwood
8078f04769
minor 404 page improvements
2013-02-13 00:25:27 -08:00
Jeff Atwood
1a0ead770e
add base_url to all /faq links in emails
2013-02-12 23:33:35 -08:00
Jeff Atwood
b5a25084c0
That 1px makes all the difference, man
2013-02-12 23:17:54 -08:00
xdite
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
xdite
f232c646a7
move 3 test to 1
2013-02-13 15:15:44 +08:00
xdite
9189d937f7
move all logic to omniauth
...
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
xdite
be3d036084
use omniauth-openid to replace google id
2013-02-13 15:08:32 +08:00
Jeff Atwood
4c572ecd8d
clean up some copy
2013-02-12 22:43:21 -08:00
Jeff Atwood
36165d4687
copyedits
2013-02-12 22:20:53 -08:00
Dan Neumann
afb83c1108
cleaned up discourse_plugin
2013-02-12 22:45:10 -06:00
Neil Lalonde
4e9d9138d6
Fix broken signup with Twitter
2013-02-12 20:50:31 -05:00
Robin Ward
27a07054d7
We never want to filter TopicView to just one post.
2013-02-12 19:02:16 -05:00
Dan Neumann
4a390bc562
remove reinvention of #parameterize
2013-02-12 17:53:06 -06:00
Robin Ward
69c7b5aeed
Support category names with spaces
2013-02-12 17:54:56 -05:00
Neil Lalonde
8235d47bdd
Add a new default favicon using the pencil drawn logo
2013-02-12 17:47:44 -05:00
Robin Ward
eea6eeb07a
Allow travis to use sample .yml files
2013-02-12 16:30:56 -05:00
Neil Lalonde
824b09389f
Don't allow signups without a password
2013-02-12 15:42:16 -05:00
Robin Ward
d7f3241285
Option to supress replies button below a post, when its reply is directly following.
2013-02-12 14:35:21 -05:00
Cortland Klein
9ce896840c
Clarify the unit of time for ninja_edit_window
2013-02-12 11:17:11 -08:00
Robin Ward
04c8b20840
Remove a ton of old images we no longer use. They are leftover
...
from our prototype.
2013-02-12 13:04:40 -05:00
Robin Ward
95c86b0ffa
Merge pull request #140 from blom/adjust-regexp
...
Adjust some regular expressions
2013-02-12 08:47:54 -08:00
Robin Ward
d90235477c
Merge pull request #134 from abdulsattar/master
...
Set window height as maximum height of div_resizer
2013-02-12 08:45:52 -08:00
Robin Ward
449862dca3
Merge pull request #117 from ZogStriP/patch-4
...
Added code climate status image
2013-02-12 08:44:32 -08:00
Robin Ward
84d1ff437a
Merge pull request #105 from jamiehoyle/jh
...
Some mobile optimisations - mainly for the header.
2013-02-12 08:43:55 -08:00
Robin Ward
f2a29f2522
Small doc fixes.
2013-02-12 11:40:08 -05:00
Robin Ward
924ad1dae0
Merge pull request #106 from gammons/master
...
Refactored TopicsController#show into something that is much more maintainable
2013-02-12 08:36:20 -08:00
Robin Ward
be9c374285
Oops, database.yml and redis.yml were still included
2013-02-12 11:32:32 -05:00
Robin Ward
47d8a33f04
Merge commit '3875806315ef1122edbaf619b72a74f2c89926b0'
2013-02-12 11:24:36 -05:00
Ørjan Blom
bcd5040b11
Adjust some regular expressions
...
* Match beginning of string instead of beginning of line.
* Escape literal periods.
2013-02-12 17:21:56 +01:00
Robin Ward
3875806315
Introduction of Chef to Vagrant. Removed redis.yml and database.yml. Also updated
...
instructions a lot, and included setup instructions for provisioning your own VM.
Closes #28 and #61 .
2013-02-12 11:18:59 -05:00
Neil Lalonde
4636b354b4
Use the new mothership change_nickname API
2013-02-12 10:19:02 -05:00
Neil Lalonde
238032051e
Users with no email_tokens return true from email_confirmed
2013-02-12 10:19:02 -05:00
Robin Ward
84b40811b1
Merge branch 'master' of github.com:discourse/discourse
2013-02-12 10:04:41 -05:00
Abdulsattar Mohammed
c4eb5eee53
set window height as maximum height of div_resizer
...
This fixes the issue where a user can resize the div so that grippie is
no longer visible and is not reize the div back.
2013-02-12 13:56:37 +05:30
Sam
4668cf1d54
Merge pull request #114 from edward/patch-1
...
Consistency in SQL style
2013-02-12 00:11:59 -08:00
Sam Saffron
925925817f
remove old buggy code see: http://meta.discourse.org/t/quoted-you-emails/2226/3
...
notify by display name is silly, display name is not unique in the system
2013-02-12 18:49:57 +11:00
Sam Saffron
99526c33da
emoji should not be coupled into the core
...
avatars were being counted and should not have been for basic users
2013-02-12 18:43:48 +11:00
Sam Saffron
bdba0a78c4
scaffolding for message bus diags
2013-02-12 18:01:38 +11:00
Sam Saffron
818b84f02c
we are using structure.sql having this around only causes confusion
2013-02-12 15:17:33 +11:00
Sam Saffron
c1f093d48b
Merge branch 'master' of github.com:discourse/discourse
2013-02-12 15:06:48 +11:00
Sam Saffron
878fcd2c61
sketchy logo, so our techincolor logo is not sprawled across the web leading to confusion
2013-02-12 15:06:34 +11:00
Sam
6e74b4fb0c
Merge pull request #130 from danneu/slug-refactoring
...
Lean on Inflector for slug transliteration.
2013-02-11 19:31:16 -08:00
Sam Saffron
ad88487a32
Merge branch 'master' of github.com:discourse/discourse
2013-02-12 13:45:24 +11:00
