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
Sam Saffron
2b276bc2c8
gist oneboxer issues
2013-02-12 13:45:08 +11:00
Sam Saffron
2609350457
sample bluepill config
2013-02-12 13:44:44 +11:00
Dan Neumann
50cf8cd4d5
Set up slug.rb for obvious method extractions.
2013-02-11 20:36:54 -06:00
Dan Neumann
9daf53df73
lean on Inflector transliteration
2013-02-11 20:34:38 -06:00
Jeff Atwood
ecbaa45736
remove extraneous text on PM summary
2013-02-11 16:14:44 -08:00
Jamie Hoyle
07f30d445a
Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss
2013-02-11 22:59:13 +00:00
Grant Ammons
f3dc93a0db
WIP, a very nice refactoring of TopicsController#show
2013-02-11 17:54:56 -05:00
Robin Ward
e033213f84
Merge pull request #94 from danneu/plugin-registry-patch
...
Extracted default value initializers.
2013-02-11 14:50:09 -08:00
Robin Ward
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
Robin Ward
e0a66d0d19
Merge pull request #102 from charlesroper/patch-1
...
Update DEVELOPMENT.md
2013-02-11 14:47:47 -08:00
Robin Ward
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
Robin Ward
41e621bf3b
Merge branch 'topic-reply-button-state' of https://github.com/tms/discourse
2013-02-11 17:39:23 -05:00
Robin Ward
7746a4576d
Fixes: Bug concatenating string URL with integer id
2013-02-11 16:18:15 -05:00
Robin Ward
74220b4194
Don't update the current ip to an empty string
2013-02-11 16:01:53 -05:00
Robin Ward
60ccb5ecf5
Merge pull request #128 from alxndr/master
...
Typo fix
2013-02-11 12:57:04 -08:00
Alexander
ab9cb9cf5b
Typo fix
2013-02-11 12:49:23 -08:00
Robin Ward
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
Robin Ward
6ce32b8bc4
Trivial: Was not finding files in public for errors due to missing extensions.
2013-02-11 14:39:26 -05:00
Robin Ward
0f5ac91bbc
Update Gems to address CVE-2013-0276, CVE-2013-0277 and CVE-2013-0269
2013-02-11 14:03:54 -05:00
Robin Ward
7375566213
Merge pull request #119 from xdite/refactor_topic_view
...
Refactor topic view
2013-02-11 10:30:30 -08:00
Robin Ward
238aa0d007
Merge pull request #121 from xdite/refactor_application_layout
...
Refactor application layout
2013-02-11 10:28:09 -08:00
Robin Ward
10c12d05b3
iOS autocomplete bug fix - don't follow link to #
2013-02-11 12:48:34 -05:00
Robin Ward
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
Neil Lalonde
4e87289249
Add sidekiq instructions in DEVELOPMENT.md
2013-02-11 11:42:25 -05:00
Neil Lalonde
c18b85873f
Prevent login until email is confirmed
2013-02-11 11:18:37 -05:00
Robin Ward
f21609fe2e
Don't track links within discourse unless they're to other topics.
2013-02-11 11:11:48 -05:00
Robin Ward
37fa61ab51
Merge branch 'master' of github.com:discourse/discourse
2013-02-11 10:37:44 -05:00
