codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 16:18:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
1195 commits 7 branches 179 tags 87 MiB
Commit graph

1195 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Atwood
0db31b3398 just set opacity of links on archived not row 2013-03-15 14:17:47 -07:00
Jeff Atwood
e22b4fe229 fancier favorite star on topics 2013-03-15 14:06:04 -07:00
Kuba Brecka
d40ebce979 cs translation update 2013-03-15 22:05:29 +01:00
Robin Ward
67f0de4b8b Fixed some merge conflicts 2013-03-15 16:59:10 -04:00
Robin Ward
1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse 
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
 2013-03-15 16:49:17 -04:00
Robin Ward
76d8df6ac6 Merge pull request #462 from kubabrecka/colorpicker3 
implement color picking from predefined set for category badges + option to change foreground color
 2013-03-15 13:43:59 -07:00
Robin Ward
be01e7be60 Slightly offset the second popup if two are on at once 2013-03-15 16:05:57 -04:00
Robin Ward
dd5885bf12 FIX: Twitter tags were using property instead of name. 2013-03-15 15:42:21 -04:00
Robin Ward
87b950fc49 We are randomly seeing the wrong serializing used in test. Trying to revert 
this to see if it is the cause.

Revert "see: https://github.com/rails-api/active_model_serializers/pull/233"

This reverts commit 2a5cbd8072.
 2013-03-15 15:23:43 -04:00
Robin Ward
ad082cea70 Big commit: 
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
 2013-03-15 14:35:33 -04:00
Robin Ward
7714e2050e Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files 
extracted hard coded strings in the admin javascript files [ci skip]
 2013-03-15 06:49:03 -07:00
Régis Hanol
aef014f439 displays the number of characters left when editing the topic title 2013-03-15 12:56:14 +01:00
Jeff Atwood
6e7e5cb9e2 Merge pull request #467 from nicksahler/patch-3 
Wrong file. :|
 2013-03-15 02:59:55 -07:00
Nick Sahler
fb0da25b2d Wrong file. :| 2013-03-15 05:35:26 -03:00
Neil Lalonde
6c4d9ecfdc Use one request to fetch dashboard report data and check version 2013-03-14 18:26:26 -04:00
Régis Hanol
cad55bf244 extracted hard coded strings in the admin javascript files 2013-03-14 23:03:13 +01:00
Sam
6690a2ba3e Merge pull request #463 from kubabrecka/cs_update15 
cs translation update + pseudolocalization
 2013-03-14 14:29:35 -07:00
Sam
2a5cbd8072 see: https://github.com/rails-api/active_model_serializers/pull/233 2013-03-14 14:27:43 -07:00
Régis Hanol
3bf6625aa4 displays a message when a failure happen while creating a new category 2013-03-14 22:25:55 +01:00
Kuba Brecka
053eb0aa85 cs translation update + pseudolocalization 2013-03-14 17:54:00 +01:00
Neil Lalonde
4f42110e39 Change layout of the admin dashboard 2013-03-14 12:42:45 -04:00
Robin Ward
1715220d77 FIX: Hide topics list when loading new topics by category 2013-03-14 12:38:05 -04:00
Robin Ward
f47240483c FIX: On refresh, wouldn't say "You liked this" 2013-03-14 12:15:24 -04:00
Robin Ward
2c8afca855 Let's ignore structure.sql - it doesn't seem necessary and just causes merge 
conflicts.
 2013-03-14 11:15:09 -04:00
Robin Ward
8760f58f3d Merge pull request #450 from ZogStriP/fixes-category-bug-on-cancel 
fixes bug when modifying the category of a topic but cancelling the edit
 2013-03-14 08:08:26 -07:00
Robin Ward
18133caf25 Merge pull request #449 from kubabrecka/composer_wider_placeholder 
make the "add user" placeholder in composer wider, so other languages can fit into that
 2013-03-14 08:06:04 -07:00
Robin Ward
025dd86e26 Merge pull request #423 from nverba/heroku-integration 
Basic Heroku integration
 2013-03-14 08:05:46 -07:00
Neil Lalonde
91bd27ec0a Keep a jQuery object of hidden login form 2013-03-14 11:03:57 -04:00
nsahler
d398d13aed - Mobile Reply-as-new fix 
- Documentation
 2013-03-14 11:02:13 -04:00
Robin Ward
dc9d54f1c7 Merge pull request #461 from richp10/master 
Sample Apache2 configuration
 2013-03-14 07:47:52 -07:00
Robin Ward
bde8e3df4a Merge pull request #455 from ZogStriP/master 
keeping French localization up to date
 2013-03-14 06:39:19 -07:00
Robin Ward
42621859d1 Merge pull request #459 from tangramor/master 
Fixed issue #435. Add zh_TW translations. Add missed translations according to newest en.yml
 2013-03-14 06:38:37 -07:00
Robin Ward
4c1ee78a78 Merge pull request #457 from kubabrecka/update_cs14 
update cs translation
 2013-03-14 06:36:19 -07:00
Robin Ward
17c05b4460 Merge pull request #460 from ZogStriP/extracted-a-few-missing-strings 
extracted a few missing strings
 2013-03-14 06:35:19 -07:00
Kuba Brecka
8784c55188 implement color picking from predefined set for category badges + option to change foreground color 2013-03-14 14:16:57 +01:00
Richard Phillips
ff4aaa04cb Apache2 Configuration Sample 
Sample Virtualhost showing how to:proxy requests to thinserver cluster,
Server static files locally, set headers for downstream server to cache
static assets, exclude mod_security rules that interfere with Discourse.
 2013-03-14 12:18:56 +00:00
Regis Hanol
6abfa5342c extracted a few missing strings 2013-03-14 11:59:40 +01:00
tangramor
30f6561623 Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese 
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
 2013-03-14 18:18:59 +08:00
Kuba Brecka
5f3ac08dba update cs translation 2013-03-14 08:41:40 +01:00
Régis Hanol
969a62841c keeping French l10n up to date 2013-03-14 01:32:19 +01:00
Robin Ward
a8c44d90a3 FIX: Title changes didn't always apply. Cleaned up some ugly JS. 2013-03-13 18:38:38 -04:00
Neil Lalonde
7777b3f650 Autofocus on first field in signup form 2013-03-13 17:59:51 -04:00
Robin Ward
21b5183d6a Fix linting errors. 2013-03-13 16:04:48 -04:00
Robin Ward
518910a54d FIX: Don't include link counts when selecting text to quote a post. 2013-03-13 15:51:41 -04:00
Neil Lalonde
213d3e5c10 Remove unused code and routes that don't exist in session_controller 2013-03-13 15:21:45 -04:00
nverba
68e3f5228f Basic Heroku integration 2013-03-13 19:07:49 +00:00
Robin Ward
45674ef8e7 FIX: When a moderator made a post, their name wasn't highlighted until refresh 2013-03-13 13:59:42 -04:00
Neil Lalonde
58004d44cd Support for browser password managers, but doesn't quite work in IE 2013-03-13 13:55:33 -04:00
Robin Ward
ea20993bed FIX: Don't create a new version when a post is recovered. Also display username instead of full name for consistency. 2013-03-13 12:35:55 -04:00
Robin Ward
42c7a65a05 When editing a post that is in reply to another post, show display meta data to that effect. 2013-03-13 12:00:38 -04:00