codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-21 13:02:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
7624 commits 7 branches 179 tags 87 MiB
Commit graph

7624 commits

This branch
This branch
All branches
Author SHA1 Message Date
Régis Hanol
3be822f97e Merge pull request #1914 from velesin/topic_creator_refactoring 
Refactors TopicCreator
 2014-02-06 15:04:54 -08:00
Jeff Atwood
929191ecd9 new intro message and better 404 copy 2014-02-06 14:51:24 -08:00
Sam
0efcb9cee9 BUGFIX: race condition in blocking_tick 
causes erratic spec failure
 2014-02-07 08:40:43 +11:00
Sam
f27ffe3223 BUGFIX: scheduler was showing up empty in multisite 2014-02-07 08:37:02 +11:00
David Celis
e751b8d58f Default values for posts/topics fields on Category 
When creating categories (or, at least, subcategories), certain integer
values are set to a default of NULL: topics_week, topics_month,
topics_year, posts_week, posts_month, and posts_year. This causes
consistent exceptions when trying to visit `/categories`, with the
offending line being in
`CategoryDetailedSerializer#count_with_subcategories`. This attempts to
coerce nil into Fixnum.

A fix could be to convert to 0 in the code, but these attributes should
really never be NULL. If there are no posts or topics, they should be 0
to maintain data integrity.

Signed-off-by: David Celis <me@davidcel.is>
 2014-02-06 12:04:03 -08:00
Wojciech Zawistowski
bc1824a6ed Refactors TopicCreator 2014-02-06 20:52:50 +01:00
Neil Lalonde
5b559d9631 Pinned uncategorized topics span the title and category column in topic lists 2014-02-06 14:38:04 -05:00
David Celis
49bc7692bf Include binstubs generated by Rails 4 
Commit b516ecc added `bin/` to the .gitignore file. Now that Discourse
runs using Rails 4 by default, however, we should include the binstubs
generated by `rake rails:update:bin` in version control as this is the
recommendation of the Rails core team. Additionally, for those wishing
to deploy Discourse to Heroku, these binstubs are actually mandatory
according to [this article](https://devcenter.heroku.com/articles/rails4).

Other binstubs can continue to be ignored.

Signed-off-by: David Celis <me@davidcel.is>
 2014-02-06 11:15:00 -08:00
Neil Lalonde
113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Neil Lalonde
a72e7324ba Append browser-update div last in the dom to prevent googlebots from seeing it first 2014-02-06 10:48:15 -05:00
Régis Hanol
9b3740a7c6 Merge pull request #1909 from codedinc/shortenUrl-fix 
Fix shortenUrl helper to not crash when URL doesn't include any "/".
 2014-02-06 16:35:11 +01:00
macournoyer
8bf872e92e Fix shortenUrl helper to not crash when URL doesn't include any "/". 2014-02-06 10:12:38 -05:00
Régis Hanol
bd418cd5ef Merge pull request #1897 from matsen/master 
Removing outdated references to .sample `config/` files in HEROKU.md
 2014-02-06 15:29:16 +01:00
Régis Hanol
a5e1c694a6 Merge pull request #1905 from velesin/post_destroyer_refactoring 
Refactors PostDestroyer
 2014-02-06 15:00:58 +01:00
Wojciech Zawistowski
4485ae7b05 Refactors PostDestroyer 2014-02-06 07:54:34 -05:00
Régis Hanol
c4cfd5a7fe BUGFIX: unbind the file uploader when closing the composer 2014-02-06 12:54:06 +01:00
Régis Hanol
58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Régis Hanol
a710773bb4 BUGFIX: do not override default browser keyboard shortcuts behavior 2014-02-06 11:07:33 +01:00
Régis Hanol
6d3c3a02cb Merge pull request #1900 from ballistiq/allow_user_activation_on_create 
Whitelist :active param so that we can automatically create users that a...
 2014-02-06 09:56:00 +01:00
Régis Hanol
f2a75aaf26 Merge pull request #1908 from riking/docker-link 
Extract version check in dashboard to own template
 2014-02-06 09:54:03 +01:00
Sam
4e3980896e Merge pull request #1906 from fabricioflores/patch-1 
Update client.es.yml
 2014-02-06 18:32:40 +11:00
Jeff Atwood
f2c017ac1a Merge pull request #1910 from awesomerobot/master 
previous restricted badge fix broke restricted badges in titles, this fixes it
 2014-02-05 22:26:59 -08:00
Sam
d9df40dfcd minor refactor 2014-02-06 17:07:15 +11:00
Sam
a69f59ef51 FEATURE: much faster asset precompilation with a redis backed cache 2014-02-06 16:55:53 +11:00
Kris Aubuchon
00e941ff07 previous restricted badge fix broke restricted badges in titles, this fixes it 2014-02-06 00:30:44 -05:00
Sam
d132fd0609 add full-name class for styling 2014-02-06 15:53:49 +11:00
riking
7c12aeb848 Extract version check in dashboard to own template 2014-02-05 17:22:10 -08:00
Sam
fad80bbee3 Sort schedules by "next run due" time 2014-02-06 10:59:42 +11:00
Neil Lalonde
14018ec07c FIX: topic and post counts on /categories page should include sub-categories 2014-02-05 18:39:49 -05:00
Neil Lalonde
7d79d5a738 Change title of button from Starred to Star 2014-02-05 18:39:49 -05:00
Sam
e1f293ad66 FEATURE: new scheduler 
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
 2014-02-06 10:26:16 +11:00
Sam
447816fe39 Merge pull request #1824 from riking/patch-2 
Fix group matching SQL query
 2014-02-06 08:07:13 +11:00
Sam
7ea2cee3aa Merge pull request #1898 from awesomerobot/master 
removing :focus style until I figure out a better fix; also fixing restricted badge alignment
 2014-02-06 08:03:34 +11:00
Robin Ward
aff16f372b FIX: Show a nicer error when a user tries to access a category they 
can't see.
 2014-02-05 15:33:52 -05:00
Robin Ward
95585503ac Updated onebox (again) to fix Github link 2014-02-05 14:41:25 -05:00
Robin Ward
1990f7b704 Update Onebox gem 2014-02-05 14:37:03 -05:00
Fabricio Flores
b27cc970a9 Update client.es.yml 
Added tranlations in admin.users.nav
 2014-02-05 14:15:20 -05:00
Robin Ward
1dac3cfd64 API endpoint for retrieving the current user 2014-02-05 13:46:24 -05:00
Robin Ward
af5254d3b4 FIX: Remove canvas tag. 2014-02-05 12:22:36 -05:00
Régis Hanol
e45a2bd064 Merge pull request #1904 from vikhyat/load-plugins-1 
Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency.
 2014-02-05 10:22:25 +01:00
Vikhyat Korrapati
6acc5c19e7 Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency. 2014-02-05 10:50:28 +05:30
Sam
391cfe15ab Merge pull request #1902 from vikhyat/plugin-test-server-side-javascript-2 
Don't clear DiscoursePluginRegistry if LOAD_PLUGINS=true.
 2014-02-04 21:13:16 -08:00
Sam
311a44240f Merge pull request #1901 from vikhyat/fill-plugin-spec-glob 
Fix plugin:spec rake task to include subdirectories.
 2014-02-04 21:11:11 -08:00
Kris Aubuchon
e42374d6f6 aligning content within restricted-badges 2014-02-04 21:52:48 -05:00
Kris Aubuchon
3ae7c14b85 Merge remote-tracking branch 'upstream/master' 2014-02-04 21:49:34 -05:00
Vikhyat Korrapati
7b46cc0962 Don't clear DiscoursePluginRegistry if LOAD_PLUGINS=true. 2014-02-05 08:05:35 +05:30
Vikhyat Korrapati
fab4e59f76 Fix plugin:spec rake task to include subdirectories. 2014-02-05 06:11:49 +05:30
Sam
df65371d72 BUGFIX: microcontroller was consuming too much CPU 
sleep 0.1 and file test were expensive compared to a signal every second
 2014-02-05 10:48:36 +11:00
Régis Hanol
759c18d9f5 FEATURE: HOME/END should always take you to the correct spot 2014-02-04 23:25:27 +01:00
Robin Ward
8adb08a9ca FIX: Don't allow <button> in posts either. 2014-02-04 16:29:00 -05:00