JJ Allaire
89656e0ef0
rename alert to alertPanel
2013-12-15 07:33:47 -05:00
JJ Allaire
a314459a94
merge origin/master
...
Merge remote-tracking branch 'origin/master' into feature/alerts
Conflicts:
NEWS
R/bootstrap.R
2013-12-15 07:28:42 -05:00
Joe Cheng
b23cc47d95
Merge pull request #334 from rstudio/feature/font-awesome
...
icon function for embedding icons from the font-awesome icon library
2013-12-14 21:47:52 -08:00
JJ Allaire
01576f22f5
change name of function from alertPanel to alert
2013-12-14 17:06:36 -05:00
JJ Allaire
4be349c24c
alertPanel function for showing user alerts
2013-12-14 15:40:54 -05:00
JJ Allaire
e371fff110
update NEWS
2013-12-14 10:17:33 -05:00
JJ Allaire
dffe6b4f39
Merge remote-tracking branch 'origin/master' into feature/font-awesome
2013-12-14 09:46:59 -05:00
JJ Allaire
7b20fd91ef
fix R CMD check documentation errors
2013-12-14 09:44:54 -05:00
JJ Allaire
300c25ded1
re-roxygenize
2013-12-14 09:07:37 -05:00
JJ Allaire
284e814d2a
integrate icons into the rest of the ui
2013-12-14 09:02:11 -05:00
Yihui Xie
92def0f71d
Merge pull request #332 from jcheng5/bugfix/no-html-class
...
Fix test breakage due to HTML() missing from rendered output
2013-12-13 14:27:36 -08:00
Joe Cheng
bccae9d71c
Fix test breakage due to HTML() missing from rendered output
2013-12-13 14:18:06 -08:00
JJ Allaire
d4b29ab08d
initial font-awesome import
2013-12-13 15:56:18 -05:00
Yihui Xie
317d013a0b
Merge pull request #330 from yihui/travis
...
Travis CI
2013-12-13 12:41:04 -08:00
Yihui Xie
d297de732f
ignore travis.yml in .Rbuildignore
2013-12-13 00:52:46 -06:00
Yihui Xie
c41d4d32b9
enable Travis CI
...
YAML copied from https://github.com/yihui/highr/blob/master/.travis.yml
2013-12-13 00:31:31 -06:00
Yihui Xie
1b47e40a3a
Merge pull request #328 from rstudio/feature/rproj-changes
...
Rproj changes: don't roxygenize; use --as-cran for test
2013-12-12 09:44:58 -08:00
JJ Allaire
ae2f35c6c5
Rproj changes: don't roxygenize; use --as-cran for test
2013-12-12 06:20:35 -05:00
JJ Allaire
261cb7d3cd
fix incorrect ellipses arg in hr function
2013-12-11 15:46:38 -05:00
Yihui Xie
2705385681
Merge pull request #320 from rstudio/feature/layout-cleanup
...
misc cleanup of new layout functions
2013-12-11 09:11:42 -08:00
JJ Allaire
876acf2839
Merge remote-tracking branch 'origin/master' into feature/layout-cleanup
2013-12-11 06:00:43 -05:00
JJ Allaire
d0446f068c
Merge remote-tracking branch 'origin/master' into feature/layout-cleanup
2013-12-11 05:59:02 -05:00
Yihui Xie
a9396d1e2f
Merge pull request #324 from rstudio/feature/hr-tag
...
add hr tag to exported html builder tags
2013-12-10 21:01:28 -08:00
JJ Allaire
e87102e586
update NEWS
2013-12-10 20:41:17 -05:00
JJ Allaire
9a7dc5ba86
add hr tag to exported html builder tags
2013-12-10 20:20:16 -05:00
JJ Allaire
9acb3f83f8
add fluid parameter to navbarPage to specify fluid vs. fixed layout
2013-12-10 20:04:57 -05:00
Joe Cheng
ac112ea287
Race condition where clientData$singletons can be NULL
...
Reproduced in Shiny Server load testing.
Code reviewed by @trestletech
2013-12-09 15:51:45 -08:00
Yihui Xie
46054f513b
fixes #314 : the data passed to htmlOutputBinding could be null
2013-12-08 17:55:49 -06:00
JJ Allaire
261f67df50
update NAMESPACE For removed panelWithSidebar
2013-12-08 09:14:36 -05:00
JJ Allaire
22f9b2affe
rename tabsPosition to position
2013-12-08 09:10:50 -05:00
JJ Allaire
06c392c066
remove panelWithSidebar (this scenario will be handled by more composable top-level pages)
2013-12-08 09:10:28 -05:00
JJ Allaire
3d67b3bc17
Merge branch 'feature/remove-tab-condition' into feature/layout-cleanup
2013-12-08 09:06:47 -05:00
JJ Allaire
6cefab5d8a
Merge branch 'feature/navbar-header-footer' into feature/layout-cleanup
2013-12-08 09:06:35 -05:00
JJ Allaire
cc261de37b
remove condition attribute from tabPanel
...
the tab content visibility needs to be the union of data-display-if and whether the tab is active (the currenty implementation makes it always visible when data-display-if evaluates to true)
2013-12-07 17:16:02 -05:00
JJ Allaire
20712641a7
re-roxygenize for tabsetPanel position argument
2013-12-07 17:09:53 -05:00
JJ Allaire
e4d0b16fd5
add header and footer arguments to navbarPage
2013-12-07 17:09:26 -05:00
JJ Allaire
f8c25791e9
Merge pull request #318 from rstudio/feature/tabs-position
...
Add position parameter to tabsetPanel
2013-12-06 12:31:50 -08:00
JJ Allaire
704aa433d4
use match.arg for tabsPosition
2013-12-06 15:30:23 -05:00
Joe Cheng
3bd1003164
Merge pull request #316 from rstudio/feature/conditional-tabs
...
conditional expression to determine visibility of tabPanel
2013-12-06 11:21:58 -08:00
JJ Allaire
8dd55d7506
always assign data-display-if (it will be dropped if it's NULL)
2013-12-06 13:04:56 -06:00
Joe Cheng
6252d778c1
Merge pull request #317 from rstudio/feature/head-param
...
add optional head parameter to top-level page functions
2013-12-06 10:58:26 -08:00
Joe Cheng
942248b9e6
Merge pull request #315 from rstudio/feature/navbar-page
...
navbarPage and panelWithSidebar
2013-12-06 10:51:07 -08:00
Winston Chang
4793449105
Add example for actionButton
2013-12-06 12:13:31 -06:00
JJ Allaire
428e3bc0fc
forward head parameter in pageWithSidebar
2013-12-06 12:09:35 -06:00
Winston Chang
bf2c80cfcf
Improvements to invalidateLater docs
2013-12-06 12:09:23 -06:00
JJ Allaire
06b0685a57
change name of position parameter to tabsPosition
2013-12-06 11:33:49 -06:00
JJ Allaire
231ea25968
Add position paramter to tabsetPanel to enable positioning of tabs above, below, left, or right of tab content
2013-12-06 10:34:04 -06:00
JJ Allaire
8658eeddb2
update NEWS
2013-12-06 09:10:38 -06:00
JJ Allaire
d0769eed97
add optional head parameter to top-level page functions
2013-12-06 08:56:20 -06:00
JJ Allaire
b1fcd1f7c8
conditional expression to determine visibility of tabPanel
2013-12-06 08:12:26 -06:00
