34329ee598
Merge pull request #137 from shapkin/patch-1
...
Update app/controllers/categories_controller.rb
2013-02-13 07:20:50 -08:00
afc23cc8cb
Merge pull request #133 from xdite/apply_omniauth
...
Apply omniauth
2013-02-13 07:19:13 -08:00
b036c9e555
Update app/controllers/categories_controller.rb
...
Fix extra whitespace and hash style.
Comply with a style guide like in Github.
2013-02-13 15:14:38 +04:00
329f4617a9
less magic numbers
2013-02-13 22:01:16 +11:00
93846aecb1
13 sucks
2013-02-13 21:57:58 +11:00
3bfdb2dd5b
missed this. was inserting dupes when loading more
2013-02-13 21:18:06 +11:00
b7c5687b10
Merge branch 'master' of github.com:discourse/discourse
2013-02-13 20:38:59 +11:00
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
48e2b8c269
require 50 read posts, not 100, for basic user
2013-02-13 01:23:02 -08:00
ae034a438c
scope google search on 404 to domain
2013-02-13 01:05:35 -08:00
ee75980f23
first step of variable-izing the /tos
2013-02-13 00:35:18 -08:00
8078f04769
minor 404 page improvements
2013-02-13 00:25:27 -08:00
b5a25084c0
That 1px makes all the difference, man
2013-02-12 23:17:54 -08:00
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
9189d937f7
move all logic to omniauth
...
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
be3d036084
use omniauth-openid to replace google id
2013-02-13 15:08:32 +08:00
4c572ecd8d
clean up some copy
2013-02-12 22:43:21 -08:00
4e9d9138d6
Fix broken signup with Twitter
2013-02-12 20:50:31 -05:00
69c7b5aeed
Support category names with spaces
2013-02-12 17:54:56 -05:00
8235d47bdd
Add a new default favicon using the pencil drawn logo
2013-02-12 17:47:44 -05:00
824b09389f
Don't allow signups without a password
2013-02-12 15:42:16 -05:00
d7f3241285
Option to supress replies button below a post, when its reply is directly following.
2013-02-12 14:35:21 -05:00
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
95c86b0ffa
Merge pull request #140 from blom/adjust-regexp
...
Adjust some regular expressions
2013-02-12 08:47:54 -08:00
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
84d1ff437a
Merge pull request #105 from jamiehoyle/jh
...
Some mobile optimisations - mainly for the header.
2013-02-12 08:43:55 -08:00
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
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
4636b354b4
Use the new mothership change_nickname API
2013-02-12 10:19:02 -05:00
238032051e
Users with no email_tokens return true from email_confirmed
2013-02-12 10:19:02 -05:00
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
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
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
878fcd2c61
sketchy logo, so our techincolor logo is not sprawled across the web leading to confusion
2013-02-12 15:06:34 +11:00
ecbaa45736
remove extraneous text on PM summary
2013-02-11 16:14:44 -08:00
07f30d445a
Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss
2013-02-11 22:59:13 +00:00
f3dc93a0db
WIP, a very nice refactoring of TopicsController#show
2013-02-11 17:54:56 -05:00
da79d6a8ed
Merge pull request #122 from cjbell88/fix_minor_button_cut_off
...
Fix 1px button cut off on topic progress up / down buttons.
2013-02-11 14:48:15 -08:00
592531be28
Merge pull request #109 from tms/topic-reply-button-state
...
Disable reply button on archived/closed topics
2013-02-11 14:42:19 -08:00
7746a4576d
Fixes: Bug concatenating string URL with integer id
2013-02-11 16:18:15 -05:00
57049b55a2
Little things:
...
- Retries on deadlock when calculating average time
- Removes Warning: When specifying html format for errors
- Doesn't use manual SQL to update user's ip address
2013-02-11 15:47:28 -05:00
6ce32b8bc4
Trivial: Was not finding files in public for errors due to missing extensions.
2013-02-11 14:39:26 -05:00
7375566213
Merge pull request #119 from xdite/refactor_topic_view
...
Refactor topic view
2013-02-11 10:30:30 -08:00
238aa0d007
Merge pull request #121 from xdite/refactor_application_layout
...
Refactor application layout
2013-02-11 10:28:09 -08:00
10c12d05b3
iOS autocomplete bug fix - don't follow link to #
2013-02-11 12:48:34 -05:00
09e53c72d4
Changed our minds: Let's track internal links, just never to users. Something like FAQ is useful.
2013-02-11 12:36:33 -05:00
c18b85873f
Prevent login until email is confirmed
2013-02-11 11:18:37 -05:00
f21609fe2e
Don't track links within discourse unless they're to other topics.
2013-02-11 11:11:48 -05:00
240a290422
Fix 1px button cut off on topic progress up / down buttons.
2013-02-11 12:08:50 +00:00
4175341b26
move stylesheet
2013-02-11 19:41:23 +08:00
Robin Ward
Alexander Shapkin
Sam Saffron
Jeff Atwood
xdite
xdite
Neil Lalonde
Ørjan Blom
Abdulsattar Mohammed
Jamie Hoyle
Grant Ammons
Chris Bell