Lucas Bickel
|
090fdae99b
|
Merge remote-tracking branch 'robbt/feature/relative_smartblocks' into dev/merge-testing
|
2018-01-09 21:53:12 +01:00 |
|
Lucas Bickel
|
b7b581e6ec
|
Merge remote-tracking branch 'robbt/fix/show_files_meet_criteria' into dev/merge-testing
|
2018-01-09 21:51:30 +01:00 |
Lucas Bickel
|
a51f33442e
|
Merge pull request #405 from Robbt/fix/prevent-rename-of-clear-button
modified jquery find for shuffle and generate buttons to not target clear button
|
2018-01-09 20:44:57 +01:00 |
Robbt
|
98ee6bafe6
|
Removed unneeded function prototype
|
2018-01-08 21:50:06 -05:00 |
|
Robbt
|
144f1b5561
|
Fixed form validation and display after errors and when removing rows
|
2018-01-08 21:48:31 -05:00 |
|
Robbt
|
c8ba866484
|
Removing carriage return to attempt to try to avoid merge conflict in github UI
|
2018-01-08 18:47:21 -05:00 |
|
Robbt
|
25066afb37
|
Resolve variable name for isSmartBlock vs. isStaticSmartblock to avoid conflict
|
2018-01-08 18:45:27 -05:00 |
|
Robbt
|
b958aae77b
|
Resolve variable name for isSmartBlock vs. isStaticSmartblock to avoid conflict
|
2018-01-08 18:45:14 -05:00 |
|
Robbt
|
325f99c169
|
Merge changes from playlist preview to avoid conflicts
|
2018-01-08 18:42:55 -05:00 |
|
Robbt
|
7b8e630174
|
modified jquery find for shuffle and generate buttons to not target clear button
|
2018-01-08 18:24:39 -05:00 |
Robb Ebright
|
5e7a5b3e1d
|
Revert "fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid"
This reverts commit fc4f82a83a.
|
2018-01-07 15:27:58 -05:00 |
|
Robb Ebright
|
5848d307da
|
changing the default smartblock color to white for improved visibility
|
2018-01-04 15:49:32 -05:00 |
|
Robb Ebright
|
fc4f82a83a
|
fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid
|
2018-01-04 15:49:03 -05:00 |
|
Lucas Bickel
|
63e97692b0
|
Merge pull request #364 from Robbt/feature/smart-block-dynamic-preview
Feature: Modified form to allow preview of tracks for dynamic smartblocks
|
2018-01-04 21:10:13 +01:00 |
|
Lucas Bickel
|
4469d0c252
|
Merge pull request #402 from Robbt/fix/display-autoplaylist-on-calendar
fixed autoplaylist database logic and icon position
|
2018-01-04 21:08:34 +01:00 |
|
Robb Ebright
|
015bcea70d
|
Merge branch 'feature/relative_smartblocks' of https://github.com/Robbt/libretime into feature/relative_smartblocks
|
2018-01-04 10:38:25 -05:00 |
|
Robb Ebright
|
18a7ff5c0a
|
fixed autoplaylist database logic and icon position
|
2018-01-03 22:01:46 -05:00 |
|
Robb Ebright
|
927fcbc42d
|
Pluralized file criteria, cleaned up CSS and removed dead code
|
2018-01-03 18:57:02 -05:00 |
|
Robb Ebright
|
0af56cc283
|
Added javascript text to localegenerator
|
2018-01-03 17:15:30 -05:00 |
|
Lucas Bickel
|
81b418b636
|
Merge pull request #373 from Robbt/fix/display-autoplaylist-on-calendar
Fix/display autoplaylist on calendar
|
2018-01-02 18:55:05 +01:00 |
|
Robb Ebright
|
968dcfa6ad
|
added CSS for autoplaylist icon
|
2018-01-02 10:07:33 -05:00 |
|
Lucas Bickel
|
9d4fcaa58e
|
Merge pull request #394 from HammyHavoc/patch-2
Changing 'System' to 'Settings' in documentation
|
2018-01-02 12:23:14 +01:00 |
|
Lucas Bickel
|
d3c1bde584
|
Merge pull request #395 from HammyHavoc/patch-3
Making documentation less confusing
|
2018-01-02 12:21:58 +01:00 |
|
Lucas Bickel
|
9ca8c03d28
|
Merge pull request #392 from HammyHavoc/patch-1
Cleaned up preparing-the-server documentation page
|
2018-01-02 12:16:33 +01:00 |
Hammy Havoc
|
97dffadf9d
|
Moved Listener Stats to under The Main Menus
Also renamed it to Analytics as it will focus on all of the features of the Analytics area. :- )
|
2018-01-02 01:29:23 +00:00 |
|
Hammy Havoc
|
1e5579f1fe
|
Further improvements to readability
|
2018-01-02 01:23:53 +00:00 |
|
Hammy Havoc
|
ffddbe0163
|
Improved readability
|
2018-01-02 01:23:06 +00:00 |
|
Hammy Havoc
|
003ea23905
|
Making documentation less confusing
|
2018-01-02 01:18:20 +00:00 |
|
Hammy Havoc
|
2c01d9bcfa
|
Changing 'System' to 'Settings' in documentation
|
2018-01-02 01:14:38 +00:00 |
|
Hammy Havoc
|
3c808aef45
|
Changed 'System->Streams' to 'Settings->Streams'
|
2018-01-02 01:01:57 +00:00 |
|
Hammy Havoc
|
81f14a6b4e
|
Removed an unnecessary double space
|
2018-01-01 22:41:08 +00:00 |
|
Hammy Havoc
|
bf3f22df0f
|
Cleaned up preparing-the-server documentation page
A lot more to come across the whole documentation and source itself. :- ) Let's make LibreTime amazing.
|
2018-01-01 22:38:46 +00:00 |
|
Lucas Bickel
|
c342aef031
|
Use max upload size from php config in frontend plupload js
|
2017-12-26 13:14:01 +01:00 |
|
Robb Ebright
|
e4f94c18cc
|
Replaced lower case a icon with A and fixed transparency
|
2017-12-20 09:08:23 -05:00 |
|
Robb Ebright
|
7584f07d48
|
fixed icon
|
2017-12-20 08:52:33 -05:00 |
|
Robb Ebright
|
703a0e8b9b
|
Merge branch 'fix/display-autoplaylist-on-calendar' of https://github.com/Robbt/libretime into Robbt-fix/display-autoplaylist-on-calendar
|
2017-12-17 11:26:25 -05:00 |
|
Robb Ebright
|
ee86112898
|
Removed debug code and rewrote SQL as ORM query and readded icon image file
|
2017-12-17 10:47:38 -05:00 |
|
Lucas Bickel
|
0327a750ad
|
Merge pull request #379 from miles75/master
Hungarian translation. New translations and error corrections.
|
2017-12-17 09:56:25 +01:00 |
|
Robb
|
027b50b9a3
|
Merge pull request #378 from peppinoita/master
New screenshots
|
2017-12-14 15:09:22 -05:00 |
|
Robb
|
bf2894bc5a
|
Merge pull request #377 from peppinoita/patch-1
Update index.md
|
2017-12-14 15:05:22 -05:00 |
Jerry Russell
|
3c9bf4d554
|
Revert "syncing libretime/libretime.git master to jerry924/libretime.git"
This reverts commit ae76893dae.
|
2017-12-10 11:30:55 -08:00 |
|
Jerry Russell
|
ae76893dae
|
syncing libretime/libretime.git master to jerry924/libretime.git
|
2017-12-10 11:26:30 -08:00 |
|
Jerry Russell
|
a16ccfff8a
|
Merge remote-tracking branch 'upstream/master'
|
2017-12-10 11:21:55 -08:00 |
miles75
|
0a4406fc6b
|
Hungarian translation. New translations and error corrections.
|
2017-12-10 12:44:17 +01:00 |
peppinoita
|
d0b71efd13
|
Update index.md
|
2017-12-08 13:36:56 +01:00 |
|
peppinoita
|
f4fdfb0d45
|
Add files via upload
|
2017-12-08 12:57:13 +01:00 |
|
peppinoita
|
90987da711
|
Add files via upload
|
2017-12-08 12:56:11 +01:00 |
|
peppinoita
|
af0e85b0ea
|
Add files via upload
last screenshots
|
2017-12-08 12:51:17 +01:00 |
|
peppinoita
|
dc4fad989a
|
Delete Screenshot559-Log_in.png.PNG
|
2017-12-08 12:29:19 +01:00 |
|
peppinoita
|
ba8d0f43a1
|
Add files via upload
Filename error
|
2017-12-08 12:28:33 +01:00 |