laf
|
0062e59f3a
|
Merge branch 'master' of github.com:laf/librenms into twitter-typeahead
Conflicts:
html/index.php
|
2015-05-03 13:30:56 +01:00 |
|
JoubertRedRat
|
5469d09b40
|
Merge commit 'c1ac5e4b549f4e6fa3671992c57e2080bf827e35' as 'lib/pace'
|
2015-05-01 10:54:10 -03:00 |
|
laf
|
bcb39db66a
|
Updated global search for new typeahead
|
2015-04-29 15:18:14 +01:00 |
|
laf
|
24bb9c41a6
|
Merge commit '1ba21ed194ed33d013c2dd181083e989001fa330' as 'lib/handlebars'
|
2015-04-29 13:58:35 +01:00 |
|
laf
|
1ba21ed194
|
Squashed 'lib/handlebars/' content from commit 891f48b
git-subtree-dir: lib/handlebars
git-subtree-split: 891f48b7e9c321dd9cbe7a898533eb6b2434b8a0
|
2015-04-29 13:58:35 +01:00 |
|
laf
|
57f802aa13
|
Merge commit '0f02c6843711558e22389be70fc0a74783871339' as 'lib/typeahead'
|
2015-04-29 13:54:41 +01:00 |
|
Alexander Sosna
|
5dab002566
|
chmod 0644 to html
|
2015-04-28 22:49:50 +02:00 |
|
Alexander Sosna
|
52da832e6e
|
chmod 0644 to images
|
2015-04-28 22:49:12 +02:00 |
|
Neil Lathwood
|
6b2e11dca7
|
Merge pull request #682 from laf/font-awesome-2-lib
Added Font awesome to lib via subtree
|
2015-03-31 13:32:25 +01:00 |
|
laf
|
ffd8fa687d
|
Merge commit '9e53021ef4f077d8d28ea95728ded4c93ef6b312' as 'lib/Font-Awesome'
|
2015-03-28 14:21:12 +00:00 |
|
laf
|
591c265a6f
|
Merge commit '35db670c97cf708658d9b331d5bd55c0c21cf7bc' as 'lib/vis'
|
2015-03-28 13:50:19 +00:00 |
|
laf
|
35db670c97
|
Squashed 'lib/vis/' content from commit 1d029ca
git-subtree-dir: lib/vis
git-subtree-split: 1d029cab7b527f3b292e95d550efbf784dac8699
|
2015-03-28 13:50:19 +00:00 |
|
laf
|
6207bae03a
|
Switched to using Jquery Bootgrid for tables
|
2015-03-27 16:28:09 +00:00 |
|
laf
|
115bed5812
|
Merge commit 'fcbbaffce15ad99a8095616f55183ca39e0e16a7' as 'lib/jquery-bootgrid'
|
2015-03-27 09:02:55 +00:00 |
|
laf
|
fcbbaffce1
|
Squashed 'lib/jquery-bootgrid/' content from commit 300dc3d
git-subtree-dir: lib/jquery-bootgrid
git-subtree-split: 300dc3d8618ed56e5e2e8754e1bb5ce7a2ff724e
|
2015-03-27 09:02:55 +00:00 |
|