Commit graph

7637 commits

Author SHA1 Message Date
Neil Lalonde
db1fb36495 Add public/*.html integration with Transifex 2014-04-11 16:56:22 -04:00
Neil Lalonde
b7203c125e Merge pull request #2226 from CirnoKaster/patch-2
client.zh_TW.yml: adding lines under filters.new
2014-04-11 13:50:54 -04:00
Robin Ward
1ae6c726dc Removes duplicate Controller definition 2014-04-11 12:51:09 -04:00
Robin Ward
0b42228663 FIX: Double clicking the home logo could leave you in a perpetual
"Loading" state.
2014-04-11 11:57:12 -04:00
Neil Lalonde
6b0cae8910 Update translations 2014-04-11 11:53:02 -04:00
Neil Lalonde
6e939c28fb Remove topic.notifications.title translation key since it's always an empty string 2014-04-11 10:54:02 -04:00
Neil Lalonde
543e6a7ddc Merge pull request #2251 from fantasticfears/locale
update zh_CN translation
2014-04-11 10:22:58 -04:00
Sam
f628ca3d8d Merge pull request #2256 from vikhyat/poll-plugin
Poll plugin updates
2014-04-11 14:07:15 +10:00
Vikhyat Korrapati
edfea2f801 Update poll when title is changed. 2014-04-11 09:05:07 +05:30
Vikhyat Korrapati
2928ce6ca1 Remove the colon from the poll prefix, drop regex support.
This is needed to make it possible to programmatically toggle between
open and closed polls.
2014-04-11 08:41:37 +05:30
Vikhyat Korrapati
edbbf7ffbb Switch the awkward poll.post.poll_details.closed to poll.closed. 2014-04-11 08:13:02 +05:30
Sam
b1c79ff811 Merge pull request #2255 from vikhyat/fix-sass-plugin-import
Only @import plugin scss. Fixes the huge emoji issue.
2014-04-11 12:40:48 +10:00
Vikhyat Korrapati
aebae2fa5c Only @import plugin scss. Fixes the huge emoji issue. 2014-04-11 08:06:18 +05:30
Erick Guan
28dd55c772 update zh_CN translation 2014-04-11 09:28:35 +08:00
Sam
668a5ff526 FEATURE: lock icon for archived topics
remove model sniffing hack
2014-04-11 10:27:04 +10:00
Sam
fe6153ba96 Merge pull request #2232 from vikhyat/username-on-top-setting
Add option to show username on top of posts instead of the left gutter
2014-04-11 10:13:18 +10:00
Sam
8d3c7b8f79 Merge pull request #2250 from ligthyear/fix-plugin-scss-import-path
Bugfix: Keep import path and context for plugin's scss imports
2014-04-11 10:12:09 +10:00
Sam
e770112cf5 Merge pull request #2254 from bradx3/fix_composer_padding
BUGFIX: adjust page padding when composer view open
2014-04-11 10:10:48 +10:00
Brad Wilson
836b0c41ab BUGFIX: adjust page padding when composer view open
From https://meta.discourse.org/t/discourse-general-polish/13184 :

"Footer padding gets out of sync: start typing a new topic in the composer ... size it big ... got to random topic ... footer padding is not added so you can not see the last post on topic. (workaround, resize composer once more so footer padding is added). This need to be added everywhere automatically. Including admin screens."
2014-04-11 09:54:14 +10:00
Neil Lalonde
2e3ba1d5dc Update ru translations from Transifex 2014-04-10 15:45:58 -04:00
Neil Lalonde
cb11967715 Add transifex config. Reconcile client.yml and server.yml translations in github and transifex. Transifex is now the source of all client.yml and server.yml files. 2014-04-10 15:42:38 -04:00
Jeff Atwood
bc56bc62a6 better auto-close example text 2014-04-10 12:25:02 -07:00
Robin Ward
e80851b0fa Special case: When crawling a link to an image, just put the filename as
the title.
2014-04-10 13:45:13 -04:00
Robin Ward
99e2bab62d Use update_all to prevent after_commit from executing again. 2014-04-10 13:19:57 -04:00
Jeff Atwood
605e60b016 copyedit on pins 2014-04-10 09:50:53 -07:00
Robin Ward
caa2564b83 Start up the Job scheduler after all the other initializers have loaded.
We do this so that plugins can register scheduled jobs.
2014-04-10 12:41:13 -04:00
Vikhyat Korrapati
af69b78ecb Changes to posts template to make it easier to display posts on top. 2014-04-10 21:56:13 +05:30
Régis Hanol
e1b96d2f15 Merge pull request #2249 from riking/onaldanm-1
Correct Closed Poll French Translation
2014-04-10 18:16:52 +02:00
Benjamin Kampmann
269600323a Bugfix: Keep import path and context for plugin scss imports
- instead of concating all files into one gigantic file reuse the importer
 - and that way keep the context for relative paths in plugin scss
2014-04-10 16:24:45 +02:00
Régis Hanol
8e58687df5 Merge pull request #2248 from riking/closed-result
Show results by default for closed polls
2014-04-10 10:53:12 +02:00
Régis Hanol
d0591c18f8 Merge pull request #2245 from ligthyear/category-double-selection-fix
Bugfix: double selection of categories in user preferences
2014-04-10 10:52:57 +02:00
Sam
7b3618baf9 clean up style 2014-04-10 18:34:50 +10:00
Sam
cd8b30bfcb BUGFIX: clicking on home was broke 2014-04-10 18:31:39 +10:00
Sébastien Miquerolle
1754375fcb Correct Closed Poll French Translation
Fix the locale and the \\s? position.
2014-04-10 01:12:59 -07:00
Benjamin Kampmann
72a6566bfd Prevent user from selecting the same category twice for different notification levels in their preferences 2014-04-10 10:08:59 +02:00
Kane York
6e8392bf8e Show results by default for closed polls 2014-04-10 01:00:52 -07:00
Sam
6daef624c3 BUGFIX: smoke test was broken 2014-04-10 16:57:23 +10:00
Sam
41631311e9 jiggle comment 2014-04-10 16:36:39 +10:00
Sam
49386412ca Merge pull request #2247 from bradx3/fix_null_topic_error
BUGFIX: suppress error when scrolling at bottom of topic
2014-04-10 16:33:01 +10:00
Sam
de9aa49b52 BUGFIX: default should register CSS for both mobile and desktop
If you want desktop only use :desktop option
2014-04-10 16:30:22 +10:00
Sam
97269fc918 FEATURE: education panel on pinning at bottom of topics 2014-04-10 15:53:58 +10:00
Brad Wilson
629e6f4158 BUGFIX: suppress error when scrolling at bottom of topic
fixes "Uncaught TypeError: Cannot call method 'get' of null" when 
scrolling at the bottom of the topic screen.
2014-04-10 15:36:44 +10:00
Jeff Atwood
cfc1444177 Merge pull request #2246 from awesomerobot/master
de-bluing some non-links
2014-04-09 21:06:10 -07:00
Kris Aubuchon
ec96ca4c60 modifying some styles for the new pin/unpin feature 2014-04-09 23:27:05 -04:00
Kris Aubuchon
1725f6e5bc Merge remote-tracking branch 'upstream/master' 2014-04-09 21:26:00 -04:00
Kris Aubuchon
8067381782 de-bluing some non-links 2014-04-09 21:19:04 -04:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Jeff Atwood
3f6764ce22 don't need the external link glyph in summary now 2014-04-09 17:10:07 -07:00
Jeff Atwood
1926a4c236 Safari 5.1 apparently, so fine 2014-04-09 16:21:08 -07:00
Sam
ac097e2d0f Merge pull request #2244 from vikhyat/css-import
Site Customization @import fixes
2014-04-10 07:01:34 +10:00